Generate vertx OAS2 (#226)

bin/java-vertx-async-petstore-server.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-vertx -o samples/server/petstore/java-vertx/async -DvertxSwaggerRouterVersion=1.2.0"
+ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-vertx -o samples/server/petstore/java-vertx/async -DvertxSwaggerRouterVersion=1.4.0 -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags

bin/java-vertx-rx-petstore-server.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-vertx --artifact-id java-vertx-rx-server -o samples/server/petstore/java-vertx/rx -DvertxSwaggerRouterVersion=1.2.0,rxInterface=true"
+ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-vertx --artifact-id java-vertx-rx-server -o samples/server/petstore/java-vertx/rx -DvertxSwaggerRouterVersion=1.4.0,rxInterface=true -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags

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

@@ -1,18 +1,18 @@
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.PathItem.HttpMethod;
+import io.swagger.v3.oas.models.media.Schema;
+
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.URLPathUtils;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.PathItem.HttpMethod;
-import io.swagger.v3.core.util.Json;
 
 import java.io.File;
 import java.net.URL;
@@ -25,7 +25,7 @@
 public class JavaVertXServerCodegen extends AbstractJavaCodegen {
 
     protected String resourceFolder = "src/main/resources";
-    protected String rootPackage = "io.swagger.server.api";
+    protected String rootPackage = "org.openapitools.server.api";
     protected String apiVersion = "1.0.0-SNAPSHOT";
 
     public static final String ROOT_PACKAGE = "rootPackage";
@@ -124,7 +124,7 @@ public void processOpts() {
         apiDocTemplateFiles.clear();
 
         supportingFiles.clear();
-        supportingFiles.add(new SupportingFile("swagger.mustache", resourceFolder, "swagger.json"));
+        supportingFiles.add(new SupportingFile("openapi.mustache", resourceFolder, "openapi.json"));
         supportingFiles.add(new SupportingFile("MainApiVerticle.mustache",
                 sourceFolder + File.separator + rootPackage.replace(".", File.separator),
                 "MainApiVerticle.java"));
@@ -173,6 +173,13 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return newObjs;
     }
 
+    @Override
+    public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
+        generateJSONSpecFile(objs);
+        return super.postProcessSupportingFileData(objs);
+    }
+
+
     @Override
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation,
                                           Map<String, Schema> definitions, OpenAPI openAPI) {
@@ -194,10 +201,6 @@ public CodegenModel fromModel(String name, Schema model, Map<String, Schema> all
     public void preprocessOpenAPI(OpenAPI openAPI) {
         super.preprocessOpenAPI(openAPI);
 
-        // add full swagger definition in a mustache parameter
-        String openAPIDef = Json.pretty(openAPI);
-        this.additionalProperties.put("fullOpenAPI", openAPIDef);
-
         // add server port from the swagger file, 8080 by default
         URL url = URLPathUtils.getServerURL(openAPI);
         this.additionalProperties.put("serverPort", URLPathUtils.getPort(url, 8080));

modules/openapi-generator/src/main/resources/JavaVertXServer/README.mustache

@@ -1 +1,3 @@
+{{^hideGenerationTimestamp}}
 Project generated on : {{generatedDate}}
+{{/hideGenerationTimestamp}}

modules/openapi-generator/src/main/resources/JavaVertXServer/openapi.mustache

@@ -0,0 +1 @@
+{{{openapi-json}}}

samples/server/petstore/java-vertx/async/.openapi-generator-ignore

@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):

samples/server/petstore/java-vertx/async/.openapi-generator/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/java-vertx/async/README.md

@@ -1 +0,0 @@
-Project generated on : 2017-07-08T16:03:02.953+02:00

samples/server/petstore/java-vertx/async/pom.xml

@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>io.swagger</groupId>
-	<artifactId>swagger-java-vertx-server</artifactId>
+	<groupId>org.openapitools</groupId>
+	<artifactId>openapi-java-vertx-server</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -28,24 +28,25 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>io.vertx</groupId>
-			<artifactId>vertx-unit</artifactId>
-			<version>${vertx.version}</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-unit</artifactId>
+            <version>${vertx.version}</version>
+            <scope>test</scope>
+        </dependency>
 
 		<dependency>
-			<groupId>com.github.phiz71</groupId>
-			<artifactId>vertx-swagger-router</artifactId>
-			<version>${vertx-swagger-router.version}</version>
-		</dependency>
+            <groupId>com.github.phiz71</groupId>
+            <artifactId>vertx-swagger-router</artifactId>
+            <version>${vertx-swagger-router.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.fasterxml.jackson.datatype</groupId>
+          <artifactId>jackson-datatype-jsr310</artifactId>
+          <version>${jackson-datatype-jsr310.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson-datatype-jsr310.version}</version>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -75,7 +76,7 @@
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<manifestEntries>
 										<Main-Class>io.vertx.core.Starter</Main-Class>
-										<Main-Verticle>io.swagger.server.api.MainApiVerticle</Main-Verticle>
+										<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
 									</manifestEntries>
 								</transformer>
 							</transformers>
@@ -87,4 +88,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiException.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/MainApiException.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api;
+package org.openapitools.server.api;
 
 public class MainApiException extends Exception {
     private int statusCode;

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/MainApiVerticle.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/MainApiVerticle.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api;
+package org.openapitools.server.api;
 
 import java.nio.charset.Charset;
 
@@ -42,7 +42,7 @@ public void init(Vertx vertx, Context context) {
     public void start(Future<Void> startFuture) throws Exception {
         Json.mapper.registerModule(new JavaTimeModule());
         FileSystem vertxFileSystem = vertx.fileSystem();
-        vertxFileSystem.readFile("swagger.json", readFile -> {
+        vertxFileSystem.readFile("openapi.json", readFile -> {
             if (readFile.succeeded()) {
                 Swagger swagger = new SwaggerParser().parse(readFile.result().toString(Charset.forName("utf-8")));
                 Router swaggerRouter = SwaggerRouter.swaggerRouter(router, swagger, vertx.eventBus(), new OperationIdServiceIdResolver());
@@ -66,7 +66,7 @@ public void start(Future<Void> startFuture) throws Exception {
 
     public void deployVerticles(Future<Void> startFuture) {
 
-        vertx.deployVerticle("io.swagger.server.api.verticle.PetApiVerticle", res -> {
+        vertx.deployVerticle("org.openapitools.server.api.verticle.PetApiVerticle", res -> {
             if (res.succeeded()) {
                 LOGGER.info("PetApiVerticle : Deployed");
             } else {
@@ -75,7 +75,7 @@ public void deployVerticles(Future<Void> startFuture) {
             }
         });
 
-        vertx.deployVerticle("io.swagger.server.api.verticle.StoreApiVerticle", res -> {
+        vertx.deployVerticle("org.openapitools.server.api.verticle.StoreApiVerticle", res -> {
             if (res.succeeded()) {
                 LOGGER.info("StoreApiVerticle : Deployed");
             } else {
@@ -84,7 +84,7 @@ public void deployVerticles(Future<Void> startFuture) {
             }
         });
 
-        vertx.deployVerticle("io.swagger.server.api.verticle.UserApiVerticle", res -> {
+        vertx.deployVerticle("org.openapitools.server.api.verticle.UserApiVerticle", res -> {
             if (res.succeeded()) {
                 LOGGER.info("UserApiVerticle : Deployed");
             } else {

samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Category.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Category.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/ModelApiResponse.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/ModelApiResponse.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;

samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Order.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Order.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;

samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Pet.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Pet.java

@@ -1,13 +1,13 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.server.api.model.Category;
-import io.swagger.server.api.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.server.api.model.Category;
+import org.openapitools.server.api.model.Tag;
 
 /**
  * A pet for sale in the pet store

samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Tag.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Tag.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/User.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/User.java

@@ -1,4 +1,4 @@
-package io.swagger.server.api.model;
+package org.openapitools.server.api.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/verticle/PetApi.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApi.java

@@ -1,9 +1,9 @@
-package io.swagger.server.api.verticle;
+package org.openapitools.server.api.verticle;
 
 import java.io.File;
-import io.swagger.server.api.MainApiException;
-import io.swagger.server.api.model.ModelApiResponse;
-import io.swagger.server.api.model.Pet;
+import org.openapitools.server.api.MainApiException;
+import org.openapitools.server.api.model.ModelApiResponse;
+import org.openapitools.server.api.model.Pet;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
@@ -13,7 +13,7 @@
 
 public interface PetApi  {
     //addPet
-    void addPet(Pet body, Handler<AsyncResult<Void>> handler);
+    void addPet(Pet pet, Handler<AsyncResult<Void>> handler);
 
     //deletePet
     void deletePet(Long petId, String apiKey, Handler<AsyncResult<Void>> handler);
@@ -28,7 +28,7 @@ public interface PetApi  {
     void getPetById(Long petId, Handler<AsyncResult<Pet>> handler);
 
     //updatePet
-    void updatePet(Pet body, Handler<AsyncResult<Void>> handler);
+    void updatePet(Pet pet, Handler<AsyncResult<Void>> handler);
 
     //updatePetWithForm
     void updatePetWithForm(Long petId, String name, String status, Handler<AsyncResult<Void>> handler);

samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/verticle/PetApiException.java → samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApiException.java

@@ -1,9 +1,9 @@
-package io.swagger.server.api.verticle;
+package org.openapitools.server.api.verticle;
 
 import java.io.File;
-import io.swagger.server.api.MainApiException;
-import io.swagger.server.api.model.ModelApiResponse;
-import io.swagger.server.api.model.Pet;
+import org.openapitools.server.api.MainApiException;
+import org.openapitools.server.api.model.ModelApiResponse;
+import org.openapitools.server.api.model.Pet;
 
 public final class PetApiException extends MainApiException {
     public PetApiException(int statusCode, String statusMessage) {