From 8b8ede3402b150d0b23816c6d90f6172c8c8ead9 Mon Sep 17 00:00:00 2001 From: Jonas von Andrian Date: Fri, 13 Mar 2026 12:52:14 +0100 Subject: [PATCH] Breaking: use jackson 3 to parse --- .github/workflows/build.yml | 6 +-- .github/workflows/publish.yml | 4 +- build.gradle.kts | 8 +-- codegen/build.gradle.kts | 2 +- .../lancom/openapi/codegen/type/SimpleType.kt | 2 +- .../openapi/codegen/view/OpenApiEntity.kt | 4 +- .../resources/templates/enum-class.mustache | 4 +- renovate.json | 4 +- .../openapi/common/types/ComponentType.kt | 4 +- .../openapi/common/types/HeaderStyle.kt | 4 +- .../de/lancom/openapi/common/types/In.kt | 4 +- .../lancom/openapi/common/types/InApiKey.kt | 4 +- .../openapi/common/types/ParameterStyle.kt | 4 +- .../lancom/openapi/common/types/SchemaType.kt | 4 +- .../de/lancom/openapi/common/types/Style.kt | 4 +- .../parser/entity/APIKeySecurityScheme.kt | 4 +- .../entity/AdditionalPropertiesBoolean.kt | 4 +- .../entity/AdditionalPropertiesReference.kt | 4 +- .../entity/AdditionalPropertiesSchema.kt | 4 +- .../lancom/openapi/parser/entity/Callback.kt | 4 +- .../openapi/parser/entity/Components.kt | 4 +- .../lancom/openapi/parser/entity/Contact.kt | 4 +- .../openapi/parser/entity/DefaultJson.kt | 6 +-- .../openapi/parser/entity/Discriminator.kt | 6 +-- .../lancom/openapi/parser/entity/Encoding.kt | 4 +- .../lancom/openapi/parser/entity/Example.kt | 4 +- .../openapi/parser/entity/ExampleJson.kt | 6 +-- .../parser/entity/ExternalDocumentation.kt | 6 +-- .../parser/entity/HTTPSecurityScheme.kt | 4 +- .../de/lancom/openapi/parser/entity/Header.kt | 4 +- .../de/lancom/openapi/parser/entity/Info.kt | 4 +- .../lancom/openapi/parser/entity/License.kt | 4 +- .../de/lancom/openapi/parser/entity/Link.kt | 4 +- .../lancom/openapi/parser/entity/MediaType.kt | 4 +- .../parser/entity/OAuth2SecurityScheme.kt | 4 +- .../lancom/openapi/parser/entity/OpenApi.kt | 4 +- .../entity/OpenIdConnectSecurityScheme.kt | 4 +- .../lancom/openapi/parser/entity/Operation.kt | 4 +- .../lancom/openapi/parser/entity/Parameter.kt | 4 +- .../lancom/openapi/parser/entity/PathItem.kt | 4 +- .../de/lancom/openapi/parser/entity/Paths.kt | 4 +- .../openapi/parser/entity/RawExtension.kt | 6 +-- .../openapi/parser/entity/RequestBody.kt | 4 +- .../openapi/parser/entity/RequestBodyJson.kt | 6 +-- .../lancom/openapi/parser/entity/Response.kt | 4 +- .../lancom/openapi/parser/entity/Responses.kt | 4 +- .../de/lancom/openapi/parser/entity/Schema.kt | 4 +- .../parser/entity/SecurityRequirement.kt | 6 +-- .../de/lancom/openapi/parser/entity/Server.kt | 4 +- .../openapi/parser/entity/ServerVariable.kt | 4 +- .../de/lancom/openapi/parser/entity/Tag.kt | 4 +- .../parser/entity/TagGroupsExtension.kt | 4 +- .../parser/entity/TagGroupsExtensionEntry.kt | 4 +- .../de/lancom/openapi/parser/entity/XML.kt | 6 +-- .../common/converter/simple/Extension.kt | 12 ++--- .../common/converter/simple/ObjectMapper.kt | 8 +-- .../common/converter/simple/ToSimple.kt | 2 +- .../common/jackson/JsonWrapperDeserializer.kt | 12 +++-- .../jackson/JsonWrapperKeySerializer.kt | 10 ++-- .../common/jackson/JsonWrapperSerializer.kt | 8 +-- .../openapi/common/types/ContentType.kt | 4 +- .../de/lancom/openapi/common/types/Path.kt | 7 +-- .../common/types/ResponseStatusCode.kt | 4 +- .../openapi/common/types/SchemaFormat.kt | 7 +-- .../de/lancom/openapi/common/types/TagRef.kt | 7 +-- .../de/lancom/openapi/common/util/Jackson.kt | 52 +++++++++++-------- .../common/util/SimpleOpenApiParser.kt | 2 +- .../openapi/parser/entity/EntityDescriptor.kt | 4 +- .../openapi/parser/entity/JsonEntity.kt | 2 +- .../parser/entity/JsonEntityFactory.kt | 4 +- .../parser/jackson/EntityDeserializer.kt | 12 ++--- .../parser/jackson/EntitySerializer.kt | 25 +++++---- .../openapi/parser/jackson/ExtensionParser.kt | 4 +- .../lancom/openapi/parser/jackson/Parser.kt | 2 +- .../lancom/openapi/parser/jackson/Wrapper.kt | 17 +++--- .../de/lancom/openapi/parser/ref/Instance.kt | 12 ++--- .../de/lancom/openapi/parser/ref/Reference.kt | 30 +++++------ .../lancom/openapi/parser/util/MergeUtils.kt | 6 +-- .../lancom/openapi/simple/entity/Example.kt | 2 +- .../de/lancom/openapi/simple/entity/Header.kt | 2 +- .../de/lancom/openapi/simple/entity/Link.kt | 2 +- .../lancom/openapi/simple/entity/MediaType.kt | 2 +- .../lancom/openapi/simple/entity/OpenApi.kt | 2 +- .../lancom/openapi/simple/entity/Operation.kt | 2 +- .../lancom/openapi/simple/entity/Parameter.kt | 2 +- .../de/lancom/openapi/simple/entity/Schema.kt | 2 +- .../de/lancom/openapi/simple/entity/Tag.kt | 2 +- .../simple/types/AdditionalProperties.kt | 26 +++++----- .../lancom/openapi/common/util/TestUtils.kt | 2 +- .../parser/CleanupUnusedComponentsTest.kt | 2 +- .../de/lancom/openapi/parser/ExampleTest.kt | 2 +- .../lancom/openapi/parser/JsonWrapperTest.kt | 2 +- .../de/lancom/openapi/parser/MergeTest.kt | 2 +- .../parser/petstore/ParserPetstoreApiTest.kt | 6 ++- .../serialisation/AbstractBooleanFieldTest.kt | 2 +- .../serialisation/AbstractObjectFieldTest.kt | 2 +- .../AbstractSerialisationTest.kt | 6 +-- .../serialisation/EntityFieldTestCases.kt | 2 +- .../openapi/parser/serialisation/FieldTest.kt | 2 +- .../serialisation/StringNullFieldTest.kt | 2 +- .../openapi/parser/serialisation/TestCase.kt | 4 +- 101 files changed, 293 insertions(+), 274 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b358d01..b101ce7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest - name: Build with Java 11 + name: Build with Java 21 steps: - name: checkout @@ -21,11 +21,11 @@ jobs: - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 21 - name: gradle build run: ./gradlew build --stacktrace diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9598fb6..824c88c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,11 +21,11 @@ jobs: - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v5 - - name: Set up JDK 8 + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 21 - name: gradle publishToSonatype closeAndReleaseSonatypeStagingRepository run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --stacktrace diff --git a/build.gradle.kts b/build.gradle.kts index 620c12b..0a73ef0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } kotlin { - jvmToolchain(11) + jvmToolchain(21) } java { @@ -21,9 +21,9 @@ group = "io.github.lancomsystems.openapi.parser" version = libraryVersion dependencies { - implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1") + implementation("tools.jackson.core:jackson-databind:3.0.4") + implementation("tools.jackson.dataformat:jackson-dataformat-yaml:3.0.4") + implementation("tools.jackson.module:jackson-module-kotlin:3.0.4") testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.3") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.3") } diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts index 29aeaec..71eadeb 100644 --- a/codegen/build.gradle.kts +++ b/codegen/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { } kotlin { - jvmToolchain(11) + jvmToolchain(21) } val wrapper by tasks.creating diff --git a/codegen/src/main/kotlin/de/lancom/openapi/codegen/type/SimpleType.kt b/codegen/src/main/kotlin/de/lancom/openapi/codegen/type/SimpleType.kt index d251a8f..102952b 100644 --- a/codegen/src/main/kotlin/de/lancom/openapi/codegen/type/SimpleType.kt +++ b/codegen/src/main/kotlin/de/lancom/openapi/codegen/type/SimpleType.kt @@ -19,7 +19,7 @@ data class SimpleType( val jsonNode = SimpleType( type = "JsonNode", imports = setOf( - "com.fasterxml.jackson.databind.JsonNode", + "tools.jackson.databind.JsonNode", ), ) diff --git a/codegen/src/main/kotlin/de/lancom/openapi/codegen/view/OpenApiEntity.kt b/codegen/src/main/kotlin/de/lancom/openapi/codegen/view/OpenApiEntity.kt index ec02667..c5e20a3 100644 --- a/codegen/src/main/kotlin/de/lancom/openapi/codegen/view/OpenApiEntity.kt +++ b/codegen/src/main/kotlin/de/lancom/openapi/codegen/view/OpenApiEntity.kt @@ -135,8 +135,8 @@ class OpenApiEntity( companion object { val staticImports = listOf( - "com.fasterxml.jackson.databind.annotation.JsonDeserialize", - "com.fasterxml.jackson.databind.annotation.JsonSerialize", + "tools.jackson.databind.annotation.JsonDeserialize", + "tools.jackson.databind.annotation.JsonSerialize", "de.lancom.openapi.common.types.*", "de.lancom.openapi.common.util.*", "de.lancom.openapi.parser.field.Field", diff --git a/codegen/src/main/resources/templates/enum-class.mustache b/codegen/src/main/resources/templates/enum-class.mustache index 4990459..e7f3852 100644 --- a/codegen/src/main/resources/templates/enum-class.mustache +++ b/codegen/src/main/resources/templates/enum-class.mustache @@ -1,8 +1,8 @@ {{>banner}} package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/renovate.json b/renovate.json index b3288ca..bf2cb61 100644 --- a/renovate.json +++ b/renovate.json @@ -3,9 +3,9 @@ "commitMessagePrefix": "Upgrade: ", "packageRules": [ { - "groupName": "com.fasterxml.jackson", + "groupName": "tools.jackson", "matchPackagePrefixes": [ - "com.fasterxml.jackson" + "tools.jackson" ] } ], diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/ComponentType.kt b/src/generated/kotlin/de/lancom/openapi/common/types/ComponentType.kt index b899831..9a3ce29 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/ComponentType.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/ComponentType.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/HeaderStyle.kt b/src/generated/kotlin/de/lancom/openapi/common/types/HeaderStyle.kt index 6007fb3..9bf5445 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/HeaderStyle.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/HeaderStyle.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/In.kt b/src/generated/kotlin/de/lancom/openapi/common/types/In.kt index 8582650..1a33d11 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/In.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/In.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/InApiKey.kt b/src/generated/kotlin/de/lancom/openapi/common/types/InApiKey.kt index 7f3fb7d..7c1c107 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/InApiKey.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/InApiKey.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/ParameterStyle.kt b/src/generated/kotlin/de/lancom/openapi/common/types/ParameterStyle.kt index 54f7643..ec3e2de 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/ParameterStyle.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/ParameterStyle.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/SchemaType.kt b/src/generated/kotlin/de/lancom/openapi/common/types/SchemaType.kt index 45702ee..41e5a06 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/SchemaType.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/SchemaType.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/common/types/Style.kt b/src/generated/kotlin/de/lancom/openapi/common/types/Style.kt index a59cfbe..d31cd75 100644 --- a/src/generated/kotlin/de/lancom/openapi/common/types/Style.kt +++ b/src/generated/kotlin/de/lancom/openapi/common/types/Style.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/APIKeySecurityScheme.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/APIKeySecurityScheme.kt index bf2f965..78a7f22 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/APIKeySecurityScheme.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/APIKeySecurityScheme.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesBoolean.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesBoolean.kt index 7ec5b5b..826e412 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesBoolean.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesBoolean.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesReference.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesReference.kt index e9d7dd0..fe6301e 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesReference.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesReference.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesSchema.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesSchema.kt index 56a94ba..a847cb4 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesSchema.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/AdditionalPropertiesSchema.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Callback.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Callback.kt index 5aa1fd0..c4fcb61 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Callback.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Callback.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Components.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Components.kt index 5ba469f..87c591a 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Components.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Components.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Contact.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Contact.kt index 6cfa7e7..cb9f590 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Contact.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Contact.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/DefaultJson.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/DefaultJson.kt index 5e4a99e..e203339 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/DefaultJson.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/DefaultJson.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Discriminator.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Discriminator.kt index 35ea5b6..b37c44c 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Discriminator.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Discriminator.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Encoding.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Encoding.kt index bdd103f..288d7e9 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Encoding.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Encoding.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Example.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Example.kt index c20af45..1f0a97c 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Example.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Example.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/ExampleJson.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/ExampleJson.kt index 288e5cc..f9969c9 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/ExampleJson.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/ExampleJson.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/ExternalDocumentation.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/ExternalDocumentation.kt index 5ef8847..ae9a4e7 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/ExternalDocumentation.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/ExternalDocumentation.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/HTTPSecurityScheme.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/HTTPSecurityScheme.kt index f83672e..9d8937a 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/HTTPSecurityScheme.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/HTTPSecurityScheme.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Header.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Header.kt index 8d98064..5dcfc7f 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Header.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Header.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Info.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Info.kt index 243b16a..06776b9 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Info.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Info.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/License.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/License.kt index 8ed2ddc..9e59ca9 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/License.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/License.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Link.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Link.kt index 4c769f5..6003bb5 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Link.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Link.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/MediaType.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/MediaType.kt index f38a257..5ed15b8 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/MediaType.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/MediaType.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/OAuth2SecurityScheme.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/OAuth2SecurityScheme.kt index cf8b40f..9a1c587 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/OAuth2SecurityScheme.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/OAuth2SecurityScheme.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenApi.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenApi.kt index e85220e..4eb540a 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenApi.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenApi.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenIdConnectSecurityScheme.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenIdConnectSecurityScheme.kt index 24be600..1826c89 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenIdConnectSecurityScheme.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/OpenIdConnectSecurityScheme.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Operation.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Operation.kt index 3fe85f2..61d77b6 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Operation.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Operation.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Parameter.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Parameter.kt index 5df9ba6..f8f294e 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Parameter.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Parameter.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/PathItem.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/PathItem.kt index e43c21f..f0fc6fa 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/PathItem.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/PathItem.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Paths.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Paths.kt index 5a90f1a..d5adb39 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Paths.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Paths.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/RawExtension.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/RawExtension.kt index 7242b8e..ba86a90 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/RawExtension.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/RawExtension.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBody.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBody.kt index a2ad40a..c05e344 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBody.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBody.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBodyJson.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBodyJson.kt index 366c6e3..ca03d3c 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBodyJson.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/RequestBodyJson.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Response.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Response.kt index 8094ee3..f0348ef 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Response.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Response.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Responses.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Responses.kt index dbfb4a0..2de890d 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Responses.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Responses.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Schema.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Schema.kt index 881d9c9..3cf5902 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Schema.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Schema.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/SecurityRequirement.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/SecurityRequirement.kt index 321eb97..5e4328a 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/SecurityRequirement.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/SecurityRequirement.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Server.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Server.kt index 7bb3f69..e2e1c93 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Server.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Server.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/ServerVariable.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/ServerVariable.kt index 1c3e928..c82b5d2 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/ServerVariable.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/ServerVariable.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/Tag.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/Tag.kt index 59c24dc..b00794a 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/Tag.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/Tag.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtension.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtension.kt index 96b2010..c4e108d 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtension.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtension.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtensionEntry.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtensionEntry.kt index 6328a5b..0e694db 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtensionEntry.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/TagGroupsExtensionEntry.kt @@ -6,8 +6,8 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/generated/kotlin/de/lancom/openapi/parser/entity/XML.kt b/src/generated/kotlin/de/lancom/openapi/parser/entity/XML.kt index b81b90b..b72891b 100644 --- a/src/generated/kotlin/de/lancom/openapi/parser/entity/XML.kt +++ b/src/generated/kotlin/de/lancom/openapi/parser/entity/XML.kt @@ -6,9 +6,9 @@ *****************************************************************************/ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.JsonNode +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.types.* import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.field.Field diff --git a/src/main/kotlin/de/lancom/openapi/common/converter/simple/Extension.kt b/src/main/kotlin/de/lancom/openapi/common/converter/simple/Extension.kt index 15a7476..b444c37 100644 --- a/src/main/kotlin/de/lancom/openapi/common/converter/simple/Extension.kt +++ b/src/main/kotlin/de/lancom/openapi/common/converter/simple/Extension.kt @@ -1,9 +1,9 @@ package de.lancom.openapi.common.converter.simple -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.node.ArrayNode -import com.fasterxml.jackson.databind.node.BooleanNode -import com.fasterxml.jackson.databind.node.TextNode +import tools.jackson.databind.JsonNode +import tools.jackson.databind.node.ArrayNode +import tools.jackson.databind.node.BooleanNode +import tools.jackson.databind.node.StringNode import de.lancom.openapi.parser.entity.RawExtension fun toSimple( @@ -23,13 +23,13 @@ fun toSimple( is BooleanNode -> de.lancom.openapi.simple.types.Extension(jsonNode.booleanValue()) - is TextNode -> + is StringNode -> de.lancom.openapi.simple.types.Extension(jsonNode.textValue()) is ArrayNode -> de.lancom.openapi.simple.types.Extension( jsonNode - .elements() + .values() .asSequence() .map(::toSimple) .map(de.lancom.openapi.simple.types.Extension::value) diff --git a/src/main/kotlin/de/lancom/openapi/common/converter/simple/ObjectMapper.kt b/src/main/kotlin/de/lancom/openapi/common/converter/simple/ObjectMapper.kt index 26fd3d0..717f920 100644 --- a/src/main/kotlin/de/lancom/openapi/common/converter/simple/ObjectMapper.kt +++ b/src/main/kotlin/de/lancom/openapi/common/converter/simple/ObjectMapper.kt @@ -1,9 +1,9 @@ package de.lancom.openapi.common.converter.simple -import com.fasterxml.jackson.core.TreeNode -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import com.fasterxml.jackson.module.kotlin.treeToValue +import tools.jackson.core.TreeNode +import tools.jackson.databind.ObjectMapper +import tools.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.treeToValue import java.io.File fun ObjectMapper.toSimpleOpenApi( diff --git a/src/main/kotlin/de/lancom/openapi/common/converter/simple/ToSimple.kt b/src/main/kotlin/de/lancom/openapi/common/converter/simple/ToSimple.kt index 6d9fb57..21b1e43 100644 --- a/src/main/kotlin/de/lancom/openapi/common/converter/simple/ToSimple.kt +++ b/src/main/kotlin/de/lancom/openapi/common/converter/simple/ToSimple.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.common.converter.simple -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.util.ParsedReference import de.lancom.openapi.parser.entity.JsonEntity diff --git a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperDeserializer.kt b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperDeserializer.kt index ded1b8b..562b8e4 100644 --- a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperDeserializer.kt +++ b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperDeserializer.kt @@ -1,14 +1,16 @@ package de.lancom.openapi.common.jackson -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.databind.DeserializationContext -import com.fasterxml.jackson.databind.deser.std.StdDeserializer +import tools.jackson.core.JsonParser +import tools.jackson.databind.DeserializationContext +import tools.jackson.databind.deser.std.StdDeserializer abstract class JsonWrapperDeserializer( clazz: Class, private val factory: (String) -> JW? ) : StdDeserializer(clazz) { - override fun deserialize(parser: JsonParser, ctxt: DeserializationContext?): JW? { - return factory(parser.text) + override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): JW { + return requireNotNull(factory(parser.text)) { + "Unknown JsonWrapper key: ${parser.text}" + } } } diff --git a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperKeySerializer.kt b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperKeySerializer.kt index 2139cdf..4e7830d 100644 --- a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperKeySerializer.kt +++ b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperKeySerializer.kt @@ -1,8 +1,8 @@ package de.lancom.openapi.common.jackson -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.ser.std.StdSerializer +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.ser.std.StdSerializer abstract class JsonWrapperKeySerializer( clazz: Class, @@ -10,8 +10,8 @@ abstract class JsonWrapperKeySerializer( override fun serialize( value: JW, gen: JsonGenerator, - serializers: SerializerProvider + serializers: SerializationContext, ) { - gen.writeFieldName(value.key) + gen.writeName(value.key) } } diff --git a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperSerializer.kt b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperSerializer.kt index eccefae..e47ef71 100644 --- a/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperSerializer.kt +++ b/src/main/kotlin/de/lancom/openapi/common/jackson/JsonWrapperSerializer.kt @@ -1,8 +1,8 @@ package de.lancom.openapi.common.jackson -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.ser.std.StdSerializer +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.ser.std.StdSerializer abstract class JsonWrapperSerializer( clazz: Class, @@ -10,7 +10,7 @@ abstract class JsonWrapperSerializer( override fun serialize( value: JW, gen: JsonGenerator, - serializers: SerializerProvider + serializers: SerializationContext, ) { gen.writeString(value.key) } diff --git a/src/main/kotlin/de/lancom/openapi/common/types/ContentType.kt b/src/main/kotlin/de/lancom/openapi/common/types/ContentType.kt index 5e4b46b..b8b6a37 100644 --- a/src/main/kotlin/de/lancom/openapi/common/types/ContentType.kt +++ b/src/main/kotlin/de/lancom/openapi/common/types/ContentType.kt @@ -1,7 +1,7 @@ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/main/kotlin/de/lancom/openapi/common/types/Path.kt b/src/main/kotlin/de/lancom/openapi/common/types/Path.kt index 23db597..4698fd7 100644 --- a/src/main/kotlin/de/lancom/openapi/common/types/Path.kt +++ b/src/main/kotlin/de/lancom/openapi/common/types/Path.kt @@ -1,11 +1,11 @@ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion -@JsonSerialize(keyUsing = Path.Companion.Serializer::class) +@JsonSerialize(keyUsing = Path.Companion.KeySerializer::class) @JsonDeserialize(using = Path.Companion.Deserializer::class) data class Path( val path: String @@ -14,6 +14,7 @@ data class Path( companion object : JsonWrapperCompanion(::Path, Path::class.java) { class Serializer : AbstractSerializer() + class KeySerializer : AbstractKeySerializer() class Deserializer : AbstractDeserializer() } } diff --git a/src/main/kotlin/de/lancom/openapi/common/types/ResponseStatusCode.kt b/src/main/kotlin/de/lancom/openapi/common/types/ResponseStatusCode.kt index 4392ebf..b7ec42c 100644 --- a/src/main/kotlin/de/lancom/openapi/common/types/ResponseStatusCode.kt +++ b/src/main/kotlin/de/lancom/openapi/common/types/ResponseStatusCode.kt @@ -1,7 +1,7 @@ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion diff --git a/src/main/kotlin/de/lancom/openapi/common/types/SchemaFormat.kt b/src/main/kotlin/de/lancom/openapi/common/types/SchemaFormat.kt index 91abcb1..7f5e0c6 100644 --- a/src/main/kotlin/de/lancom/openapi/common/types/SchemaFormat.kt +++ b/src/main/kotlin/de/lancom/openapi/common/types/SchemaFormat.kt @@ -1,17 +1,18 @@ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion -@JsonSerialize(keyUsing = SchemaFormat.Companion.Serializer::class) +@JsonSerialize(keyUsing = SchemaFormat.Companion.KeySerializer::class) @JsonDeserialize(using = SchemaFormat.Companion.Deserializer::class) data class SchemaFormat(val format: String) : JsonWrapper { override val key: String = format companion object : JsonWrapperCompanion(::SchemaFormat, SchemaFormat::class.java) { class Serializer : AbstractSerializer() + class KeySerializer : AbstractKeySerializer() class Deserializer : AbstractDeserializer() val UUID = SchemaFormat("uuid") diff --git a/src/main/kotlin/de/lancom/openapi/common/types/TagRef.kt b/src/main/kotlin/de/lancom/openapi/common/types/TagRef.kt index 92a8211..1d17141 100644 --- a/src/main/kotlin/de/lancom/openapi/common/types/TagRef.kt +++ b/src/main/kotlin/de/lancom/openapi/common/types/TagRef.kt @@ -1,11 +1,11 @@ package de.lancom.openapi.common.types -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.common.jackson.JsonWrapperCompanion -@JsonSerialize(keyUsing = TagRef.Companion.Serializer::class) +@JsonSerialize(keyUsing = TagRef.Companion.KeySerializer::class) @JsonDeserialize(using = TagRef.Companion.Deserializer::class) data class TagRef( val tag: String @@ -14,6 +14,7 @@ data class TagRef( companion object : JsonWrapperCompanion(::TagRef, TagRef::class.java) { class Serializer : AbstractSerializer() + class KeySerializer : AbstractKeySerializer() class Deserializer : AbstractDeserializer() } } diff --git a/src/main/kotlin/de/lancom/openapi/common/util/Jackson.kt b/src/main/kotlin/de/lancom/openapi/common/util/Jackson.kt index ec825cf..c395b34 100644 --- a/src/main/kotlin/de/lancom/openapi/common/util/Jackson.kt +++ b/src/main/kotlin/de/lancom/openapi/common/util/Jackson.kt @@ -1,15 +1,16 @@ package de.lancom.openapi.common.util -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.MapperFeature -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.databind.SerializationFeature -import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator -import com.fasterxml.jackson.dataformat.yaml.YAMLMapper +import tools.jackson.databind.JsonNode +import tools.jackson.databind.MapperFeature +import tools.jackson.databind.ObjectMapper +import tools.jackson.databind.SerializationFeature +import tools.jackson.databind.json.JsonMapper +import tools.jackson.dataformat.yaml.YAMLWriteFeature +import tools.jackson.dataformat.yaml.YAMLMapper +import tools.jackson.module.kotlin.kotlinModule val jsonMapper = createObjectMapper(yaml = false) -val jsonPrettyPrintMapper = createObjectMapper(yaml = false).enable(SerializationFeature.INDENT_OUTPUT) +val jsonPrettyPrintMapper = createObjectMapper(yaml = false, prettyPrint = true) val yamlMapper = createObjectMapper(yaml = true) fun T.toJsonNode(): JsonNode { @@ -32,7 +33,7 @@ fun JsonNode.toYamlString(ignoreOrder: Boolean = true): String { fun deepSortJsonNode(node: JsonNode, objectMapper: ObjectMapper): JsonNode { return when { node.isObject -> - node.fieldNames() + node.propertyNames() .asSequence() .toList() .sorted() @@ -41,7 +42,7 @@ fun deepSortJsonNode(node: JsonNode, objectMapper: ObjectMapper): JsonNode { } node.isArray -> - node.elements() + node.values() .asSequence() .toList() .fold(objectMapper.createArrayNode()) { sorted, entry: JsonNode -> @@ -53,19 +54,28 @@ fun deepSortJsonNode(node: JsonNode, objectMapper: ObjectMapper): JsonNode { } } -fun createObjectMapper(yaml: Boolean): ObjectMapper { - val mapperBuilder = if (yaml) { - YAMLMapper.builder() - .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER) - .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES) - .enable(YAMLGenerator.Feature.SPLIT_LINES) - .enable(YAMLGenerator.Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS) +fun createObjectMapper(yaml: Boolean, prettyPrint: Boolean = false): ObjectMapper { + return if (yaml) { + val builder = YAMLMapper.builder() + .addModule(kotlinModule { }) + .disable(YAMLWriteFeature.WRITE_DOC_START_MARKER) + .enable(YAMLWriteFeature.MINIMIZE_QUOTES) + .enable(YAMLWriteFeature.SPLIT_LINES) + .enable(YAMLWriteFeature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS) + .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS) + if (prettyPrint) { + builder.enable(SerializationFeature.INDENT_OUTPUT) + } + builder.build() } else { - JsonMapper.builder() + val builder = JsonMapper.builder() + .addModule(kotlinModule { }) + .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS) + if (prettyPrint) { + builder.enable(SerializationFeature.INDENT_OUTPUT) + } + builder.build() } - return mapperBuilder - .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS) - .build() } fun JsonNode.booleanValueOrErrorOpt(): Boolean? { diff --git a/src/main/kotlin/de/lancom/openapi/common/util/SimpleOpenApiParser.kt b/src/main/kotlin/de/lancom/openapi/common/util/SimpleOpenApiParser.kt index 999051d..36acda4 100644 --- a/src/main/kotlin/de/lancom/openapi/common/util/SimpleOpenApiParser.kt +++ b/src/main/kotlin/de/lancom/openapi/common/util/SimpleOpenApiParser.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.common.util -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.converter.simple.toSimple import java.io.File diff --git a/src/main/kotlin/de/lancom/openapi/parser/entity/EntityDescriptor.kt b/src/main/kotlin/de/lancom/openapi/parser/entity/EntityDescriptor.kt index 9652a33..6b29410 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/entity/EntityDescriptor.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/entity/EntityDescriptor.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.common.util.ParsedReference import de.lancom.openapi.common.util.ValidParsedReference @@ -136,7 +136,7 @@ data class EntityDescriptor( .filterIsInstance() .map(SecurityRequirement::_jsonNode) .mapNotNull { it.orNull } - .flatMap { it.fieldNames().asSequence() } + .flatMap { it.propertyNames().asSequence() } .map { securityRequirement -> ValidParsedReference(ComponentType.SecuritySchemes, securityRequirement) } diff --git a/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntity.kt b/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntity.kt index a59d4fa..450a6a8 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntity.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntity.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode interface JsonEntity : Entity { val jsonNode: JsonNode diff --git a/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntityFactory.kt b/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntityFactory.kt index 46d8355..36bc8bc 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntityFactory.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/entity/JsonEntityFactory.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.entity -import com.fasterxml.jackson.databind.node.* +import tools.jackson.databind.node.* import de.lancom.openapi.parser.jackson.Parser interface JsonEntityFactory : Parser { @@ -38,6 +38,6 @@ interface JsonEntityFactory : Parser { } operator fun invoke(string: String): E { - return parseJsonNode(TextNode(string)) + return parseJsonNode(StringNode(string)) } } diff --git a/src/main/kotlin/de/lancom/openapi/parser/jackson/EntityDeserializer.kt b/src/main/kotlin/de/lancom/openapi/parser/jackson/EntityDeserializer.kt index a64dd8b..7b611a1 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/jackson/EntityDeserializer.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/jackson/EntityDeserializer.kt @@ -1,17 +1,17 @@ package de.lancom.openapi.parser.jackson -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.databind.DeserializationContext -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.deser.std.StdDeserializer +import tools.jackson.core.JsonParser +import tools.jackson.databind.DeserializationContext +import tools.jackson.databind.JsonNode +import tools.jackson.databind.deser.std.StdDeserializer import de.lancom.openapi.parser.entity.Entity abstract class EntityDeserializer( clazz: Class, val parser: Parser, ) : StdDeserializer(clazz) { - override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): E { - val node: JsonNode = p!!.codec!!.readTree(p)!! + override fun deserialize(p: JsonParser, ctxt: DeserializationContext): E { + val node: JsonNode = p.readValueAsTree() return parser.parseJsonNode(node) } } diff --git a/src/main/kotlin/de/lancom/openapi/parser/jackson/EntitySerializer.kt b/src/main/kotlin/de/lancom/openapi/parser/jackson/EntitySerializer.kt index 9607ff3..3a12842 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/jackson/EntitySerializer.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/jackson/EntitySerializer.kt @@ -1,8 +1,9 @@ package de.lancom.openapi.parser.jackson -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.ser.std.StdSerializer +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.JsonNode +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.ser.std.StdSerializer import de.lancom.openapi.common.jackson.JsonWrapper import de.lancom.openapi.parser.entity.AdditionalPropertiesBoolean import de.lancom.openapi.parser.entity.Entity @@ -12,21 +13,19 @@ abstract class EntitySerializer( clazz: Class, val parser: Parser, ) : StdSerializer(clazz) { - override fun serialize(value: E?, gen: JsonGenerator?, provider: SerializerProvider?) { - if (value == null) { - gen!!.writeNull() - } else if (value is AdditionalPropertiesBoolean) { - gen!!.writeObject(true) + override fun serialize(value: E, gen: JsonGenerator, provider: SerializationContext) { + if (value is AdditionalPropertiesBoolean) { + gen.writePOJO(true) } else if (value is JsonWrapper) { - gen!!.writeObject(value.key) + gen.writePOJO(value.key) } else { val entityDescriptor = value.entityDescriptor val entityJson = entityDescriptor.jsonNode if (entityJson != null) { if (entityJson.isDefined) { - gen!!.writeObject(entityJson.orNull) + gen.writeTree(entityJson.orNull as JsonNode) } else { - gen!!.writeStartObject() + gen.writeStartObject() gen.writeEndObject() } } else { @@ -36,10 +35,10 @@ abstract class EntitySerializer( val size = flatten.size when (size) { 0 -> - gen!!.writeObject(entityDescriptor.entityMap.sorted(entityDescriptor.order)) + gen.writePOJO(entityDescriptor.entityMap.sorted(entityDescriptor.order)) 1 -> - gen!!.writeObject(flatten.first()) + gen.writePOJO(flatten.first()) else -> TODO() diff --git a/src/main/kotlin/de/lancom/openapi/parser/jackson/ExtensionParser.kt b/src/main/kotlin/de/lancom/openapi/parser/jackson/ExtensionParser.kt index 4b91dfc..4122b00 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/jackson/ExtensionParser.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/jackson/ExtensionParser.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.jackson -import com.fasterxml.jackson.databind.node.ObjectNode +import tools.jackson.databind.node.ObjectNode import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.entity.Extension import de.lancom.openapi.parser.field.Field @@ -13,7 +13,7 @@ fun extensionParser( return if (extensions == null) { parser(wrapper, Field.unset(), wrapper.fieldOrder) } else { - val objectNode: ObjectNode = wrapper.jsonNodeField.getOrError().deepCopy() + val objectNode: ObjectNode = wrapper.jsonNodeField.getOrError().deepCopy() as ObjectNode extensions.keys.forEach { extension -> objectNode.remove(extension) } diff --git a/src/main/kotlin/de/lancom/openapi/parser/jackson/Parser.kt b/src/main/kotlin/de/lancom/openapi/parser/jackson/Parser.kt index 058c6c6..8489246 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/jackson/Parser.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/jackson/Parser.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.jackson -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field diff --git a/src/main/kotlin/de/lancom/openapi/parser/jackson/Wrapper.kt b/src/main/kotlin/de/lancom/openapi/parser/jackson/Wrapper.kt index ea471d9..cb71eea 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/jackson/Wrapper.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/jackson/Wrapper.kt @@ -1,7 +1,7 @@ package de.lancom.openapi.parser.jackson -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.node.ObjectNode +import tools.jackson.databind.JsonNode +import tools.jackson.databind.node.ObjectNode import de.lancom.openapi.common.util.* import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.entity.Extension @@ -18,9 +18,12 @@ data class Wrapper( val jsonNodeField: Field, ) { val fieldOrder: Set by lazy { - jsonNodeField.orNull?.fields()?.iterator()?.asSequence()?.toList()?.map { (key, _) -> - key - }?.toSet() ?: emptySet() + jsonNodeField.orNull + ?.properties() + ?.asSequence() + ?.map { (key, _) -> key } + ?.toSet() + ?: emptySet() } val field: Field by lazy { jsonNodeField.mapField(::Wrapper) @@ -28,7 +31,7 @@ data class Wrapper( val mapField: Field> by lazy { jsonNodeField.map { jsonNode -> - jsonNode.fields().iterator().asSequence().toList().associate { (k, v) -> + jsonNode.properties().asSequence().associate { (k, v) -> k to Wrapper(v) } } @@ -36,7 +39,7 @@ data class Wrapper( val listField: Field> by lazy { jsonNodeField.map { jsonNode -> - jsonNode.elements().iterator().asSequence().toList().map(Field.Companion::invoke).map(::Wrapper) + jsonNode.values().asSequence().toList().map(Field.Companion::invoke).map(::Wrapper) } } diff --git a/src/main/kotlin/de/lancom/openapi/parser/ref/Instance.kt b/src/main/kotlin/de/lancom/openapi/parser/ref/Instance.kt index d4b8ae3..db7dbdd 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/ref/Instance.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/ref/Instance.kt @@ -1,9 +1,9 @@ package de.lancom.openapi.parser.ref -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.databind.ser.std.StdSerializer +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.ser.std.StdSerializer @JsonSerialize(using = Instance.Companion.Serializer::class) data class Instance( @@ -11,8 +11,8 @@ data class Instance( ) : ReferenceOrInstance { companion object { class Serializer : StdSerializer>(Instance::class.java) { - override fun serialize(value: Instance<*>?, gen: JsonGenerator?, provider: SerializerProvider?) { - gen!!.writeObject(value!!.referenced) + override fun serialize(value: Instance<*>, gen: JsonGenerator, provider: SerializationContext) { + gen.writePOJO(value.referenced) } } } diff --git a/src/main/kotlin/de/lancom/openapi/parser/ref/Reference.kt b/src/main/kotlin/de/lancom/openapi/parser/ref/Reference.kt index 820b1ff..4f5d4c5 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/ref/Reference.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/ref/Reference.kt @@ -1,14 +1,14 @@ package de.lancom.openapi.parser.ref -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.databind.DeserializationContext -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.databind.deser.std.StdDeserializer -import com.fasterxml.jackson.databind.ser.std.StdSerializer +import tools.jackson.core.JsonGenerator +import tools.jackson.core.JsonParser +import tools.jackson.databind.DeserializationContext +import tools.jackson.databind.JsonNode +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize +import tools.jackson.databind.deser.std.StdDeserializer +import tools.jackson.databind.ser.std.StdSerializer import de.lancom.openapi.common.util.ParsedReference import de.lancom.openapi.parser.field.Field import de.lancom.openapi.parser.jackson.Wrapper @@ -25,18 +25,18 @@ data class Reference( companion object { class Serializer : StdSerializer>(Reference::class.java) { - override fun serialize(value: Reference<*>?, gen: JsonGenerator?, provider: SerializerProvider?) { - gen!!.writeObject( + override fun serialize(value: Reference<*>, gen: JsonGenerator, provider: SerializationContext) { + gen.writePOJO( mapOf( - "\$ref" to value!!.ref - ) + "\$ref" to value.ref, + ), ) } } class Deserializer : StdDeserializer>(Reference::class.java) { - override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): Reference<*> { - val node: JsonNode = p!!.codec!!.readTree(p)!! + override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Reference<*> { + val node: JsonNode = p.readValueAsTree() val wrapper = Wrapper(node) val ref = wrapper["\$ref"].getString().getOrError() return Reference(ref) diff --git a/src/main/kotlin/de/lancom/openapi/parser/util/MergeUtils.kt b/src/main/kotlin/de/lancom/openapi/parser/util/MergeUtils.kt index bb27da8..91ecbeb 100644 --- a/src/main/kotlin/de/lancom/openapi/parser/util/MergeUtils.kt +++ b/src/main/kotlin/de/lancom/openapi/parser/util/MergeUtils.kt @@ -1,7 +1,7 @@ package de.lancom.openapi.parser.util -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.databind.JsonNode +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.util.OperationMethod import de.lancom.openapi.common.util.toYamlString import de.lancom.openapi.common.util.yamlMapper @@ -18,7 +18,7 @@ private data class Rename( private val path = "#/components/$component/$name" fun renameYaml(subject: String): String { - return subject.replace("'$path'", "'$path$suffix'") + return subject.replace(path, "$path$suffix") } fun renameComponent(openApi: OpenApi): OpenApi { diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Example.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Example.kt index 82f7c81..786831a 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Example.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Example.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.simple.types.Extension diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Header.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Header.kt index 9399672..99d450a 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Header.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Header.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.common.types.HeaderStyle import de.lancom.openapi.simple.types.Extension diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Link.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Link.kt index 9632ab8..534efc4 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Link.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Link.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.simple.types.Extension diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/MediaType.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/MediaType.kt index 35aca18..c286b71 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/MediaType.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/MediaType.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.simple.types.Extension import de.lancom.openapi.simple.util.Extensions diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/OpenApi.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/OpenApi.kt index 7ff6ba8..fbc389e 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/OpenApi.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/OpenApi.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.simple.types.Extension import de.lancom.openapi.simple.util.Extensions import de.lancom.openapi.simple.util.Resolver diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Operation.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Operation.kt index d207e2f..1f64b66 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Operation.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Operation.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ResponseStatusCode import de.lancom.openapi.common.types.TagRef import de.lancom.openapi.simple.types.Extension diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Parameter.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Parameter.kt index 405e55c..05ec14c 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Parameter.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Parameter.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.common.types.In import de.lancom.openapi.common.types.ParameterStyle diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Schema.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Schema.kt index d049055..7880eff 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Schema.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Schema.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.common.types.ComponentType import de.lancom.openapi.common.types.SchemaFormat import de.lancom.openapi.common.types.SchemaType diff --git a/src/main/kotlin/de/lancom/openapi/simple/entity/Tag.kt b/src/main/kotlin/de/lancom/openapi/simple/entity/Tag.kt index d5e4d94..f5101a8 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/entity/Tag.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/entity/Tag.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.simple.entity -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import de.lancom.openapi.simple.types.Extension import de.lancom.openapi.simple.util.Extensions diff --git a/src/main/kotlin/de/lancom/openapi/simple/types/AdditionalProperties.kt b/src/main/kotlin/de/lancom/openapi/simple/types/AdditionalProperties.kt index a288bc9..3a61714 100644 --- a/src/main/kotlin/de/lancom/openapi/simple/types/AdditionalProperties.kt +++ b/src/main/kotlin/de/lancom/openapi/simple/types/AdditionalProperties.kt @@ -1,13 +1,13 @@ package de.lancom.openapi.simple.types -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.databind.DeserializationContext -import com.fasterxml.jackson.databind.JsonDeserializer -import com.fasterxml.jackson.databind.JsonSerializer -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonSerialize +import tools.jackson.core.JsonGenerator +import tools.jackson.core.JsonParser +import tools.jackson.databind.DeserializationContext +import tools.jackson.databind.SerializationContext +import tools.jackson.databind.ValueDeserializer +import tools.jackson.databind.ValueSerializer +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.databind.annotation.JsonSerialize import de.lancom.openapi.simple.entity.SchemaOrRef @JsonSerialize(using = AdditionalPropertiesSerializer::class) @@ -22,26 +22,26 @@ data class AdditionalPropertiesSchema( val schemaOrRef: SchemaOrRef, ) : AdditionalProperties -class AdditionalPropertiesSerializer : JsonSerializer() { +class AdditionalPropertiesSerializer : ValueSerializer() { override fun serialize( value: AdditionalProperties, gen: JsonGenerator, - serializers: SerializerProvider + serializers: SerializationContext, ) { when (value) { AdditionalPropertiesBoolean -> gen.writeBoolean(true) is AdditionalPropertiesSchema -> - gen.writeObject(value.schemaOrRef) + gen.writePOJO(value.schemaOrRef) } } } -class AdditionalPropertiesDeserializer : JsonDeserializer() { +class AdditionalPropertiesDeserializer : ValueDeserializer() { override fun deserialize( p: JsonParser, - ctxt: DeserializationContext + ctxt: DeserializationContext, ): AdditionalProperties { val value = p.valueAsString return if (value == "true") { diff --git a/src/test/kotlin/de/lancom/openapi/common/util/TestUtils.kt b/src/test/kotlin/de/lancom/openapi/common/util/TestUtils.kt index e808b2e..9fd75cb 100644 --- a/src/test/kotlin/de/lancom/openapi/common/util/TestUtils.kt +++ b/src/test/kotlin/de/lancom/openapi/common/util/TestUtils.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.common.util -import com.fasterxml.jackson.databind.JsonNode +import tools.jackson.databind.JsonNode import org.junit.jupiter.api.Assertions fun assertYamlEquals(expected: E, actual: E, ignoreOrder: Boolean = true) { diff --git a/src/test/kotlin/de/lancom/openapi/parser/CleanupUnusedComponentsTest.kt b/src/test/kotlin/de/lancom/openapi/parser/CleanupUnusedComponentsTest.kt index c8cc41c..5768ef6 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/CleanupUnusedComponentsTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/CleanupUnusedComponentsTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.util.yamlMapper import de.lancom.openapi.parser.entity.OpenApi import de.lancom.openapi.parser.util.cleanupUnusedComponents diff --git a/src/test/kotlin/de/lancom/openapi/parser/ExampleTest.kt b/src/test/kotlin/de/lancom/openapi/parser/ExampleTest.kt index 7be4f7b..22c1a56 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/ExampleTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/ExampleTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.util.assertYamlEquals import de.lancom.openapi.common.util.toJsonNode import de.lancom.openapi.common.util.yamlMapper diff --git a/src/test/kotlin/de/lancom/openapi/parser/JsonWrapperTest.kt b/src/test/kotlin/de/lancom/openapi/parser/JsonWrapperTest.kt index 8c46a7c..6416597 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/JsonWrapperTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/JsonWrapperTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.types.ResponseStatusCode import de.lancom.openapi.common.util.toYamlString import de.lancom.openapi.common.util.yamlMapper diff --git a/src/test/kotlin/de/lancom/openapi/parser/MergeTest.kt b/src/test/kotlin/de/lancom/openapi/parser/MergeTest.kt index 62cbf32..7adbbc3 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/MergeTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/MergeTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser -import com.fasterxml.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.readValue import de.lancom.openapi.common.util.assertYamlEquals import de.lancom.openapi.common.util.yamlMapper import de.lancom.openapi.parser.entity.Info diff --git a/src/test/kotlin/de/lancom/openapi/parser/petstore/ParserPetstoreApiTest.kt b/src/test/kotlin/de/lancom/openapi/parser/petstore/ParserPetstoreApiTest.kt index dcb2225..4723f59 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/petstore/ParserPetstoreApiTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/petstore/ParserPetstoreApiTest.kt @@ -8,7 +8,6 @@ import de.lancom.openapi.parser.entity.PathItem import de.lancom.openapi.parser.entity.Paths import de.lancom.openapi.parser.util.apiEndpoints import de.lancom.openapi.parser.util.filterApiEndpoints -import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.io.File @@ -118,7 +117,10 @@ class ParserPetstoreApiTest { - id """.trimIndent() - assertEquals(expected, actual) + assertYamlEquals( + expectedTree = yamlMapper.readTree(expected), + actualTree = yamlMapper.readTree(actual), + ) } @Test diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractBooleanFieldTest.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractBooleanFieldTest.kt index 26c612a..24ed694 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractBooleanFieldTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractBooleanFieldTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.core.type.TypeReference +import tools.jackson.core.type.TypeReference import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractObjectFieldTest.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractObjectFieldTest.kt index cc2d236..2edfe2e 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractObjectFieldTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractObjectFieldTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.core.type.TypeReference +import tools.jackson.core.type.TypeReference import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractSerialisationTest.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractSerialisationTest.kt index c5d6c37..027a011 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractSerialisationTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/AbstractSerialisationTest.kt @@ -3,7 +3,6 @@ package de.lancom.openapi.parser.serialisation import de.lancom.openapi.common.util.assertYamlEquals import de.lancom.openapi.common.util.yamlMapper import de.lancom.openapi.parser.entity.Entity -import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource @@ -33,7 +32,8 @@ abstract class AbstractSerialisationTest { println(testCase.entityField.getOrError()) throw RuntimeException(exception) } - val expected = testCase.serializedYaml + "\n" - assertEquals(expected, actual) + val expectedTree = yamlMapper.readTree(testCase.serializedYaml) + val actualTree = yamlMapper.readTree(actual) + assertYamlEquals(expectedTree, actualTree) } } diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/EntityFieldTestCases.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/EntityFieldTestCases.kt index c60ccca..1529342 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/EntityFieldTestCases.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/EntityFieldTestCases.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import tools.jackson.module.kotlin.jacksonTypeRef import de.lancom.openapi.parser.entity.Entity import kotlin.reflect.full.createInstance diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/FieldTest.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/FieldTest.kt index 15a0c7e..8fcbd04 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/FieldTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/FieldTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.core.type.TypeReference +import tools.jackson.core.type.TypeReference import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/StringNullFieldTest.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/StringNullFieldTest.kt index bc82fd9..840f6ea 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/StringNullFieldTest.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/StringNullFieldTest.kt @@ -1,6 +1,6 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.core.type.TypeReference +import tools.jackson.core.type.TypeReference import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field diff --git a/src/test/kotlin/de/lancom/openapi/parser/serialisation/TestCase.kt b/src/test/kotlin/de/lancom/openapi/parser/serialisation/TestCase.kt index bbc701e..d16abea 100644 --- a/src/test/kotlin/de/lancom/openapi/parser/serialisation/TestCase.kt +++ b/src/test/kotlin/de/lancom/openapi/parser/serialisation/TestCase.kt @@ -1,7 +1,7 @@ package de.lancom.openapi.parser.serialisation -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import tools.jackson.core.type.TypeReference +import tools.jackson.module.kotlin.jacksonTypeRef import de.lancom.openapi.parser.entity.Entity import de.lancom.openapi.parser.field.Field import org.junit.jupiter.api.Named