Merge remote-tracking branch 'origin/master' into issue-321

Author: HugoMario

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

@@ -2010,7 +2010,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
 
                 if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType) || "multipart/form-data".equalsIgnoreCase(contentType)) {
                     final CodegenContent codegenContent = new CodegenContent(contentType);
-                    codegenContent.getVendorExtensions().put(CodegenConstants.IS_FORM_EXT_NAME, Boolean.TRUE);
+                    codegenContent.getContentExtensions().put(CodegenConstants.IS_FORM_EXT_NAME, Boolean.TRUE);
 
                     final Map<String, Schema> propertyMap = schema.getProperties();
                     boolean isMultipart = contentType.equalsIgnoreCase("multipart/form-data");

src/main/resources/handlebars/Java/libraries/retrofit2/api_test.mustache

@@ -28,7 +28,7 @@ public class {{classname}}Test {
     {{#operations}}
     {{#operation}}
     {{#contents}}
-    {{#@ƒirst}}
+    {{#@first}}
 
     /**
      * {{summary}}
@@ -44,7 +44,7 @@ public class {{classname}}Test {
 
         // TODO: test validations
     }
-    {{/@ƒirst}}
+    {{/@first}}
     {{/contents}}
     {{/operation}}
     {{/operations}}

src/main/resources/handlebars/JavaJaxRS/cxf/apiServiceImpl.mustache

@@ -15,7 +15,6 @@ import org.apache.cxf.jaxrs.model.wadl.DocTarget;
 
 import org.apache.cxf.jaxrs.ext.multipart.*;
 
-import io.swagger.annotations.Api;
 {{#useSpringAnnotationConfig}}
 import org.springframework.stereotype.Service;
 {{/useSpringAnnotationConfig}}