Update to codegen changes

Author: vietj

vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/generator/WebApiProxyHandlerGen.java

@@ -79,31 +79,17 @@ public void generateActionSwitchEntry(ProxyMethodInfo m, CodeWriter writer) {
       .code(String.format("service.%s(\n", m.getName()))
       .indent().indent();
 
-    if (!m.isUseFutures()) {
-      Stream<String> methodParamsTail = Stream.of("context", serviceCallHandler);
-      writer.writeSeq(
-        Stream.concat(
-          ((WebApiProxyMethodInfo) m).getParamsToExtract().stream().map(this::generateJsonParamExtractFromContext),
-          methodParamsTail
-        ),
-        ",\n"
-      );
-      writer
-        .unindent()
-        .write(");\n");
-    } else {
-      Stream<String> methodParamsTail = Stream.of("context");
-      writer.writeSeq(
-        Stream.concat(
-          ((WebApiProxyMethodInfo) m).getParamsToExtract().stream().map(this::generateJsonParamExtractFromContext),
-          methodParamsTail
-        ),
-        ",\n"
-      );
-      writer.write(")\n");
-      writer
-        .write(".onComplete(" + serviceCallHandler + ");\n");
-    }
+    Stream<String> methodParamsTail = Stream.of("context");
+    writer.writeSeq(
+      Stream.concat(
+        ((WebApiProxyMethodInfo) m).getParamsToExtract().stream().map(this::generateJsonParamExtractFromContext),
+        methodParamsTail
+      ),
+      ",\n"
+    );
+    writer
+      .unindent()
+      .write(").onComplete(" + serviceCallHandler + ");\n");
     writer.unindent().unindent()
       .codeln("} catch (Exception e) {")
       .indent()

vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/generator/model/WebApiProxyMethodInfo.java

@@ -19,9 +19,9 @@ public class WebApiProxyMethodInfo extends ProxyMethodInfo {
   final List<ParamInfo> paramsToExtract;
   final String requestContextName;
 
-  public WebApiProxyMethodInfo(Set<ClassTypeInfo> ownerTypes, String name, TypeInfo returnType, Text returnDescription, boolean fluent, boolean cacheReturn, List<ParamInfo> params, String comment, Doc doc, boolean staticMethod, boolean defaultMethod, List<TypeParamInfo.Method> typeParams, boolean proxyIgnore, boolean proxyClose, boolean deprecated, Text deprecatedDesc, boolean useFutures, boolean methodOverride) {
-    super(ownerTypes, name, returnType, returnDescription, fluent, cacheReturn, params, comment, doc, staticMethod, defaultMethod, typeParams, proxyIgnore, proxyClose, deprecated, deprecatedDesc, useFutures, methodOverride);
-    final int truncateParamsToIndex = useFutures ? 1 : 2;
+  public WebApiProxyMethodInfo(Set<ClassTypeInfo> ownerTypes, String name, TypeInfo returnType, Text returnDescription, boolean fluent, boolean cacheReturn, List<ParamInfo> params, String comment, Doc doc, boolean staticMethod, boolean defaultMethod, List<TypeParamInfo.Method> typeParams, boolean proxyIgnore, boolean proxyClose, boolean deprecated, Text deprecatedDesc, boolean methodOverride) {
+    super(ownerTypes, name, returnType, returnDescription, fluent, cacheReturn, params, comment, doc, staticMethod, defaultMethod, typeParams, proxyIgnore, proxyClose, deprecated, deprecatedDesc, methodOverride);
+    final int truncateParamsToIndex = 1;
     paramsToExtract = params.subList(0, params.size() - truncateParamsToIndex);
     requestContextName = params.get(params.size() - truncateParamsToIndex).getName();
   }
@@ -44,7 +44,6 @@ public WebApiProxyMethodInfo(ProxyMethodInfo info) {
       info.isProxyClose(),
       info.isDeprecated(),
       info.getDeprecatedDesc(),
-      info.isUseFutures(),
       info.isMethodOverride()
     );
   }

vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/generator/model/WebApiProxyModel.java

@@ -45,23 +45,26 @@ protected void checkParamType(ExecutableElement elem, TypeInfo typeInfo, int pos
   }
 
   @Override
-  protected MethodInfo createMethodInfo(Set<ClassTypeInfo> ownerTypes, String methodName, String comment, Doc doc, TypeInfo returnType, Text returnDescription, boolean isFluent, boolean isCacheReturn, List<ParamInfo> mParams, ExecutableElement methodElt, boolean isStatic, boolean isDefault, ArrayList<TypeParamInfo.Method> typeParams, TypeElement declaringElt, boolean methodDeprecated, Text deprecatedDesc, boolean useFutures, boolean methodOverride) {
-    ProxyMethodInfo baseInfo = (ProxyMethodInfo) super.createMethodInfo(ownerTypes, methodName, comment, doc, returnType, returnDescription, isFluent, isCacheReturn, mParams, methodElt, isStatic, isDefault, typeParams, declaringElt, methodDeprecated, deprecatedDesc, useFutures, methodOverride);
+  protected MethodInfo createMethodInfo(Set<ClassTypeInfo> ownerTypes, String methodName, String comment, Doc doc, TypeInfo returnType, Text returnDescription, boolean isFluent, boolean isCacheReturn, List<ParamInfo> mParams, ExecutableElement methodElt, boolean isStatic, boolean isDefault, ArrayList<TypeParamInfo.Method> typeParams, TypeElement declaringElt, boolean methodDeprecated, Text methodDeprecatedDesc, boolean methodOverride) {
+    ProxyMethodInfo baseInfo = (ProxyMethodInfo) super.createMethodInfo(ownerTypes, methodName, comment, doc, returnType, returnDescription, isFluent, isCacheReturn, mParams, methodElt, isStatic, isDefault, typeParams, declaringElt, methodDeprecated, deprecatedDesc, methodOverride);
     if (!isStatic && !baseInfo.isProxyClose()) {
       // Check signature constraints
 
-      TypeInfo ret;
-      if (baseInfo.getKind() == MethodKind.FUTURE && baseInfo.isUseFutures()) {
-        ret = ((ParameterizedTypeInfo)returnType).getArg(0);
-      } else {
+      if (!returnType.isParameterized()) {
+        throw new GenException(methodElt, SIGNATURE_CONSTRAINT_ERROR);
+      }
+      ParameterizedTypeInfo pt = (ParameterizedTypeInfo) returnType;
+      if (pt.getArgs().size() != 1) {
         throw new GenException(methodElt, SIGNATURE_CONSTRAINT_ERROR);
       }
+      TypeInfo ret;
+      ret = pt.getArg(0);
       if (!ServiceResponse.class.getName().equals(ret.getName())) {
         throw new GenException(methodElt, SIGNATURE_CONSTRAINT_ERROR);
       }
 
       TypeInfo shouldBeServiceRequest;
-      if (mParams.size() == 0) {
+      if (mParams.isEmpty()) {
         throw new GenException(methodElt, SIGNATURE_CONSTRAINT_ERROR);
       }
       shouldBeServiceRequest = mParams.get(mParams.size() - 1).getType();

vertx-web-api-service/src/test/java/io/vertx/ext/web/api/service/generator/models/InvalidMissingContext.java

@@ -1,7 +1,6 @@
 package io.vertx.ext.web.api.service.generator.models;
 
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
+import io.vertx.core.Future;
 import io.vertx.ext.web.api.service.ServiceResponse;
 import io.vertx.ext.web.api.service.WebApiServiceGen;
 
@@ -11,5 +10,5 @@
 @WebApiServiceGen
 public interface InvalidMissingContext {
 
-  void someMethod(Integer id, Handler<AsyncResult<ServiceResponse>> resultHandler);
+  Future<ServiceResponse> someMethod(Integer id);
 }

vertx-web-api-service/src/test/java/io/vertx/ext/web/api/service/generator/models/InvalidWrongHandler.java

@@ -1,7 +1,6 @@
 package io.vertx.ext.web.api.service.generator.models;
 
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
+import io.vertx.core.Future;
 import io.vertx.ext.web.api.service.ServiceRequest;
 import io.vertx.ext.web.api.service.WebApiServiceGen;
 
@@ -11,5 +10,5 @@
 @WebApiServiceGen
 public interface InvalidWrongHandler {
 
-  void someMethod(ServiceRequest context, Handler<AsyncResult<Integer>> resultHandler);
+  Future<Integer> someMethod(ServiceRequest context);
 }