Skip to content

Commit 0ba4263

Browse files
maksimkurbmaksimkurb
committed
Regenerate samples
1 parent b95b7f8 commit 0ba4263

7 files changed

Lines changed: 35 additions & 100 deletions

File tree

  • samples
    • client
    • server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix

‎samples/client/echo_api/java/apache-httpclient/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ext {
121121
jakarta_annotation_version = "1.3.5"
122122
httpclient_version = "5.1.3"
123123
jodatime_version = "2.9.9"
124-
junit_version = "4.13.2"
124+
junit_version = "5.10.2"
125125
}
126126

127127
dependencies {
@@ -135,5 +135,10 @@ dependencies {
135135
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
136136
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
137137
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
138-
testImplementation "junit:junit:$junit_version"
138+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
139+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
140+
}
141+
142+
test {
143+
useJUnitPlatform()
139144
}

‎samples/client/petstore/java/apache-httpclient-jackson3/.openapi-generator/FILES‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.github/workflows/maven.yml
22
.gitignore
3-
.openapi-generator-ignore
43
.travis.yml
54
README.md
65
api/openapi.yaml
@@ -147,60 +146,3 @@ src/main/java/org/openapitools/client/model/SpecialModelName.java
147146
src/main/java/org/openapitools/client/model/Tag.java
148147
src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
149148
src/main/java/org/openapitools/client/model/User.java
150-
src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
151-
src/test/java/org/openapitools/client/api/DefaultApiTest.java
152-
src/test/java/org/openapitools/client/api/FakeApiTest.java
153-
src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
154-
src/test/java/org/openapitools/client/api/PetApiTest.java
155-
src/test/java/org/openapitools/client/api/StoreApiTest.java
156-
src/test/java/org/openapitools/client/api/UserApiTest.java
157-
src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
158-
src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
159-
src/test/java/org/openapitools/client/model/AnimalTest.java
160-
src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
161-
src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
162-
src/test/java/org/openapitools/client/model/ArrayTestTest.java
163-
src/test/java/org/openapitools/client/model/CapitalizationTest.java
164-
src/test/java/org/openapitools/client/model/CatTest.java
165-
src/test/java/org/openapitools/client/model/CategoryTest.java
166-
src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
167-
src/test/java/org/openapitools/client/model/ClassModelTest.java
168-
src/test/java/org/openapitools/client/model/ClientTest.java
169-
src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
170-
src/test/java/org/openapitools/client/model/DogTest.java
171-
src/test/java/org/openapitools/client/model/EnumArraysTest.java
172-
src/test/java/org/openapitools/client/model/EnumClassTest.java
173-
src/test/java/org/openapitools/client/model/EnumTestTest.java
174-
src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
175-
src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
176-
src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
177-
src/test/java/org/openapitools/client/model/FooTest.java
178-
src/test/java/org/openapitools/client/model/FormatTestTest.java
179-
src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
180-
src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
181-
src/test/java/org/openapitools/client/model/MapTestTest.java
182-
src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
183-
src/test/java/org/openapitools/client/model/Model200ResponseTest.java
184-
src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
185-
src/test/java/org/openapitools/client/model/ModelFileTest.java
186-
src/test/java/org/openapitools/client/model/ModelListTest.java
187-
src/test/java/org/openapitools/client/model/ModelReturnTest.java
188-
src/test/java/org/openapitools/client/model/NameTest.java
189-
src/test/java/org/openapitools/client/model/NullableClassTest.java
190-
src/test/java/org/openapitools/client/model/NumberOnlyTest.java
191-
src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
192-
src/test/java/org/openapitools/client/model/OrderTest.java
193-
src/test/java/org/openapitools/client/model/OuterCompositeTest.java
194-
src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
195-
src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
196-
src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
197-
src/test/java/org/openapitools/client/model/OuterEnumTest.java
198-
src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
199-
src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
200-
src/test/java/org/openapitools/client/model/PetTest.java
201-
src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
202-
src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
203-
src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
204-
src/test/java/org/openapitools/client/model/TagTest.java
205-
src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
206-
src/test/java/org/openapitools/client/model/UserTest.java

‎samples/client/petstore/java/apache-httpclient/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ext {
121121
jakarta_annotation_version = "1.3.5"
122122
httpclient_version = "5.1.3"
123123
jodatime_version = "2.9.9"
124-
junit_version = "4.13.2"
124+
junit_version = "5.10.2"
125125
}
126126

127127
dependencies {
@@ -135,5 +135,10 @@ dependencies {
135135
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
136136
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
137137
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
138-
testImplementation "junit:junit:$junit_version"
138+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
139+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
140+
}
141+
142+
test {
143+
useJUnitPlatform()
139144
}

‎samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# org.openapitools.server - Kotlin Server library for Polymorphism example with allOf and discriminator
1+
# org.openapitools.server - Kotlin Server library for Basic polymorphism example with discriminator
22

33
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
44

‎samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Cat.kt‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Polymorphism example with allOf and discriminator
2+
* Basic polymorphism example with discriminator
33
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
44
*
55
* The version of the OpenAPI document: 1.0
@@ -11,24 +11,21 @@
1111
*/
1212
package org.openapitools.server.models
1313

14-
import org.openapitools.server.models.Pet
1514

1615
/**
17-
* A representation of a cat
16+
* A pet cat
1817
* @param huntingSkill The measured skill for hunting
18+
* @param petType
1919
*/
2020
data class Cat(
2121
/* The measured skill for hunting */
2222

2323
@field:com.fasterxml.jackson.annotation.JsonProperty("huntingSkill")
2424
val huntingSkill: Cat.HuntingSkill,
2525

26-
@field:com.fasterxml.jackson.annotation.JsonProperty("name")
27-
override val name: kotlin.String,
28-
2926
@field:com.fasterxml.jackson.annotation.JsonProperty("petType")
30-
override val petType: kotlin.String
31-
) : Pet(name = name, petType = petType)
27+
val petType: kotlin.Any? = null
28+
) : Pet()
3229
{
3330
/**
3431
* The measured skill for hunting

‎samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Dog.kt‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Polymorphism example with allOf and discriminator
2+
* Basic polymorphism example with discriminator
33
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
44
*
55
* The version of the OpenAPI document: 1.0
@@ -11,24 +11,19 @@
1111
*/
1212
package org.openapitools.server.models
1313

14-
import org.openapitools.server.models.Pet
1514

1615
/**
17-
* A representation of a dog
16+
* A pet dog
17+
* @param petType
1818
* @param packSize the size of the pack the dog is from
1919
*/
2020
data class Dog(
21+
22+
@field:com.fasterxml.jackson.annotation.JsonProperty("petType")
23+
val petType: kotlin.Any?,
2124
/* the size of the pack the dog is from */
2225

2326
@field:com.fasterxml.jackson.annotation.JsonProperty("packSize")
24-
val packSize: kotlin.Int = 0,
25-
26-
@field:com.fasterxml.jackson.annotation.JsonProperty("name")
27-
override val name: kotlin.String,
28-
29-
@field:com.fasterxml.jackson.annotation.JsonProperty("petType")
30-
override val petType: kotlin.String
31-
) : Pet(name = name, petType = petType)
32-
{
33-
}
27+
val packSize: kotlin.Int = 0
28+
) : Pet()
3429

‎samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix/src/main/kotlin/org/openapitools/server/models/Pet.kt‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Polymorphism example with allOf and discriminator
2+
* Basic polymorphism example with discriminator
33
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
44
*
55
* The version of the OpenAPI document: 1.0
@@ -11,25 +11,16 @@
1111
*/
1212
package org.openapitools.server.models
1313

14+
import org.openapitools.server.models.Cat
15+
import org.openapitools.server.models.Dog
1416

1517
/**
1618
*
17-
* @param name
18-
* @param petType
1919
*/
20-
@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "petType", visible = true)
20+
@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "petType", visible = false)
2121
@com.fasterxml.jackson.annotation.JsonSubTypes(
22-
com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "Cat"),
23-
com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "Dog")
24-
)
25-
sealed class Pet(
26-
27-
@field:com.fasterxml.jackson.annotation.JsonProperty("name")
28-
open val name: kotlin.String
29-
,
30-
31-
@field:com.fasterxml.jackson.annotation.JsonProperty("petType")
32-
open val petType: kotlin.String
33-
22+
com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "cat"),
23+
com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "dog")
3424
)
25+
sealed class Pet
3526

0 commit comments

Comments
 (0)