Merge branch 'master' into patch-1

Author: michaelversus

src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java

@@ -1081,6 +1081,11 @@ protected void addCodegenContentParameters(CodegenOperation codegenOperation, Li
             addParameters(content, codegenOperation.pathParams);
         }
     }
+
+    @Override
+    public boolean checkAliasModel() {
+        return true;
+    }
 /*
     TODO: uncomment if/when switching to stream for file upload
     @Override

src/main/java/io/swagger/codegen/v3/generators/go/AbstractGoCodegen.java

@@ -583,4 +583,9 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
     public ISchemaHandler getSchemaHandler() {
         return new GoSchemaHandler(this);
     }
+
+    @Override
+    public boolean checkAliasModel() {
+        return true;
+    }
 }

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

@@ -1522,4 +1522,9 @@ public void setLanguageArguments(List<CodegenArgument> languageArguments) {
     public boolean defaultIgnoreImportMappingOption() {
         return true;
     }
+
+    @Override
+    public boolean checkAliasModel() {
+        return true;
+    }
 }

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

@@ -28,7 +28,7 @@ import java.util.Optional;
 {{>generatedAnnotation}}
 {{#operations}}
 @Controller
-public class {{classname}} {
+public interface {{classname}} {
 
 {{#operation}}
 {{#contents}}
@@ -45,7 +45,7 @@ public class {{classname}} {
     })
     {{/implicitHeaders}}
     @{{#lambda.capitalise}}{{httpMethod}}{{/lambda.capitalise}}(value = "{{{path}}}"{{#hasProduces}}, produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }{{/hasProduces}}{{#hasConsumes}}, consumes = {{braces "left"}}{{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}{{braces "right"}}{{/hasConsumes}})
-    public Single<HttpResponse<{{>returnTypes}}>> {{operationId}}({{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/parameters}}) {
+    default Single<HttpResponse<{{>returnTypes}}>> {{operationId}}({{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/parameters}}) {
         return Single.fromCallable(() -> {
             throw new UnsupportedOperationException();
         });

src/main/resources/handlebars/JavaMicronaut/bodyParams.mustache

@@ -1 +1 @@
-{{#isBodyParam}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{/useBeanValidation}}@Body {{{dataType}}} {{paramName}}{{/isBodyParam}}
+{{#isBodyParam}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{/useBeanValidation}}@Body {{{dataType}}} {{paramName}}{{/isBodyParam}}

src/main/resources/handlebars/JavaMicronaut/headerParams.mustache

@@ -1 +1 @@
-{{#isHeaderParam}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @Header(value = "{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
+{{#isHeaderParam}}@Parameter(description = "{{{description}}}" {{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @Header(value = "{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}

src/main/resources/handlebars/JavaMicronaut/pathParams.mustache

@@ -1 +1 @@
-{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}

src/main/resources/handlebars/JavaMicronaut/queryParams.mustache

@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{#required}}@NotNull {{/required}}{{/useBeanValidation}}@QueryValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@Parameter(description = "{{{description}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{#required}}@NotNull {{/required}}{{/useBeanValidation}}@QueryValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}

src/main/resources/handlebars/JavaMicronaut/typeInfoAnnotation.mustache

@@ -4,4 +4,4 @@
   {{#children}}
   @JsonSubTypes.Type(value = {{classname}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),
   {{/children}}
-}){{/jackson}}
+}){{/jackson}}

src/test/java/io/swagger/codegen/v3/generators/java/MicronautGeneratorCodegenTest.java

@@ -0,0 +1,69 @@
+package io.swagger.codegen.v3.generators.java;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.rules.TemporaryFolder;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import io.swagger.codegen.v3.ClientOptInput;
+import io.swagger.codegen.v3.DefaultGenerator;
+import io.swagger.codegen.v3.config.CodegenConfigurator;
+import io.swagger.codegen.v3.generators.AbstractCodegenTest;
+
+public class MicronautGeneratorCodegenTest extends AbstractCodegenTest {
+    private final TemporaryFolder folder = new TemporaryFolder();
+    private File output = null;
+
+    @BeforeClass
+    public void generateCode() throws IOException {
+        this.folder.create();
+        output = this.folder.getRoot();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setLang("micronaut")
+                .setInputSpecURL("src/test/resources/3_0_0/parameterOrder.yaml")
+                .setOutputDir(output.getAbsolutePath());
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        new DefaultGenerator().opts(clientOptInput).generate();
+    }
+
+    @AfterClass
+    public void cleanUp() {
+        this.folder.delete();
+    }
+
+    @Test(description = "verify that model classes are generated")
+    public void testModels() {
+        Assert.assertTrue(new File(output, "/src/main/java/io/swagger/model/LocalizedText.java").exists());
+    }
+
+    @Test(description = "verify that configuration classes are generated")
+    public void testConfigurations() {
+        Assert.assertTrue(new File(output, "/src/main/java/io/swagger/configuration/UnsupportedOperationExceptionHandler.java").exists());
+    }
+
+    @Test(description = "verify interface api generated")
+    public void testApiInterface() throws IOException {
+        final String expectedContent = "@Controller" + System.lineSeparator()
+                                       + "public interface AdminApi {";
+        final File controllerFile = new File(output, "/src/main/java/io/swagger/api/AdminApi.java");
+        final String content = FileUtils.readFileToString(controllerFile);
+        Assert.assertTrue(content.contains(expectedContent));
+    }
+
+    @Test(description = "verify that parameters are listed as follows: header, query, path, cookie, body")
+    public void testApiParameters() throws IOException {
+        final String expectedContent = "default Single<HttpResponse<LocalizedText>> updateTest(@Parameter(description = \"Localized Text object containing updated data.\" ) @Valid @Body LocalizedText body" + System.lineSeparator()
+                                 + ",@Parameter(description = \"description\") @PathVariable(\"id\") Long id" + System.lineSeparator()
+                                 + ")";
+        final File controllerFile = new File(output, "/src/main/java/io/swagger/api/AdminApi.java");
+        final String content = FileUtils.readFileToString(controllerFile);
+        Assert.assertTrue(content.contains(expectedContent));
+    }
+}