loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-10 23:52:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to jackson-datatype-threetenbp 2.9.10 (#4176)

Browse Source 
* Update to jackson-datatype-threetenbp 2.9.10

* Update to ThreeTen BP 1.4.0

* Fix import and usage of org.threeten.bp.DateTimeUtils

* Refresh samples
This commit is contained in:
Jochen Schalanda
2019-10-19 09:08:56 +02:00
committed by William Cheng
parent be0fc7e49f
commit ab0b3d9795
104 changed files with 140 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/pom.xml
View File

@@ -198,8 +198,8 @@
<diffutils-version>1.3.0</diffutils-version> <diffutils-version>1.3.0</diffutils-version>
<guava-version>26.0-jre</guava-version> <guava-version>26.0-jre</guava-version>
<generex-version>1.0.2</generex-version> <generex-version>1.0.2</generex-version>
<jackson-version>2.9.5</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/openapi-generator/src/main/resources/Java/CustomInstantDeserializer.mustache vendored
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

4
modules/openapi-generator/src/main/resources/Java/build.gradle.mustache vendored
View File

@@ -136,8 +136,8 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_version = "2.9.10"
jackson_databind_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
jersey_version = "1.19.4" jersey_version = "1.19.4"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

4
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache vendored
View File

@@ -124,7 +124,7 @@ ext {
jackson_databind_version = "2.9.10" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
{{#threetenbp}} {{#threetenbp}}
threepane_version = "2.6.4" jackson_threetenbp_version = "2.9.10"
{{/threetenbp}} {{/threetenbp}}
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
feign_form_version = "2.1.0" feign_form_version = "2.1.0"
@@ -150,7 +150,7 @@ dependencies {
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}} {{/java8}}
{{#threetenbp}} {{#threetenbp}}
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
{{/threetenbp}} {{/threetenbp}}
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2" compile "com.brsanthu:migbase64:2.2"

4
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache vendored
View File

@@ -17,8 +17,8 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache vendored
View File

@@ -318,7 +318,7 @@
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
{{#threetenbp}} {{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache vendored
View File

@@ -128,7 +128,7 @@ ext {
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
{{#threetenbp}} {{#threetenbp}}
jackson_threeten_version = "2.6.4" jackson_threeten_version = "2.9.10"
{{/threetenbp}} {{/threetenbp}}
} }

8
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache vendored
View File

@@ -16,16 +16,16 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
{{#withXml}} {{#withXml}}
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.9" % "compile", "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.10" % "compile",
{{/withXml}} {{/withXml}}
{{#joda}} {{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
{{/joda}} {{/joda}}
{{#java8}} {{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
{{/java8}} {{/java8}}
{{#threetenbp}} {{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
{{/threetenbp}} {{/threetenbp}}
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"

2
modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache vendored
View File

@@ -313,7 +313,7 @@
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache vendored
View File

@@ -132,7 +132,7 @@ ext {
{{/supportJava6}} {{/supportJava6}}
junit_version = "4.12" junit_version = "4.12"
{{#threetenbp}} {{#threetenbp}}
threetenbp_version = "2.6.4" threetenbp_version = "2.9.10"
{{/threetenbp}} {{/threetenbp}}
} }

6
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache vendored
View File

@@ -17,13 +17,13 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
{{#joda}} {{#joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
{{/joda}} {{/joda}}
{{#java8}} {{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
{{/java8}} {{/java8}}
{{#threetenbp}} {{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
{{/threetenbp}} {{/threetenbp}}
{{^java8}} {{^java8}}
"com.brsanthu" % "migbase64" % "2.2", "com.brsanthu" % "migbase64" % "2.2",

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache vendored
View File

@@ -364,7 +364,7 @@
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.9.10</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache vendored
View File

@@ -140,7 +140,7 @@ dependencies {
compile 'joda-time:joda-time:2.9.9' compile 'joda-time:joda-time:2.9.9'
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
compile 'org.threeten:threetenbp:1.3.5' compile 'org.threeten:threetenbp:1.4.0'
{{/threetenbp}} {{/threetenbp}}
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache vendored
View File

@@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}} {{/threetenbp}}
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
"javax.annotation" % "jsr250-api" % "1.0" % "compile", "javax.annotation" % "jsr250-api" % "1.0" % "compile",

2
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache vendored
View File

@@ -316,7 +316,7 @@
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<javax-annotation-version>1.0</javax-annotation-version> <javax-annotation-version>1.0</javax-annotation-version>

6
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache vendored
View File

@@ -99,8 +99,8 @@ ext {
rest_assured_version = "4.0.0" rest_assured_version = "4.0.0"
junit_version = "4.12" junit_version = "4.12"
{{#jackson}} {{#jackson}}
jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_version = "2.9.10"
jackson_databind_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = 0.2.0 jackson_databind_nullable_version = 0.2.0
{{/jackson}} {{/jackson}}
{{#gson}} {{#gson}}
@@ -111,7 +111,7 @@ ext {
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
threetenbp_version = "1.3.8" threetenbp_version = "1.4.0"
{{/threetenbp}} {{/threetenbp}}
okio_version = "1.13.0" okio_version = "1.13.0"
} }

2
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache vendored
View File

@@ -24,7 +24,7 @@ lazy val root = (project in file(".")).
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
"org.threeten" % "threetenbp" % "1.3.8" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}} {{/threetenbp}}
"com.squareup.okio" % "okio" % "1.13.0" % "compile", "com.squareup.okio" % "okio" % "1.13.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

8
modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache vendored
View File

@@ -320,14 +320,14 @@
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
{{#jackson}} {{#jackson}}
<jackson-version>2.9.9</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
{{#threetenbp}} {{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
{{/jackson}} {{/jackson}}
<okio-version>1.13.0</okio-version> <okio-version>1.13.0</okio-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache vendored
View File

@@ -122,7 +122,7 @@ ext {
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_version = "2.9.10" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
threetenbp_version = "2.6.4" threetenbp_version = "2.9.10"
resteasy_version = "3.1.3.Final" resteasy_version = "3.1.3.Final"
{{^java8}} {{^java8}}
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

6
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache vendored
View File

@@ -16,12 +16,12 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
{{#java8}} {{#java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
{{/java8}} {{/java8}}
{{^java8}} {{^java8}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile",
{{/java8}} {{/java8}}

2
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache vendored
View File

@@ -297,7 +297,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.9.10</threetenbp-version>
{{^java8}} {{^java8}}
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/java8}} {{/java8}}

2
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache vendored
View File

@@ -127,7 +127,7 @@ ext {
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
{{#threetenbp}} {{#threetenbp}}
jackson_threeten_version = "2.6.4" jackson_threeten_version = "2.9.10"
{{/threetenbp}} {{/threetenbp}}
} }

6
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache vendored
View File

@@ -309,14 +309,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.9.9</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
{{#joda}} {{#joda}}
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache vendored
View File

@@ -114,7 +114,7 @@ ext {
junit_version = "4.12" junit_version = "4.12"
jodatime_version = "2.9.3" jodatime_version = "2.9.3"
{{#threetenbp}} {{#threetenbp}}
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
{{/threetenbp}} {{/threetenbp}}
} }

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache vendored
View File

@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"joda-time" % "joda-time" % "2.9.3" % "compile", "joda-time" % "joda-time" % "2.9.3" % "compile",
{{#threetenbp}} {{#threetenbp}}
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}} {{/threetenbp}}
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache vendored
View File

@@ -276,7 +276,7 @@
<okhttp-version>2.7.5</okhttp-version> <okhttp-version>2.7.5</okhttp-version>
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache vendored
View File

@@ -149,7 +149,7 @@ ext {
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
{{/threetenbp}} {{/threetenbp}}
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache vendored
View File

@@ -50,7 +50,7 @@ lazy val root = (project in file(".")).
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}} {{/threetenbp}}
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache vendored
View File

@@ -401,7 +401,7 @@
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

4
modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache vendored
View File

@@ -28,8 +28,8 @@ task execute(type:JavaExec) {
ext { ext {
swagger_annotations_version = "1.5.21" swagger_annotations_version = "1.5.21"
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_version = "2.9.10"
jackson_databind_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jackson_databind_version = "2.9.10"
vertx_version = "3.4.2" vertx_version = "3.4.2"
junit_version = "4.12" junit_version = "4.12"
} }

4
modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache vendored
View File

@@ -289,8 +289,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx-version>3.4.2</vertx-version> <vertx-version>3.4.2</vertx-version>
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-databind> <jackson-databind>2.9.10</jackson-databind>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache vendored
View File

@@ -89,7 +89,7 @@
<groupId>com.github.joschi.jackson</groupId> <groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId> <artifactId>jackson-datatype-threetenbp</artifactId>
{{^parentOverridden}} {{^parentOverridden}}
<version>2.6.4</version> <version>2.9.10</version>
{{/parentOverridden}} {{/parentOverridden}}
</dependency> </dependency>
{{/threetenbp}} {{/threetenbp}}

2
modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache vendored
View File

@@ -263,7 +263,7 @@
<dependency> <dependency>
<groupId>org.threeten</groupId> <groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId> <artifactId>threetenbp</artifactId>
<version>1.3.6</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

2
modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache vendored
View File

@@ -42,7 +42,7 @@ dependencies {
compile "com.squareup.okhttp3:okhttp:4.2.0" compile "com.squareup.okhttp3:okhttp:4.2.0"
{{/jvm-okhttp4}} {{/jvm-okhttp4}}
{{#threetenbp}} {{#threetenbp}}
compile "org.threeten:threetenbp:1.3.8" compile "org.threeten:threetenbp:1.4.0"
{{/threetenbp}} {{/threetenbp}}
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0"
} }

4
samples/client/petstore/java/feign/build.gradle
View File

@@ -99,7 +99,7 @@ ext {
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_version = "2.9.10" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
threepane_version = "2.6.4" jackson_threetenbp_version = "2.9.10"
feign_version = "9.7.0" feign_version = "9.7.0"
feign_form_version = "2.1.0" feign_form_version = "2.1.0"
junit_version = "4.12" junit_version = "4.12"
@@ -117,7 +117,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2" compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"

4
samples/client/petstore/java/feign/build.sbt
View File

@@ -17,8 +17,8 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
samples/client/petstore/java/feign/pom.xml
View File

@@ -284,7 +284,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

4
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

4
samples/client/petstore/java/feign10x/build.gradle
View File

@@ -99,7 +99,7 @@ ext {
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_version = "2.9.10" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
threepane_version = "2.6.4" jackson_threetenbp_version = "2.9.10"
feign_version = "10.2.3" feign_version = "10.2.3"
feign_form_version = "2.1.0" feign_form_version = "2.1.0"
junit_version = "4.12" junit_version = "4.12"
@@ -117,7 +117,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2" compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"

4
samples/client/petstore/java/feign10x/build.sbt
View File

@@ -17,8 +17,8 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
samples/client/petstore/java/feign10x/pom.xml
View File

@@ -284,7 +284,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

4
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/google-api-client/build.gradle
View File

@@ -103,7 +103,7 @@ ext {
jersey_common_version = "2.25.1" jersey_common_version = "2.25.1"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
jackson_threeten_version = "2.6.4" jackson_threeten_version = "2.9.10"
} }
dependencies { dependencies {

2
samples/client/petstore/java/google-api-client/build.sbt
View File

@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"
) )

2
samples/client/petstore/java/google-api-client/pom.xml
View File

@@ -261,7 +261,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

4
samples/client/petstore/java/jersey1/build.gradle
View File

@@ -112,8 +112,8 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
jackson_version = "2.6.4" jackson_version = "2.9.10"
jackson_databind_version = "2.6.4" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
jersey_version = "1.19.4" jersey_version = "1.19.4"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"

4
samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/jersey2-java6/build.sbt
View File

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.brsanthu" % "migbase64" % "2.2", "com.brsanthu" % "migbase64" % "2.2",
"org.apache.commons" % "commons-lang3" % "3.6", "org.apache.commons" % "commons-lang3" % "3.6",
"commons-io" % "commons-io" % "2.5", "commons-io" % "commons-io" % "2.5",

2
samples/client/petstore/java/jersey2-java6/pom.xml
View File

@@ -293,7 +293,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.9.10</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/jersey2-java8/build.sbt
View File

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"
) )

2
samples/client/petstore/java/jersey2/build.gradle
View File

@@ -100,7 +100,7 @@ ext {
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
jersey_version = "2.27" jersey_version = "2.27"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "2.6.4" threetenbp_version = "2.9.10"
} }
dependencies { dependencies {

2
samples/client/petstore/java/jersey2/build.sbt
View File

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.brsanthu" % "migbase64" % "2.2", "com.brsanthu" % "migbase64" % "2.2",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"

2
samples/client/petstore/java/jersey2/pom.xml
View File

@@ -286,7 +286,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.9.10</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
View File

@@ -106,7 +106,7 @@ dependencies {
compile 'io.gsonfire:gson-fire:1.8.3' compile 'io.gsonfire:gson-fire:1.8.3'
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile 'org.threeten:threetenbp:1.3.5' compile 'org.threeten:threetenbp:1.4.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
View File

@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
"com.google.code.gson" % "gson" % "2.8.5", "com.google.code.gson" % "gson" % "2.8.5",
"org.apache.commons" % "commons-lang3" % "3.9", "org.apache.commons" % "commons-lang3" % "3.9",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
"javax.annotation" % "jsr250-api" % "1.0" % "compile", "javax.annotation" % "jsr250-api" % "1.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
View File

@@ -270,7 +270,7 @@
<okhttp-version>3.14.2</okhttp-version> <okhttp-version>3.14.2</okhttp-version>
<gson-version>2.8.5</gson-version> <gson-version>2.8.5</gson-version>
<commons-lang3-version>3.9</commons-lang3-version> <commons-lang3-version>3.9</commons-lang3-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<javax-annotation-version>1.0</javax-annotation-version> <javax-annotation-version>1.0</javax-annotation-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
samples/client/petstore/java/okhttp-gson/build.gradle
View File

@@ -106,7 +106,7 @@ dependencies {
compile 'io.gsonfire:gson-fire:1.8.3' compile 'io.gsonfire:gson-fire:1.8.3'
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile 'org.threeten:threetenbp:1.3.5' compile 'org.threeten:threetenbp:1.4.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
samples/client/petstore/java/okhttp-gson/build.sbt
View File

@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
"com.google.code.gson" % "gson" % "2.8.5", "com.google.code.gson" % "gson" % "2.8.5",
"org.apache.commons" % "commons-lang3" % "3.9", "org.apache.commons" % "commons-lang3" % "3.9",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
"javax.annotation" % "jsr250-api" % "1.0" % "compile", "javax.annotation" % "jsr250-api" % "1.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
samples/client/petstore/java/okhttp-gson/pom.xml
View File

@@ -263,7 +263,7 @@
<okhttp-version>3.14.2</okhttp-version> <okhttp-version>3.14.2</okhttp-version>
<gson-version>2.8.5</gson-version> <gson-version>2.8.5</gson-version>
<commons-lang3-version>3.9</commons-lang3-version> <commons-lang3-version>3.9</commons-lang3-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<javax-annotation-version>1.0</javax-annotation-version> <javax-annotation-version>1.0</javax-annotation-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
samples/client/petstore/java/rest-assured/build.gradle
View File

@@ -100,7 +100,7 @@ ext {
junit_version = "4.12" junit_version = "4.12"
gson_version = "2.8.5" gson_version = "2.8.5"
gson_fire_version = "1.8.3" gson_fire_version = "1.8.3"
threetenbp_version = "1.3.8" threetenbp_version = "1.4.0"
okio_version = "1.13.0" okio_version = "1.13.0"
} }

2
samples/client/petstore/java/rest-assured/build.sbt
View File

@@ -13,7 +13,7 @@ lazy val root = (project in file(".")).
"io.rest-assured" % "scala-support" % "4.0.0", "io.rest-assured" % "scala-support" % "4.0.0",
"com.google.code.gson" % "gson" % "2.8.5", "com.google.code.gson" % "gson" % "2.8.5",
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
"org.threeten" % "threetenbp" % "1.3.8" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"com.squareup.okio" % "okio" % "1.13.0" % "compile", "com.squareup.okio" % "okio" % "1.13.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test" "com.novocode" % "junit-interface" % "0.10" % "test"

2
samples/client/petstore/java/rest-assured/pom.xml
View File

@@ -245,7 +245,7 @@
<gson-version>2.8.5</gson-version> <gson-version>2.8.5</gson-version>
<gson-fire-version>1.8.3</gson-fire-version> <gson-fire-version>1.8.3</gson-fire-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<okio-version>1.13.0</okio-version> <okio-version>1.13.0</okio-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/resteasy/build.gradle
View File

@@ -98,7 +98,7 @@ ext {
jackson_version = "2.9.10" jackson_version = "2.9.10"
jackson_databind_version = "2.9.10" jackson_databind_version = "2.9.10"
jackson_databind_nullable_version = "0.2.0" jackson_databind_nullable_version = "0.2.0"
threetenbp_version = "2.6.4" threetenbp_version = "2.9.10"
resteasy_version = "3.1.3.Final" resteasy_version = "3.1.3.Final"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"

4
samples/client/petstore/java/resteasy/build.sbt
View File

@@ -16,8 +16,8 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
"joda-time" % "joda-time" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",

2
samples/client/petstore/java/resteasy/pom.xml
View File

@@ -246,7 +246,7 @@
<jackson-version>2.9.10</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<threetenbp-version>2.6.4</threetenbp-version> <threetenbp-version>2.9.10</threetenbp-version>
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

4
samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/resttemplate-withXml/build.gradle
View File

@@ -102,7 +102,7 @@ ext {
spring_web_version = "4.3.9.RELEASE" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
jackson_threeten_version = "2.6.4" jackson_threeten_version = "2.9.10"
} }
dependencies { dependencies {

6
samples/client/petstore/java/resttemplate-withXml/pom.xml
View File

@@ -267,10 +267,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.9.9</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/resttemplate/build.gradle
View File

@@ -102,7 +102,7 @@ ext {
spring_web_version = "4.3.9.RELEASE" spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9" jodatime_version = "2.9.9"
junit_version = "4.12" junit_version = "4.12"
jackson_threeten_version = "2.6.4" jackson_threeten_version = "2.9.10"
} }
dependencies { dependencies {

6
samples/client/petstore/java/resttemplate/pom.xml
View File

@@ -259,10 +259,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version> <spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.9.9</jackson-version> <jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version> <jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
View File

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils; import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase; import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction; import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
import com.fasterxml.jackson.datatype.threetenbp.function.Function; import com.fasterxml.jackson.datatype.threetenbp.function.Function;
import org.threeten.bp.DateTimeException; import org.threeten.bp.DateTimeException;
import org.threeten.bp.DateTimeUtils;
import org.threeten.bp.Instant; import org.threeten.bp.Instant;
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.ZoneId; import org.threeten.bp.ZoneId;
@@ -205,7 +205,7 @@ public class CustomInstantDeserializer<T extends Temporal>
private ZoneId getZone(DeserializationContext context) { private ZoneId getZone(DeserializationContext context) {
// Instants are always in UTC, so don't waste compute cycles // Instants are always in UTC, so don't waste compute cycles
return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone()); return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
} }
private static class FromIntegerArguments { private static class FromIntegerArguments {

2
samples/client/petstore/java/retrofit2-play25/build.gradle
View File

@@ -101,7 +101,7 @@ ext {
play_version = "2.5.14" play_version = "2.5.14"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2-play25/build.sbt
View File

@@ -18,7 +18,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"

2
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@@ -289,7 +289,7 @@
<play-version>2.5.15</play-version> <play-version>2.5.15</play-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/retrofit2-play26/build.gradle
View File

@@ -103,7 +103,7 @@ ext {
play_version = "2.6.7" play_version = "2.6.7"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2-play26/build.sbt
View File

@@ -19,7 +19,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"

2
samples/client/petstore/java/retrofit2-play26/pom.xml
View File

@@ -294,7 +294,7 @@
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/retrofit2/build.gradle
View File

@@ -99,7 +99,7 @@ ext {
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2/build.sbt
View File

@@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"

2
samples/client/petstore/java/retrofit2/pom.xml
View File

@@ -249,7 +249,7 @@
<gson-fire-version>1.8.3</gson-fire-version> <gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/retrofit2rx/build.gradle
View File

@@ -100,7 +100,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "4.12" junit_version = "4.12"
rx_java_version = "1.3.0" rx_java_version = "1.3.0"
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2rx/build.sbt
View File

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"io.reactivex" % "rxjava" % "1.3.0" % "compile", "io.reactivex" % "rxjava" % "1.3.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"

2
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@@ -260,7 +260,7 @@
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-version> <rxjava-version>1.3.0</rxjava-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/retrofit2rx2/build.gradle
View File

@@ -100,7 +100,7 @@ ext {
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "4.12" junit_version = "4.12"
rx_java_version = "2.1.1" rx_java_version = "2.1.1"
threetenbp_version = "1.3.5" threetenbp_version = "1.4.0"
json_fire_version = "1.8.0" json_fire_version = "1.8.0"
} }

2
samples/client/petstore/java/retrofit2rx2/build.sbt
View File

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile", "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"

2
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@@ -260,7 +260,7 @@
<swagger-annotations-version>1.5.22</swagger-annotations-version> <swagger-annotations-version>1.5.22</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.8</threetenbp-version> <threetenbp-version>1.4.0</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/kotlin-threetenbp/build.gradle
View File

@@ -33,6 +33,6 @@ dependencies {
compile "com.squareup.moshi:moshi-kotlin:1.8.0" compile "com.squareup.moshi:moshi-kotlin:1.8.0"
compile "com.squareup.moshi:moshi-adapters:1.8.0" compile "com.squareup.moshi:moshi-adapters:1.8.0"
compile "com.squareup.okhttp3:okhttp:4.2.0" compile "com.squareup.okhttp3:okhttp:4.2.0"
compile "org.threeten:threetenbp:1.3.8" compile "org.threeten:threetenbp:1.4.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0"
} }

2
samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION
View File

@@ -1 +1 @@
4.1.3-SNAPSHOT 4.2.0-SNAPSHOT

2
samples/openapi3/client/petstore/kotlin/build.gradle
View File

@@ -32,6 +32,6 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.squareup.moshi:moshi-kotlin:1.8.0" compile "com.squareup.moshi:moshi-kotlin:1.8.0"
compile "com.squareup.moshi:moshi-adapters:1.8.0" compile "com.squareup.moshi:moshi-adapters:1.8.0"
compile "com.squareup.okhttp3:okhttp:4.0.1" compile "com.squareup.okhttp3:okhttp:4.2.0"
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0"
} }

4
samples/openapi3/client/petstore/kotlin/docs/HasOnlyReadOnly.md
View File

@@ -4,8 +4,8 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**bar** | **kotlin.String** | | [optional] **bar** | **kotlin.String** | | [optional] [readonly]
**foo** | **kotlin.String** | | [optional] **foo** | **kotlin.String** | | [optional] [readonly]

4
samples/openapi3/client/petstore/kotlin/docs/Name.md
View File

@@ -5,9 +5,9 @@
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**name** | **kotlin.Int** | | **name** | **kotlin.Int** | |
**snakeCase** | **kotlin.Int** | | [optional] **snakeCase** | **kotlin.Int** | | [optional] [readonly]
**property** | **kotlin.String** | | [optional] **property** | **kotlin.String** | | [optional]
**&#x60;123number&#x60;** | **kotlin.Int** | | [optional] **&#x60;123number&#x60;** | **kotlin.Int** | | [optional] [readonly]

2
samples/openapi3/client/petstore/kotlin/docs/ReadOnlyFirst.md
View File

@@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**bar** | **kotlin.String** | | [optional] **bar** | **kotlin.String** | | [optional] [readonly]
**baz** | **kotlin.String** | | [optional] **baz** | **kotlin.String** | | [optional]

2
samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@@ -139,7 +139,7 @@ open class ApiClient(val baseUrl: String) {
val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase() val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
val request = when (requestConfig.method) { val request = when (requestConfig.method) {
RequestMethod.DELETE -> Request.Builder().url(url).delete() RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(body, contentType))
RequestMethod.GET -> Request.Builder().url(url) RequestMethod.GET -> Request.Builder().url(url)
RequestMethod.HEAD -> Request.Builder().url(url).head() RequestMethod.HEAD -> Request.Builder().url(url).head()
RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(body, contentType)) RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(body, contentType))

2
samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
View File

@@ -20,4 +20,4 @@ val Response.isClientError : Boolean get() = this.code in 400..499
/** /**
* Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
*/ */
val Response.isServerError : Boolean get() = this.code in 500..999 val Response.isServerError : Boolean get() = this.code in 500..999

12
samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
View File

@@ -32,35 +32,23 @@ data class EnumArrays (
companion object { companion object {
private const val serialVersionUID: Long = 123 private const val serialVersionUID: Long = 123
} }
/** /**
* *
* Values: greaterThanEqual,dollar * Values: greaterThanEqual,dollar
*/ */
enum class JustSymbol(val value: kotlin.String){ enum class JustSymbol(val value: kotlin.String){
@Json(name = ">=") greaterThanEqual(">="), @Json(name = ">=") greaterThanEqual(">="),
@Json(name = "$") dollar("$"); @Json(name = "$") dollar("$");
} }
/** /**
* *
* Values: fish,crab * Values: fish,crab
*/ */
enum class ArrayEnum(val value: kotlin.String){ enum class ArrayEnum(val value: kotlin.String){
@Json(name = "fish") fish("fish"), @Json(name = "fish") fish("fish"),
@Json(name = "crab") crab("crab"); @Json(name = "crab") crab("crab");
} }
} }

24
samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
View File

@@ -54,67 +54,43 @@ data class EnumTest (
companion object { companion object {
private const val serialVersionUID: Long = 123 private const val serialVersionUID: Long = 123
} }
/** /**
* *
* Values: uPPER,lower,eMPTY * Values: uPPER,lower,eMPTY
*/ */
enum class EnumString(val value: kotlin.String){ enum class EnumString(val value: kotlin.String){
@Json(name = "UPPER") uPPER("UPPER"), @Json(name = "UPPER") uPPER("UPPER"),
@Json(name = "lower") lower("lower"), @Json(name = "lower") lower("lower"),
@Json(name = "") eMPTY(""); @Json(name = "") eMPTY("");
} }
/** /**
* *
* Values: uPPER,lower,eMPTY * Values: uPPER,lower,eMPTY
*/ */
enum class EnumStringRequired(val value: kotlin.String){ enum class EnumStringRequired(val value: kotlin.String){
@Json(name = "UPPER") uPPER("UPPER"), @Json(name = "UPPER") uPPER("UPPER"),
@Json(name = "lower") lower("lower"), @Json(name = "lower") lower("lower"),
@Json(name = "") eMPTY(""); @Json(name = "") eMPTY("");
} }
/** /**
* *
* Values: _1,minus1 * Values: _1,minus1
*/ */
enum class EnumInteger(val value: kotlin.Int){ enum class EnumInteger(val value: kotlin.Int){
@Json(name = 1) _1(1), @Json(name = 1) _1(1),
@Json(name = -1) minus1(-1); @Json(name = -1) minus1(-1);
} }
/** /**
* *
* Values: _1period1,minus1Period2 * Values: _1period1,minus1Period2
*/ */
enum class EnumNumber(val value: kotlin.Double){ enum class EnumNumber(val value: kotlin.Double){
@Json(name = 1.1) _1period1(1.1), @Json(name = 1.1) _1period1(1.1),
@Json(name = -1.2) minus1Period2(-1.2); @Json(name = -1.2) minus1Period2(-1.2);
} }
} }

Some files were not shown because too many files have changed in this diff Show More