Update Java Vertx client dependency (#2507)

* update java vertx client dep

* update java client description

* update sample

bin/java-petstore-vertx.json

@@ -1,4 +1,5 @@
 {
     "library": "vertx",
+    "dateLibrary": "java8",
     "artifactId": "petstore-vertx"
 }

docs/generators/java.md

@@ -54,4 +54,4 @@ sidebar_label: java
 |useRuntimeException|Use RuntimeException instead of Exception| |false|
 |feignVersion|Version of OpenFeign: '10.x', '9.x' (default)| |false|
 |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9</dd><dt>**okhttp-gson**</dt><dd>HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit**</dt><dd>HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.0.7-RELEASE. JSON processing: Jackson 2.9.5</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8</dd><dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.8.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.8.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.x</dd><dt>**okhttp-gson**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit**</dt><dd>HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.8.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 3.x. JSON processing: Gson 2.x. Only for Java8</dd><dl>|okhttp-gson|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

@@ -116,18 +116,18 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(FEIGN_VERSION, "Version of OpenFeign: '10.x', '9.x' (default)"));
         cliOptions.add(CliOption.newBoolean(USE_REFLECTION_EQUALS_HASHCODE, "Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact."));
 
-        supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'");
-        supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put(OKHTTP_GSON, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
-        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
-        supportedLibraries.put(RESTTEMPLATE, "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put(WEBCLIENT, "HTTP client: Spring WebClient 5.0.7-RELEASE. JSON processing: Jackson 2.9.5");
-        supportedLibraries.put(RESTEASY, "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put(VERTX, "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put(GOOGLE_API_CLIENT, "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9");
-        supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8");
+        supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.8.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
+        supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.8.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'");
+        supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.x");
+        supportedLibraries.put(OKHTTP_GSON, "HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
+        supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
+        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
+        supportedLibraries.put(RESTTEMPLATE, "HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.8.x");
+        supportedLibraries.put(WEBCLIENT, "HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x");
+        supportedLibraries.put(RESTEASY, "HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.8.x");
+        supportedLibraries.put(VERTX, "HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x");
+        supportedLibraries.put(GOOGLE_API_CLIENT, "HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x");
+        supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 3.x. JSON processing: Gson 2.x. Only for Java8");
 
         CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
         libraryOption.setEnum(supportedLibraries);

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

@@ -29,6 +29,7 @@ task execute(type:JavaExec) {
 ext {
     swagger_annotations_version = "1.5.21"
     jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
+    jackson_databind_version = "{{^threetenbp}}2.8.11.3{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
     vertx_version = "3.4.2"
     junit_version = "4.12"
 }
@@ -39,7 +40,7 @@ dependencies {
     compile "io.vertx:vertx-rx-java:$vertx_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     {{#joda}}
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     {{/joda}}

modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache

@@ -234,7 +234,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson-databind}</version>
         </dependency>
         {{#joda}}
             <dependency>
@@ -278,6 +278,7 @@
         <vertx-version>3.4.2</vertx-version>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
         <jackson-version>{{^threetenbp}}2.8.11{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
+        <jackson-databind>{{^threetenbp}}2.8.11.3{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-databind>
         <junit-version>4.12</junit-version>
     </properties>
 </project>

samples/client/petstore/java/vertx/build.gradle

@@ -28,7 +28,8 @@ task execute(type:JavaExec) {
 
 ext {
     swagger_annotations_version = "1.5.21"
-    jackson_version = "2.6.4"
+    jackson_version = "2.8.9"
+    jackson_databind_version = "2.8.11.3"
     vertx_version = "3.4.2"
     junit_version = "4.12"
 }
@@ -39,9 +40,8 @@ dependencies {
     compile "io.vertx:vertx-rx-java:$vertx_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
     testCompile "junit:junit:$junit_version"
     testCompile "io.vertx:vertx-unit:$vertx_version"
 }

samples/client/petstore/java/vertx/pom.xml

@@ -227,18 +227,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson-databind}</version>
         </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.joschi.jackson</groupId>
-                <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -259,7 +254,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx-version>3.4.2</vertx-version>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
-        <jackson-version>2.6.4</jackson-version>
+        <jackson-version>2.8.11</jackson-version>
+        <jackson-databind>2.8.11.3</jackson-databind>
         <junit-version>4.12</junit-version>
     </properties>
 </project>

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/CustomInstantDeserializer.java

@@ -1,232 +0,0 @@
-package org.openapitools.client;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonTokenId;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-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.deser.ThreeTenDateTimeDeserializerBase;
-import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
-import com.fasterxml.jackson.datatype.threetenbp.function.Function;
-import org.threeten.bp.DateTimeException;
-import org.threeten.bp.Instant;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.format.DateTimeFormatter;
-import org.threeten.bp.temporal.Temporal;
-import org.threeten.bp.temporal.TemporalAccessor;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-
-/**
- * Deserializer for ThreeTen temporal {@link Instant}s, {@link OffsetDateTime}, and {@link ZonedDateTime}s.
- * Adapted from the jackson threetenbp InstantDeserializer to add support for deserializing rfc822 format.
- *
- * @author Nick Williams
- */
-public class CustomInstantDeserializer<T extends Temporal>
-    extends ThreeTenDateTimeDeserializerBase<T> {
-  private static final long serialVersionUID = 1L;
-
-  public static final CustomInstantDeserializer<Instant> INSTANT = new CustomInstantDeserializer<Instant>(
-      Instant.class, DateTimeFormatter.ISO_INSTANT,
-      new Function<TemporalAccessor, Instant>() {
-        @Override
-        public Instant apply(TemporalAccessor temporalAccessor) {
-          return Instant.from(temporalAccessor);
-        }
-      },
-      new Function<FromIntegerArguments, Instant>() {
-        @Override
-        public Instant apply(FromIntegerArguments a) {
-          return Instant.ofEpochMilli(a.value);
-        }
-      },
-      new Function<FromDecimalArguments, Instant>() {
-        @Override
-        public Instant apply(FromDecimalArguments a) {
-          return Instant.ofEpochSecond(a.integer, a.fraction);
-        }
-      },
-      null
-  );
-
-  public static final CustomInstantDeserializer<OffsetDateTime> OFFSET_DATE_TIME = new CustomInstantDeserializer<OffsetDateTime>(
-      OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME,
-      new Function<TemporalAccessor, OffsetDateTime>() {
-        @Override
-        public OffsetDateTime apply(TemporalAccessor temporalAccessor) {
-          return OffsetDateTime.from(temporalAccessor);
-        }
-      },
-      new Function<FromIntegerArguments, OffsetDateTime>() {
-        @Override
-        public OffsetDateTime apply(FromIntegerArguments a) {
-          return OffsetDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId);
-        }
-      },
-      new Function<FromDecimalArguments, OffsetDateTime>() {
-        @Override
-        public OffsetDateTime apply(FromDecimalArguments a) {
-          return OffsetDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId);
-        }
-      },
-      new BiFunction<OffsetDateTime, ZoneId, OffsetDateTime>() {
-        @Override
-        public OffsetDateTime apply(OffsetDateTime d, ZoneId z) {
-          return d.withOffsetSameInstant(z.getRules().getOffset(d.toLocalDateTime()));
-        }
-      }
-  );
-
-  public static final CustomInstantDeserializer<ZonedDateTime> ZONED_DATE_TIME = new CustomInstantDeserializer<ZonedDateTime>(
-      ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME,
-      new Function<TemporalAccessor, ZonedDateTime>() {
-        @Override
-        public ZonedDateTime apply(TemporalAccessor temporalAccessor) {
-          return ZonedDateTime.from(temporalAccessor);
-        }
-      },
-      new Function<FromIntegerArguments, ZonedDateTime>() {
-        @Override
-        public ZonedDateTime apply(FromIntegerArguments a) {
-          return ZonedDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId);
-        }
-      },
-      new Function<FromDecimalArguments, ZonedDateTime>() {
-        @Override
-        public ZonedDateTime apply(FromDecimalArguments a) {
-          return ZonedDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId);
-        }
-      },
-      new BiFunction<ZonedDateTime, ZoneId, ZonedDateTime>() {
-        @Override
-        public ZonedDateTime apply(ZonedDateTime zonedDateTime, ZoneId zoneId) {
-          return zonedDateTime.withZoneSameInstant(zoneId);
-        }
-      }
-  );
-
-  protected final Function<FromIntegerArguments, T> fromMilliseconds;
-
-  protected final Function<FromDecimalArguments, T> fromNanoseconds;
-
-  protected final Function<TemporalAccessor, T> parsedToValue;
-
-  protected final BiFunction<T, ZoneId, T> adjust;
-
-  protected CustomInstantDeserializer(Class<T> supportedType,
-                    DateTimeFormatter parser,
-                    Function<TemporalAccessor, T> parsedToValue,
-                    Function<FromIntegerArguments, T> fromMilliseconds,
-                    Function<FromDecimalArguments, T> fromNanoseconds,
-                    BiFunction<T, ZoneId, T> adjust) {
-    super(supportedType, parser);
-    this.parsedToValue = parsedToValue;
-    this.fromMilliseconds = fromMilliseconds;
-    this.fromNanoseconds = fromNanoseconds;
-    this.adjust = adjust == null ? new BiFunction<T, ZoneId, T>() {
-      @Override
-      public T apply(T t, ZoneId zoneId) {
-        return t;
-      }
-    } : adjust;
-  }
-
-  @SuppressWarnings("unchecked")
-  protected CustomInstantDeserializer(CustomInstantDeserializer<T> base, DateTimeFormatter f) {
-    super((Class<T>) base.handledType(), f);
-    parsedToValue = base.parsedToValue;
-    fromMilliseconds = base.fromMilliseconds;
-    fromNanoseconds = base.fromNanoseconds;
-    adjust = base.adjust;
-  }
-
-  @Override
-  protected JsonDeserializer<T> withDateFormat(DateTimeFormatter dtf) {
-    if (dtf == _formatter) {
-      return this;
-    }
-    return new CustomInstantDeserializer<T>(this, dtf);
-  }
-
-  @Override
-  public T deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-    //NOTE: Timestamps contain no timezone info, and are always in configured TZ. Only
-    //string values have to be adjusted to the configured TZ.
-    switch (parser.getCurrentTokenId()) {
-      case JsonTokenId.ID_NUMBER_FLOAT: {
-        BigDecimal value = parser.getDecimalValue();
-        long seconds = value.longValue();
-        int nanoseconds = DecimalUtils.extractNanosecondDecimal(value, seconds);
-        return fromNanoseconds.apply(new FromDecimalArguments(
-            seconds, nanoseconds, getZone(context)));
-      }
-
-      case JsonTokenId.ID_NUMBER_INT: {
-        long timestamp = parser.getLongValue();
-        if (context.isEnabled(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS)) {
-          return this.fromNanoseconds.apply(new FromDecimalArguments(
-              timestamp, 0, this.getZone(context)
-          ));
-        }
-        return this.fromMilliseconds.apply(new FromIntegerArguments(
-            timestamp, this.getZone(context)
-        ));
-      }
-
-      case JsonTokenId.ID_STRING: {
-        String string = parser.getText().trim();
-        if (string.length() == 0) {
-          return null;
-        }
-        if (string.endsWith("+0000")) {
-          string = string.substring(0, string.length() - 5) + "Z";
-        }
-        T value;
-        try {
-          TemporalAccessor acc = _formatter.parse(string);
-          value = parsedToValue.apply(acc);
-          if (context.isEnabled(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)) {
-            return adjust.apply(value, this.getZone(context));
-          }
-        } catch (DateTimeException e) {
-          throw _peelDTE(e);
-        }
-        return value;
-      }
-    }
-    throw context.mappingException("Expected type float, integer, or string.");
-  }
-
-  private ZoneId getZone(DeserializationContext context) {
-    // Instants are always in UTC, so don't waste compute cycles
-    return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone());
-  }
-
-  private static class FromIntegerArguments {
-    public final long value;
-    public final ZoneId zoneId;
-
-    private FromIntegerArguments(long value, ZoneId zoneId) {
-      this.value = value;
-      this.zoneId = zoneId;
-    }
-  }
-
-  private static class FromDecimalArguments {
-    public final long integer;
-    public final int fraction;
-    public final ZoneId zoneId;
-
-    private FromDecimalArguments(long integer, int fraction, ZoneId zoneId) {
-      this.integer = integer;
-      this.fraction = fraction;
-      this.zoneId = zoneId;
-    }
-  }
-}

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java

@@ -4,8 +4,8 @@ import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
 import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
 import org.openapitools.client.model.XmlItem;

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java

@@ -4,8 +4,8 @@ import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
 import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
 import org.openapitools.client.model.XmlItem;

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java

@@ -4,8 +4,8 @@ import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
 import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
 import org.openapitools.client.model.XmlItem;

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -22,9 +22,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
 
 /**
  * FormatTest

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -20,12 +20,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass

samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java

@@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.threeten.bp.OffsetDateTime;
+import java.time.OffsetDateTime;
 
 /**
  * Order

samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/FakeApiTest.java

@@ -16,10 +16,11 @@ import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
 import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
 
 import org.openapitools.client.Configuration;
 
@@ -64,6 +65,22 @@ public class FakeApiTest {
         api = new FakeApiImpl();
     }
     
+    /**
+     * creates an XmlItem
+     * this route creates an XmlItem
+     *
+     * @param context Vertx test context for doing assertions
+     */
+    @Test
+    public void createXmlItemTest(TestContext context) {
+        Async async = context.async();
+        XmlItem xmlItem = null;
+        api.createXmlItem(xmlItem, result -> {
+            // TODO: test validations
+            async.complete();
+        });
+    }
+    
     /**
      * 
      * Test serialization of outer boolean types
@@ -89,8 +106,8 @@ public class FakeApiTest {
     @Test
     public void fakeOuterCompositeSerializeTest(TestContext context) {
         Async async = context.async();
-        OuterComposite outerComposite = null;
-        api.fakeOuterCompositeSerialize(outerComposite, result -> {
+        OuterComposite body = null;
+        api.fakeOuterCompositeSerialize(body, result -> {
             // TODO: test validations
             async.complete();
         });
@@ -137,8 +154,8 @@ public class FakeApiTest {
     @Test
     public void testBodyWithFileSchemaTest(TestContext context) {
         Async async = context.async();
-        FileSchemaTestClass fileSchemaTestClass = null;
-        api.testBodyWithFileSchema(fileSchemaTestClass, result -> {
+        FileSchemaTestClass body = null;
+        api.testBodyWithFileSchema(body, result -> {
             // TODO: test validations
             async.complete();
         });
@@ -154,8 +171,8 @@ public class FakeApiTest {
     public void testBodyWithQueryParamsTest(TestContext context) {
         Async async = context.async();
         String query = null;
-        User user = null;
-        api.testBodyWithQueryParams(query, user, result -> {
+        User body = null;
+        api.testBodyWithQueryParams(query, body, result -> {
             // TODO: test validations
             async.complete();
         });
@@ -170,8 +187,8 @@ public class FakeApiTest {
     @Test
     public void testClientModelTest(TestContext context) {
         Async async = context.async();
-        Client client = null;
-        api.testClientModel(client, result -> {
+        Client body = null;
+        api.testClientModel(body, result -> {
             // TODO: test validations
             async.complete();
         });
@@ -259,8 +276,8 @@ public class FakeApiTest {
     @Test
     public void testInlineAdditionalPropertiesTest(TestContext context) {
         Async async = context.async();
-        Map<String, String> requestBody = null;
-        api.testInlineAdditionalProperties(requestBody, result -> {
+        Map<String, String> param = null;
+        api.testInlineAdditionalProperties(param, result -> {
             // TODO: test validations
             async.complete();
         });
@@ -283,4 +300,4 @@ public class FakeApiTest {
         });
     }
     
-}
+}

samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/FormatTestTest.java

@@ -20,9 +20,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.vertx.core.file.AsyncFile;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;

samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java

@@ -18,12 +18,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;

samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.threeten.bp.OffsetDateTime;
+import java.time.OffsetDateTime;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;