diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java index 79a100bba21..37c68adf0f3 100644 --- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java +++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java @@ -163,8 +163,6 @@ public class CodeGenMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException { - Swagger swagger = new SwaggerParser().read(inputSpec); - //attempt to read from config file CodegenConfigurator configurator = CodegenConfigurator.fromFile(configurationFile); @@ -258,7 +256,7 @@ public void execute() throws MojoExecutionException { configurator.addSystemProperty(key, value); } } - + final ClientOptInput input = configurator.toClientOptInput(); final CodegenConfig config = input.getConfig(); @@ -285,7 +283,7 @@ public void execute() throws MojoExecutionException { // Maven logs exceptions thrown by plugins only if invoked with -e // I find it annoying to jump through hoops to get basic diagnostic information, // so let's log it in any case: - getLog().error(e); + getLog().error(e); throw new MojoExecutionException("Code generation failed. See above for the full exception."); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java index 324ca56e70b..13deaa8d83a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java @@ -7,7 +7,6 @@ import io.swagger.models.Model; import io.swagger.models.Operation; import io.swagger.models.Swagger; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.util.*; import java.io.File; @@ -154,12 +153,12 @@ public HaskellServantCodegen() { * @return the escaped term */ @Override - public String escapeReservedWord(String name) { + public String escapeReservedWord(final String name) { return name + "_"; } @Override - public void preprocessSwagger(Swagger swagger) { + public void preprocessSwagger(final Swagger swagger) { // From the title, compute a reasonable name for the package and the API String title = swagger.getInfo().getTitle(); @@ -225,7 +224,7 @@ public void preprocessSwagger(Swagger swagger) { * @return a string value used as the `dataType` field for model templates, `returnType` for api templates */ @Override - public String getTypeDeclaration(Property p) { + public String getTypeDeclaration(final Property p) { if (p instanceof ArrayProperty) { ArrayProperty ap = (ArrayProperty) p; Property inner = ap.getItems(); @@ -246,7 +245,7 @@ public String getTypeDeclaration(Property p) { * @see io.swagger.models.properties.Property */ @Override - public String getSwaggerType(Property p) { + public String getSwaggerType(final Property p) { String swaggerType = super.getSwaggerType(p); String type = null; if (typeMapping.containsKey(swaggerType)) { @@ -264,7 +263,7 @@ public String getSwaggerType(Property p) { } @Override - public String toInstantiationType(Property p) { + public String toInstantiationType(final Property p) { if (p instanceof MapProperty) { MapProperty ap = (MapProperty) p; Property additionalProperties2 = ap.getAdditionalProperties(); @@ -288,7 +287,7 @@ public String toInstantiationType(Property p) { // Intersperse a separator string between a list of strings, like String.join. - private String joinStrings(String sep, List ss) { + private String joinStrings(final String sep, final List ss) { StringBuilder sb = new StringBuilder(); for (String s : ss) { if (sb.length() > 0) { @@ -303,7 +302,7 @@ private String joinStrings(String sep, List ss) { // For example, the path /api/jobs/info/{id}/last would become: // "api" :> "jobs" :> "info" :> Capture "id" IdType :> "last" // IdType is provided by the capture params. - private List pathToServantRoute(String path, List pathParams) { + private List pathToServantRoute(String path, final List pathParams) { // Map the capture params by their names. HashMap captureTypes = new HashMap(); for (CodegenParameter param : pathParams) { @@ -331,7 +330,7 @@ private List pathToServantRoute(String path, List path } // Extract the arguments that are passed in the route path parameters - private List pathToClientType(String path, List pathParams) { + private List pathToClientType(String path, final List pathParams) { // Map the capture params by their names. HashMap captureTypes = new HashMap(); for (CodegenParameter param : pathParams) { @@ -357,7 +356,7 @@ private List pathToClientType(String path, List pathPa @Override - public CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map definitions, Swagger swagger) { + public CodegenOperation fromOperation(final String resourcePath, final String httpMethod, final Operation operation, final Map definitions, final Swagger swagger) { CodegenOperation op = super.fromOperation(resourcePath, httpMethod, operation, definitions, swagger); List path = pathToServantRoute(op.path, op.pathParams); @@ -423,7 +422,7 @@ public CodegenOperation fromOperation(String resourcePath, String httpMethod, Op return op; } - private String makeQueryListType(String type, String collectionFormat) { + private String makeQueryListType(String type, final String collectionFormat) { type = type.substring(1, type.length() - 1); switch(collectionFormat) { case "csv": return "(QueryList 'CommaSeparated (" + type + "))"; @@ -432,11 +431,11 @@ private String makeQueryListType(String type, String collectionFormat) { case "pipes": return "(QueryList 'PipeSeparated (" + type + "))"; case "multi": return "(QueryList 'MultiParamArray (" + type + "))"; default: - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } } - private String fixOperatorChars(String string) { + private String fixOperatorChars(final String string) { StringBuilder sb = new StringBuilder(); for (char c : string.toCharArray()) { if (specialCharReplacements.containsKey(c)) { @@ -450,13 +449,13 @@ private String fixOperatorChars(String string) { } // Remove characters from a string that do not belong in a model classname - private String fixModelChars(String string) { + private String fixModelChars(final String string) { return string.replace(".", "").replace("-", ""); } // Override fromModel to create the appropriate model namings @Override - public CodegenModel fromModel(String name, Model mod, Map allDefinitions) { + public CodegenModel fromModel(final String name, final Model mod, final Map allDefinitions) { CodegenModel model = super.fromModel(name, mod, allDefinitions); // Clean up the class name to remove invalid characters @@ -487,7 +486,7 @@ public CodegenModel fromModel(String name, Model mod, Map allDefi } @Override - public CodegenParameter fromParameter(Parameter param, Set imports) { + public CodegenParameter fromParameter(final Parameter param, final Set imports) { CodegenParameter p = super.fromParameter(param, imports); p.vendorExtensions.put("x-formParamName", camelize(p.baseName)); p.dataType = fixModelChars(p.dataType); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java index 528666c58e5..5baf4f9eb1c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java @@ -1,4 +1,4 @@ -package io.swagger.codegen.Go; +package io.swagger.codegen.go; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; @@ -29,7 +29,7 @@ protected void setExpectations() { clientCodegen.setPackageVersion(GoClientOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; clientCodegen.setPackageName(GoClientOptionsProvider.PACKAGE_NAME_VALUE); - times = 1; + times = 1; }}; } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java index 83fa8d6437e..84df354e6d8 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java @@ -1,4 +1,4 @@ -package io.swagger.codegen.Go; +package io.swagger.codegen.go; import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenProperty; @@ -257,7 +257,7 @@ public static Object[][] primeNumbers() { } @Test(dataProvider = "modelNames", description = "avoid inner class") - public void modelNameTest(String name, String expectedName) { + public void modelNameTest(final String name, final String expectedName) { final Model model = new ModelImpl(); final DefaultCodegen codegen = new GoClientCodegen(); final CodegenModel cm = codegen.fromModel(name, model); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java index 71d9b3942f1..dcb89d263cc 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java @@ -1,4 +1,4 @@ -package io.swagger.codegen.slim; +package io.swagger.codegen.lumen; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java index a7ecdd9d974..7228f119711 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java @@ -1,4 +1,4 @@ -package io.swagger.codegen.springBoot; +package io.swagger.codegen.springboot; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.java.JavaClientOptionsTest; @@ -54,7 +54,7 @@ protected void setExpectations() { times = 1; clientCodegen.setBasePackage(SpringBootServerOptionsProvider.BASE_PACKAGE_VALUE); times = 1; - + }}; } }