[JavaVertx]Add useFuture option

Author: Fyro-Ing

src/main/java/io/swagger/codegen/v3/generators/java/JavaVertXServerCodegen.java

@@ -50,6 +50,8 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen implements BeanV
   public static final String MOUNT_OPERATION_FROM_INTERFACE = "mountFromInterface";
   public static final String SPEC_LOCATION_OPTION = "specLocation";
 
+  public static final String USE_FUTURE_OPTION = "useFuture";
+
   protected String rootPackage = "io.swagger.server.api";
   protected String apiVerticle;
   protected String apiVersion = "1.0.0-SNAPSHOT";
@@ -72,6 +74,8 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen implements BeanV
    * <li>mountOperationFrom : type String, define how routes are mounted.</li>
    *
    * <li>specLocation : define spec location, default as {@link JavaVertXServerCodegen#SPEC_LOCATION}.</li>
+   *
+   * <li>useFuture : define use services as future, default false.</li>
    * </ul>
    */
   public JavaVertXServerCodegen() {
@@ -111,6 +115,11 @@ public JavaVertXServerCodegen() {
     specLocation.setDefault(SPEC_LOCATION);
     cliOptions.add(specLocation);
 
+    CliOption useFutureOption = CliOption.newBoolean(USE_FUTURE_OPTION,
+      "When specified, describe service as future or not. Default as false");
+    useFutureOption.setDefault(Boolean.FALSE.toString());
+    cliOptions.add(useFutureOption);
+
     cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
   }
 
@@ -186,7 +195,6 @@ public void processOpts() {
       additionalProperties.put(MOUNT_OPERATION_FROM_EXTENSIONS, true);
     }
 
-
     if (!additionalProperties.containsKey(SPEC_LOCATION_OPTION)) {
       additionalProperties.put(SPEC_LOCATION_OPTION, SPEC_LOCATION);
     }
@@ -323,8 +331,7 @@ private void manageOperations(PathItem pathItem, String pathname) {
             if (operationExtension instanceof String) {
               address = (String) operationExtension;
             } else if (operationExtension instanceof Map) {
-              address = (String) ((Map<String, Object>) operationExtension).get(
-                OPENAPI_EXTENSION_ADDRESS);
+              address = (String) ((Map<String, Object>) operationExtension).get(OPENAPI_EXTENSION_ADDRESS);
               serviceId = (String) ((Map<String, Object>) operationExtension).get(OPENAPI_EXTENSION_METHOD_NAME);
             }
           } else if (operationExtension instanceof String && pathExtension instanceof Map) {

src/main/resources/handlebars/JavaVertXServer/api.mustache

@@ -3,7 +3,13 @@ package {{package}};
 {{#imports}}import {{import}};
 {{/imports}}
 
+{{#useFuture}}
 import io.vertx.core.Future;
+{{/useFuture}}
+{{^useFuture}}
+import io.vertx.core.Handler;
+import io.vertx.core.AsyncResult;
+{{/useFuture}}
 import io.vertx.ext.web.validation.RequestParameter;
 import io.vertx.ext.web.api.service.ServiceRequest;
 import io.vertx.ext.web.api.service.ServiceResponse;
@@ -24,7 +30,7 @@ public interface {{classname}}  {
 {{#operations}}
 {{#operation}}
 {{#contents}}
-    Future<ServiceResponse> {{#vendorExtensions}}{{x-serviceid}}{{/vendorExtensions}}({{#useDataObject}}{{#parameters}}{{^isBodyParam}}{{^isEnum}}{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{dataType}}}{{/datatypeWithEnum}}{{/isEnum}}{{#isEnum}}{{{dataType}}}{{/isEnum}} {{paramName}}{{/isBodyParam}}{{#isBodyParam}}{{^isBinary}}{{^parent}}{{^children}}{{{dataType}}} body{{/children}}{{/parent}}{{/isBinary}}{{/isBodyParam}}{{#hasMore}}{{^isBinary}}, {{/isBinary}}{{/hasMore}}{{^hasMore}}{{^isBinary}}, {{/isBinary}}{{/hasMore}}{{/parameters}}{{/useDataObject}}{{^useDataObject}}RequestParameter body, {{/useDataObject}}ServiceRequest request);
+    {{#useFuture}}Future<ServiceResponse>{{/useFuture}}{{^useFuture}}void{{/useFuture}} {{#vendorExtensions}}{{x-serviceid}}{{/vendorExtensions}}({{#useDataObject}}{{#parameters}}{{^isBodyParam}}{{^isEnum}}{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{dataType}}}{{/datatypeWithEnum}}{{/isEnum}}{{#isEnum}}{{{dataType}}}{{/isEnum}} {{paramName}}{{/isBodyParam}}{{#isBodyParam}}{{^isBinary}}{{^parent}}{{^children}}{{{dataType}}} body{{/children}}{{/parent}}{{/isBinary}}{{/isBodyParam}}{{#hasMore}}{{^isBinary}}, {{/isBinary}}{{/hasMore}}{{^hasMore}}{{^isBinary}}, {{/isBinary}}{{/hasMore}}{{/parameters}}{{/useDataObject}}{{^useDataObject}}RequestParameter body, {{/useDataObject}}ServiceRequest request{{^useFuture}}, Handler<AsyncResult<ServiceResponse>> resultHandler{{/useFuture}});
 {{/contents}}
 {{/operation}}
 {{/operations}}

src/main/resources/handlebars/JavaVertXServer/apiVerticle.mustache

@@ -16,7 +16,6 @@ import io.vertx.reactivex.ext.web.openapi.RouterBuilder;
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
-import io.vertx.core.eventbus.MessageConsumer;
 import io.vertx.core.http.HttpServer;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.openapi.RouterBuilder;
@@ -30,7 +29,6 @@ import org.slf4j.LoggerFactory;
 public class {{title}}Verticle extends AbstractVerticle {
     static final Logger LOGGER = LoggerFactory.getLogger({{title}}Verticle.class);
 
-    MessageConsumer<JsonObject> consumer;
     HttpServer server;
 
     @Override
@@ -75,8 +73,7 @@ public class {{title}}Verticle extends AbstractVerticle {
 
   @Override
   public Completable rxStop() {
-    return this.consumer.rxUnregister()
-      .andThen(this.server.rxClose());
+    return this.server.rxClose();
   }{{/rxInterface}}
       {{^rxInterface}}return server.listen()
           .onSuccess(server -> LOGGER.info("{{title}}Verticle started on port " + server.actualPort()));
@@ -86,9 +83,10 @@ public class {{title}}Verticle extends AbstractVerticle {
     }
 
   @Override
-  public void stop() {
-    this.server.close();
-    this.consumer.unregister();
+  public void stop(Promise<Void> stopPromise) throws Exception {
+    this.server.close()
+      .onSuccess(server -> stopPromise.complete())
+      .onFailure(stopPromise::fail);
   }{{/rxInterface}}
 
 }

src/main/resources/handlebars/JavaVertXServer/package-info-service.mustache

@@ -1,4 +1,4 @@
-@ModuleGen(name = "service", groupPackage = "{{apiPackage}}", useFutures = true)
+@ModuleGen(name = "service", groupPackage = "{{apiPackage}}", useFutures = {{#useFuture}}true{{/useFuture}}{{^useFuture}}false{{/useFuture}})
 package {{apiPackage}};
 
 import io.vertx.codegen.annotations.ModuleGen;