diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java index 502e4d046bae..98c0b8c05b5e 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java @@ -21,6 +21,7 @@ public class SwaggerCodegen { public static void main(String[] args) { + @SuppressWarnings("unchecked") Cli.CliBuilder builder = Cli.builder("swagger-codegen-cli") .withDescription("Swagger code generator CLI. More info on swagger.io") .withDefaultCommand(Langs.class) diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java index d72295f4ca97..4fad4308a670 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java @@ -230,15 +230,15 @@ public class Generate implements Runnable { } } - private Set createSetFromCsvList(String csvProperty) { + private static Set createSetFromCsvList(String csvProperty) { final List values = OptionUtils.splitCommaSeparatedList(csvProperty); return new HashSet(values); } - private Map createMapFromKeyValuePairs(String commaSeparatedKVPairs) { + private static Map createMapFromKeyValuePairs(String commaSeparatedKVPairs) { final List> pairs = OptionUtils.parseCommaSeparatedTuples(commaSeparatedKVPairs); - Map result = new HashMap(); + Map result = new HashMap(); for (Pair pair : pairs) { result.put(pair.getLeft(), pair.getRight()); diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java index 9843024b1043..348c94d92b0c 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java @@ -93,7 +93,7 @@ public class Meta implements Runnable { * @param data - map with additional params needed to process templates * @return converter object to pass to lambdaj */ - private Converter processFiles(final File targetDir, final Map data) { + private static Converter processFiles(final File targetDir, final Map data) { return new Converter() { private DefaultGenerator generator = new DefaultGenerator(); @@ -133,7 +133,7 @@ public class Meta implements Runnable { * @param generator - class with reader getter * @return loader for template */ - private Mustache.TemplateLoader loader(final DefaultGenerator generator) { + private static Mustache.TemplateLoader loader(final DefaultGenerator generator) { return new Mustache.TemplateLoader() { @Override public Reader getTemplate(String name) { @@ -149,7 +149,7 @@ public class Meta implements Runnable { * @param packageName - package name to convert * @return relative path */ - private String asPath(String packageName) { + private static String asPath(String packageName) { return packageName.replace(".", File.separator); } } diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java index e07d0be4610d..36a560b776de 100644 --- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java +++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java @@ -12,6 +12,7 @@ import mockit.Verifications; import org.apache.commons.lang3.ArrayUtils; import org.testng.annotations.Test; +@SuppressWarnings("unused") public class GenerateTest { @Mocked diff --git a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java index a7dc4d7f1cd4..650f05d58e60 100644 --- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java +++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java @@ -41,7 +41,7 @@ public class OptionUtilsTest { } } - private void doCommaSeparatedListTest(String csvStr, List expectedResults) { + private static void doCommaSeparatedListTest(String csvStr, List expectedResults) { final List result = OptionUtils.splitCommaSeparatedList(csvStr); assertNotNull(result); assertEquals(result.size(), expectedResults.size()); 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 c56b86588e54..1608329f9532 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 @@ -99,7 +99,7 @@ public class CodeGenMojo extends AbstractMojo { * A map of language-specific parameters as passed with the -c option to the command line */ @Parameter(name = "configOptions") - private Map configOptions; + private Map configOptions; /** * Add the output directory to the project as a source root, so that the diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index d6bbb9fa5261..467d6e40b903 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -14,6 +14,7 @@ import java.util.regex.Pattern; public abstract class AbstractGenerator { + @SuppressWarnings("static-method") public File writeToFile(String filename, String contents) throws IOException { System.out.println("writing file " + filename); File output = new File(filename); @@ -48,10 +49,7 @@ public abstract class AbstractGenerator { try { InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name)); if (is == null) { - is = new FileInputStream(new File(name)); - } - if (is == null) { - throw new RuntimeException("no file found"); + is = new FileInputStream(new File(name)); // May throw but never return a null value } return new InputStreamReader(is); } catch (Exception e) { @@ -96,6 +94,7 @@ public abstract class AbstractGenerator { return this.getClass().getClassLoader().getResource(getCPResourcePath(name)) != null; } + @SuppressWarnings("static-method") public String getCPResourcePath(String name) { if (!"/".equals(File.separator)) { return name.replaceAll(Pattern.quote(File.separator), "/"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java index 571498c3121f..57918dd9b354 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java @@ -5,13 +5,8 @@ import io.swagger.codegen.auth.AuthParser; import io.swagger.models.Swagger; import io.swagger.models.auth.AuthorizationValue; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; - public class ClientOptInput { private CodegenConfig config; private ClientOpts opts; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java index ffb4a0112a57..3168808e5b17 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java @@ -11,7 +11,6 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -32,10 +31,9 @@ public class Codegen extends DefaultGenerator { "\n -DdebugOperations prints operations passed to the template engine" + "\n -DdebugSupportingFiles prints additional data passed to the template engine"; + @SuppressWarnings("deprecation") public static void main(String[] args) { - StringBuilder sb = new StringBuilder(); - Options options = new Options(); options.addOption("h", "help", false, "shows this message"); options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]"); @@ -139,7 +137,7 @@ public class Codegen extends DefaultGenerator { // see if it's a class try { System.out.println("loading class " + name); - Class customClass = Class.forName(name); + Class customClass = Class.forName(name); System.out.println("loaded"); return (CodegenConfig) customClass.newInstance(); } catch (Exception e) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java index c5b9231341e1..956e906b44f9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -38,7 +38,7 @@ public class CodegenOperation { * * @return true if parameter exists, false otherwise */ - private boolean nonempty(List params) { + private static boolean nonempty(List params) { return params != null && params.size() > 0; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java index 87352907ad0b..d80bc38a4c75 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java @@ -40,6 +40,50 @@ public class CodegenProperty { public CodegenProperty items; public Map vendorExtensions; + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((_enum == null) ? 0 : _enum.hashCode()); + result = prime * result + ((allowableValues == null) ? 0 : allowableValues.hashCode()); + result = prime * result + ((baseName == null) ? 0 : baseName.hashCode()); + result = prime * result + ((baseType == null) ? 0 : baseType.hashCode()); + result = prime * result + ((complexType == null) ? 0 : complexType.hashCode()); + result = prime * result + ((containerType == null) ? 0 : containerType.hashCode()); + result = prime * result + ((datatype == null) ? 0 : datatype.hashCode()); + result = prime * result + ((datatypeWithEnum == null) ? 0 : datatypeWithEnum.hashCode()); + result = prime * result + ((defaultValue == null) ? 0 : defaultValue.hashCode()); + result = prime * result + ((defaultValueWithParam == null) ? 0 : defaultValueWithParam.hashCode()); + result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + ((example == null) ? 0 : example.hashCode()); + result = prime * result + ((exclusiveMaximum == null) ? 0 : exclusiveMaximum.hashCode()); + result = prime * result + ((exclusiveMinimum == null) ? 0 : exclusiveMinimum.hashCode()); + result = prime * result + ((getter == null) ? 0 : getter.hashCode()); + result = prime * result + ((hasMore == null) ? 0 : hasMore.hashCode()); + result = prime * result + ((isContainer == null) ? 0 : isContainer.hashCode()); + result = prime * result + (isEnum ? 1231 : 1237); + result = prime * result + ((isNotContainer == null) ? 0 : isNotContainer.hashCode()); + result = prime * result + ((isPrimitiveType == null) ? 0 : isPrimitiveType.hashCode()); + result = prime * result + ((isReadOnly == null) ? 0 : isReadOnly.hashCode()); + result = prime * result + ((items == null) ? 0 : items.hashCode()); + result = prime * result + ((jsonSchema == null) ? 0 : jsonSchema.hashCode()); + result = prime * result + ((max == null) ? 0 : max.hashCode()); + result = prime * result + ((maxLength == null) ? 0 : maxLength.hashCode()); + result = prime * result + ((maximum == null) ? 0 : maximum.hashCode()); + result = prime * result + ((min == null) ? 0 : min.hashCode()); + result = prime * result + ((minLength == null) ? 0 : minLength.hashCode()); + result = prime * result + ((minimum == null) ? 0 : minimum.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((pattern == null) ? 0 : pattern.hashCode()); + result = prime * result + ((required == null) ? 0 : required.hashCode()); + result = prime * result + ((secondaryParam == null) ? 0 : secondaryParam.hashCode()); + result = prime * result + ((setter == null) ? 0 : setter.hashCode()); + result = prime * result + ((unescapedDescription == null) ? 0 : unescapedDescription.hashCode()); + result = prime * result + ((vendorExtensions == null) ? 0 : vendorExtensions.hashCode()); + return result; + } + @Override public boolean equals(Object obj) { if (obj == null) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index abc4d045315e..030c22e37944 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -106,38 +106,48 @@ public class DefaultCodegen { } // override with any special post-processing + @SuppressWarnings("static-method") public Map postProcessModels(Map objs) { return objs; } // override with any special post-processing + @SuppressWarnings("static-method") public Map postProcessOperations(Map objs) { return objs; } // override with any special post-processing + @SuppressWarnings("static-method") public Map postProcessSupportingFileData(Map objs) { return objs; } // override to post-process any model properties - public void postProcessModelProperty(CodegenModel model, CodegenProperty property){} + @SuppressWarnings("unused") + public void postProcessModelProperty(CodegenModel model, CodegenProperty property){ + } // override to post-process any parameters - public void postProcessParameter(CodegenParameter parameter){} + @SuppressWarnings("unused") + public void postProcessParameter(CodegenParameter parameter){ + } //override with any special handling of the entire swagger spec + @SuppressWarnings("unused") public void preprocessSwagger(Swagger swagger) { } // override with any special handling of the entire swagger spec + @SuppressWarnings("unused") public void processSwagger(Swagger swagger) { } // override with any special text escaping logic + @SuppressWarnings("static-method") public String escapeText(String input) { - if (input != null) { - input = input.trim(); + if (input != null) { + input = input.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. String output = input.replaceAll("\n", "\\\\n"); output = output.replace("\r", "\\r"); output = output.replace("\"", "\\\""); @@ -286,6 +296,7 @@ public class DefaultCodegen { * @param operationId operation ID * @return the sanitized method name */ + @SuppressWarnings("static-method") public String toOperationId(String operationId) { // throw exception if method name is empty if (StringUtils.isEmpty(operationId)) { @@ -318,7 +329,7 @@ public class DefaultCodegen { * @return the sanitized parameter name */ public String toParamName(String name) { - name = removeNonNameElementToCamelCase(name); + name = removeNonNameElementToCamelCase(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if (reservedWords.contains(name)) { return escapeReservedWord(name); } @@ -331,6 +342,7 @@ public class DefaultCodegen { * @param property Codegen property object * @return the Enum name */ + @SuppressWarnings("static-method") public String toEnumName(CodegenProperty property) { return StringUtils.capitalize(property.name) + "Enum"; } @@ -343,6 +355,7 @@ public class DefaultCodegen { * * throws Runtime exception as reserved word is not allowed (default behavior) */ + @SuppressWarnings("static-method") public String escapeReservedWord(String name) { throw new RuntimeException("reserved word " + name + " not allowed"); } @@ -452,6 +465,7 @@ public class DefaultCodegen { * @param operation Swagger operation object * @return string presentation of the example path */ + @SuppressWarnings("static-method") public String generateExamplePath(String path, Operation operation) { StringBuilder sb = new StringBuilder(); sb.append(path); @@ -534,6 +548,7 @@ public class DefaultCodegen { * @param p Swagger property object * @return string presentation of the default value of the property */ + @SuppressWarnings("static-method") public String toDefaultValue(Property p) { if (p instanceof StringProperty) { return "null"; @@ -580,6 +595,7 @@ public class DefaultCodegen { * @param p Swagger property object * @return string presentation of the default value of the property */ + @SuppressWarnings("static-method") public String toDefaultValueWithParam(String name, Property p) { if (p instanceof StringProperty) { return " = data." + name + ";"; @@ -623,6 +639,7 @@ public class DefaultCodegen { * @param p Swagger property object * @return string presentation of the type **/ + @SuppressWarnings("static-method") public String getSwaggerType(Property p) { String datatype = null; if (p instanceof StringProperty && "number".equals(p.getFormat())) { @@ -677,6 +694,7 @@ public class DefaultCodegen { * @param name string to be snake-cased * @return snake-cased string */ + @SuppressWarnings("static-method") public String snakeCase(String name) { return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : ""; } @@ -687,6 +705,7 @@ public class DefaultCodegen { * @param name string to be capitalized * @return capitalized string */ + @SuppressWarnings("static-method") public String initialCaps(String name) { return StringUtils.capitalize(name); } @@ -697,6 +716,7 @@ public class DefaultCodegen { * @param name name * @return a string presentation of the type */ + @SuppressWarnings("static-method") public String getTypeDeclaration(String name) { return name; } @@ -1102,7 +1122,7 @@ public class DefaultCodegen { } } - private Response findMethodResponse(Map responses) { + private static Response findMethodResponse(Map responses) { String code = null; for (String responseCode : responses.keySet()) { @@ -1575,7 +1595,6 @@ public class DefaultCodegen { // to use the built-in model parsing, we unwrap the ArrayModel // and get a single property from it ArrayModel impl = (ArrayModel) model; - CodegenModel cm = fromModel(bp.getName(), impl); // get the single property ArrayProperty ap = new ArrayProperty().items(impl.getItems()); ap.setRequired(param.getRequired()); @@ -1616,6 +1635,7 @@ public class DefaultCodegen { * @param schemes a map of Swagger SecuritySchemeDefinition object * @return a list of Codegen Security objects */ + @SuppressWarnings("static-method") public List fromSecurity(Map schemes) { if (schemes == null) { return Collections.emptyList(); @@ -1722,6 +1742,7 @@ public class DefaultCodegen { && !languageSpecificPrimitives.contains(type); } + @SuppressWarnings("static-method") protected List> toExamples(Map examples) { if (examples == null) { return null; @@ -1745,7 +1766,7 @@ public class DefaultCodegen { } } - private List addHasMore(List objs) { + private static List addHasMore(List objs) { if (objs != null) { for (int i = 0; i < objs.size(); i++) { if (i > 0) { @@ -1759,7 +1780,7 @@ public class DefaultCodegen { return objs; } - private Map addHasMore(Map objs) { + private static Map addHasMore(Map objs) { if (objs != null) { for (int i = 0; i < objs.size() - 1; i++) { if (i > 0) { @@ -1782,6 +1803,7 @@ public class DefaultCodegen { * @param co Codegen Operation object * @param operations map of Codegen operations */ + @SuppressWarnings("static-method") public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { List opList = operations.get(tag); if (opList == null) { @@ -1806,8 +1828,6 @@ public class DefaultCodegen { co.baseName = tag; } - - private void addParentContainer(CodegenModel m, String name, Property property) { final CodegenProperty tmp = fromProperty(name, property); addImport(m, tmp.complexType); @@ -1836,7 +1856,7 @@ public class DefaultCodegen { String secondPattern = "([a-z\\d])([A-Z])"; String replacementPattern = "$1_$2"; // Replace package separator with slash. - word = word.replaceAll("\\.", "/"); + word = word.replaceAll("\\.", "/"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // Replace $ with two underscores for inner classes. word = word.replaceAll("\\$", "__"); // Replace capital letter with _ plus lowercase letter. @@ -1853,6 +1873,7 @@ public class DefaultCodegen { * @param word The word * @return The dashized version of the word, e.g. "my-name" */ + @SuppressWarnings("static-method") protected String dashize(String word) { return underscore(word).replaceAll("[_ ]", "-"); } @@ -1867,7 +1888,7 @@ public class DefaultCodegen { * @param name The base name * @return The next name for the base name */ - private String generateNextName(String name) { + private static String generateNextName(String name) { Pattern pattern = Pattern.compile("\\d+\\z"); Matcher matcher = pattern.matcher(name); if (matcher.find()) { @@ -1932,9 +1953,10 @@ public class DefaultCodegen { * @param name string to be camelize * @return camelized string */ + @SuppressWarnings("static-method") public String removeNonNameElementToCamelCase(String name) { String nonNameElementPattern = "[-_:;#]"; - name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function() { + name = StringUtils.join(Lists.transform(Lists.newArrayList(name.split(nonNameElementPattern)), new Function() { // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. @Nullable @Override public String apply(String input) { @@ -1971,7 +1993,7 @@ public class DefaultCodegen { Pattern p = Pattern.compile("\\/(.?)"); Matcher m = p.matcher(word); while (m.find()) { - word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); + word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. m = p.matcher(word); } @@ -2062,6 +2084,7 @@ public class DefaultCodegen { return library; } + @SuppressWarnings("static-method") protected CliOption buildLibraryCliOption(Map supportedLibraries) { StringBuilder sb = new StringBuilder("library template (sub-template) to use:"); for (String lib : supportedLibraries.keySet()) { @@ -2076,6 +2099,7 @@ public class DefaultCodegen { * @param name string to be sanitize * @return sanitized string */ + @SuppressWarnings("static-method") public String sanitizeName(String name) { // NOTE: performance wise, we should have written with 2 replaceAll to replace desired // character with _ or empty character. Below aims to spell out different cases we've @@ -2089,7 +2113,7 @@ public class DefaultCodegen { } // input[] => input - name = name.replaceAll("\\[\\]", ""); + name = name.replaceAll("\\[\\]", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // input[a][b] => input_a_b name = name.replaceAll("\\[", "_"); @@ -2111,6 +2135,5 @@ public class DefaultCodegen { // remove everything else other than word, number and _ // $php_variable => php_variable return name.replaceAll("[^a-zA-Z0-9_]", ""); - } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 79b07f2427bd..6943057f558f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -403,7 +403,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { System.out.println("can't open " + outputFile + " for output"); } } - files.add(outputFile); } } @@ -412,13 +411,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } } - config.processSwagger(swagger); - return files; } - private void processMimeTypes(List mimeTypeList, Map operation, String source) { + private static void processMimeTypes(List mimeTypeList, Map operation, String source) { if (mimeTypeList != null && mimeTypeList.size() > 0) { List> c = new ArrayList>(); int count = 0; @@ -439,7 +436,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } - private List sortModelsByInheritance(final Map definitions) { + private static List sortModelsByInheritance(final Map definitions) { List sortedModelKeys = new ArrayList(definitions.keySet()); Comparator cmp = new Comparator() { @Override @@ -609,10 +606,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } - private String generateParameterId(Parameter parameter) { + private static String generateParameterId(Parameter parameter) { return parameter.getName() + ":" + parameter.getIn(); } + @SuppressWarnings("static-method") protected String sanitizeTag(String tag) { // remove spaces and make strong case String[] parts = tag.split(" "); @@ -625,6 +623,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { return buf.toString().replaceAll("[^a-zA-Z ]", ""); } + @SuppressWarnings("static-method") public Map processOperations(CodegenConfig config, String tag, List ops) { Map operations = new HashMap(); Map objs = new HashMap(); @@ -685,6 +684,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { return operations; } + @SuppressWarnings("static-method") public Map processModels(CodegenConfig config, Map definitions, Map allDefinitions) { Map objs = new HashMap(); objs.put("package", config.modelPackage()); @@ -704,7 +704,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { Set importSet = new TreeSet(); for (String nextImport : allImports) { - Map im = new HashMap(); String mapping = config.importMapping().get(nextImport); if (mapping == null) { mapping = config.toModelImport(nextImport); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java index 2e698162182d..bd22f40616b9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java @@ -1,10 +1,8 @@ package io.swagger.codegen; -import com.sun.org.apache.xpath.internal.operations.Mod; import io.swagger.models.*; import io.swagger.models.parameters.BodyParameter; import io.swagger.models.parameters.Parameter; -import io.swagger.models.parameters.RefParameter; import io.swagger.models.properties.*; import io.swagger.util.Json; @@ -174,9 +172,7 @@ public class InlineModelResolver { m.setItems(new RefProperty(existing)); } } - } else if (model instanceof ComposedModel) { - ComposedModel m = (ComposedModel) model; - } + } } } } @@ -199,7 +195,7 @@ public class InlineModelResolver { public String uniqueName(String key) { int count = 0; boolean done = false; - key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", ""); + key = key.replaceAll("[^a-z_\\.A-Z0-9 ]", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. while (!done) { String name = key; if (count > 0) { @@ -295,53 +291,26 @@ public class InlineModelResolver { } } - public Model modelFromProperty(ArrayProperty object, String path) { - String access = object.getAccess(); + @SuppressWarnings("static-method") + public Model modelFromProperty(ArrayProperty object, @SuppressWarnings("unused") String path) { String description = object.getDescription(); String example = object.getExample(); - String name = object.getName(); - Integer position = object.getPosition(); - Boolean readOnly = object.getReadOnly(); - Boolean required = object.getRequired(); - String title = object.getTitle(); - Map extensions = object.getVendorExtensions(); - Xml xml = object.getXml(); - -// object.getItems() -// Map properties = object.getProperties(); - Property inner = object.getItems(); if (inner instanceof ObjectProperty) { ArrayModel model = new ArrayModel(); model.setDescription(description); model.setExample(example); -// model.setName(name); -// model.setXml(xml); - model.setItems(object.getItems()); return model; } - -// if(properties != null) { -// flattenProperties(properties, path); -// model.setProperties(properties); -// } - return null; } public Model modelFromProperty(ObjectProperty object, String path) { - String access = object.getAccess(); String description = object.getDescription(); String example = object.getExample(); String name = object.getName(); - Integer position = object.getPosition(); - Boolean readOnly = object.getReadOnly(); - Boolean required = object.getRequired(); - String title = object.getTitle(); - Map extensions = object.getVendorExtensions(); Xml xml = object.getXml(); - Map properties = object.getProperties(); ModelImpl model = new ModelImpl(); @@ -358,17 +327,10 @@ public class InlineModelResolver { return model; } - public Model modelFromProperty(MapProperty object, String path) { - String access = object.getAccess(); + @SuppressWarnings("static-method") + public Model modelFromProperty(MapProperty object, @SuppressWarnings("unused") String path) { String description = object.getDescription(); String example = object.getExample(); - String name = object.getName(); - Integer position = object.getPosition(); - Boolean readOnly = object.getReadOnly(); - Boolean required = object.getRequired(); - String title = object.getTitle(); - Map extensions = object.getVendorExtensions(); - Xml xml = object.getXml(); ArrayModel model = new ArrayModel(); model.setDescription(description); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java index 818edab02147..e528fb51f52d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java @@ -2,7 +2,6 @@ package io.swagger.codegen; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import io.swagger.models.Swagger; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -57,8 +56,6 @@ public class MetaGenerator extends AbstractGenerator { } protected void generate(String[] args) { - StringBuilder sb = new StringBuilder(); - String targetLanguage = null; String outputFolder = null; String name = null; String targetPackage = "io.swagger.codegen"; @@ -71,12 +68,9 @@ public class MetaGenerator extends AbstractGenerator { options.addOption("n", "name", true, "the human-readable name of the generator"); options.addOption("p", "package", true, "the package to put the main class into (defaults to io.swagger.codegen"); - ClientOptInput clientOptInput = new ClientOptInput(); - Swagger swagger = null; CommandLine cmd = null; try { CommandLineParser parser = new BasicParser(); - cmd = parser.parse(options, args); if (cmd.hasOption("h")) { usage(options); @@ -85,12 +79,11 @@ public class MetaGenerator extends AbstractGenerator { if (cmd.hasOption("n")) { name = cmd.getOptionValue("n"); } else { - System.out.println("name is required"); + System.out.println("name is required"); //FIXME replace by LOGGER usage(options); return; } if (cmd.hasOption("l")) { - targetLanguage = cmd.getOptionValue("l"); } if (cmd.hasOption("p")) { targetPackage = cmd.getOptionValue("p"); @@ -98,7 +91,7 @@ public class MetaGenerator extends AbstractGenerator { if (cmd.hasOption("o")) { outputFolder = cmd.getOptionValue("o"); } else { - System.out.println("output folder is required"); + System.out.println("output folder is required"); // FIXME replace by LOGGER usage(options); return; } @@ -161,8 +154,6 @@ public class MetaGenerator extends AbstractGenerator { public Reader getTemplate(String name) { return getTemplateReader(templateDir + File.separator + name + ".mustache"); } - - ; }) .defaultValue("") .compile(template); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java index 53c6ca5ab9b9..976376bae682 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java @@ -11,6 +11,7 @@ public class SupportingFile { this.destinationFilename = destinationFilename; } + @Override public String toString() { StringBuilder builder = new StringBuilder(); builder.append("SupportingFile:").append("\n"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java index 5fb41755184d..4fb39517cd4b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java @@ -18,7 +18,7 @@ public class AuthParser { for (String part : parts) { String[] kvPair = part.split(":"); if (kvPair.length == 2) { - auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header")); + auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header")); // FIXME replace the deprecated method by decode(string, encoding). Which encoding is used ? Default UTF-8 ? } } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java index 6d6062e93c8b..1115a4b709d9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java @@ -42,7 +42,7 @@ public class ExampleGenerator { if (examples == null) { if (mediaTypes == null) { // assume application/json for this - mediaTypes = Arrays.asList("application/json"); + mediaTypes = Arrays.asList("application/json"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. } for (String mediaType : mediaTypes) { Map kv = new HashMap(); @@ -127,7 +127,7 @@ public class ExampleGenerator { return resolveModelToExample(simpleName, mediaType, model, processedModels); } } else if (property instanceof UUIDProperty) { - return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; + return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; } return ""; @@ -142,16 +142,14 @@ public class ExampleGenerator { ModelImpl impl = (ModelImpl) model; Map values = new HashMap(); - if (impl != null && impl.getProperties() != null) { + if (impl.getProperties() != null) { for (String propertyName : impl.getProperties().keySet()) { Property property = impl.getProperties().get(propertyName); values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels)); } } - return values; } - return ""; } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java index 15f22dfe8ffd..bf4896ac5d8d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java @@ -39,7 +39,7 @@ public class XmlExampleGenerator { public XmlExampleGenerator(Map examples) { this.examples = examples; if (examples == null) { - examples = new HashMap(); + examples = new HashMap(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. } } @@ -74,10 +74,6 @@ public class XmlExampleGenerator { Map elements = new LinkedHashMap(); String name = modelName; - String namespace; - String prefix; - Boolean wrapped; - Xml xml = model.getXml(); if (xml != null) { if (xml.getName() != null) { @@ -117,6 +113,7 @@ public class XmlExampleGenerator { return sb.toString(); } + @SuppressWarnings("static-method") protected String quote(String string) { return "\"" + string + "\""; } @@ -211,14 +208,17 @@ public class XmlExampleGenerator { return "not implemented " + property; } + @SuppressWarnings("static-method") protected String openTag(String name) { return "<" + name + ">"; } + @SuppressWarnings("static-method") protected String closeTag(String name) { return ""; } + @SuppressWarnings("static-method") protected String indent(int indent) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < indent; i++) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index cdfc01d2f82e..fe7fe08eb12e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -73,7 +73,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, do nothing if (name.matches("^[A-Z_]*$")) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java index aa5d314184b4..69fc84567646 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java @@ -63,7 +63,9 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon * unmarshalling problems and any other RuntimeException will be considered as ApiErrors. */ protected boolean onlyOneSuccess = true; - Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class); + + @SuppressWarnings("hiding") + protected Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class); public AkkaScalaClientCodegen() { super(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java index ac84e7c795d2..ffe1467a7e7a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java @@ -7,7 +7,6 @@ import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; import io.swagger.models.properties.ArrayProperty; -import io.swagger.models.properties.BooleanProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; @@ -151,7 +150,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, do nothing if (name.matches("^[A-Z_]*$")) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java index bac6efe2aff5..78017feb583f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java @@ -23,8 +23,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; -import org.apache.commons.lang.StringUtils; - public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java index 23c266e618fc..0ab69bd54332 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java @@ -22,6 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig { + @SuppressWarnings("unused") private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class); protected boolean optionalAssemblyInfoFlag = true; protected boolean optionalMethodArgumentFlag = true; @@ -229,7 +230,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, do nothing if (name.matches("^[A-Z_]*$")) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java index d4a8ada06b97..5228c86457ff 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java @@ -172,7 +172,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi @Override public String toVarName(String name) { - name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); + name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. name = dashize(name); return name; } @@ -196,6 +196,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi return operations; } + @SuppressWarnings("static-method") protected String namespaceToFolder(String ns) { return ns.replace(".", File.separator).replace("-", "_"); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java index 3ad108e2e61d..d3d249bfcd26 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java @@ -172,7 +172,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, do nothing if (name.matches("^[A-Z_]*$")) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java index 7d11f2a81838..b4039b03b8c5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java @@ -168,7 +168,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, do nothing if (name.matches("^[A-Z_]*$")) { @@ -218,15 +218,10 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toDefaultValue(Property p) { if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); return "{}"; } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); return "[]"; } - return super.toDefaultValue(p); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java index dac3d23b22ac..fd49d59fd27e 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java @@ -190,14 +190,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String getTypeDeclaration(Property p) { - if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); - return getSwaggerType(p); - } else if (p instanceof MapProperty) { - MapProperty mp = (MapProperty) p; - Property inner = mp.getAdditionalProperties(); - + if (p instanceof ArrayProperty || p instanceof MapProperty) { return getSwaggerType(p); } return super.getTypeDeclaration(p); @@ -253,12 +246,8 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig } return "0"; } else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); return "new Dictionary()"; } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); return "new Array()"; } else { return "null"; @@ -268,8 +257,8 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); - + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. + // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { name = name.toLowerCase(); @@ -320,7 +309,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toApiFilename(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // e.g. PhoneNumberApi.rb => phone_number_api.rb return camelize(name) + "Api"; @@ -373,7 +362,4 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig public void setSourceFolder(String sourceFolder) { this.sourceFolder = sourceFolder; } - } - - diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index 483e841d7355..6d6d1c5ba227 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -249,7 +249,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf } @SuppressWarnings("unchecked") - private List> getOperations(Map objs) { + private static List> getOperations(Map objs) { List> result = new ArrayList>(); Map apiInfo = (Map) objs.get("apiInfo"); List> apis = (List>) apiInfo.get("apis"); @@ -259,7 +259,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf return result; } - private List> sortOperationsByPath(List ops) { + private static List> sortOperationsByPath(List ops) { Multimap opsByPath = ArrayListMultimap.create(); for (CodegenOperation op : ops) { @@ -304,7 +304,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf @Override public String toOperationId(String operationId) { - operationId = super.toOperationId(operationId); + operationId = super.toOperationId(operationId); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // Use the part after the last dot, e.g. // controllers.defaultController.addPet => addPet operationId = operationId.replaceAll(".*\\.", ""); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java index 429d992b7ef8..903cb7ba76eb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JMeterCodegen.java @@ -5,8 +5,6 @@ import io.swagger.models.Operation; import io.swagger.models.Path; import io.swagger.models.Swagger; import io.swagger.models.properties.*; -import org.apache.commons.lang.StringUtils; - import java.util.*; import java.io.File; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 8a09eb34ea9b..37c73af7f801 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -17,6 +17,7 @@ import java.io.File; import java.util.*; public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { + @SuppressWarnings("hiding") private static final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class); public static final String FULL_JAVA_UTIL = "fullJavaUtil"; public static final String DEFAULT_LIBRARY = ""; @@ -292,7 +293,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if("_".equals(name)) { name = "_u"; @@ -323,7 +324,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelName(String name) { - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // model name cannot use reserved keyword, e.g. return if (reservedWords.contains(name)) { @@ -617,7 +618,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { } } - private String getAccept(Operation operation) { + private static String getAccept(Operation operation) { String accepts = null; String defaultContentType = "application/json"; if (operation.getProduces() != null && !operation.getProduces().isEmpty()) { @@ -648,14 +649,14 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { return super.needToImport(type) && type.indexOf(".") < 0; } - private String findCommonPrefixOfVars(List vars) { + private static String findCommonPrefixOfVars(List vars) { String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()])); // exclude trailing characters that should be part of a valid variable // e.g. ["status-on", "status-off"] => "status-" (not "status-o") return prefix.replaceAll("[a-zA-Z0-9]+\\z", ""); } - private String toEnumVarName(String value) { + private static String toEnumVarName(String value) { String var = value.replaceAll("\\W+", "_").toUpperCase(); if (var.matches("\\d.*")) { return "_" + var; @@ -664,7 +665,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { } } - private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { + private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { // This generator uses inline classes to define enums, which breaks when // dealing with models that have subTypes. To clean this up, we will analyze // the parent and child models, look for enums that match, and remove @@ -748,8 +749,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { this.serializableModel = serializableModel; } - private String sanitizePackageName(String packageName) { - packageName = packageName.trim(); + private static String sanitizePackageName(String packageName) { + packageName = packageName.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_"); if(Strings.isNullOrEmpty(packageName)) { return "invalidPackageName"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index 01ca02f185d9..37ac0cf95074 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -11,7 +11,7 @@ import io.swagger.util.Yaml; import java.util.*; -public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig { +public class JavaInflectorServerCodegen extends JavaClientCodegen { protected String title = "Swagger Inflector"; public JavaInflectorServerCodegen() { @@ -174,7 +174,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod if (name.length() == 0) { return "DefaultController"; } - name = name.replaceAll("[^a-zA-Z0-9]+", "_"); + name = name.replaceAll("[^a-zA-Z0-9]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. return camelize(name)+ "Controller"; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java index ac680d594632..94eae2cd94a8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig { + @SuppressWarnings("hiding") private static final Logger LOGGER = LoggerFactory.getLogger(JavascriptClientCodegen.class); private static final String PROJECT_NAME = "projectName"; @@ -225,7 +226,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if("_".equals(name)) { name = "_u"; @@ -256,7 +257,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo @Override public String toModelName(String name) { - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // model name cannot use reserved keyword, e.g. return if (reservedWords.contains(name)) { @@ -287,8 +288,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo @Override public String getTypeDeclaration(Property p) { if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - Property inner = ap.getItems(); + // ArrayProperty ap = (ArrayProperty) p; + // Property inner = ap.getItems(); return getSwaggerType(p); // TODO: + "/* <" + getTypeDeclaration(inner) + "> */"; } else if (p instanceof MapProperty) { MapProperty mp = (MapProperty) p; @@ -329,15 +330,12 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } else if (p instanceof MapProperty) { return " = {}"; } else if (p instanceof LongProperty) { - LongProperty dp = (LongProperty) p; return " = data." + name + ";"; // added for Javascript } else if (p instanceof RefProperty) { - RefProperty rp = (RefProperty)p; return ".constructFromObject(data." + name + ");"; } - return super.toDefaultValueWithParam(name, p); } @@ -465,14 +463,14 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo && !languageSpecificPrimitives.contains(type); } - private String findCommonPrefixOfVars(List vars) { + private static String findCommonPrefixOfVars(List vars) { String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()])); // exclude trailing characters that should be part of a valid variable // e.g. ["status-on", "status-off"] => "status-" (not "status-o") return prefix.replaceAll("[a-zA-Z0-9]+\\z", ""); } - private String toEnumVarName(String value) { + private static String toEnumVarName(String value) { String var = value.replaceAll("\\W+", "_").toUpperCase(); if (var.matches("\\d.*")) { return "_" + var; @@ -481,7 +479,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } } - private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { + private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { // This generator uses inline classes to define enums, which breaks when // dealing with models that have subTypes. To clean this up, we will analyze // the parent and child models, look for enums that match, and remove @@ -529,13 +527,12 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo return codegenModel; } - private String sanitizePackageName(String packageName) { - packageName = packageName.trim(); + private static String sanitizePackageName(String packageName) { + packageName = packageName.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_"); if(Strings.isNullOrEmpty(packageName)) { return "invalidPackageName"; } return packageName; } - } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java index 5814751d63c9..8ef4056ee5aa 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java @@ -8,7 +8,7 @@ import io.swagger.models.Swagger; import java.io.File; import java.util.*; -public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig { +public class JaxRSServerCodegen extends JavaClientCodegen { protected String dateLibrary = "default"; protected String title = "Swagger Server"; protected String implFolder = "src/main/java"; @@ -180,7 +180,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf } } this.additionalProperties.put("serverPort", port); - if(swagger != null && swagger.getPaths() != null) { + if( swagger.getPaths() != null) { for(String pathname : swagger.getPaths().keySet()) { Path path = swagger.getPath(pathname); if(path.getOperations() != null) { @@ -256,7 +256,7 @@ public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConf if (name.length() == 0) { return "DefaultApi"; } - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. return camelize(name) + "Api"; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index f463fbc473f4..6fa031050bb0 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -212,7 +212,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig } @SuppressWarnings("unchecked") - private List> getOperations(Map objs) { + private static List> getOperations(Map objs) { List> result = new ArrayList>(); Map apiInfo = (Map) objs.get("apiInfo"); List> apis = (List>) apiInfo.get("apis"); @@ -222,7 +222,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig return result; } - private List> sortOperationsByPath(List ops) { + private static List> sortOperationsByPath(List ops) { Multimap opsByPath = ArrayListMultimap.create(); for (CodegenOperation op : ops) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index dd002a12b190..76739f5ab3c3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -219,12 +219,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toInstantiationType(Property p) { if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); return instantiationTypes.get("map"); } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); return instantiationTypes.get("array"); } else { return null; @@ -312,7 +308,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelName(String type) { - type = type.replaceAll("[^0-9a-zA-Z_]", "_"); + type = type.replaceAll("[^0-9a-zA-Z_]", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // language build-in classes if (typeMapping.keySet().contains(type) || @@ -372,7 +368,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all upper case, do noting if (name.matches("^[A-Z_]$")) { @@ -409,6 +405,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { return "_" + name; } + @SuppressWarnings("static-method") public String escapeSpecialWord(String name) { return "var_" + name; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java index 90fea3f4a9b8..afb190d7d551 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java @@ -7,7 +7,6 @@ import io.swagger.codegen.SupportingFile; import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CliOption; import io.swagger.models.properties.ArrayProperty; -import io.swagger.models.properties.BooleanProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; @@ -182,14 +181,13 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { public String toVarName(String name) { // return the name in underscore style // PhoneNumber => phone_number - name = underscore(name); + name = underscore(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // parameter name starting with number won't compile // need to escape it by appending _ at the beginning if (name.matches("^\\d.*")) { name = "_" + name; } - return name; } @@ -220,7 +218,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toApiFilename(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // e.g. phone_number_api.rb => PhoneNumberApi.rb return camelize(name) + "Api"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 12e6b3ea8ed9..0381d09fb739 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -20,6 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { + @SuppressWarnings("hiding") static Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class); public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; @@ -116,9 +117,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } public String toPackagePath(String packageName, String basePath) { - packageName = packageName.replace(invokerPackage, ""); + packageName = packageName.replace(invokerPackage, ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if (basePath != null && basePath.length() > 0) { - basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; + basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. } String regFirstPathSeparator; @@ -313,7 +314,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if ("camelCase".equals(variableNamingConvention)) { // return the name in camelCase style @@ -343,7 +344,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelName(String name) { // Note: backslash ("\\") is allowed for e.g. "\\DateTime" - name = name.replaceAll("[^\\w\\\\]+", "_"); + name = name.replaceAll("[^\\w\\\\]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // remove dollar sign name = name.replaceAll("$", ""); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index 02ce858d0cd4..ba32286f2664 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -176,7 +176,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // remove dollar sign name = name.replaceAll("$", ""); @@ -209,7 +209,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toModelName(String name) { - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // remove dollar sign name = name.replaceAll("$", ""); @@ -291,6 +291,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig * (PEP 0008) Python packages should also have short, all-lowercase names, * although the use of underscores is discouraged. */ + @SuppressWarnings("static-method") public String generatePackageName(String packageName) { return underscore(packageName.replaceAll("[^\\w]+", "")); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java index ddc4f35346f8..f5c2faef2c47 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java @@ -186,7 +186,6 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("api_error.mustache", gemFolder, "api_error.rb")); supportingFiles.add(new SupportingFile("configuration.mustache", gemFolder, "configuration.rb")); supportingFiles.add(new SupportingFile("version.mustache", gemFolder, "version.rb")); - String modelFolder = gemFolder + File.separator + modelPackage.replace("/", File.separator); } @@ -208,6 +207,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { /** * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client". */ + @SuppressWarnings("static-method") public String generateModuleName(String gemName) { return camelize(gemName.replaceAll("[^\\w]+", "_")); } @@ -215,6 +215,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { /** * Generate Ruby gem name from the module name, e.g. use "swagger_client" for "SwaggerClient". */ + @SuppressWarnings("static-method") public String generateGemName(String moduleName) { return underscore(moduleName.replaceAll("[^\\w]+", "")); } @@ -306,7 +307,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toVarName(String name) { // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { @@ -333,7 +334,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelName(String name) { - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // model name cannot use reserved keyword, e.g. return if (reservedWords.contains(name)) { @@ -360,7 +361,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toApiFilename(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // e.g. PhoneNumberApi.rb => phone_number_api.rb return underscore(name) + "_api"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java index 4effb480048e..3647937f9ad9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java @@ -162,7 +162,7 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig public String toVarName(String name) { // return the name in underscore style // PhoneNumber => phone_number - name = underscore(name); + name = underscore(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // parameter name starting with number won't compile // need to escape it by appending _ at the beginning diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java index e478c00341e2..8bb0b3383739 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java @@ -2,7 +2,6 @@ package io.swagger.codegen.languages; import com.fasterxml.jackson.core.JsonProcessingException; -import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; @@ -18,8 +17,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; -import org.apache.commons.lang.StringUtils; - public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfig { protected String gemName; protected String moduleName; @@ -146,7 +143,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi @Override public String toVarName(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { @@ -198,7 +195,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi @Override public String toApiFilename(String name) { // replace - with _ e.g. created-at => created_at - name = name.replaceAll("-", "_"); + name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. // e.g. PhoneNumberApi.rb => phone_number_api.rb return underscore(name) + "_api"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java index ae28493fe7ce..18b3159fbf72 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SlimFrameworkServerCodegen.java @@ -177,8 +177,7 @@ public class SlimFrameworkServerCodegen extends DefaultCodegen implements Codege @Override public String toVarName(String name) { - // sanitize name - name = sanitizeName(name); + name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. if ("camelCase".equals(variableNamingConvention)) { // return the name in camelCase style diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 256f78b02b63..2c5287d5717b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -6,7 +6,7 @@ import io.swagger.models.Operation; import java.io.File; import java.util.*; -public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig { +public class SpringMVCServerCodegen extends JavaClientCodegen { public static final String CONFIG_PACKAGE = "configPackage"; protected String title = "Petstore Server"; protected String configPackage = ""; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java index ddd72e4230b3..7d3b53fe87b2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java @@ -267,6 +267,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { return codegenProperty; } + @SuppressWarnings("static-method") public String toSwiftyEnumName(String value) { // Prevent from breaking properly cased identifier if (value.matches("[A-Z][a-z0-9]+[a-zA-Z0-9]*")) { @@ -286,7 +287,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig { @Override public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map definitions, Swagger swagger) { - path = normalizePath(path); + path = normalizePath(path); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. List parameters = operation.getParameters(); parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate() { @Override diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java index 83241ddc5e70..7d8108b2a133 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java @@ -128,12 +128,8 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toInstantiationType(Property p) { if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); return instantiationTypes.get("map"); } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); return instantiationTypes.get("array"); } else { return null; @@ -217,12 +213,8 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig } else if (p instanceof DecimalProperty) { return "new Long()"; } else if (p instanceof MapProperty) { - MapProperty ap = (MapProperty) p; - String inner = getSwaggerType(ap.getAdditionalProperties()); return "new HashMap()"; } else if (p instanceof ArrayProperty) { - ArrayProperty ap = (ArrayProperty) p; - String inner = getSwaggerType(ap.getItems()); return "new ArrayList()"; } // else diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java index 1b6f878b512a..7ad1ff07e2b0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/akkascala/AkkaScalaClientOptionsTest.java @@ -22,6 +22,7 @@ public class AkkaScalaClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java index 26d55d7e9b2f..538614436f42 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/android/AndroidClientOptionsTest.java @@ -22,6 +22,7 @@ public class AndroidClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java index b6b90ae7a7c3..8ea0280434a0 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/asyncscala/AsyncScalaClientOptionsTest.java @@ -22,6 +22,7 @@ public class AsyncScalaClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java index 2245f2f58771..8108d206f3a3 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java @@ -45,6 +45,7 @@ public class CodegenConfiguratorTest { @Tested CodegenConfigurator configurator; + @SuppressWarnings("unused") @Test public void testVerbose() throws Exception { diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java index 367977e2b052..c8d6b6a02bc1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientOptionsTest.java @@ -22,6 +22,7 @@ public class CSharpClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java index 7e30e2b1cd0d..cb3854e2bd8f 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/csharpdotnettwo/CsharpDotNet2ClientOptionsTest.java @@ -22,6 +22,7 @@ public class CsharpDotNet2ClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java index b002fd999782..519ac4943ccb 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/dart/DartClientOptionsTest.java @@ -22,6 +22,7 @@ public class DartClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java index 21a9cb5e03b2..97f4036c4d96 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/flash/FlashClienOptionsTest.java @@ -24,6 +24,7 @@ public class FlashClienOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java index 8c54a382993b..49399b3beef8 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/inflector/JavaInflectorServerOptionsTest.java @@ -21,6 +21,7 @@ public class JavaInflectorServerOptionsTest extends JavaClientOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java index 29166bc87500..2a4d582f7764 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -27,6 +27,7 @@ public class JavaClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java index 66b48cd6b89f..dcd87b4d7008 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaInheritanceTest.java @@ -15,6 +15,7 @@ import org.testng.annotations.Test; public class JavaInheritanceTest { + @SuppressWarnings("static-method") @Test(description = "convert a composed model") public void javaInheritanceTest() { final Model model = new ComposedModel().parent(new RefModel("Base")) diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java index 2babdc189e1a..5ac5f7885909 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +@SuppressWarnings("static-method") public class JavaModelEnumTest { @Test(description = "convert a java model with an enum") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java index dc815e351aa9..f8c8bae61289 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java @@ -24,6 +24,7 @@ import org.testng.annotations.Test; import java.util.List; +@SuppressWarnings("static-method") public class JavaModelTest { @Test(description = "convert a simple java model") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java index 9ae5e6dc3e4b..4a4e6ff91802 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java @@ -31,7 +31,7 @@ public class AllowableValuesTest { } @DataProvider(name = PROVIDER_NAME) - private Object[][] resource() { + private static Object[][] resource() { final CodegenParameter param1 = new CodegenParameter(); final CodegenParameter param2 = new CodegenParameter() {{ allowableValues = ImmutableMap.of("values", ImmutableList.of("item1", "item2", "item3")); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java index 055bb721ad81..a441a7984d28 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java @@ -22,6 +22,7 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java index 55219787f89d..b1ee5b0040a7 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJava8ModelTest.java @@ -1,6 +1,7 @@ package io.swagger.codegen.jaxrs; import io.swagger.codegen.CodegenModel; + import io.swagger.codegen.languages.JaxRSServerCodegen; import io.swagger.models.Model; import io.swagger.models.ModelImpl; @@ -12,7 +13,9 @@ import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; +@SuppressWarnings("static-method") public class JaxrsJava8ModelTest { + @Test(description = "convert a simple java model with java8 types") public void simpleModelTest() { final Model model = new ModelImpl() diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java index 3f2ac1a9ec1b..c2cb65c78ca1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsJodaModelTest.java @@ -12,7 +12,9 @@ import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; +@SuppressWarnings("static-method") public class JaxrsJodaModelTest { + @Test(description = "convert a simple java model with Joda types") public void simpleModelTest() { final Model model = new ModelImpl() diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java index da2d5e35e2ae..3566f2e98e29 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/BooleanOptionsTest.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +@SuppressWarnings("static-method") public class BooleanOptionsTest { private static final String OPTIONS_PROVIDER = "Codegen"; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java index ce905315ae3b..c1cfa43b08bf 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/nodejs/NodeJSServerOptionsTest.java @@ -22,6 +22,7 @@ public class NodeJSServerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java index 33f20625e16e..795c6ee2d9cf 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java @@ -22,6 +22,7 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java index f48f20ce1191..7d3eeaa41087 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java @@ -24,6 +24,7 @@ import org.testng.annotations.Test; import java.util.Map; +@SuppressWarnings("static-method") public class ObjcModelTest { @Test(description = "convert a simple java model") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java index e52373c3c081..a9d77c403938 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringMVCServerOptionsProvider.java @@ -8,7 +8,7 @@ import java.util.Map; public class SpringMVCServerOptionsProvider extends JavaOptionsProvider { public static final String CONFIG_PACKAGE_VALUE = "configPackage"; - public static final String LIBRARY_VALUE = "j8-async"; + public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class @Override public String getLanguage() { diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java index d85b0c9dbc18..b277acbbe5c8 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/perl/PerlClientOptionsTest.java @@ -22,6 +22,7 @@ public class PerlClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java index e50185a3e8db..fb5e21d1cce1 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpClientOptionsTest.java @@ -22,6 +22,7 @@ public class PhpClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java index 79da2d2ccda4..3cad349a882e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java @@ -18,6 +18,7 @@ import com.google.common.collect.Sets; import org.testng.Assert; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class PhpModelTest { @Test(description = "convert a simple php model") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java index fc68a9e92e19..2682200e60ae 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonClientOptionsTest.java @@ -22,6 +22,7 @@ public class PythonClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java index 07c4bc76b030..d57b445b9c2b 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java @@ -11,6 +11,7 @@ import io.swagger.parser.SwaggerParser; import org.testng.Assert; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class PythonTest { @Test(description = "convert a python model with dots") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java index 389721d3841e..1bc1147cd00c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/qtfivecpp/Qt5CPPOptionsTest.java @@ -22,6 +22,7 @@ public class Qt5CPPOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java index 404941619730..f61367e8220e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientOptionsTest.java @@ -22,6 +22,7 @@ public class RubyClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java index 0e916aebd76b..fe0b3b3b5443 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaClientOptionsTest.java @@ -22,6 +22,7 @@ public class ScalaClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java index 81290c473872..e3c12d028fba 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java @@ -18,6 +18,7 @@ import com.google.common.collect.Sets; import org.testng.Assert; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class ScalaModelTest { @Test(description = "convert a simple scala model") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java index 49bbe4373b6e..70c3dd30987f 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/scalatra/ScalatraServerOptionsTest.java @@ -22,6 +22,7 @@ public class ScalatraServerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java index 11681230289a..c32ef13fd82e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/silex/SilexServerOptionsTest.java @@ -22,6 +22,7 @@ public class SilexServerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java index 6691cf27f860..56e81aba251a 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/sinatra/SinatraServerOptionsTest.java @@ -22,6 +22,7 @@ public class SinatraServerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java index 51c668bd931a..554f4ca0db54 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/slim/SlimFrameworkServerOptionsTest.java @@ -22,6 +22,7 @@ public class SlimFrameworkServerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java index d4b984ffcd27..c24162c1a3c9 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springmvc/SpringMVCServerOptionsTest.java @@ -22,6 +22,7 @@ public class SpringMVCServerOptionsTest extends JavaClientOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java index bc2da143efbc..9f9f6da27a1c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticDocOptionsTest.java @@ -22,6 +22,7 @@ public class StaticDocOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java index f3e08e805417..6b16b3b7f5b8 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/staticDocs/StaticOperationTest.java @@ -10,6 +10,7 @@ import io.swagger.models.properties.StringProperty; import org.testng.Assert; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class StaticOperationTest { @Test(description = "convert a string parameter") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java index befe62e32c42..91ba418fb916 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlOptionsTest.java @@ -22,6 +22,7 @@ public class StaticHtmlOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java index f2f461f2b703..ba142d314e97 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swagger/SwaggerOptionsTest.java @@ -22,6 +22,7 @@ public class SwaggerOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java index a1478a8ba058..0ed24654f0ac 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swaggeryaml/SwaggerYamlOptionsTest.java @@ -22,6 +22,7 @@ public class SwaggerYamlOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java index 7d3504f67de4..7b8ccb616320 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftOptionsTest.java @@ -22,6 +22,7 @@ public class SwiftOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java index 83ebb8be15ef..35262568fa59 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/tizen/TizenClientOptionsTest.java @@ -22,6 +22,7 @@ public class TizenClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java index 3fdf817dc58e..df57cec4b705 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularClientOptionsTest.java @@ -22,6 +22,7 @@ public class TypeScriptAngularClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java index 55bbbeffdba4..78b14f50e876 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular/TypeScriptAngularModelTest.java @@ -17,6 +17,7 @@ import com.google.common.collect.Sets; import org.testng.Assert; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class TypeScriptAngularModelTest { @Test(description = "convert a simple TypeScript Angular model") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java index 2374011b1b9d..51fa87c35d21 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptnode/TypeScriptNodeClientOptionsTest.java @@ -22,6 +22,7 @@ public class TypeScriptNodeClientOptionsTest extends AbstractOptionsTest { return clientCodegen; } + @SuppressWarnings("unused") @Override protected void setExpectations() { new Expectations(clientCodegen) {{ diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java index 995fc8c80e7d..c0af8dc56c92 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java @@ -19,7 +19,6 @@ package io.swagger.generator; import org.apache.commons.io.IOUtils; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import java.io.IOException; @@ -30,8 +29,6 @@ public class Bootstrap extends HttpServlet { @Override public void init(ServletConfig config) throws ServletException { - ServletContext context = config.getServletContext(); - DynamicSwaggerConfig bc = new DynamicSwaggerConfig(); bc.setBasePath("/api"); bc.setTitle("Swagger Generator"); diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java index 4ffc2348c27a..11932b262953 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java @@ -24,4 +24,9 @@ public class ApiException extends Exception { super(msg); this.code = code; } + + public int getCode() + { + return code; + } } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java index 14093f536d2e..2adf97b8bf46 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java @@ -16,12 +16,12 @@ package io.swagger.generator.exception; +import org.apache.http.HttpStatus; + public class BadRequestException extends ApiException { private static final long serialVersionUID = -5540416398447252055L; - private int code; - public BadRequestException(int code, String msg) { - super(code, msg); - this.code = code; + public BadRequestException(String msg) { + super(HttpStatus.SC_BAD_REQUEST, msg); } } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java index cdae50ce9b65..d3747be7d9a8 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java @@ -16,12 +16,12 @@ package io.swagger.generator.exception; +import org.apache.http.HttpStatus; + public class NotFoundException extends ApiException { private static final long serialVersionUID = -1223255119112336573L; - private int code; - public NotFoundException(int code, String msg) { - super(code, msg); - this.code = code; + public NotFoundException(String msg) { + super(HttpStatus.SC_NOT_FOUND, msg); } } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index 9946831640d4..c04ea9200890 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -34,7 +34,7 @@ public class Generator { try { config = CodegenConfigLoader.forName(language); } catch (Exception e) { - throw new BadRequestException(400, String.format("Unsupported target %s supplied. %s", language, e)); + throw new BadRequestException(String.format("Unsupported target %s supplied. %s", language, e)); } Map map = new LinkedHashMap(); for (CliOption option : config.cliOptions()) { @@ -69,7 +69,7 @@ public class Generator { private static String generate(String language, GeneratorInput opts, Type type) throws ApiException { LOGGER.debug(String.format("generate %s for %s", type.getTypeName(), language)); if (opts == null) { - throw new BadRequestException(400, "No options were supplied"); + throw new BadRequestException("No options were supplied"); } JsonNode node = opts.getSpec(); if(node != null && "{}".equals(node.toString())) { @@ -81,13 +81,13 @@ public class Generator { if (opts.getSwaggerUrl() != null) { swagger = new SwaggerParser().read(opts.getSwaggerUrl()); } else { - throw new BadRequestException(400, "No swagger specification was supplied"); + throw new BadRequestException("No swagger specification was supplied"); } } else { swagger = new SwaggerParser().read(node, true); } if (swagger == null) { - throw new BadRequestException(400, "The swagger specification supplied was not valid"); + throw new BadRequestException("The swagger specification supplied was not valid"); } ClientOptInput clientOptInput = new ClientOptInput(); @@ -104,7 +104,7 @@ public class Generator { try { codegenConfig = CodegenConfigLoader.forName(language); } catch(RuntimeException e) { - throw new BadRequestException(400, "Unsupported target " + language + " supplied"); + throw new BadRequestException("Unsupported target " + language + " supplied"); } if (opts.getOptions() != null) { @@ -127,7 +127,7 @@ public class Generator { ZipUtil zip = new ZipUtil(); zip.compressFiles(filesToAdd, outputFilename); } else { - throw new BadRequestException(400, "A target generation was attempted, but no files were created!"); + throw new BadRequestException("A target generation was attempted, but no files were created!"); } for(File file: files) { try { @@ -144,16 +144,16 @@ public class Generator { LOGGER.error("unable to delete output folder " + outputFolder); } } catch (Exception e) { - throw new BadRequestException(500, "Unable to build target: " + e.getMessage()); + throw new BadRequestException("Unable to build target: " + e.getMessage()); } return outputFilename; } - public static InputOption clientOptions(String language) { + public static InputOption clientOptions(@SuppressWarnings("unused") String language) { return null; } - public static InputOption serverOptions(String language) { + public static InputOption serverOptions(@SuppressWarnings("unused") String language) { return null; } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index 343692f8385e..53d5d8a72a6d 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -24,6 +24,7 @@ import java.util.*; @Path("/gen") @Api(value = "/gen", description = "Resource for generating swagger components") +@SuppressWarnings("static-method") public class SwaggerResource { static List clients = new ArrayList(); static List servers = new ArrayList(); @@ -110,7 +111,7 @@ public class SwaggerResource { responseContainer = "map", tags = "clients") public Response getClientOptions( - @Context HttpServletRequest request, + @SuppressWarnings("unused") @Context HttpServletRequest request, @ApiParam(value = "The target language for the client library", required = true) @PathParam("language") String language) throws Exception { @@ -132,7 +133,7 @@ public class SwaggerResource { responseContainer = "map", tags = "servers") public Response getServerOptions( - @Context HttpServletRequest request, + @SuppressWarnings("unused") @Context HttpServletRequest request, @ApiParam(value = "The target language for the server framework", required = true) @PathParam("framework") String framework) throws Exception { @@ -181,7 +182,7 @@ public class SwaggerResource { @ApiParam(value = "parameters", required = true) GeneratorInput opts) throws Exception { if (framework == null) { - throw new BadRequestException(400, "Framework is required"); + throw new BadRequestException("Framework is required"); } String filename = Generator.generateServer(framework, opts); System.out.println("generated name: " + filename); diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java index 22ed4ada8785..631541f6c012 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java @@ -1,12 +1,9 @@ package io.swagger.generator.util; -import java.util.List; - public class ValidationException extends Exception { private static final long serialVersionUID = 6861195361018260380L; private int code; private String msg; - private List errors; public ValidationException(String msg) { super(msg); diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java index c5cc99461f30..6b6b22fd6756 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java @@ -4,6 +4,7 @@ import io.swagger.generator.model.GeneratorInput; import org.testng.annotations.Test; +@SuppressWarnings("static-method") public class GeneratorInputTest { @Test(description = "write an object") diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java index 55161327b1ce..ca5ea43412fa 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java @@ -2,8 +2,6 @@ package io.swagger.generator.online; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; -import static org.testng.Assert.assertNotNull; - import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConfigLoader; import io.swagger.codegen.options.AkkaScalaClientOptionsProvider; @@ -43,7 +41,6 @@ import io.swagger.generator.model.GeneratorInput; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.io.FileUtils; @@ -67,7 +64,7 @@ public class OnlineGeneratorOptionsTest { private static final String OPTIONS_PROVIDER = "optionsProvider"; @DataProvider(name = OPTIONS_PROVIDER) - private Object[][] listOptions() { + private static Object[][] listOptions() { return new Object[][]{{new AkkaScalaClientOptionsProvider()}, {new AndroidClientOptionsProvider()}, {new AsyncScalaClientOptionsProvider()}, {new CSharpClientOptionsProvider()}, {new CsharpDotNet2ClientOptionsProvider()}, {new DartClientOptionsProvider()}, @@ -122,7 +119,7 @@ public class OnlineGeneratorOptionsTest { } } - private HashMap convertOptions(OptionsProvider provider) { + private static HashMap convertOptions(OptionsProvider provider) { HashMap options = new HashMap(); for (Map.Entry entry : provider.createOptions().entrySet()) { options.put(entry.getKey(), new InvocationCounter(entry.getValue())); @@ -159,7 +156,7 @@ public class OnlineGeneratorOptionsTest { } @Test(dataProvider = OPTIONS_PROVIDER) - public void getOptionsTest(OptionsProvider provider) throws ApiException { + public static void getOptionsTest(OptionsProvider provider) throws ApiException { final Map opts = Generator.getOptions(provider.getLanguage()); final Function cliOptionWrapper = new Function() { diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java index 93277a6a2f97..bca63e37eedf 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java +++ b/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java @@ -13,6 +13,7 @@ import org.testng.annotations.Test; import java.util.Map; +@SuppressWarnings("static-method") public class OnlineJavaClientOptionsTest { @Test