Skip to content

Commit 5270fa0

Browse files
alex-ntalex-nt
committed
Fix build
1 parent 9be1fcf commit 5270fa0

36 files changed

Lines changed: 94 additions & 116 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ dependencies {
137137
implementation "org.springframework:spring-context:$spring_web_version"
138138
implementation "{{jacksonPackage}}.core:jackson-core:$jackson_version"
139139
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
140-
implementation "{{jacksonPackage}}.core:jackson-databind:$jackson_databind_version"
140+
implementation "{{jacksonPackage}}.core:jackson-databind:$jackson_version"
141141
implementation "{{jacksonPackage}}.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
142142
{{#openApiNullable}}
143143
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"

‎samples/client/echo_api/java/restclient/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
implementation "org.springframework:spring-context:$spring_web_version"
113113
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
114114
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
115-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
115+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
116116
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
117117
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
118118
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"

‎samples/client/others/java/restclient-enum-in-multipart/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
implementation "org.springframework:spring-context:$spring_web_version"
113113
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
114114
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
115-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
115+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
116116
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
117117
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
118118
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"

‎samples/client/others/java/restclient-useAbstractionForFiles/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
implementation "org.springframework:spring-context:$spring_web_version"
113113
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
114114
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
115-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
115+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
116116
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
117117
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
118118
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnyOfUserOrPet.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ import kotlinx.serialization.json.encodeToJsonElement
4545

4646
sealed interface AnyOfUserOrPet {
4747
@JvmInline
48-
value class UserValue(val value: User) : AnyOfUserOrPet
48+
value class (val value: User) : AnyOfUserOrPet
4949

5050
@JvmInline
51-
value class PetValue(val value: Pet) : AnyOfUserOrPet
51+
value class (val value: Pet) : AnyOfUserOrPet
5252

5353
}
5454

@@ -59,8 +59,8 @@ object AnyOfUserOrPetSerializer : KSerializer<AnyOfUserOrPet> {
5959
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("AnyOfUserOrPet can only be serialized with Json")
6060

6161
when (value) {
62-
is AnyOfUserOrPet.UserValue -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
63-
is AnyOfUserOrPet.PetValue -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
62+
is AnyOfUserOrPet. -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
63+
is AnyOfUserOrPet. -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
6464
}
6565
}
6666

@@ -73,15 +73,15 @@ object AnyOfUserOrPetSerializer : KSerializer<AnyOfUserOrPet> {
7373
if (jsonElement !is JsonPrimitive) {
7474
try {
7575
val instance = jsonDecoder.json.decodeFromJsonElement<User>(jsonElement)
76-
return AnyOfUserOrPet.UserValue(instance)
76+
return AnyOfUserOrPet.(instance)
7777
} catch (e: Exception) {
7878
errorMessages.add("Failed to deserialize as User: ${e.message}")
7979
}
8080
}
8181
if (jsonElement !is JsonPrimitive) {
8282
try {
8383
val instance = jsonDecoder.json.decodeFromJsonElement<Pet>(jsonElement)
84-
return AnyOfUserOrPet.PetValue(instance)
84+
return AnyOfUserOrPet.(instance)
8585
} catch (e: Exception) {
8686
errorMessages.add("Failed to deserialize as Pet: ${e.message}")
8787
}

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnyOfUserOrPetOrArrayString.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ import kotlinx.serialization.json.encodeToJsonElement
4545

4646
sealed interface AnyOfUserOrPetOrArrayString {
4747
@JvmInline
48-
value class UserValue(val value: User) : AnyOfUserOrPetOrArrayString
48+
value class (val value: User) : AnyOfUserOrPetOrArrayString
4949

5050
@JvmInline
51-
value class PetValue(val value: Pet) : AnyOfUserOrPetOrArrayString
51+
value class (val value: Pet) : AnyOfUserOrPetOrArrayString
5252

5353
@JvmInline
54-
value class ListStringValue(val value: kotlin.collections.List<kotlin.String>) : AnyOfUserOrPetOrArrayString
54+
value class (val value: kotlin.collections.List<kotlin.String>) : AnyOfUserOrPetOrArrayString
5555

5656
}
5757

@@ -62,9 +62,9 @@ object AnyOfUserOrPetOrArrayStringSerializer : KSerializer<AnyOfUserOrPetOrArray
6262
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("AnyOfUserOrPetOrArrayString can only be serialized with Json")
6363

6464
when (value) {
65-
is AnyOfUserOrPetOrArrayString.UserValue -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
66-
is AnyOfUserOrPetOrArrayString.PetValue -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
67-
is AnyOfUserOrPetOrArrayString.ListStringValue -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
65+
is AnyOfUserOrPetOrArrayString. -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
66+
is AnyOfUserOrPetOrArrayString. -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
67+
is AnyOfUserOrPetOrArrayString. -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
6868
}
6969
}
7070

@@ -77,23 +77,23 @@ object AnyOfUserOrPetOrArrayStringSerializer : KSerializer<AnyOfUserOrPetOrArray
7777
if (jsonElement !is JsonPrimitive) {
7878
try {
7979
val instance = jsonDecoder.json.decodeFromJsonElement<User>(jsonElement)
80-
return AnyOfUserOrPetOrArrayString.UserValue(instance)
80+
return AnyOfUserOrPetOrArrayString.(instance)
8181
} catch (e: Exception) {
8282
errorMessages.add("Failed to deserialize as User: ${e.message}")
8383
}
8484
}
8585
if (jsonElement !is JsonPrimitive) {
8686
try {
8787
val instance = jsonDecoder.json.decodeFromJsonElement<Pet>(jsonElement)
88-
return AnyOfUserOrPetOrArrayString.PetValue(instance)
88+
return AnyOfUserOrPetOrArrayString.(instance)
8989
} catch (e: Exception) {
9090
errorMessages.add("Failed to deserialize as Pet: ${e.message}")
9191
}
9292
}
9393
if (jsonElement is JsonArray) {
9494
try {
9595
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.collections.List<kotlin.String>>(jsonElement)
96-
return AnyOfUserOrPetOrArrayString.ListStringValue(instance)
96+
return AnyOfUserOrPetOrArrayString.(instance)
9797
} catch (e: Exception) {
9898
errorMessages.add("Failed to deserialize as kotlin.collections.List<kotlin.String>: ${e.message}")
9999
}

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/BooleanOrLong.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import kotlinx.serialization.json.encodeToJsonElement
4242
@Serializable(with = BooleanOrLongSerializer::class)
4343
sealed interface BooleanOrLong {
4444
@JvmInline
45-
value class BooleanValue(val value: kotlin.Boolean) : BooleanOrLong
45+
value class (val value: kotlin.Boolean) : BooleanOrLong
4646

4747
@JvmInline
48-
value class LongValue(val value: kotlin.Long) : BooleanOrLong
48+
value class (val value: kotlin.Long) : BooleanOrLong
4949

5050
}
5151

@@ -56,8 +56,8 @@ object BooleanOrLongSerializer : KSerializer<BooleanOrLong> {
5656
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("BooleanOrLong can only be serialized with Json")
5757

5858
when (value) {
59-
is BooleanOrLong.BooleanValue -> jsonEncoder.encodeBoolean(value.value)
60-
is BooleanOrLong.LongValue -> jsonEncoder.encodeLong(value.value)
59+
is BooleanOrLong. -> jsonEncoder.encodeBoolean(value.value)
60+
is BooleanOrLong. -> jsonEncoder.encodeLong(value.value)
6161
}
6262
}
6363

@@ -70,15 +70,15 @@ object BooleanOrLongSerializer : KSerializer<BooleanOrLong> {
7070
if (jsonElement is JsonPrimitive && !jsonElement.isString) {
7171
try {
7272
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.Boolean>(jsonElement)
73-
return BooleanOrLong.BooleanValue(instance)
73+
return BooleanOrLong.(instance)
7474
} catch (e: Exception) {
7575
errorMessages.add("Failed to deserialize as kotlin.Boolean: ${e.message}")
7676
}
7777
}
7878
if (jsonElement is JsonPrimitive && !jsonElement.isString) {
7979
try {
8080
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.Long>(jsonElement)
81-
return BooleanOrLong.LongValue(instance)
81+
return BooleanOrLong.(instance)
8282
} catch (e: Exception) {
8383
errorMessages.add("Failed to deserialize as kotlin.Long: ${e.message}")
8484
}

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/StringOrLong.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import kotlinx.serialization.json.encodeToJsonElement
4242
@Serializable(with = StringOrLongSerializer::class)
4343
sealed interface StringOrLong {
4444
@JvmInline
45-
value class StringValue(val value: kotlin.String) : StringOrLong
45+
value class (val value: kotlin.String) : StringOrLong
4646

4747
@JvmInline
48-
value class LongValue(val value: kotlin.Long) : StringOrLong
48+
value class (val value: kotlin.Long) : StringOrLong
4949

5050
}
5151

@@ -56,8 +56,8 @@ object StringOrLongSerializer : KSerializer<StringOrLong> {
5656
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("StringOrLong can only be serialized with Json")
5757

5858
when (value) {
59-
is StringOrLong.StringValue -> jsonEncoder.encodeString(value.value)
60-
is StringOrLong.LongValue -> jsonEncoder.encodeLong(value.value)
59+
is StringOrLong. -> jsonEncoder.encodeString(value.value)
60+
is StringOrLong. -> jsonEncoder.encodeLong(value.value)
6161
}
6262
}
6363

@@ -70,15 +70,15 @@ object StringOrLongSerializer : KSerializer<StringOrLong> {
7070
if (jsonElement is JsonPrimitive && jsonElement.isString) {
7171
try {
7272
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.String>(jsonElement)
73-
return StringOrLong.StringValue(instance)
73+
return StringOrLong.(instance)
7474
} catch (e: Exception) {
7575
errorMessages.add("Failed to deserialize as kotlin.String: ${e.message}")
7676
}
7777
}
7878
if (jsonElement is JsonPrimitive && !jsonElement.isString) {
7979
try {
8080
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.Long>(jsonElement)
81-
return StringOrLong.LongValue(instance)
81+
return StringOrLong.(instance)
8282
} catch (e: Exception) {
8383
errorMessages.add("Failed to deserialize as kotlin.Long: ${e.message}")
8484
}

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/UserOrPet.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ import kotlinx.serialization.json.encodeToJsonElement
4444
@Serializable(with = UserOrPetSerializer::class)
4545
sealed interface UserOrPet {
4646
@JvmInline
47-
value class UserValue(val value: User) : UserOrPet
47+
value class (val value: User) : UserOrPet
4848

4949
@JvmInline
50-
value class PetValue(val value: Pet) : UserOrPet
50+
value class (val value: Pet) : UserOrPet
5151

5252
}
5353

@@ -58,8 +58,8 @@ object UserOrPetSerializer : KSerializer<UserOrPet> {
5858
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("UserOrPet can only be serialized with Json")
5959

6060
when (value) {
61-
is UserOrPet.UserValue -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
62-
is UserOrPet.PetValue -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
61+
is UserOrPet. -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
62+
is UserOrPet. -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
6363
}
6464
}
6565

@@ -72,15 +72,15 @@ object UserOrPetSerializer : KSerializer<UserOrPet> {
7272
if (jsonElement !is JsonPrimitive) {
7373
try {
7474
val instance = jsonDecoder.json.decodeFromJsonElement<User>(jsonElement)
75-
return UserOrPet.UserValue(instance)
75+
return UserOrPet.(instance)
7676
} catch (e: Exception) {
7777
errorMessages.add("Failed to deserialize as User: ${e.message}")
7878
}
7979
}
8080
if (jsonElement !is JsonPrimitive) {
8181
try {
8282
val instance = jsonDecoder.json.decodeFromJsonElement<Pet>(jsonElement)
83-
return UserOrPet.PetValue(instance)
83+
return UserOrPet.(instance)
8484
} catch (e: Exception) {
8585
errorMessages.add("Failed to deserialize as Pet: ${e.message}")
8686
}

‎samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/UserOrPetOrArrayString.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ import kotlinx.serialization.json.encodeToJsonElement
4444
@Serializable(with = UserOrPetOrArrayStringSerializer::class)
4545
sealed interface UserOrPetOrArrayString {
4646
@JvmInline
47-
value class UserValue(val value: User) : UserOrPetOrArrayString
47+
value class (val value: User) : UserOrPetOrArrayString
4848

4949
@JvmInline
50-
value class PetValue(val value: Pet) : UserOrPetOrArrayString
50+
value class (val value: Pet) : UserOrPetOrArrayString
5151

5252
@JvmInline
53-
value class ListStringValue(val value: kotlin.collections.List<kotlin.String>) : UserOrPetOrArrayString
53+
value class (val value: kotlin.collections.List<kotlin.String>) : UserOrPetOrArrayString
5454

5555
}
5656

@@ -61,9 +61,9 @@ object UserOrPetOrArrayStringSerializer : KSerializer<UserOrPetOrArrayString> {
6161
val jsonEncoder = encoder as? JsonEncoder ?: throw SerializationException("UserOrPetOrArrayString can only be serialized with Json")
6262

6363
when (value) {
64-
is UserOrPetOrArrayString.UserValue -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
65-
is UserOrPetOrArrayString.PetValue -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
66-
is UserOrPetOrArrayString.ListStringValue -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
64+
is UserOrPetOrArrayString. -> jsonEncoder.encodeSerializableValue(User.serializer(), value.value)
65+
is UserOrPetOrArrayString. -> jsonEncoder.encodeSerializableValue(Pet.serializer(), value.value)
66+
is UserOrPetOrArrayString. -> jsonEncoder.encodeJsonElement(jsonEncoder.json.encodeToJsonElement(value.value))
6767
}
6868
}
6969

@@ -76,23 +76,23 @@ object UserOrPetOrArrayStringSerializer : KSerializer<UserOrPetOrArrayString> {
7676
if (jsonElement !is JsonPrimitive) {
7777
try {
7878
val instance = jsonDecoder.json.decodeFromJsonElement<User>(jsonElement)
79-
return UserOrPetOrArrayString.UserValue(instance)
79+
return UserOrPetOrArrayString.(instance)
8080
} catch (e: Exception) {
8181
errorMessages.add("Failed to deserialize as User: ${e.message}")
8282
}
8383
}
8484
if (jsonElement !is JsonPrimitive) {
8585
try {
8686
val instance = jsonDecoder.json.decodeFromJsonElement<Pet>(jsonElement)
87-
return UserOrPetOrArrayString.PetValue(instance)
87+
return UserOrPetOrArrayString.(instance)
8888
} catch (e: Exception) {
8989
errorMessages.add("Failed to deserialize as Pet: ${e.message}")
9090
}
9191
}
9292
if (jsonElement is JsonArray) {
9393
try {
9494
val instance = jsonDecoder.json.decodeFromJsonElement<kotlin.collections.List<kotlin.String>>(jsonElement)
95-
return UserOrPetOrArrayString.ListStringValue(instance)
95+
return UserOrPetOrArrayString.(instance)
9696
} catch (e: Exception) {
9797
errorMessages.add("Failed to deserialize as kotlin.collections.List<kotlin.String>: ${e.message}")
9898
}

0 commit comments

Comments
 (0)