From 4d947a1c4579a73c7350ea55153d33ef76ba5d89 Mon Sep 17 00:00:00 2001 From: agilob Date: Tue, 9 Nov 2021 06:36:01 +0000 Subject: [PATCH] Non functional Java styling changes (#10808) * Replace explicit with <> * Remove redundant toString() calls on String * Use StandardCharsets.UTF_8 instead "UTF-8" string * Simpler annotation format and redundant this * Dont concat on empty String, use String.valueOf() * Dont run equals on empty String * Use string.anyMatch instead counting * Collection add all instead iterating and adding * Replace string contact with append chain in stringBuilders --- .../codegen/CodegenConfigLoader.java | 2 +- .../openapitools/codegen/CodegenModel.java | 36 ++--- .../openapitools/codegen/DefaultCodegen.java | 148 +++++++++--------- .../codegen/SpecValidationException.java | 2 +- .../openapitools/codegen/TemplateManager.java | 2 +- .../codegen/TemplatingEngineLoader.java | 4 +- .../codegen/config/CodegenConfigurator.java | 4 +- .../codegen/examples/ExampleGenerator.java | 2 +- .../codegen/examples/XmlExampleGenerator.java | 2 +- .../codegen/ignore/rules/RootedFileRule.java | 2 +- .../codegen/languages/AbstractAdaCodegen.java | 26 +-- .../languages/AbstractCSharpCodegen.java | 22 +-- .../codegen/languages/AbstractCppCodegen.java | 2 +- .../languages/AbstractDartCodegen.java | 4 +- .../languages/AbstractEiffelCodegen.java | 8 +- .../languages/AbstractFSharpCodegen.java | 33 ++-- .../codegen/languages/AbstractGoCodegen.java | 16 +- .../languages/AbstractGraphQLCodegen.java | 6 +- .../languages/AbstractJavaCodegen.java | 19 ++- .../AbstractJavaJAXRSServerCodegen.java | 2 +- .../languages/AbstractKotlinCodegen.java | 14 +- .../codegen/languages/AbstractPhpCodegen.java | 6 +- .../languages/AbstractPythonCodegen.java | 2 +- .../languages/AbstractRubyCodegen.java | 4 +- .../languages/AbstractScalaCodegen.java | 2 +- .../AbstractTypeScriptClientCodegen.java | 4 +- .../languages/AndroidClientCodegen.java | 2 +- .../codegen/languages/ApexClientCodegen.java | 6 +- .../AsciidocDocumentationCodegen.java | 20 +-- .../languages/AspNetCoreServerCodegen.java | 6 +- .../codegen/languages/BashClientCodegen.java | 2 +- .../languages/CLibcurlClientCodegen.java | 4 +- .../languages/CSharpClientCodegen.java | 2 +- .../languages/CSharpNetCoreClientCodegen.java | 2 +- .../languages/ConfluenceWikiCodegen.java | 8 +- .../languages/CppPistacheServerCodegen.java | 6 +- .../languages/CppQtAbstractCodegen.java | 22 +-- .../languages/CppRestSdkClientCodegen.java | 8 +- .../languages/CppRestbedServerCodegen.java | 14 +- .../languages/CppTinyClientCodegen.java | 12 +- .../languages/CppTizenClientCodegen.java | 14 +- .../languages/CppUE4ClientCodegen.java | 14 +- .../languages/CrystalClientCodegen.java | 10 +- .../languages/ElixirClientCodegen.java | 10 +- .../codegen/languages/ElmClientCodegen.java | 22 ++- .../languages/FsharpGiraffeServerCodegen.java | 2 +- .../languages/HaskellHttpClientCodegen.java | 12 +- .../languages/HaskellServantCodegen.java | 20 +-- .../languages/HaskellYesodServerCodegen.java | 18 +-- .../languages/JMeterClientCodegen.java | 2 +- .../languages/JavaCXFClientCodegen.java | 2 +- .../languages/JavaCXFExtServerCodegen.java | 6 +- .../languages/JavaInflectorServerCodegen.java | 2 +- .../languages/JavaMicronautClientCodegen.java | 2 +- .../languages/JavaPKMSTServerCodegen.java | 2 +- .../languages/JavaUndertowServerCodegen.java | 2 +- .../languages/JavaVertXServerCodegen.java | 2 +- .../JavascriptApolloClientCodegen.java | 10 +- .../languages/JavascriptClientCodegen.java | 10 +- ...JavascriptClosureAngularClientCodegen.java | 26 +-- .../JavascriptFlowtypedClientCodegen.java | 8 +- .../codegen/languages/K6ClientCodegen.java | 6 +- .../languages/KotlinSpringServerCodegen.java | 2 +- .../codegen/languages/KtormSchemaCodegen.java | 2 +- .../codegen/languages/LuaClientCodegen.java | 8 +- .../MarkdownDocumentationCodegen.java | 2 +- .../codegen/languages/MysqlSchemaCodegen.java | 54 +++---- .../codegen/languages/NimClientCodegen.java | 4 +- .../languages/NodeJSExpressServerCodegen.java | 2 +- .../codegen/languages/OCamlClientCodegen.java | 4 +- .../codegen/languages/ObjcClientCodegen.java | 8 +- .../codegen/languages/PerlClientCodegen.java | 2 +- .../languages/PhpSilexServerCodegen.java | 4 +- .../languages/PhpSymfonyServerCodegen.java | 16 +- .../languages/PowerShellClientCodegen.java | 46 +++--- .../languages/ProtobufSchemaCodegen.java | 4 +- .../languages/PythonClientCodegen.java | 22 +-- .../codegen/languages/RClientCodegen.java | 2 +- .../codegen/languages/RustClientCodegen.java | 4 +- .../codegen/languages/RustServerCodegen.java | 20 +-- .../languages/ScalaFinchServerCodegen.java | 8 +- .../languages/ScalaSttpClientCodegen.java | 2 +- .../languages/ScalatraServerCodegen.java | 4 +- .../codegen/languages/SpringCodegen.java | 2 +- .../languages/StaticHtml2Generator.java | 8 +- .../languages/StaticHtmlGenerator.java | 10 +- .../codegen/languages/Swift4Codegen.java | 4 +- .../languages/Swift5ClientCodegen.java | 8 +- .../TypeScriptAngularClientCodegen.java | 2 +- .../languages/TypeScriptClientCodegen.java | 14 +- .../TypeScriptFetchClientCodegen.java | 8 +- .../TypeScriptNestjsClientCodegen.java | 6 +- .../TypeScriptNodeClientCodegen.java | 2 +- .../templating/HandlebarsEngineAdapter.java | 6 +- .../templating/MustacheEngineAdapter.java | 4 +- .../codegen/utils/ModelUtils.java | 4 +- .../utils/OneOfImplementorAdditionalData.java | 5 +- .../codegen/utils/StringUtils.java | 6 +- .../codegen/DefaultCodegenTest.java | 2 +- .../org/openapitools/codegen/TestUtils.java | 8 +- .../codegen/csharp/CSharpModelTest.java | 2 +- .../codegen/csharp/CSharpOperationTest.java | 2 +- .../codegen/dart/DartClientCodegenTest.java | 3 +- .../dart/dio/DartDioClientCodegenTest.java | 3 +- .../dio/DartDioNextClientCodegenTest.java | 3 +- .../fsharp/FSharpServerCodegenTest.java | 1 - .../codegen/java/AbstractJavaCodegenTest.java | 2 +- .../codegen/java/JavaClientCodegenTest.java | 2 +- .../jaxrs/JavaJerseyServerCodegenTest.java | 4 +- .../micronaut/MicronautClientCodegenTest.java | 2 +- .../codegen/kotlin/KotlinTestUtils.java | 2 +- .../markdown/MarkdownSampleGeneratorTest.java | 4 +- .../codegen/ruby/RubyClientCodegenTest.java | 6 +- .../codegen/testutils/AssertFile.java | 4 +- .../codegen/utils/JsonCacheTest.java | 5 +- 115 files changed, 523 insertions(+), 531 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java index 6c552a97b806..64cd2fe921ee 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java @@ -45,7 +45,7 @@ public static CodegenConfig forName(String name) { try { return (CodegenConfig) Class.forName(name).getDeclaredConstructor().newInstance(); } catch (Exception e) { - throw new GeneratorNotFoundException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs.toString(), e); + throw new GeneratorNotFoundException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs, e); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index 0a44812ceac9..39e7f784cc94 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -45,9 +45,9 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public List children; // anyOf, oneOf, allOf - public Set anyOf = new TreeSet(); - public Set oneOf = new TreeSet(); - public Set allOf = new TreeSet(); + public Set anyOf = new TreeSet<>(); + public Set oneOf = new TreeSet<>(); + public Set allOf = new TreeSet<>(); // The schema name as written in the OpenAPI document. public String name; @@ -66,20 +66,20 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public boolean isAlias; // Is this effectively an alias of another simple type public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isShort, isUnboundedInteger, isBoolean; private boolean additionalPropertiesIsAnyType; - public List vars = new ArrayList(); // all properties (without parent's properties) - public List allVars = new ArrayList(); // all properties (with parent's properties) - public List requiredVars = new ArrayList(); // a list of required properties - public List optionalVars = new ArrayList(); // a list of optional properties - public List readOnlyVars = new ArrayList(); // a list of read-only properties - public List readWriteVars = new ArrayList(); // a list of properties for read, write - public List parentVars = new ArrayList(); + public List vars = new ArrayList<>(); // all properties (without parent's properties) + public List allVars = new ArrayList<>(); // all properties (with parent's properties) + public List requiredVars = new ArrayList<>(); // a list of required properties + public List optionalVars = new ArrayList<>(); // a list of optional properties + public List readOnlyVars = new ArrayList<>(); // a list of read-only properties + public List readWriteVars = new ArrayList<>(); // a list of properties for read, write + public List parentVars = new ArrayList<>(); public Map allowableValues; // Sorted sets of required parameters. - public Set mandatory = new TreeSet(); // without parent's required properties - public Set allMandatory = new TreeSet(); // with parent's required properties + public Set mandatory = new TreeSet<>(); // without parent's required properties + public Set allMandatory = new TreeSet<>(); // with parent's required properties - public Set imports = new TreeSet(); + public Set imports = new TreeSet<>(); public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasValidation; /** * Indicates the OAS schema specifies "nullable: true". @@ -104,7 +104,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public boolean hasOnlyReadOnly = true; // true if all properties are read-only public ExternalDocumentation externalDocumentation; - public Map vendorExtensions = new HashMap(); + public Map vendorExtensions = new HashMap<>(); private CodegenComposedSchemas composedSchemas; private boolean hasMultipleTypes = false; @@ -320,7 +320,7 @@ public CodegenDiscriminator getDiscriminator() { public void setDiscriminator(CodegenDiscriminator discriminator) { this.discriminator = discriminator; - if (discriminator instanceof CodegenDiscriminator && !discriminator.getMappedModels().isEmpty()) { + if (discriminator != null && !discriminator.getMappedModels().isEmpty()) { this.hasDiscriminatorWithNonEmptyMapping = true; } } @@ -1067,13 +1067,13 @@ public void removeAllDuplicatedProperty() { private List removeDuplicatedProperty(List vars) { // clone the list first - List newList = new ArrayList(); + List newList = new ArrayList<>(); for (CodegenProperty cp : vars) { newList.add(cp.clone()); } - Set propertyNames = new TreeSet(); - Set duplicatedNames = new TreeSet(); + Set propertyNames = new TreeSet<>(); + Set duplicatedNames = new TreeSet<>(); ListIterator iterator = newList.listIterator(); while (iterator.hasNext()) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index dc67303aa9bd..6e669ab37cde 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -147,8 +147,8 @@ public class DefaultCodegen implements CodegenConfig { protected Map typeMapping; protected Map instantiationTypes; protected Set reservedWords; - protected Set languageSpecificPrimitives = new HashSet(); - protected Map importMapping = new HashMap(); + protected Set languageSpecificPrimitives = new HashSet<>(); + protected Map importMapping = new HashMap<>(); protected String modelPackage = "", apiPackage = "", fileSuffix; protected String modelNamePrefix = "", modelNameSuffix = ""; protected String apiNamePrefix = "", apiNameSuffix = "Api"; @@ -159,25 +159,25 @@ public class DefaultCodegen implements CodegenConfig { apiTemplateFiles are for API outputs only (controllers/handlers). API templates may be written multiple times; APIs are grouped by tag and the file is written once per tag group. */ - protected Map apiTemplateFiles = new HashMap(); - protected Map modelTemplateFiles = new HashMap(); - protected Map apiTestTemplateFiles = new HashMap(); - protected Map modelTestTemplateFiles = new HashMap(); - protected Map apiDocTemplateFiles = new HashMap(); - protected Map modelDocTemplateFiles = new HashMap(); - protected Map reservedWordsMappings = new HashMap(); + protected Map apiTemplateFiles = new HashMap<>(); + protected Map modelTemplateFiles = new HashMap<>(); + protected Map apiTestTemplateFiles = new HashMap<>(); + protected Map modelTestTemplateFiles = new HashMap<>(); + protected Map apiDocTemplateFiles = new HashMap<>(); + protected Map modelDocTemplateFiles = new HashMap<>(); + protected Map reservedWordsMappings = new HashMap<>(); protected String templateDir; protected String embeddedTemplateDir; protected Map additionalProperties = new HashMap<>(); - protected Map serverVariables = new HashMap(); - protected Map vendorExtensions = new HashMap(); + protected Map serverVariables = new HashMap<>(); + protected Map vendorExtensions = new HashMap<>(); /* Supporting files are those which aren't models, APIs, or docs. These get a different map of data bound to the templates. Supporting files are written once. See also 'apiTemplateFiles'. */ - protected List supportingFiles = new ArrayList(); - protected List cliOptions = new ArrayList(); + protected List supportingFiles = new ArrayList<>(); + protected List cliOptions = new ArrayList<>(); protected boolean skipOverwrite; protected boolean removeOperationIdPrefix; protected String removeOperationIdPrefixDelimiter = "_"; @@ -210,7 +210,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). */ protected boolean supportsAdditionalPropertiesWithComposedSchema; protected boolean supportsMixins; - protected Map supportedLibraries = new LinkedHashMap(); + protected Map supportedLibraries = new LinkedHashMap<>(); protected String library; protected Boolean sortParamsByRequiredFlag = true; protected Boolean sortModelPropertiesByRequiredFlag = false; @@ -222,7 +222,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). // How to encode special characters like $ // They are translated to words like "Dollar" and prefixed with ' // Then translated back during JSON encoding and decoding - protected Map specialCharReplacements = new HashMap(); + protected Map specialCharReplacements = new HashMap<>(); // When a model is an alias for a simple type protected Map typeAliases = null; protected Boolean prependFormOrBodyParameters = false; @@ -236,7 +236,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). protected boolean useOneOfInterfaces = false; // whether or not the oneOf imports machinery should add oneOf interfaces as imports in implementing classes protected boolean addOneOfInterfaceImports = false; - protected List addOneOfInterfaces = new ArrayList(); + protected List addOneOfInterfaces = new ArrayList<>(); // flag to indicate whether to only update files whose contents have changed protected boolean enableMinimalUpdate = false; @@ -260,7 +260,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers). private Map modelNameToSchemaCache; // A cache to efficiently lookup schema `toModelName()` based on the schema Key - private Map schemaKeyToModelNameCache = new HashMap<>(); + private final Map schemaKeyToModelNameCache = new HashMap<>(); @Override public List cliOptions() { @@ -440,7 +440,7 @@ public Map postProcessAllModels(Map objs) { // Gather data from all the models that contain oneOf into OneOfImplementorAdditionalData classes // (see docstring of that class to find out what information is gathered and why) - Map additionalDataMap = new HashMap(); + Map additionalDataMap = new HashMap<>(); for (Map.Entry modelsEntry : objs.entrySet()) { Map modelsAttrs = (Map) modelsEntry.getValue(); List models = (List) modelsAttrs.get("models"); @@ -503,7 +503,7 @@ protected Map getModelNameToSchemaCache() { * @return map of all models indexed by names */ public Map getAllModels(Map objs) { - Map allModels = new HashMap(); + Map allModels = new HashMap<>(); for (Entry entry : objs.entrySet()) { String modelName = toModelName(entry.getKey()); Map inner = (Map) entry.getValue(); @@ -823,9 +823,9 @@ public void postProcessParameter(CodegenParameter parameter) { public void preprocessOpenAPI(OpenAPI openAPI) { if (useOneOfInterfaces) { // we process the openapi schema here to find oneOf schemas and create interface models for them - Map schemas = new HashMap(openAPI.getComponents().getSchemas()); + Map schemas = new HashMap<>(openAPI.getComponents().getSchemas()); if (schemas == null) { - schemas = new HashMap(); + schemas = new HashMap<>(); } Map pathItems = openAPI.getPaths(); @@ -858,12 +858,12 @@ public void preprocessOpenAPI(OpenAPI openAPI) { } // also add all properties of all schemas to be checked for oneOf - Map propertySchemas = new HashMap(); + Map propertySchemas = new HashMap<>(); for (Map.Entry e : schemas.entrySet()) { Schema s = e.getValue(); Map props = s.getProperties(); if (props == null) { - props = new HashMap(); + props = new HashMap<>(); } for (Map.Entry p : props.entrySet()) { propertySchemas.put(e.getKey() + "/" + p.getKey(), p.getValue()); @@ -1431,7 +1431,7 @@ public String toOperationId(String operationId) { public String toVarName(final String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); - } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) { + } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) { return escape(name, specialCharReplacements, null, null); } return name; @@ -1449,7 +1449,7 @@ public String toParamName(String 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); - } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) { + } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) { return escape(name, specialCharReplacements, null, null); } return name; @@ -1547,7 +1547,7 @@ public DefaultCodegen() { .generationMessage(String.format(Locale.ROOT, "OpenAPI Generator: %s (%s)", getName(), codegenType.toValue())) .build(); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList("double", "int", "long", @@ -1564,7 +1564,7 @@ public DefaultCodegen() { "Float") ); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("array", "List"); typeMapping.put("set", "Set"); typeMapping.put("map", "Map"); @@ -1591,9 +1591,9 @@ public DefaultCodegen() { typeMapping.put("URI", "URI"); typeMapping.put("AnyType", "oas_any_type_not_mapped"); - instantiationTypes = new HashMap(); + instantiationTypes = new HashMap<>(); - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString())); @@ -1748,7 +1748,7 @@ public String generateExamplePath(String path, Operation operation) { if (!param.getRequired()) { paramPart.append("]"); } - sb.append(paramPart.toString()); + sb.append(paramPart); } } } @@ -2382,14 +2382,14 @@ public int hashCode() { } } - Map schemaCodegenPropertyCache = new HashMap(); + Map schemaCodegenPropertyCache = new HashMap<>(); protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map allDefinitions) { final ComposedSchema composed = (ComposedSchema) schema; - Map properties = new LinkedHashMap(); - List required = new ArrayList(); - Map allProperties = new LinkedHashMap(); - List allRequired = new ArrayList(); + Map properties = new LinkedHashMap<>(); + List required = new ArrayList<>(); + Map allProperties = new LinkedHashMap<>(); + List allRequired = new ArrayList<>(); // if schema has properties outside of allOf/oneOf/anyOf also add them to m if (composed.getProperties() != null && !composed.getProperties().isEmpty()) { @@ -2407,7 +2407,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map(); + m.allVars = new ArrayList<>(); if (composed.getAllOf() != null) { int modelImplCnt = 0; // only one inline object allowed in a ComposedModel int modelDiscriminators = 0; // only one discriminator allowed in a ComposedModel @@ -2443,7 +2443,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map(); + m.interfaces = new ArrayList<>(); for (Schema interfaceSchema : interfaces) { interfaceSchema = unaliasSchema(interfaceSchema, importMapping); @@ -2521,7 +2521,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map(); + m.allParents = new ArrayList<>(); for (String pname : allParents) { String pModelName = toModelName(pname); m.allParents.add(pModelName); @@ -2673,7 +2673,7 @@ public CodegenModel fromModel(String name, Schema schema) { // TODO remove the anyType check here in the future ANyType models can have enums defined m.isEnum = true; // comment out below as allowableValues is not set in post processing model enum - m.allowableValues = new HashMap(); + m.allowableValues = new HashMap<>(); m.allowableValues.put("values", schema.getEnum()); } if (!ModelUtils.isArraySchema(schema)) { @@ -2742,7 +2742,7 @@ public CodegenModel fromModel(String name, Schema schema) { // set isDiscriminator on the discriminator property if (m.discriminator != null) { String discPropName = m.discriminator.getPropertyBaseName(); - List> listOLists = new ArrayList>(); + List> listOLists = new ArrayList<>(); listOLists.add(m.requiredVars); listOLists.add(m.vars); listOLists.add(m.allVars); @@ -3461,13 +3461,13 @@ public CodegenProperty fromProperty(String name, Schema p) { //Inline enum case: if (p.getEnum() != null && !p.getEnum().isEmpty()) { List _enum = p.getEnum(); - property._enum = new ArrayList(); + property._enum = new ArrayList<>(); for (Object i : _enum) { property._enum.add(String.valueOf(i)); } property.isEnum = true; - Map allowableValues = new HashMap(); + Map allowableValues = new HashMap<>(); allowableValues.put("values", _enum); if (allowableValues.size() > 0) { property.allowableValues = allowableValues; @@ -3480,7 +3480,7 @@ public CodegenProperty fromProperty(String name, Schema p) { if (referencedSchema.getEnum() != null && !referencedSchema.getEnum().isEmpty()) { List _enum = referencedSchema.getEnum(); - Map allowableValues = new HashMap(); + Map allowableValues = new HashMap<>(); allowableValues.put("values", _enum); if (allowableValues.size() > 0) { property.allowableValues = allowableValues; @@ -3783,7 +3783,7 @@ protected void handleMethodResponse(Operation operation, Map schemas, CodegenOperation op, ApiResponse methodResponse) { - handleMethodResponse(operation, schemas, op, methodResponse, Collections.emptyMap()); + handleMethodResponse(operation, schemas, op, methodResponse, Collections.emptyMap()); } /** @@ -3888,7 +3888,7 @@ public CodegenOperation fromOperation(String path, Map schemas = ModelUtils.getSchemas(this.openAPI); CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION); - Set imports = new HashSet(); + Set imports = new HashSet<>(); if (operation.getExtensions() != null && !operation.getExtensions().isEmpty()) { op.vendorExtensions.putAll(operation.getExtensions()); @@ -3986,15 +3986,15 @@ public CodegenOperation fromOperation(String path, } List parameters = operation.getParameters(); - List allParams = new ArrayList(); - List bodyParams = new ArrayList(); - List pathParams = new ArrayList(); - List queryParams = new ArrayList(); - List headerParams = new ArrayList(); - List cookieParams = new ArrayList(); - List formParams = new ArrayList(); - List requiredParams = new ArrayList(); - List optionalParams = new ArrayList(); + List allParams = new ArrayList<>(); + List bodyParams = new ArrayList<>(); + List pathParams = new ArrayList<>(); + List queryParams = new ArrayList<>(); + List headerParams = new ArrayList<>(); + List cookieParams = new ArrayList<>(); + List formParams = new ArrayList<>(); + List requiredParams = new ArrayList<>(); + List optionalParams = new ArrayList<>(); CodegenParameter bodyParam = null; RequestBody requestBody = operation.getRequestBody(); @@ -4039,7 +4039,7 @@ public CodegenOperation fromOperation(String path, // add example if (schemas != null) { - op.requestBodyExamples = new ExampleGenerator(schemas, this.openAPI).generate(null, new ArrayList(getConsumesInfo(this.openAPI, operation)), bodyParam.baseType); + op.requestBodyExamples = new ExampleGenerator(schemas, this.openAPI).generate(null, new ArrayList<>(getConsumesInfo(this.openAPI, operation)), bodyParam.baseType); } } } @@ -4531,7 +4531,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) return codegenParameter; } - parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); + parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); if (parameterSchema == null) { LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); @@ -4755,7 +4755,7 @@ public List fromSecurity(Map securitySc return Collections.emptyList(); } - List codegenSecurities = new ArrayList(securitySchemeMap.size()); + List codegenSecurities = new ArrayList<>(securitySchemeMap.size()); for (String key : securitySchemeMap.keySet()) { final SecurityScheme securityScheme = securitySchemeMap.get(key); if (SecurityScheme.Type.APIKEY.equals(securityScheme.getType())) { @@ -4855,7 +4855,7 @@ private CodegenSecurity defaultOauthCodegenSecurity(String key, SecurityScheme s } protected void setReservedWordsLowerCase(List words) { - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); for (String word : words) { reservedWords.add(word.toLowerCase(Locale.ROOT)); } @@ -4918,9 +4918,9 @@ protected List> toExamples(Map examples) { return null; } - final List> output = new ArrayList>(examples.size()); + final List> output = new ArrayList<>(examples.size()); for (Map.Entry entry : examples.entrySet()) { - final Map kv = new HashMap(); + final Map kv = new HashMap<>(); kv.put("contentType", entry.getKey()); kv.put("example", entry.getValue()); output.add(kv); @@ -4976,7 +4976,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera co, Map> operations) { List opList = operations.get(tag); if (opList == null) { - opList = new ArrayList(); + opList = new ArrayList<>(); operations.put(tag, opList); } // check for operationId uniqueness @@ -5084,8 +5084,8 @@ protected void addVars(CodegenModel m, Map properties, List mandatory = required == null ? Collections.emptySet() - : new TreeSet(required); + Set mandatory = required == null ? Collections.emptySet() + : new TreeSet<>(required); // update "vars" without parent's properties (all, required) addVars(m, m.vars, properties, mandatory); @@ -5097,8 +5097,8 @@ protected void addVars(CodegenModel m, Map properties, List allMandatory = allRequired == null ? Collections.emptySet() - : new TreeSet(allRequired); + Set allMandatory = allRequired == null ? Collections.emptySet() + : new TreeSet<>(allRequired); // update "vars" with parent's properties (all, required) addVars(m, m.allVars, allProperties, allMandatory); m.allMandatory = allMandatory; @@ -5108,14 +5108,14 @@ protected void addVars(CodegenModel m, Map properties, List renamedMandatory = new ConcurrentSkipListSet(); + Set renamedMandatory = new ConcurrentSkipListSet<>(); Iterator mandatoryIterator = m.mandatory.iterator(); while (mandatoryIterator.hasNext()) { renamedMandatory.add(toVarName(mandatoryIterator.next())); } m.mandatory = renamedMandatory; - Set renamedAllMandatory = new ConcurrentSkipListSet(); + Set renamedAllMandatory = new ConcurrentSkipListSet<>(); Iterator allMandatoryIterator = m.allMandatory.iterator(); while (allMandatoryIterator.hasNext()) { renamedAllMandatory.add(toVarName(allMandatoryIterator.next())); @@ -5568,7 +5568,7 @@ public TemplatingEngineAdapter getTemplatingEngine() { * @return sanitized string */ public String sanitizeName(String name, String removeCharRegEx) { - return sanitizeName(name, removeCharRegEx, new ArrayList()); + return sanitizeName(name, removeCharRegEx, new ArrayList<>()); } /** @@ -5827,7 +5827,7 @@ protected List> buildEnumVars(List values, String da enumName = String.valueOf(value); } else { enumName = value.toString().substring(truncateIdx); - if ("".equals(enumName)) { + if (enumName.isEmpty()) { enumName = value.toString(); } } @@ -6057,7 +6057,7 @@ public static Set getProducesInfo(final OpenAPI openAPI, final Operation return null; } - Set produces = new ConcurrentSkipListSet(); + Set produces = new ConcurrentSkipListSet<>(); for (ApiResponse r : operation.getResponses().values()) { ApiResponse response = ModelUtils.getReferencedApiResponse(openAPI, r); @@ -6108,7 +6108,7 @@ public List fromRequestBodyToFormParameters(RequestBody body, LOGGER.debug("debugging fromRequestBodyToFormParameters= {}", body); Schema schema = ModelUtils.getSchemaFromRequestBody(body); schema = ModelUtils.getReferencedSchema(this.openAPI, schema); - List allRequired = new ArrayList(); + List allRequired = new ArrayList<>(); Map properties = new LinkedHashMap<>(); // this traverses a composed schema and extracts all properties in each schema into properties // TODO in the future have this return one codegenParameter of type object or composed which includes all definition @@ -6289,7 +6289,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set codegenParameter.datatypeWithEnum = codegenProperty.datatypeWithEnum; codegenParameter.enumName = codegenProperty.enumName; } - + // import if (codegenProperty.complexType != null) { imports.add(codegenProperty.complexType); @@ -6953,7 +6953,7 @@ public void addOneOfInterfaceModel(ComposedSchema cs, String type, OpenAPI openA cm.name = type; cm.classname = type; cm.vendorExtensions.put("x-is-one-of-interface", true); - cm.interfaceModels = new ArrayList(); + cm.interfaceModels = new ArrayList<>(); addOneOfInterfaces.add(cm); } @@ -7171,7 +7171,7 @@ private List getComposedProperties(List xOfCollection, List xOf = new ArrayList<>(); int i = 0; for (Schema xOfSchema: xOfCollection) { - CodegenProperty cp = fromProperty(collectionName + "_" + String.valueOf(i), xOfSchema); + CodegenProperty cp = fromProperty(collectionName + "_" + i, xOfSchema); xOf.add(cp); i += 1; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java index 2d8e65ba993d..f8b7371c10ce 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/SpecValidationException.java @@ -129,6 +129,6 @@ public String getMessage() { }); return super.getMessage() + " | " + - "Error count: " + errorCount + ", Warning count: " + warningCount + sb.toString(); + "Error count: " + errorCount + ", Warning count: " + warningCount + sb; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java index 072bb4037ef0..691096b39f66 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java @@ -103,7 +103,7 @@ public static String getCPResourcePath(final String name) { * @param name The location of the template * @return The raw template contents */ - @SuppressWarnings({"java:S112"}) + @SuppressWarnings("java:S112") // ignored rule java:S112 as RuntimeException is used to match previous exception type public String readTemplate(String name) { if (name == null || name.contains("..")) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplatingEngineLoader.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplatingEngineLoader.java index eaacdb26a8ff..ea471a5a5da3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplatingEngineLoader.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplatingEngineLoader.java @@ -26,7 +26,7 @@ private TemplatingEngineLoader() { throw new IllegalStateException("Utility class"); } - @SuppressWarnings({"java:S112"}) // ignore java:S112 as generic RuntimeException is acceptable here + @SuppressWarnings("java:S112") // ignore java:S112 as generic RuntimeException is acceptable here public static TemplatingEngineAdapter byIdentifier(String id) { ServiceLoader loader = ServiceLoader.load(TemplatingEngineAdapter.class, TemplatingEngineLoader.class.getClassLoader()); @@ -42,7 +42,7 @@ public static TemplatingEngineAdapter byIdentifier(String id) { // Attempt to load skipping SPI return (TemplatingEngineAdapter) Class.forName(id).getDeclaredConstructor().newInstance(); } catch (Exception e) { - throw new RuntimeException(String.format(Locale.ROOT, "Couldn't load template engine adapter %s. Available options: %n%s", id, sb.toString()), e); + throw new RuntimeException(String.format(Locale.ROOT, "Couldn't load template engine adapter %s. Available options: %n%s", id, sb), e); } } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java index 01302ab1dcd1..a2a88860f5b9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java @@ -535,9 +535,7 @@ public Context toContext() { Set warnings = new HashSet<>(); if (specification != null) { List unusedModels = ModelUtils.getUnusedSchemas(specification); - if (unusedModels != null) { - unusedModels.forEach(name -> warnings.add("Unused model: " + name)); - } + unusedModels.forEach(name -> warnings.add("Unused model: " + name)); } if (workflowSettings.isValidateSpec()) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java index fc1f7aa77c2c..8b7f64b72565 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java @@ -165,7 +165,7 @@ public List> generate(Map examples, ListemptySet()); + String example = new XmlExampleGenerator(this.examples).toXml(schema, 0, Collections.emptySet()); if (example != null) { kv.put(EXAMPLE, example); output.add(kv); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java index 91d5a0120a48..bee395a1d6ad 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java @@ -44,7 +44,7 @@ public XmlExampleGenerator(Map examples) { } public String toXml(Schema schema) { - return toXml(null, schema, 0, Collections.emptySet()); + return toXml(null, schema, 0, Collections.emptySet()); } protected String toXml(Schema schema, int indent, Collection path) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/RootedFileRule.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/RootedFileRule.java index 91b4499b1af7..9ac1d3825a1c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/RootedFileRule.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/RootedFileRule.java @@ -41,7 +41,7 @@ private String getFilenamePart(final String input, int stopIndex){ } private String getExtensionPart(final String input, int stopIndex) { - return input.substring(stopIndex > 0 ? stopIndex+1: input.length(), input.length()); + return input.substring(stopIndex > 0 ? stopIndex+1: input.length()); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java index 7ef64adcd715..9670576e7dba 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java @@ -50,7 +50,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg protected List> orderedModels; protected final Map> modelDepends; protected final Map nullableTypeMapping; - protected final HashMap operationsScopes; + protected final Map operationsScopes; protected int scopeIndex = 0; public AbstractAdaCodegen() { @@ -155,7 +155,7 @@ public AbstractAdaCodegen() { "xor") ); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("date", "Swagger.Date"); typeMapping.put("DateTime", "Swagger.Datetime"); typeMapping.put("string", "Swagger.UString"); @@ -172,7 +172,7 @@ public AbstractAdaCodegen() { typeMapping.put("binary", "Swagger.Binary"); // Mapping to convert an Ada required type to an optional type (nullable). - nullableTypeMapping = new HashMap(); + nullableTypeMapping = new HashMap<>(); nullableTypeMapping.put("Swagger.Date", "Swagger.Nullable_Date"); nullableTypeMapping.put("Swagger.Datetime", "Swagger.Nullable_Date"); nullableTypeMapping.put("Swagger.UString", "Swagger.Nullable_UString"); @@ -181,10 +181,10 @@ public AbstractAdaCodegen() { nullableTypeMapping.put("Boolean", "Swagger.Nullable_Boolean"); nullableTypeMapping.put("Swagger.Object", "Swagger.Object"); - modelDepends = new HashMap>(); - orderedModels = new ArrayList>(); - operationsScopes = new HashMap(); - super.importMapping = new HashMap(); + modelDepends = new HashMap<>(); + orderedModels = new ArrayList<>(); + operationsScopes = new HashMap<>(); + super.importMapping = new HashMap<>(); // CLI options addOption(CodegenConstants.PROJECT_NAME, "GNAT project name", @@ -193,7 +193,7 @@ public AbstractAdaCodegen() { modelNameSuffix = "Type"; embeddedTemplateDir = templateDir = "Ada"; - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("integer", "boolean", "number", "long", "float", "double", "object", "string", "date", "DateTime", "binary")); } @@ -651,7 +651,7 @@ public Map postProcessModels(Map objs) { Object v = model.get("model"); if (v instanceof CodegenModel) { CodegenModel m = (CodegenModel) v; - List d = new ArrayList(); + List d = new ArrayList<>(); for (CodegenProperty p : m.vars) { boolean isModel = false; CodegenProperty item = p; @@ -687,8 +687,8 @@ public Map postProcessModels(Map objs) { // if I find a model that has no dependencies, or all of its dependencies are in revisedOrderedModels, consider it the independentModel // put the independentModel at the end of revisedOrderedModels, and remove it from orderedModels // - List> revisedOrderedModels = new ArrayList>(); - List collectedModelNames = new ArrayList(); + List> revisedOrderedModels = new ArrayList<>(); + List collectedModelNames = new ArrayList<>(); int sizeOrderedModels = orderedModels.size(); for (int i = 0; i < sizeOrderedModels; i++) { Map independentModel = null; @@ -760,7 +760,7 @@ public Map postProcessSupportingFileData(Map obj * @return the authMethods to be used by the operation with its required scopes. */ private List postProcessAuthMethod(List authMethods, Map> scopes) { - List result = (scopes == null) ? null : new ArrayList(); + List result = (scopes == null) ? null : new ArrayList<>(); if (authMethods != null) { for (CodegenSecurity authMethod : authMethods) { if (authMethod.scopes != null) { @@ -803,7 +803,7 @@ private List postProcessAuthMethod(List authMe opSecurity.isKeyInQuery = authMethod.isKeyInQuery; opSecurity.flow = authMethod.flow; opSecurity.tokenUrl = authMethod.tokenUrl; - List> opAuthScopes = new ArrayList>(); + List> opAuthScopes = new ArrayList<>(); for (String opScopeName : opScopes) { for (Map scope : authMethod.scopes) { String name = (String) scope.get("scope"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 086d63af29b6..a42ee2dadabd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -81,9 +81,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co protected boolean supportNullable = Boolean.FALSE; // nullable type - protected Set nullableType = new HashSet(); + protected Set nullableType = new HashSet<>(); - protected Set valueTypes = new HashSet(); + protected Set valueTypes = new HashSet<>(); private final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class); @@ -104,14 +104,14 @@ public AbstractCSharpCodegen() { outputFolder = "generated-code" + File.separator + this.getName(); embeddedTemplateDir = templateDir = this.getName(); - collectionTypes = new HashSet( + collectionTypes = new HashSet<>( Arrays.asList( "IList", "List", "ICollection", "Collection", "IEnumerable") ); - mapTypes = new HashSet( + mapTypes = new HashSet<>( Arrays.asList("IDictionary") ); @@ -141,7 +141,7 @@ public AbstractCSharpCodegen() { ); // TODO: Either include fully qualified names here or handle in DefaultCodegen via lastIndexOf(".") search - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "String", "string", @@ -184,7 +184,7 @@ public AbstractCSharpCodegen() { // Nullable types here assume C# 2 support is not part of base - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("string", "string"); typeMapping.put("binary", "byte[]"); typeMapping.put("ByteArray", "byte[]"); @@ -207,11 +207,11 @@ public AbstractCSharpCodegen() { typeMapping.put("AnyType", "Object"); // nullable type - nullableType = new HashSet( + nullableType = new HashSet<>( Arrays.asList("decimal", "bool", "int", "float", "long", "double", "DateTime", "DateTimeOffset", "Guid") ); // value Types - valueTypes = new HashSet( + valueTypes = new HashSet<>( Arrays.asList("decimal", "bool", "int", "float", "long", "double") ); } @@ -463,9 +463,9 @@ protected List> buildEnumVars(List values, String da * * @param models processed models to be further processed for enum references */ - @SuppressWarnings({"unchecked"}) + @SuppressWarnings("unchecked") private void postProcessEnumRefs(final Map models) { - Map enumRefs = new HashMap(); + Map enumRefs = new HashMap<>(); for (Map.Entry entry : models.entrySet()) { CodegenModel model = ModelUtils.getModelByName(entry.getKey(), models); if (model.isEnum) { @@ -1325,7 +1325,7 @@ public void postProcessFile(File file, String fileType) { // only process files with .cs extension if ("cs".equals(FilenameUtils.getExtension(file.toString()))) { - String command = csharpPostProcessFile + " " + file.toString(); + String command = csharpPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index a6950c776fe7..982980afbc84 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -323,7 +323,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with cpp extension if ("cpp".equals(FilenameUtils.getExtension(file.toString())) || "h".equals(FilenameUtils.getExtension(file.toString()))) { - String command = cppPostProcessFile + " " + file.toString(); + String command = cppPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java index f2d2bc289a6e..86af0181b3da 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java @@ -340,7 +340,7 @@ public String toVarName(String name) { // replace all characters that have a mapping but ignore underscores // append an underscore to each replacement so that it can be camelized - if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) { + if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) { name = escape(name, specialCharReplacements, Collections.singletonList("_"), "_"); } // remove the rest @@ -752,7 +752,7 @@ public void postProcessFile(File file, String fileType) { // process all files with dart extension if ("dart".equals(FilenameUtils.getExtension(file.toString()))) { // currently supported is "dartfmt -w" and "dart format" - String command = dartPostProcessFile + " " + file.toString(); + String command = dartPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java index e11579a27131..85cc06c3c6db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java @@ -53,9 +53,9 @@ public AbstractEiffelCodegen() { "redefine", "rename", "require", "rescue", "Result", "retry", "select", "separate", "then", "True", "TUPLE", "undefine", "until", "variant", "Void", "when", "xor")); - defaultIncludes = new HashSet(Arrays.asList("map", "array")); + defaultIncludes = new HashSet<>(Arrays.asList("map", "array")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("BOOLEAN", "INTEGER_8", "INTEGER_16", "INTEGER_32", "INTEGER_64", "NATURAL_8", "NATURAL_16", "NATURAL_32", "NATURAL_64", "REAL_32", "REAL_64")); @@ -559,7 +559,7 @@ public String escapeUnsafeCharacters(String input) { } public Map createMapping(String key, String value) { - Map customImport = new HashMap(); + Map customImport = new HashMap<>(); customImport.put(key, value); return customImport; @@ -592,7 +592,7 @@ public String unCamelize(String name) { public String toEiffelFeatureStyle(String operationId) { if (operationId.startsWith("get_")) { - return operationId.substring(4, operationId.length()); + return operationId.substring(4); } else { return operationId; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java index 527481ecbdb1..e2e9d96dc9f9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java @@ -73,7 +73,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co // true if nullable types will be supported (as option) protected boolean supportNullable = Boolean.TRUE; - protected Set nullableType = new HashSet(); + protected Set nullableType = new HashSet<>(); private final Logger LOGGER = LoggerFactory.getLogger(AbstractFSharpCodegen.class); @@ -89,9 +89,9 @@ public AbstractFSharpCodegen() { outputFolder = this.getName(); embeddedTemplateDir = templateDir = this.getName(); - collectionTypes = new HashSet(Arrays.asList("list", "seq")); + collectionTypes = new HashSet<>(Arrays.asList("list", "seq")); - mapTypes = new HashSet( + mapTypes = new HashSet<>( Arrays.asList("IDictionary") ); @@ -114,7 +114,7 @@ public AbstractFSharpCodegen() { ); // TODO - these are based on C# generator, do we need to add any more? - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "String", "string", @@ -156,7 +156,7 @@ public AbstractFSharpCodegen() { instantiationTypes.put("map", "IDictionary"); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("string", "string"); typeMapping.put("binary", "byte[]"); typeMapping.put("ByteArray", "byte[]"); @@ -177,7 +177,7 @@ public AbstractFSharpCodegen() { typeMapping.put("URI", "string"); // nullable type - nullableType = new HashSet( + nullableType = new HashSet<>( Arrays.asList("decimal", "bool", "int", "float", "long", "double", "string", "Guid", "apiKey") ); } @@ -349,12 +349,12 @@ public Map postProcessAllModels(Map objs) { * Output of CodeGen models must therefore be in dependency order (rather than alphabetical order, which seems to be the default). * This could probably be made more efficient if absolutely needed. */ - @SuppressWarnings({"unchecked"}) + @SuppressWarnings("unchecked") public Map postProcessDependencyOrders(final Map objs) { - Map> dependencies = new HashMap>(); + Map> dependencies = new HashMap<>(); - List classNames = new ArrayList(); + List classNames = new ArrayList<>(); for (String k : objs.keySet()) { CodegenModel model = ModelUtils.getModelByName(k, objs); @@ -381,7 +381,7 @@ public Map postProcessDependencyOrders(final Map } } - Map sorted = new LinkedHashMap(); + Map sorted = new LinkedHashMap<>(); for (int i = sortedKeys.length - 1; i >= 0; i--) { Object k = sortedKeys[i]; sorted.put(k.toString(), objs.get(k)); @@ -400,9 +400,9 @@ public Map postProcessDependencyOrders(final Map * * @param models processed models to be further processed for enum references */ - @SuppressWarnings({"unchecked"}) + @SuppressWarnings("unchecked") private void postProcessEnumRefs(final Map models) { - Map enumRefs = new HashMap(); + Map enumRefs = new HashMap<>(); for (Map.Entry entry : models.entrySet()) { CodegenModel model = ModelUtils.getModelByName(entry.getKey(), models); if (model.isEnum) { @@ -455,10 +455,9 @@ private void postProcessEnumRefs(final Map models) { // Since we iterate enumVars for modelInnerEnum and enumClass templates, and CodegenModel is missing some of CodegenProperty's properties, // we can take advantage of Mustache's contextual lookup to add the same "properties" to the model's enumVars scope rather than CodegenProperty's scope. List> enumVars = (ArrayList>) model.allowableValues.get("enumVars"); - List> newEnumVars = new ArrayList>(); + List> newEnumVars = new ArrayList<>(); for (Map enumVar : enumVars) { - Map mixedVars = new HashMap(); - mixedVars.putAll(enumVar); + Map mixedVars = new HashMap<>(enumVar); mixedVars.put("isString", isString); mixedVars.put("isLong", isLong); @@ -473,7 +472,7 @@ private void postProcessEnumRefs(final Map models) { } } } else { - LOGGER.warn("Expected to retrieve model %s by name, but no model was found. Check your -Dmodels inclusions.", openAPIName); + LOGGER.warn("Expected to retrieve model {} by name, but no model was found. Check your -Dmodels inclusions.", openAPIName); } } } @@ -1115,7 +1114,7 @@ public void postProcessFile(File file, String fileType) { // only process files with .fs extension if ("fs".equals(FilenameUtils.getExtension(file.toString()))) { - String command = fsharpPostProcessFile + " " + file.toString(); + String command = fsharpPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java index 3c3f002b1876..803fc6ace34b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java @@ -56,7 +56,7 @@ public AbstractGoCodegen() { supportsInheritance = true; hideGenerationTimestamp = Boolean.FALSE; - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") @@ -77,7 +77,7 @@ public AbstractGoCodegen() { // Added "error" as it's used so frequently that it may as well be a keyword ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "string", "bool", @@ -133,14 +133,14 @@ public AbstractGoCodegen() { typeMapping.put("object", "map[string]interface{}"); typeMapping.put("AnyType", "interface{}"); - numberTypes = new HashSet( + numberTypes = new HashSet<>( Arrays.asList( "uint", "uint8", "uint16", "uint32", "uint64", "int", "int8", "int16", "int32", "int64", "float32", "float64") ); - importMapping = new HashMap(); + importMapping = new HashMap<>(); cliOptions.clear(); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).") @@ -252,7 +252,7 @@ protected boolean isReservedFilename(String name) { String[] parts = name.split("_"); String suffix = parts[parts.length - 1]; - Set reservedSuffixes = new HashSet(Arrays.asList( + Set reservedSuffixes = new HashSet<>(Arrays.asList( // Test "test", // $GOOS @@ -699,7 +699,7 @@ public String escapeUnsafeCharacters(String input) { } public Map createMapping(String key, String value) { - Map customImport = new HashMap(); + Map customImport = new HashMap<>(); customImport.put(key, value); return customImport; @@ -813,7 +813,7 @@ public void postProcessFile(File file, String fileType) { } // only process the following type (or we can simply rely on the file extension to check if it's a Go file) - Set supportedFileType = new HashSet( + Set supportedFileType = new HashSet<>( Arrays.asList( "supporting-mustache", "model-test", @@ -828,7 +828,7 @@ public void postProcessFile(File file, String fileType) { if ("go".equals(FilenameUtils.getExtension(file.toString()))) { // e.g. "gofmt -w yourcode.go" // e.g. "go fmt path/to/your/package" - String command = goPostProcessFile + " " + file.toString(); + String command = goPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java index 0742a6b44590..bc9914a2b00f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java @@ -55,13 +55,13 @@ public AbstractGraphQLCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "null", "ID", @@ -344,7 +344,7 @@ public String escapeUnsafeCharacters(String input) { } public Map createMapping(String key, String value) { - Map customImport = new HashMap(); + Map customImport = new HashMap<>(); customImport.put(key, value); return customImport; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 77cd594f7fb8..5c9f8c0a6f5f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -18,6 +18,7 @@ package org.openapitools.codegen.languages; import com.google.common.base.Strings; +import com.google.common.collect.Sets; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; @@ -164,9 +165,7 @@ public AbstractJavaCodegen() { "native", "super", "while", "null") ); - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", + languageSpecificPrimitives = Sets.newHashSet("String", "boolean", "Boolean", "Double", @@ -174,7 +173,7 @@ public AbstractJavaCodegen() { "Long", "Float", "Object", - "byte[]") + "byte[]" ); instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("set", "LinkedHashSet"); @@ -713,7 +712,7 @@ public String toVarName(String name) { } // If name contains special chars -> replace them. - if ((((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character))))) { + if ((((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character))))) { List allowedCharacters = new ArrayList<>(); allowedCharacters.add("_"); allowedCharacters.add("$"); @@ -996,7 +995,7 @@ public void setParameterExampleValue(CodegenParameter codegenParameter, Paramete */ @Override public void setParameterExampleValue(CodegenParameter codegenParameter, RequestBody requestBody) { - Boolean isModel = (codegenParameter.isModel || (codegenParameter.isContainer && codegenParameter.getItems().isModel)); + boolean isModel = (codegenParameter.isModel || (codegenParameter.isContainer && codegenParameter.getItems().isModel)); Content content = requestBody.getContent(); @@ -1260,7 +1259,7 @@ public Map postProcessModels(Map objs) { // if the import package happens to be found in the importMapping (key) // add the corresponding import package to the list if (importMapping.containsKey(_import)) { - Map newImportMap = new HashMap(); + Map newImportMap = new HashMap<>(); newImportMap.put("import", importMapping.get(_import)); listIterator.add(newImportMap); } @@ -1285,7 +1284,7 @@ public Map postProcessOperationsWithModels(Map o Map operations = (Map) objs.get("operations"); List operationList = (List) operations.get("operation"); for (CodegenOperation op : operationList) { - Collection operationImports = new ConcurrentSkipListSet(); + Collection operationImports = new ConcurrentSkipListSet<>(); for (CodegenParameter p : op.allParams) { if (importMapping.containsKey(p.dataType)) { operationImports.add(importMapping.get(p.dataType)); @@ -1314,7 +1313,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { if (hasBodyParameter(openAPI, operation) || hasFormParameter(openAPI, operation)) { String defaultContentType = hasFormParameter(openAPI, operation) ? "application/x-www-form-urlencoded" : "application/json"; List consumes = new ArrayList<>(getConsumesInfo(openAPI, operation)); - String contentType = consumes == null || consumes.isEmpty() ? defaultContentType : consumes.get(0); + String contentType = consumes.isEmpty() ? defaultContentType : consumes.get(0); operation.addExtension("x-contentType", contentType); } String accepts = getAccept(openAPI, operation); @@ -1865,7 +1864,7 @@ public void postProcessFile(File file, String fileType) { // only process files with java extension if ("java".equals(FilenameUtils.getExtension(file.toString()))) { - String command = javaPostProcessFile + " " + file.toString(); + String command = javaPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index d930e0b33e68..0cb56e084e11 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -66,7 +66,7 @@ public AbstractJavaJAXRSServerCodegen() { updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); updateOption(CodegenConstants.API_PACKAGE, apiPackage); updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); - updateOption(this.DATE_LIBRARY, this.getDateLibrary()); + updateOption(DATE_LIBRARY, this.getDateLibrary()); additionalProperties.put("title", title); // java inflector uses the jackson lib diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index e6f68a871a87..e0fb899e2f35 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -78,7 +78,7 @@ public AbstractKotlinCodegen() { supportsInheritance = true; setSortModelPropertiesByRequiredFlag(true); - languageSpecificPrimitives = new HashSet(Arrays.asList( + languageSpecificPrimitives = new HashSet<>(Arrays.asList( "kotlin.Byte", "kotlin.ByteArray", "kotlin.Short", @@ -97,7 +97,7 @@ public AbstractKotlinCodegen() { // this includes hard reserved words defined by https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java // as well as keywords from https://kotlinlang.org/docs/reference/keyword-reference.html - reservedWords = new HashSet(Arrays.asList( + reservedWords = new HashSet<>(Arrays.asList( "abstract", "actual", "annotation", @@ -171,7 +171,7 @@ public AbstractKotlinCodegen() { "while" )); - defaultIncludes = new HashSet(Arrays.asList( + defaultIncludes = new HashSet<>(Arrays.asList( "kotlin.Byte", "kotlin.ByteArray", "kotlin.Short", @@ -187,7 +187,7 @@ public AbstractKotlinCodegen() { "kotlin.collections.Map" )); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("string", "kotlin.String"); typeMapping.put("boolean", "kotlin.Boolean"); typeMapping.put("integer", "kotlin.Int"); @@ -214,7 +214,7 @@ public AbstractKotlinCodegen() { instantiationTypes.put("list", "kotlin.collections.ArrayList"); instantiationTypes.put("map", "kotlin.collections.HashMap"); - importMapping = new HashMap(); + importMapping = new HashMap<>(); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); importMapping.put("URI", "java.net.URI"); @@ -896,7 +896,7 @@ protected String toVariableName(String name) { } // If name contains special chars -> replace them. - if ((name.chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character))))) { + if ((name.chars().anyMatch(character -> specialCharReplacements.keySet().contains(String.valueOf((char) character))))) { List allowedCharacters = new ArrayList<>(); allowedCharacters.add("_"); allowedCharacters.add("$"); @@ -941,7 +941,7 @@ public void postProcessFile(File file, String fileType) { // only process files with kt extension if ("kt".equals(FilenameUtils.getExtension(file.toString()))) { - String command = kotlinPostProcessFile + " " + file.toString(); + String command = kotlinPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index db208bb9829d..db9c3e42029d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -79,7 +79,7 @@ public AbstractPhpCodegen() { ); // ref: http://php.net/manual/en/language.types.intro.php - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "boolean", @@ -107,7 +107,7 @@ public AbstractPhpCodegen() { additionalProperties.put("primitives", primitives); // ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("integer", "int"); typeMapping.put("long", "int"); typeMapping.put("number", "float"); @@ -769,7 +769,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with php extension if ("php".equals(FilenameUtils.getExtension(file.toString()))) { - String command = phpPostProcessFile + " " + file.toString(); + String command = phpPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java index 00caff0f8cc6..f07cef7e4dec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java @@ -270,7 +270,7 @@ public void postProcessFile(File file, String fileType) { // only process files with py extension if ("py".equals(FilenameUtils.getExtension(file.toString()))) { - String command = pythonPostProcessFile + " " + file.toString(); + String command = pythonPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java index 263512fb0cd3..67fe9bc6d93f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java @@ -238,7 +238,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with rb extension if ("rb".equals(FilenameUtils.getExtension(file.toString()))) { - String command = rubyPostProcessFile + " " + file.toString(); + String command = rubyPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); @@ -250,7 +250,7 @@ public void postProcessFile(File file, String fileType) { while ((line = br.readLine()) != null) { sb.append(line); } - LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString()); + LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb); } } else { LOGGER.info("Successfully executed: `{}`", command); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java index ea8b73be824a..c3132a06f42a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java @@ -529,7 +529,7 @@ public void postProcessFile(File file, String fileType) { // only process files with scala extension if ("scala".equals(FilenameUtils.getExtension(file.toString()))) { - String command = scalaPostProcessFile + " " + file.toString(); + String command = scalaPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 1059732e84e7..647ecda7a043 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -181,7 +181,7 @@ public AbstractTypeScriptClientCodegen() { " Required to generate a full package")); this.cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package. If not provided, using the version from the OpenAPI specification file.").defaultValue(this.getNpmVersion())); this.cliOptions.add(CliOption.newBoolean(SNAPSHOT, - "When setting this property to true, the version will be suffixed with -SNAPSHOT." + this.SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), + "When setting this property to true, the version will be suffixed with -SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), false)); this.cliOptions.add(new CliOption(NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_DESC).defaultValue(String.valueOf(this.getNullSafeAdditionalProps()))); } @@ -896,7 +896,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with ts extension if ("ts".equals(FilenameUtils.getExtension(file.toString()))) { - String command = tsPostProcessFile + " " + file.toString(); + String command = tsPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index d1c6fb6a3e84..b0bbe14c92ec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -117,7 +117,7 @@ public AndroidClientCodegen() { "native", "super", "while", "null") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "String", "boolean", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index e5ad82eb1b01..4c56b3c0eefb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -49,7 +49,7 @@ public class ApexClientCodegen extends AbstractApexCodegen { private String namedCredential; private String srcPath = "force-app/main/default/"; private String sfdxConfigPath = "config/"; - private HashMap primitiveDefaults = new HashMap(); + private HashMap primitiveDefaults = new HashMap<>(); public ApexClientCodegen() { super(); @@ -113,7 +113,7 @@ public ApexClientCodegen() { "virtual", "void", "webservice", "when", "where", "while" )); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("Blob", "Boolean", "Date", "Datetime", "Decimal", "Double", "ID", "Integer", "Long", "Object", "String", "Time" )); @@ -233,7 +233,7 @@ public String toDefaultValue(Schema p) { out = String.valueOf(p.getDefault()); } else if (ModelUtils.isLongSchema(p)) { Long def = (Long) p.getDefault(); - out = def == null ? out : def.toString() + "L"; + out = def == null ? out : def + "L"; } else if (ModelUtils.isMapSchema(p)) { Schema inner = getAdditionalProperties(p); String s = inner == null ? "Object" : getTypeDeclaration(inner); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java index fa66f2a33a2f..af1e53ab7abb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java @@ -89,10 +89,10 @@ public void execute(final Template.Fragment frag, final Writer out) throws IOExc String includeStatement = "include::{" + attributePathReference + "}" + escapeCurlyBrackets(relativeFileName) + "[opts=optional]"; if (Files.isRegularFile(filePathToInclude)) { - LOGGER.debug("including {}. file into markup from: {}", ++includeCount, filePathToInclude.toString()); + LOGGER.debug("including {}. file into markup from: {}", ++includeCount, filePathToInclude); out.write("\n" + includeStatement + "\n"); } else { - LOGGER.debug("{}. file not found, skip include for: {}", ++notFoundCount, filePathToInclude.toString()); + LOGGER.debug("{}. file not found, skip include for: {}", ++notFoundCount, filePathToInclude); out.write("\n// markup not found, no " + includeStatement + "\n"); } } @@ -140,10 +140,10 @@ public void execute(final Template.Fragment frag, final Writer out) throws IOExc final Path filePathToLinkTo = Paths.get(basePath, relativeFileName).toAbsolutePath(); if (Files.isRegularFile(filePathToLinkTo)) { - LOGGER.debug("linking {}. file into markup from: {}", ++linkedCount, filePathToLinkTo.toString()); + LOGGER.debug("linking {}. file into markup from: {}", ++linkedCount, filePathToLinkTo); out.write("\n" + linkName + " link:" + relativeFileName + "[]\n"); } else { - LOGGER.debug("{}. file not found, skip link for: {}", ++notFoundLinkCount, filePathToLinkTo.toString()); + LOGGER.debug("{}. file not found, skip link for: {}", ++notFoundLinkCount, filePathToLinkTo); out.write("\n// file not found, no " + linkName + " link :" + relativeFileName + "[]\n"); } } @@ -217,7 +217,7 @@ public AsciidocDocumentationCodegen() { outputFolder = "generated-code" + File.separator + "asciidoc"; embeddedTemplateDir = templateDir = "asciidoc-documentation"; - defaultIncludes = new HashSet(); + defaultIncludes = new HashSet<>(); cliOptions.add(new CliOption("appName", "short name of the application")); cliOptions.add(new CliOption("appDescription", "description of the application")); @@ -264,10 +264,10 @@ public AsciidocDocumentationCodegen() { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); supportingFiles.add(new SupportingFile("index.mustache", "", "index.adoc")); - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); - languageSpecificPrimitives = new HashSet(); - importMapping = new HashMap(); + languageSpecificPrimitives = new HashSet<>(); + importMapping = new HashMap<>(); } @@ -325,7 +325,7 @@ public void setUseTableTitles(boolean useTableTitles) { public void processOpts() { super.processOpts(); - String specDir = this.additionalProperties.get(SPEC_DIR) + ""; + String specDir = String.valueOf(this.additionalProperties.get(SPEC_DIR)); if (!Files.isDirectory(Paths.get(specDir))) { LOGGER.warn("base part for include markup lambda not found: {} as {}", specDir, Paths.get(specDir).toAbsolutePath()); } @@ -333,7 +333,7 @@ public void processOpts() { this.includeSpecMarkupLambda = new IncludeMarkupLambda(SPEC_DIR,specDir); additionalProperties.put("specinclude", this.includeSpecMarkupLambda); - String snippetDir = this.additionalProperties.get(SNIPPET_DIR) + ""; + String snippetDir = String.valueOf(this.additionalProperties.get(SNIPPET_DIR)); if (!Files.isDirectory(Paths.get(snippetDir))) { LOGGER.warn("base part for include markup lambda not found: {} as {}", snippetDir, Paths.get(snippetDir).toAbsolutePath()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index f27d9c452a79..43b1cbab49ed 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -444,7 +444,7 @@ protected void processOperation(CodegenOperation operation) { } // Converts, for example, PUT to HttpPut for controller attributes - operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase(Locale.ROOT); + operation.httpMethod = "Http" + operation.httpMethod.charAt(0) + operation.httpMethod.substring(1).toLowerCase(Locale.ROOT); } @Override @@ -472,7 +472,7 @@ public Map postProcessOperationsWithModels(Map o continue; } - if(consumesString.toString().equals("")) { + if(consumesString.toString().isEmpty()) { consumesString = new StringBuilder("\"" + consume.get("mediaType") + "\""); } else { @@ -500,7 +500,7 @@ public Map postProcessOperationsWithModels(Map o } } - if(!consumesString.toString().equals("")) { + if(!consumesString.toString().isEmpty()) { operation.vendorExtensions.put("x-aspnetcore-consumes", consumesString.toString()); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index 85e68a203549..5ca5fbb156be 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -209,7 +209,7 @@ public BashClientCodegen() { /** * Bash reserved words. */ - reservedWords = new HashSet( + reservedWords = new HashSet<>( Arrays.asList( "case", "do", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index 58803d150a15..d48d0f774890 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -874,7 +874,7 @@ public void postProcessFile(File file, String fileType) { } // only process the following type (or we can simply rely on the file extension to check if it's a .c or .h file) - Set supportedFileType = new HashSet( + Set supportedFileType = new HashSet<>( Arrays.asList( "supporting-mustache", "model-test", @@ -888,7 +888,7 @@ public void postProcessFile(File file, String fileType) { // only process files with .c or .h extension if ("c".equals(FilenameUtils.getExtension(file.toString())) || "h".equals(FilenameUtils.getExtension(file.toString()))) { - String command = cPostProcessFile + " " + file.toString(); + String command = cPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 3b06619b8459..6700545a65f8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -35,7 +35,7 @@ import static org.openapitools.codegen.utils.StringUtils.underscore; public class CSharpClientCodegen extends AbstractCSharpCodegen { - @SuppressWarnings({"hiding"}) + @SuppressWarnings("hiding") private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class); private static final String NUNIT = "nunit"; private static final String RESTSHARP = "restsharp"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index ab5cd5bb3d0e..b6e54b0fa214 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -56,7 +56,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { // Project Variable, determined from target framework. Not intended to be user-settable. protected static final String TARGET_FRAMEWORK_VERSION = "targetFrameworkVersion"; - @SuppressWarnings({"hiding"}) + @SuppressWarnings("hiding") private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class); private static final List frameworkStrategies = Arrays.asList( FrameworkStrategy.NETSTANDARD_1_3, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java index 1ed37650f7f9..edb5f81cd0d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java @@ -55,7 +55,7 @@ public ConfluenceWikiCodegen() { outputFolder = "docs"; embeddedTemplateDir = templateDir = "confluenceWikiDocs"; - defaultIncludes = new HashSet(); + defaultIncludes = new HashSet<>(); cliOptions.add(new CliOption("appName", "short name of the application")); cliOptions.add(new CliOption("appDescription", "description of the application")); @@ -80,10 +80,10 @@ public ConfluenceWikiCodegen() { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); supportingFiles.add(new SupportingFile("index.mustache", "", "confluence-markup.txt")); - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); - languageSpecificPrimitives = new HashSet(); - importMapping = new HashMap(); + languageSpecificPrimitives = new HashSet<>(); + importMapping = new HashMap<>(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index 0aa6cb256854..460def58afc3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -116,10 +116,10 @@ public CppPistacheServerCodegen() { supportingFiles.add(new SupportingFile("cmake.mustache", "", "CMakeLists.txt")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("int", "char", "bool", "long", "float", "double", "int32_t", "int64_t")); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("date", "std::string"); typeMapping.put("DateTime", "std::string"); typeMapping.put("string", "std::string"); @@ -137,7 +137,7 @@ public CppPistacheServerCodegen() { typeMapping.put("URI", "std::string"); typeMapping.put("ByteArray", "std::string"); - super.importMapping = new HashMap(); + super.importMapping = new HashMap<>(); importMapping.put("std::vector", "#include "); importMapping.put("std::map", "#include "); importMapping.put("std::string", "#include "); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java index 859ab9d69cd0..cef3b4039615 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @@ -22,13 +22,13 @@ public abstract class CppQtAbstractCodegen extends AbstractCppCodegen implements protected static final String CPP_NAMESPACE_DESC = "C++ namespace (convention: name::space::for::api)."; protected static final String CONTENT_COMPRESSION_ENABLED = "contentCompression"; protected static final String CONTENT_COMPRESSION_ENABLED_DESC = "Enable Compressed Content Encoding for requests and responses"; - protected Set foundationClasses = new HashSet(); + protected Set foundationClasses = new HashSet<>(); protected String cppNamespace = "OpenAPI"; - protected Map namespaces = new HashMap(); - protected Set systemIncludes = new HashSet(); + protected Map namespaces = new HashMap<>(); + protected Set systemIncludes = new HashSet<>(); protected boolean isContentCompressionEnabled = false; - protected Set nonFrameworkPrimitives = new HashSet(); + protected Set nonFrameworkPrimitives = new HashSet<>(); public CppQtAbstractCodegen() { super(); @@ -75,7 +75,7 @@ public CppQtAbstractCodegen() { * Language Specific Primitives. These types will not trigger imports by * the client generator */ - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "qint32", @@ -93,7 +93,7 @@ public CppQtAbstractCodegen() { "QByteArray") ); languageSpecificPrimitives.addAll(foundationClasses); - super.typeMapping = new HashMap(); + super.typeMapping = new HashMap<>(); typeMapping.put("date", "QDate"); typeMapping.put("DateTime", "QDateTime"); @@ -116,8 +116,8 @@ public CppQtAbstractCodegen() { typeMapping.put("URI", "QString"); typeMapping.put("file", "QByteArray"); typeMapping.put("binary", "QByteArray"); - importMapping = new HashMap(); - namespaces = new HashMap(); + importMapping = new HashMap<>(); + namespaces = new HashMap<>(); systemIncludes.add("QString"); systemIncludes.add("QList"); @@ -315,7 +315,7 @@ public Map postProcessOperationsWithModels(Map o List operations = (List) objectMap.get("operation"); List> imports = (List>) objs.get("imports"); - Map codegenModels = new HashMap(); + Map codegenModels = new HashMap<>(); for (Object moObj : allModels) { CodegenModel mo = ((Map) moObj).get("model"); @@ -336,7 +336,7 @@ public Map postProcessOperationsWithModels(Map o imports.add(createMapping("import", operation.returnBaseType)); } } - List params = new ArrayList(); + List params = new ArrayList<>(); if (operation.allParams != null) params.addAll(operation.allParams); // Check all parameter baseType if there is a necessity to include, include it if not @@ -375,7 +375,7 @@ public boolean isDataTypeString(String dataType) { } private Map createMapping(String key, String value) { - Map customImport = new HashMap(); + Map customImport = new HashMap<>(); customImport.put(key, toModelImport(value)); return customImport; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java index a72388d4226b..078e51a841ea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java @@ -166,10 +166,10 @@ public CppRestSdkClientCodegen() { supportingFiles.add(new SupportingFile("cmake-config.mustache", "", "Config.cmake.in")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("int", "char", "bool", "long", "float", "double", "int32_t", "int64_t")); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("date", "utility::datetime"); typeMapping.put("DateTime", "utility::datetime"); typeMapping.put("string", "utility::string_t"); @@ -186,7 +186,7 @@ public CppRestSdkClientCodegen() { typeMapping.put("URI", "utility::string_t"); typeMapping.put("ByteArray", "utility::string_t"); - super.importMapping = new HashMap(); + super.importMapping = new HashMap<>(); importMapping.put("std::vector", "#include "); importMapping.put("std::map", "#include "); importMapping.put("std::string", "#include "); @@ -263,7 +263,7 @@ public CodegenModel fromModel(String name, Schema model) { CodegenModel codegenModel = super.fromModel(name, model); Set oldImports = codegenModel.imports; - codegenModel.imports = new HashSet(); + codegenModel.imports = new HashSet<>(); for (String imp : oldImports) { String newImp = toModelImport(imp); if (!newImp.isEmpty()) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index ca3e6c02f48d..3f21f4adf14d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -93,10 +93,10 @@ public CppRestbedServerCodegen() { supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("int", "char", "bool", "long", "float", "double", "int32_t", "int64_t")); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("date", "std::string"); typeMapping.put("DateTime", "std::string"); typeMapping.put("string", "std::string"); @@ -113,7 +113,7 @@ public CppRestbedServerCodegen() { typeMapping.put("URI", "std::string"); typeMapping.put("ByteArray", "std::string"); - super.importMapping = new HashMap(); + super.importMapping = new HashMap<>(); importMapping.put("std::vector", "#include "); importMapping.put("std::map", "#include "); importMapping.put("std::string", "#include "); @@ -129,7 +129,7 @@ public Map updateAllModels(Map objs) { // Clean interfaces of ambiguity for (Entry cm : allModels.entrySet()) { if (cm.getValue().getInterfaces() != null && !cm.getValue().getInterfaces().isEmpty()) { - List newIntf = new ArrayList(cm.getValue().getInterfaces()); + List newIntf = new ArrayList<>(cm.getValue().getInterfaces()); for (String intf : allModels.get(cm.getKey()).getInterfaces()) { if (allModels.get(intf).getInterfaces() != null && !allModels.get(intf).getInterfaces().isEmpty()) { @@ -256,7 +256,7 @@ public CodegenModel fromModel(String name, Schema model) { CodegenModel codegenModel = super.fromModel(name, model); Set oldImports = codegenModel.imports; - codegenModel.imports = new HashSet(); + codegenModel.imports = new HashSet<>(); for (String imp : oldImports) { String newImp = toModelImport(imp); if (!newImp.isEmpty()) { @@ -285,7 +285,7 @@ public String toApiFilename(String name) { public Map postProcessOperationsWithModels(Map objs, List allModels) { Map operations = (Map) objs.get("operations"); List operationList = (List) operations.get("operation"); - List newOpList = new ArrayList(); + List newOpList = new ArrayList<>(); for (CodegenOperation op : operationList) { String path = op.path; @@ -318,7 +318,7 @@ public Map postProcessOperationsWithModels(Map o final String X_CODEGEN_OTHER_METHODS = "x-codegen-other-methods"; List currentOtherMethodList = (List) op1.vendorExtensions.get(X_CODEGEN_OTHER_METHODS); if (currentOtherMethodList == null) { - currentOtherMethodList = new ArrayList(); + currentOtherMethodList = new ArrayList<>(); } op.operationIdCamelCase = op1.operationIdCamelCase; currentOtherMethodList.add(op); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTinyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTinyClientCodegen.java index 49d70eda08b6..04e349c9cc7f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTinyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTinyClientCodegen.java @@ -71,7 +71,7 @@ public String getHelp() { } public void addControllerToAdditionalProperties() { - Map supportedControllers = new HashMap(); + Map supportedControllers = new HashMap<>(); supportedControllers.put("esp32", "isESP32"); supportedControllers.put("esp8266", "isESP8266"); if (supportedControllers.containsKey(controller)) { @@ -164,7 +164,7 @@ public CppTinyClientCodegen() { supportingFiles.add(new SupportingFile("root.cert.mustache", rootFolder, "root.cert")); // TODO no overwrite supportingFiles.add(new SupportingFile("pre_compiling_bourne.py.mustache", rootFolder, "pre_compiling_bourne.py")); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "bool", "int", @@ -172,7 +172,7 @@ public CppTinyClientCodegen() { "double", "float") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "int", @@ -182,7 +182,7 @@ public CppTinyClientCodegen() { "std::string") ); - super.typeMapping = new HashMap(); + super.typeMapping = new HashMap<>(); typeMapping.put("string", "std::string"); typeMapping.put("integer", "int"); typeMapping.put("boolean", "bool"); @@ -257,7 +257,7 @@ public String getTypeDeclaration(Schema p) { if (languageSpecificPrimitives.contains(openAPIType)) { return toModelName(openAPIType); } else { - return openAPIType + ""; + return openAPIType; } } @@ -314,7 +314,7 @@ public String toVarName(String name) { if (isReservedWord(paramName)) { return escapeReservedWord(paramName); } - return "" + paramName; + return paramName; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java index d23bf246caca..a67bc3f1845e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java @@ -71,7 +71,7 @@ public CppTizenClientCodegen() { embeddedTemplateDir = templateDir = "cpp-tizen-client"; modelPackage = ""; - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "bool", "int", @@ -79,7 +79,7 @@ public CppTizenClientCodegen() { "double", "float") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "int", @@ -105,7 +105,7 @@ public CppTizenClientCodegen() { "unsigned", "using", "virtual", "void", "volatile", "wchar_t", "while", "xor", "xor_eq" )); - super.typeMapping = new HashMap(); + super.typeMapping = new HashMap<>(); //typeMapping.put("Date", "DateTime"); //typeMapping.put("DateTime", "DateTime"); @@ -128,7 +128,7 @@ public CppTizenClientCodegen() { typeMapping.put("UUID", "std::string"); typeMapping.put("URI", "std::string"); - importMapping = new HashMap(); + importMapping = new HashMap<>(); supportingFiles.clear(); supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, "Helpers.h")); @@ -175,7 +175,7 @@ public String getTypeDeclaration(String name) { if (languageSpecificPrimitives.contains(name)) { return name; } else { - return name + ""; + return name; } } @@ -200,7 +200,7 @@ public String getTypeDeclaration(Schema p) { if (languageSpecificPrimitives.contains(openAPIType)) { return toModelName(openAPIType); } else { - return openAPIType + ""; + return openAPIType; } } @@ -295,7 +295,7 @@ public String toVarName(String name) { if (isReservedWord(paramName)) { return escapeReservedWord(paramName); } - return "" + paramName; + return paramName; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java index 9f3b47c8272c..5eb601f0a015 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java @@ -39,14 +39,14 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen { protected String unrealModuleName = "OpenAPI"; // Will be treated as pointer - protected Set pointerClasses = new HashSet(); + protected Set pointerClasses = new HashSet<>(); // source folder where to write the files protected String privateFolder = "Private"; protected String publicFolder = "Public"; protected String apiVersion = "1.0.0"; - protected Map namespaces = new HashMap(); + protected Map namespaces = new HashMap<>(); // Will be included using the <> syntax, not used in Unreal's coding convention - protected Set systemIncludes = new HashSet(); + protected Set systemIncludes = new HashSet<>(); protected String cppNamespace = unrealModuleName; protected boolean optionalProjectFileFlag = true; @@ -132,7 +132,7 @@ public CppUE4ClientCodegen() { * Language Specific Primitives. These types will not trigger imports by * the client generator */ - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "int32", @@ -159,7 +159,7 @@ public CppUE4ClientCodegen() { supportingFiles.add(new SupportingFile("module-source.mustache", privateFolder, unrealModuleName + "Module.cpp")); } - super.typeMapping = new HashMap(); + super.typeMapping = new HashMap<>(); // Maps C++ types during call to getSchemaType, see DefaultCodegen.getSchemaType and not the types/formats // defined in openapi specification "array" is also used explicitly in the generator for containers @@ -188,10 +188,10 @@ public CppUE4ClientCodegen() { typeMapping.put("UUID", "FGuid"); typeMapping.put("AnyType", "TSharedPtr"); - importMapping = new HashMap(); + importMapping = new HashMap<>(); importMapping.put("HttpFileInput", "#include \"" + modelNamePrefix + "Helpers.h\""); - namespaces = new HashMap(); + namespaces = new HashMap<>(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java index 203bed470404..0ff2d657e7a0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java @@ -130,7 +130,7 @@ public CrystalClientCodegen() { hideGenerationTimestamp = Boolean.TRUE; // reserved word. Ref: https://github.com/crystal-lang/crystal/wiki/Crystal-for-Rubyists#available-keywords - reservedWords = new HashSet( + reservedWords = new HashSet<>( Arrays.asList( "abstract", "do", "if", "nil?", "select", "union", "alias", "else", "in", "of", "self", "unless", @@ -557,8 +557,8 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc public Map postProcessOperationsWithModels(Map objs, List allModels) { objs = super.postProcessOperationsWithModels(objs, allModels); Map operations = (Map) objs.get("operations"); - HashMap modelMaps = new HashMap(); - HashMap processedModelMaps = new HashMap(); + HashMap modelMaps = new HashMap<>(); + HashMap processedModelMaps = new HashMap<>(); for (Object o : allModels) { HashMap h = (HashMap) o; @@ -870,7 +870,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with cr extension if ("cr".equals(FilenameUtils.getExtension(file.toString()))) { - String command = crystalPostProcessFile + " " + file.toString(); + String command = crystalPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); @@ -882,7 +882,7 @@ public void postProcessFile(File file, String fileType) { while ((line = br.readLine()) != null) { sb.append(line); } - LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString()); + LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb); } } else { LOGGER.info("Successfully executed: {}", command); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java index 78c1235c9df6..9903908d4e0b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java @@ -116,7 +116,7 @@ public ElixirClientCodegen() { * Reserved words. Override this with reserved words specific to your language * Ref: https://github.com/itsgreggreg/elixir_quick_reference#reserved-words */ - reservedWords = new HashSet( + reservedWords = new HashSet<>( Arrays.asList( "nil", "true", @@ -164,7 +164,7 @@ public ElixirClientCodegen() { * Language Specific Primitives. These types will not trigger imports by * the client generator */ - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "Integer", "Float", @@ -182,7 +182,7 @@ public ElixirClientCodegen() { ); // ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("integer", "Integer"); typeMapping.put("long", "Integer"); typeMapping.put("number", "Float"); @@ -727,10 +727,10 @@ public String typespec() { } sb.append("keyword()) :: "); - HashSet uniqueResponseTypes = new HashSet(); + HashSet uniqueResponseTypes = new HashSet<>(); for (CodegenResponse response : this.responses) { ExtendedCodegenResponse exResponse = (ExtendedCodegenResponse) response; - StringBuilder returnEntry = new StringBuilder(""); + StringBuilder returnEntry = new StringBuilder(); if (exResponse.baseType == null) { returnEntry.append("nil"); } else if (exResponse.simpleType) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java index ba89d67819c3..20b2ac0c944b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java @@ -328,19 +328,17 @@ public Map postProcessAllModels(final Map orgObj private boolean anyVarMatches(final List> models, final Predicate predicate) { return models.stream() - .map(obj -> (CodegenModel) obj.get("model")) - .flatMap(model -> model.vars.stream()) - .filter(var -> { - CodegenProperty prop = var; - while (prop != null) { - if (predicate.test(prop)) { - return true; + .map(obj -> (CodegenModel) obj.get("model")) + .flatMap(model -> model.vars.stream()).anyMatch(var -> { + CodegenProperty prop = var; + while (prop != null) { + if (predicate.test(prop)) { + return true; + } + prop = prop.items; } - prop = prop.items; - } - return false; - }) - .count() > 0; + return false; + }); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java index bf670711c320..1bc6d6bf8c36 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java @@ -267,7 +267,7 @@ protected void processOperation(CodegenOperation operation) { } // Converts, for example, PUT to HttpPut for controller attributes - operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase(Locale.ROOT); + operation.httpMethod = "Http" + operation.httpMethod.charAt(0) + operation.httpMethod.substring(1).toLowerCase(Locale.ROOT); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index 662cbfce1324..645069903b8e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -136,8 +136,8 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC protected Map> uniqueParamNameTypes = new HashMap<>(); protected Map> modelMimeTypes = new HashMap<>(); protected Map knownMimeDataTypes = new HashMap<>(); - protected Set typeNames = new HashSet(); - protected Set modelTypeNames = new HashSet(); + protected Set typeNames = new HashSet<>(); + protected Set modelTypeNames = new HashSet<>(); final private static Pattern CONTAINS_JSON_MIME_PATTERN = Pattern.compile("(?i)application/.*json(;.*)?"); @@ -235,7 +235,7 @@ public HaskellHttpClientCodegen() { supportingFiles.add(new SupportingFile("tests/PropMime.mustache", "tests", "PropMime.hs")); supportingFiles.add(new SupportingFile("tests/Test.mustache", "tests", "Test.hs")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "Bool", "String", @@ -555,7 +555,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { } if (!additionalProperties.containsKey(PROP_BASE_MODULE)) { - List wordsCaps = new ArrayList(); + List wordsCaps = new ArrayList<>(); for (String word : baseTitle.split(" ")) { wordsCaps.add(firstLetterToUpper(word)); } @@ -684,7 +684,7 @@ public String toInstantiationType(Schema p) { public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation op, Map> operations) { List opList = operations.get(tag); if (opList == null || opList.isEmpty()) { - opList = new ArrayList(); + opList = new ArrayList<>(); operations.put(tag, opList); } // check for operationId uniqueness @@ -1454,7 +1454,7 @@ public void postProcessFile(File file, String fileType) { // only process files with hs extension if ("hs".equals(FilenameUtils.getExtension(file.toString()))) { - String command = haskellPostProcessFile + " " + file.toString(); + String command = haskellPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index 9887d5c6f1e5..9b44c0b2d680 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -169,7 +169,7 @@ public HaskellServantCodegen() { * Language Specific Primitives. These types will not trigger imports by * the client generator */ - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "Bool", "String", @@ -286,14 +286,14 @@ public void preprocessOpenAPI(OpenAPI openAPI) { String[] words = title.split(" "); // The package name is made by appending the lowercased words of the title interspersed with dashes - List wordsLower = new ArrayList(); + List wordsLower = new ArrayList<>(); for (String word : words) { wordsLower.add(word.toLowerCase(Locale.ROOT)); } String cabalName = joinStrings("-", wordsLower); // The API name is made by appending the capitalized words of the title - List wordsCaps = new ArrayList(); + List wordsCaps = new ArrayList<>(); for (String word : words) { wordsCaps.add(firstLetterToUpper(word)); } @@ -446,7 +446,7 @@ private String joinStrings(String sep, List ss) { // IdType is provided by the capture params. private List pathToServantRoute(String path, List pathParams) { // Map the capture params by their names. - HashMap captureTypes = new HashMap(); + HashMap captureTypes = new HashMap<>(); for (CodegenParameter param : pathParams) { captureTypes.put(param.baseName, param.dataType); } @@ -462,7 +462,7 @@ private List pathToServantRoute(String path, List path } // Convert the path into a list of servant route components. - List pathComponents = new ArrayList(); + List pathComponents = new ArrayList<>(); for (String piece : path.split("/")) { if (piece.startsWith("{") && piece.endsWith("}")) { String name = piece.substring(1, piece.length() - 1); @@ -479,7 +479,7 @@ private List pathToServantRoute(String path, List path // Extract the arguments that are passed in the route path parameters private List pathToClientType(String path, List pathParams) { // Map the capture params by their names. - HashMap captureTypes = new HashMap(); + HashMap captureTypes = new HashMap<>(); for (CodegenParameter param : pathParams) { captureTypes.put(param.baseName, param.dataType); } @@ -490,7 +490,7 @@ private List pathToClientType(String path, List pathPa } // Convert the path into a list of servant route components. - List type = new ArrayList(); + List type = new ArrayList<>(); for (String piece : path.split("/")) { if (piece.startsWith("{") && piece.endsWith("}")) { String name = piece.substring(1, piece.length() - 1); @@ -605,8 +605,8 @@ private String fixOperatorChars(String string) { String name = string; //Check if it is a reserved word, in which case the underscore is added when property name is generated. if (string.startsWith("_")) { - if (reservedWords.contains(string.substring(1, string.length()))) { - name = string.substring(1, string.length()); + if (reservedWords.contains(string.substring(1))) { + name = string.substring(1); } else if (reservedWordsMappings.containsValue(string)) { name = LEADING_UNDERSCORE.matcher(string).replaceFirst(""); } @@ -685,7 +685,7 @@ public void postProcessFile(File file, String fileType) { // only process files with hs extension if ("hs".equals(FilenameUtils.getExtension(file.toString()))) { - String command = haskellPostProcessFile + " " + file.toString(); + String command = haskellPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java index dea598e04998..736b9d599b11 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java @@ -136,7 +136,7 @@ public HaskellYesodServerCodegen() { ) ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "Bool", "Int", @@ -359,7 +359,7 @@ public String toInstantiationType(Schema p) { private List pathToComponents(String path, List pathParams) { // Map the capture params by their names. - HashMap captureTypes = new HashMap(); + HashMap captureTypes = new HashMap<>(); for (CodegenParameter param : pathParams) { captureTypes.put(param.baseName, param.dataType); } @@ -370,7 +370,7 @@ private List pathToComponents(String path, List pathPa } // Convert the path into a list of yesod path components. - List components = new ArrayList(); + List components = new ArrayList<>(); for (String piece : path.split("/")) { if (piece.startsWith("{") && piece.endsWith("}")) { String name = piece.substring(1, piece.length() - 1); @@ -412,7 +412,7 @@ public CodegenOperation fromOperation(String resourcePath, String httpMethod, Op List> routes = (List>) additionalProperties.get("routes"); if (routes == null) { - routes = new ArrayList>(); + routes = new ArrayList<>(); additionalProperties.put("routes", routes); } @@ -432,10 +432,10 @@ public CodegenOperation fromOperation(String resourcePath, String httpMethod, Op } if (!found) { - Map route = new HashMap(); + Map route = new HashMap<>(); route.put("path", path); route.put("resource", resource); - List methods = new ArrayList(); + List methods = new ArrayList<>(); methods.add(op.httpMethod); route.put("methods", methods); routes.add(route); @@ -534,8 +534,8 @@ private String fixOperatorChars(String string) { String name = string; //Check if it is a reserved word, in which case the underscore is added when property name is generated. if (string.startsWith("_")) { - if (reservedWords.contains(string.substring(1, string.length()))) { - name = string.substring(1, string.length()); + if (reservedWords.contains(string.substring(1))) { + name = string.substring(1); } else if (reservedWordsMappings.containsValue(string)) { name = LEADING_UNDERSCORE.matcher(string).replaceFirst(""); } @@ -614,7 +614,7 @@ public void postProcessFile(File file, String fileType) { // only process files with hs extension if ("hs".equals(FilenameUtils.getExtension(file.toString()))) { - String command = haskellPostProcessFile + " " + file.toString(); + String command = haskellPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java index cec0fdeccaa5..bad912d9a8f6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java @@ -133,7 +133,7 @@ public JMeterClientCodegen() { /* * Reserved words. Override this with reserved words specific to your language */ - reservedWords = new HashSet( + reservedWords = new HashSet<>( Arrays.asList( "sample1", // replace with static values "sample2") diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java index 46aa7960c1b7..a47161d84603 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java @@ -70,7 +70,7 @@ public JavaCXFClientCodegen() { updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); updateOption(CodegenConstants.API_PACKAGE, apiPackage); updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); - updateOption(this.DATE_LIBRARY, this.getDateLibrary()); + updateOption(DATE_LIBRARY, this.getDateLibrary()); // clear model and api doc template as this codegen // does not support auto-generated markdown doc at the moment diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java index a02e91ad0f81..82dbc6a26ed7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java @@ -655,7 +655,7 @@ private void appendRandomDouble(StringBuilder buffer, CodegenOperation op, Codeg var.addTestData(randomBigDecimal); } } else { - buffer.append(randomBigDecimal.toString()).append('D'); + buffer.append(randomBigDecimal).append('D'); } } } @@ -1294,7 +1294,7 @@ public Map postProcessSupportingFileData(Map obj if (testDataCache.root().isDirty()) { ByteArrayOutputStream out = new ByteArrayOutputStream(); testDataCache.root().flush(out); - String testDataJson = new String(out.toByteArray(), "UTF-8"); + String testDataJson = out.toString("UTF-8"); objs.put("test-data.json", testDataJson); supportingFiles.add(new SupportingFile("testData.mustache", testDataFile.getAbsolutePath())); } @@ -1306,7 +1306,7 @@ public Map postProcessSupportingFileData(Map obj if (testDataControlCache.root().isDirty()) { ByteArrayOutputStream out = new ByteArrayOutputStream(); testDataControlCache.root().flush(out); - String testDataControlJson = new String(out.toByteArray(), "UTF-8"); + String testDataControlJson = out.toString("UTF-8"); objs.put("test-data-control.json", testDataControlJson); supportingFiles .add(new SupportingFile("testDataControl.mustache", testDataControlFile.getAbsolutePath())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java index 22f1567f3b5a..5bc602fc9aa5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java @@ -65,7 +65,7 @@ public JavaInflectorServerCodegen() { updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); updateOption(CodegenConstants.API_PACKAGE, apiPackage); updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); - updateOption(this.DATE_LIBRARY, this.getDateLibrary()); + updateOption(DATE_LIBRARY, this.getDateLibrary()); additionalProperties.put("title", title); // java inflector uses the jackson lib diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java index df5073d8d928..c8516efc020b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java @@ -116,7 +116,7 @@ public JavaMicronautClientCodegen() { .ifPresent(v -> cliOptions.remove(v)); // Add reserved words - String[] reservedWordsArray = new String[]{ + String[] reservedWordsArray = { "client", "format", "queryvalue", "queryparam", "pathvariable", "header", "cookie", "authorization", "body", "application" }; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java index b6b3d0bb7930..90c3d3b4ff45 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java @@ -471,7 +471,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { // get vendor extensions Map vendorExt = openAPI.getInfo().getExtensions(); - if (vendorExt != null && !vendorExt.toString().equals("")) { + if (vendorExt != null && !vendorExt.toString().isEmpty()) { if (vendorExt.containsKey("x-codegen")) { Map uris = (Map) vendorExt.get("x-codegen"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java index 5f44517c5c0a..fe6e26a230d1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java @@ -52,7 +52,7 @@ public JavaUndertowServerCodegen() { // clioOptions default redefinition need to be updated updateOption(CodegenConstants.INVOKER_PACKAGE, this.getInvokerPackage()); updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); - updateOption(this.DATE_LIBRARY, this.getDateLibrary()); + updateOption(DATE_LIBRARY, this.getDateLibrary()); apiTestTemplateFiles.clear(); // TODO: add test template diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java index e8b58b6e81c3..e2fc4de08d66 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java @@ -95,7 +95,7 @@ public JavaVertXServerCodegen() { updateOption(CodegenConstants.ARTIFACT_VERSION, this.getArtifactVersion()); updateOption(CodegenConstants.API_PACKAGE, apiPackage); updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); - updateOption(this.DATE_LIBRARY, this.getDateLibrary()); + updateOption(DATE_LIBRARY, this.getDateLibrary()); additionalProperties.put(ROOT_PACKAGE, rootPackage); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java index 28028afbc626..32b601491d37 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java @@ -49,7 +49,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod public static final String EMIT_JS_DOC = "emitJSDoc"; public static final String NPM_REPOSITORY = "npmRepository"; - final String[][] JAVASCRIPT_SUPPORTING_FILES = new String[][]{ + final String[][] JAVASCRIPT_SUPPORTING_FILES = { new String[]{"package.mustache", "package.json"}, // new String[]{"index.mustache", "src/index.js", }, // new String[]{"ApiClient.mustache", "src/ApiClient.js"}, @@ -59,7 +59,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod new String[]{"travis.yml", ".travis.yml"} }; - final String[][] JAVASCRIPT_ES6_SUPPORTING_FILES = new String[][]{ + final String[][] JAVASCRIPT_ES6_SUPPORTING_FILES = { new String[]{"package.mustache", "package.json"}, // new String[]{"index.mustache", "src/index.js"}, // new String[]{"ApiClient.mustache", "src/ApiClient.js"}, @@ -132,10 +132,10 @@ public JavascriptApolloClientCodegen() { "prototype", "String", "toString", "undefined", "valueOf") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("String", "Boolean", "Number", "Array", "Object", "Date", "File", "Blob") ); - defaultIncludes = new HashSet(languageSpecificPrimitives); + defaultIncludes = new HashSet<>(languageSpecificPrimitives); instantiationTypes.put("array", "Array"); instantiationTypes.put("list", "Array"); @@ -1127,7 +1127,7 @@ public void postProcessFile(File file, String fileType) { // only process files with js extension if ("js".equals(FilenameUtils.getExtension(file.toString()))) { - String command = jsPostProcessFile + " " + file.toString(); + String command = jsPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index 71f0711bc5d3..4e9ddd2a007a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -51,7 +51,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo public static final String USE_ES6 = "useES6"; public static final String NPM_REPOSITORY = "npmRepository"; - final String[][] JAVASCRIPT_SUPPORTING_FILES = new String[][]{ + final String[][] JAVASCRIPT_SUPPORTING_FILES = { new String[]{"package.mustache", "package.json"}, // new String[]{"index.mustache", "src/index.js", }, // new String[]{"ApiClient.mustache", "src/ApiClient.js"}, @@ -62,7 +62,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo new String[]{"gitignore.mustache", ".gitignore"} }; - final String[][] JAVASCRIPT_ES6_SUPPORTING_FILES = new String[][]{ + final String[][] JAVASCRIPT_ES6_SUPPORTING_FILES = { new String[]{"package.mustache", "package.json"}, // new String[]{"index.mustache", "src/index.js"}, // new String[]{"ApiClient.mustache", "src/ApiClient.js"}, @@ -135,10 +135,10 @@ public JavascriptClientCodegen() { "prototype", "String", "toString", "undefined", "valueOf") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("String", "Boolean", "Number", "Array", "Object", "Date", "File", "Blob") ); - defaultIncludes = new HashSet(languageSpecificPrimitives); + defaultIncludes = new HashSet<>(languageSpecificPrimitives); instantiationTypes.put("array", "Array"); instantiationTypes.put("set", "Array"); @@ -1212,7 +1212,7 @@ public void postProcessFile(File file, String fileType) { // only process files with js extension if ("js".equals(FilenameUtils.getExtension(file.toString()))) { - String command = jsPostProcessFile + " " + file.toString(); + String command = jsPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java index e66420e26355..edc3c21e4d5f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java @@ -55,16 +55,16 @@ public JavascriptClosureAngularClientCodegen() { "short", "try", "char", "final", "interface", "static", "void", "class", "finally", "const", "super", "while")); - languageSpecificPrimitives = new HashSet(Arrays.asList( - "string", - "boolean", - "number", - "Object", - "Blob", - "Date")); + languageSpecificPrimitives = new HashSet<>(Arrays.asList( + "string", + "boolean", + "number", + "Object", + "Blob", + "Date")); instantiationTypes.put("array", "Array"); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("Array", "Array"); typeMapping.put("array", "Array"); typeMapping.put("List", "Array"); @@ -86,11 +86,11 @@ public JavascriptClosureAngularClientCodegen() { typeMapping.put("map", "Object"); typeMapping.put("DateTime", "Date"); - importMapping = new HashMap(); - defaultIncludes = new HashSet(Arrays.asList( - "Object", - "Array", - "Blob" + importMapping = new HashMap<>(); + defaultIncludes = new HashSet<>(Arrays.asList( + "Object", + "Array", + "Blob" )); typeMapping.put("binary", "string"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java index da4193b01734..c82f5e1c68e4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java @@ -64,7 +64,7 @@ public JavascriptFlowtypedClientCodegen() { "Math", "NaN", "Number", "Object", "prototype", "String", "toString", "undefined", "valueOf")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList("string", "boolean", "number", "Array", "Object", "Date", "File", "Blob") ); @@ -95,7 +95,7 @@ public JavascriptFlowtypedClientCodegen() { typeMapping.put("UUID", "string"); typeMapping.put("URI", "string"); - defaultIncludes = new HashSet(languageSpecificPrimitives); + defaultIncludes = new HashSet<>(languageSpecificPrimitives); outputFolder = "generated-code/javascript-flowtyped"; embeddedTemplateDir = templateDir = "Javascript-Flowtyped"; @@ -173,14 +173,14 @@ public Map postProcessModels(Map objs) { // name enum with model name, e.g. StatusEnum => Pet.StatusEnum for (CodegenProperty var : cm.vars) { if (Boolean.TRUE.equals(var.isEnum)) { - var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + "" + var.enumName); + var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + var.enumName); } } if (cm.parent != null) { for (CodegenProperty var : cm.allVars) { if (Boolean.TRUE.equals(var.isEnum)) { var.datatypeWithEnum = var.datatypeWithEnum - .replace(var.enumName, cm.classname + "" + var.enumName); + .replace(var.enumName, cm.classname + var.enumName); } } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index 002084bc6165..bf3cf05c81ef 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -141,7 +141,7 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio .map(x -> quoteExample( StringEscapeUtils.escapeEcmaScript( String.valueOf(x.getValue())))) - .collect(Collectors.toCollection(() -> new TreeSet())); + .collect(Collectors.toCollection(() -> new TreeSet<>())); if (!exampleValues.isEmpty()) { @@ -274,7 +274,7 @@ public HTTPRequestGroup(String groupName, Set variables, List INVOKER_PKG_SUPPORTING_FILES = Arrays.asList("script.mustache", "README.mustache"); - static final String[][] JAVASCRIPT_SUPPORTING_FILES = new String[][]{ + static final String[][] JAVASCRIPT_SUPPORTING_FILES = { new String[]{"script.mustache", "script.js"}, new String[]{"README.mustache", "README.md"}}; protected String projectName; @@ -412,7 +412,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { List queryParams = new ArrayList<>(); List bodyOrFormParams = new ArrayList<>(); List k6Checks = new ArrayList<>(); - Set imports = new HashSet(); + Set imports = new HashSet<>(); final Operation operation = methodOperation.getValue(); final PathItem.HttpMethod method = methodOperation.getKey(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 93d7428c2362..8960b2f8e696 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -454,7 +454,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera basePath = basePath.substring(0, pos); } - if (basePath.equals("")) { + if (basePath.isEmpty()) { basePath = "default"; } else { co.subresourceOperation = !co.path.isEmpty(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java index 2db0bd7af887..876a1b3b479e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java @@ -1055,7 +1055,7 @@ public String toIdentifier(String name, String prefix, String suffix) { // identifier name cannot be empty if (escapedName.isEmpty()) { - throw new RuntimeException("Empty database/table/column name for property '" + name.toString() + "' not allowed"); + throw new RuntimeException("Empty database/table/column name for property '" + name + "' not allowed"); } return escapedName; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java index 40f2cb23c056..795b829036a1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java @@ -111,13 +111,13 @@ public LuaClientCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "nil", "string", @@ -150,7 +150,7 @@ public LuaClientCodegen() { typeMapping.put("ByteArray", "string"); typeMapping.put("object", "TODO_OBJECT_MAPPING"); - importMapping = new HashMap(); + importMapping = new HashMap<>(); importMapping.put("time.Time", "time"); importMapping.put("*os.File", "os"); importMapping.put("os", "io/ioutil"); @@ -508,7 +508,7 @@ public String escapeUnsafeCharacters(String input) { } public Map createMapping(String key, String value) { - Map customImport = new HashMap(); + Map customImport = new HashMap<>(); customImport.put(key, value); return customImport; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java index 36b635f26aef..3a3e081f7b81 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java @@ -97,7 +97,7 @@ protected void initializeSpecialCharacterMapping() { public String toParamName(String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); - } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) { + } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains(String.valueOf((char) character)))) { return escape(name, specialCharReplacements, null, null); } return name; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java index fa217e1635fa..97748d8d6db0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java @@ -41,19 +41,19 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig public static final Integer ENUM_MAX_ELEMENTS = 65535; public static final Integer IDENTIFIER_MAX_LENGTH = 64; - protected Vector mysqlNumericTypes = new Vector(Arrays.asList( + protected Vector mysqlNumericTypes = new Vector<>(Arrays.asList( "BIGINT", "BIT", "BOOL", "BOOLEAN", "DEC", "DECIMAL", "DOUBLE", "DOUBLE PRECISION", "FIXED", "FLOAT", "INT", "INTEGER", "MEDIUMINT", "NUMERIC", "REAL", "SMALLINT", "TINYINT" )); - protected Vector mysqlDateAndTimeTypes = new Vector(Arrays.asList( + protected Vector mysqlDateAndTimeTypes = new Vector<>(Arrays.asList( "DATE", "DATETIME", "TIME", "TIMESTAMP", "YEAR" )); - protected Vector mysqlStringTypes = new Vector(Arrays.asList( + protected Vector mysqlStringTypes = new Vector<>(Arrays.asList( "BINARY", "BLOB", "CHAR", "CHAR BYTE", "CHARACTER", "ENUM", "LONGBLOB", "LONGTEXT", "MEDIUMBLOB", "MEDIUMTEXT", "SET", "TEXT", "TINYBLOB", "TINYTEXT", "VARBINARY", "VARCHAR" )); - protected Vector mysqlSpatialTypes = new Vector(Arrays.asList( + protected Vector mysqlSpatialTypes = new Vector<>(Arrays.asList( "GEOMETRY", "GEOMETRYCOLLECTION", "LINESTRING", "MULTILINESTRING", "MULTIPOINT", "MULTIPOLYGON", "POINT", "POLYGON" )); @@ -125,7 +125,7 @@ public MysqlSchemaCodegen() { ); // all types can be threaded as primitives except array, object and refs - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "boolean", @@ -263,8 +263,8 @@ public Map postProcessModels(Map objs) { String tableName = this.toTableName(modelName); String modelDescription = model.getDescription(); Map modelVendorExtensions = model.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map tableDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map tableDefinition = new HashMap<>(); if (this.getIdentifierNamingConvention().equals("snake_case") && !modelName.equals(tableName)) { // add original name in table comment @@ -325,8 +325,8 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert */ public void processIntegerTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); ArrayList columnDataTypeArguments = new ArrayList(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); @@ -366,7 +366,7 @@ public void processIntegerTypeProperty(CodegenModel model, CodegenProperty prope if (i > ENUM_MAX_ELEMENTS - 1) { LOGGER.warn( "ENUM column can have maximum of {} distinct elements, following value will be skipped: {}", - ENUM_MAX_ELEMENTS.toString(), (String) enumValues.get(i)); + ENUM_MAX_ELEMENTS, (String) enumValues.get(i)); break; } String value = String.valueOf(enumValues.get(i)); @@ -417,8 +417,8 @@ public void processIntegerTypeProperty(CodegenModel model, CodegenProperty prope */ public void processDecimalTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); ArrayList columnDataTypeArguments = new ArrayList(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); @@ -457,7 +457,7 @@ public void processDecimalTypeProperty(CodegenModel model, CodegenProperty prope if (i > ENUM_MAX_ELEMENTS - 1) { LOGGER.warn( "ENUM column can have maximum of {} distinct elements, following value will be skipped: {}", - ENUM_MAX_ELEMENTS.toString(), (String) enumValues.get(i)); + ENUM_MAX_ELEMENTS, (String) enumValues.get(i)); break; } String value = String.valueOf(enumValues.get(i)); @@ -507,8 +507,8 @@ public void processDecimalTypeProperty(CodegenModel model, CodegenProperty prope */ public void processBooleanTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); ArrayList columnDataTypeArguments = new ArrayList(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); @@ -562,8 +562,8 @@ public void processBooleanTypeProperty(CodegenModel model, CodegenProperty prope */ public void processStringTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); ArrayList columnDataTypeArguments = new ArrayList(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); @@ -601,7 +601,7 @@ public void processStringTypeProperty(CodegenModel model, CodegenProperty proper if (i > ENUM_MAX_ELEMENTS - 1) { LOGGER.warn( "ENUM column can have maximum of {} distinct elements, following value will be skipped: {}", - ENUM_MAX_ELEMENTS.toString(), (String) enumValues.get(i)); + ENUM_MAX_ELEMENTS, (String) enumValues.get(i)); break; } String value = String.valueOf(enumValues.get(i)); @@ -645,8 +645,8 @@ public void processStringTypeProperty(CodegenModel model, CodegenProperty proper */ public void processDateTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); String dataType = property.getDataType(); @@ -698,8 +698,8 @@ public void processDateTypeProperty(CodegenModel model, CodegenProperty property */ public void processJsonTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); String dataType = property.getDataType(); @@ -755,8 +755,8 @@ public void processJsonTypeProperty(CodegenModel model, CodegenProperty property */ public void processUnknownTypeProperty(CodegenModel model, CodegenProperty property) { Map vendorExtensions = property.getVendorExtensions(); - Map mysqlSchema = new HashMap(); - Map columnDefinition = new HashMap(); + Map mysqlSchema = new HashMap<>(); + Map columnDefinition = new HashMap<>(); String baseName = property.getBaseName(); String colName = this.toColumnName(baseName); Boolean required = property.getRequired(); @@ -806,7 +806,7 @@ public void processUnknownTypeProperty(CodegenModel model, CodegenProperty prope * @return generated codegen property */ public HashMap toCodegenMysqlDataTypeArgument(Object value) { - HashMap arg = new HashMap(); + HashMap arg = new HashMap<>(); if (value instanceof String) { arg.put("isString", true); arg.put("isFloat", false); @@ -838,7 +838,7 @@ public HashMap toCodegenMysqlDataTypeArgument(Object value) { * @return generated codegen property */ public HashMap toCodegenMysqlDataTypeDefault(String defaultValue, String mysqlDataType) { - HashMap defaultMap = new HashMap(); + HashMap defaultMap = new HashMap<>(); if (defaultValue == null || defaultValue.toUpperCase(Locale.ROOT).equals("NULL")) { defaultMap.put("defaultValue", "NULL"); defaultMap.put("isString", false); @@ -1076,7 +1076,7 @@ public String toMysqlIdentifier(String name, String prefix, String suffix) { // identifier name cannot be empty if (escapedName.isEmpty()) { - throw new RuntimeException("Empty database/table/column name for property '" + name.toString() + "' not allowed"); + throw new RuntimeException("Empty database/table/column name for property '" + name + "' not allowed"); } return escapedName; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java index c81bccd718a3..572cbacc66f8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java @@ -117,13 +117,13 @@ public NimClientCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "array" ) ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "int", "int8", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java index de51e636a83f..3af6d99b96ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java @@ -439,7 +439,7 @@ public void postProcessFile(File file, String fileType) { // only process files with js extension if ("js".equals(FilenameUtils.getExtension(file.toString()))) { - String command = jsPostProcessFile + " " + file.toString(); + String command = jsPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java index ad061e72c067..3b62750ae02d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java @@ -672,7 +672,7 @@ private List> buildEnumValues(String valueString) { public String toEnumValueName(String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); - } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) { + } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains(String.valueOf((char) character)))) { return escape(name, specialCharReplacements, Collections.singletonList("_"), null); } else { return name; @@ -812,7 +812,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with ml or mli extension if ("ml".equals(FilenameUtils.getExtension(file.toString())) || "mli".equals(FilenameUtils.getExtension(file.toString()))) { - String command = ocamlPostProcessFile + " " + file.toString(); + String command = ocamlPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java index 562f1a5b3fd1..0075bcb8a575 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java @@ -43,7 +43,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { public static final String DEFAULT_LICENSE = "Proprietary"; public static final String CORE_DATA = "coreData"; - protected Set foundationClasses = new HashSet(); + protected Set foundationClasses = new HashSet<>(); protected String podName = "OpenAPIClient"; protected String podVersion = "1.0.0"; protected String classPrefix = "OAI"; @@ -60,7 +60,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { protected boolean generateCoreData = false; - protected Set advancedMappingTypes = new HashSet(); + protected Set advancedMappingTypes = new HashSet<>(); public ObjcClientCodegen() { super(); @@ -185,9 +185,9 @@ public ObjcClientCodegen() { "description", "class" )); - importMapping = new HashMap(); + importMapping = new HashMap<>(); - foundationClasses = new HashSet( + foundationClasses = new HashSet<>( Arrays.asList( "NSNumber", "NSObject", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index 7af1f4e36b31..2a4a8d1905ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -614,7 +614,7 @@ public void postProcessFile(File file, String fileType) { if ("t".equals(FilenameUtils.getExtension(file.toString())) || "pm".equals(FilenameUtils.getExtension(file.toString())) || "pl".equals(FilenameUtils.getExtension(file.toString()))) { - String command = perlTidyPath + " -b -bext='/' " + file.toString(); + String command = perlTidyPath + " -b -bext='/' " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java index 3c33950a0341..a6efee11fb18 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java @@ -90,7 +90,7 @@ public PhpSilexServerCodegen() { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); // ref: http://php.net/manual/en/language.types.intro.php - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "boolean", "int", @@ -108,7 +108,7 @@ public PhpSilexServerCodegen() { instantiationTypes.put("map", "map"); // ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("integer", "int"); typeMapping.put("long", "int"); typeMapping.put("float", "float"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 17d970d39c52..7ffaf723136a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -113,7 +113,7 @@ public PhpSymfonyServerCodegen() { outputFolder = "generated-code" + File.separator + "php"; apiTemplateFiles.put("api_controller.mustache", ".php"); modelTestTemplateFiles.put("testing/model_test.mustache", ".php"); - apiTestTemplateFiles = new HashMap(); + apiTestTemplateFiles = new HashMap<>(); apiTestTemplateFiles.put("testing/api_test.mustache", ".php"); embeddedTemplateDir = templateDir = "php-symfony"; @@ -139,7 +139,7 @@ public PhpSymfonyServerCodegen() { ); // ref: http://php.net/manual/en/language.types.intro.php - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "int", @@ -157,7 +157,7 @@ public PhpSymfonyServerCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "\\DateTime", "UploadedFile" @@ -167,13 +167,13 @@ public PhpSymfonyServerCodegen() { variableNamingConvention = "camelCase"; // provide primitives to mustache template - List sortedLanguageSpecificPrimitives = new ArrayList(languageSpecificPrimitives); + List sortedLanguageSpecificPrimitives = new ArrayList<>(languageSpecificPrimitives); Collections.sort(sortedLanguageSpecificPrimitives); String primitives = "'" + StringUtils.join(sortedLanguageSpecificPrimitives, "', '") + "'"; additionalProperties.put("primitives", primitives); // ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("integer", "int"); typeMapping.put("long", "int"); typeMapping.put("decimal", "float"); @@ -370,13 +370,13 @@ public void processOpts() { // Type-hintable primitive types // ref: http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration if (phpLegacySupport) { - typeHintable = new HashSet( + typeHintable = new HashSet<>( Arrays.asList( "array" ) ); } else { - typeHintable = new HashSet( + typeHintable = new HashSet<>( Arrays.asList( "array", "bool", @@ -396,7 +396,7 @@ public Map postProcessOperationsWithModels(Map o operations.put("controllerName", toControllerName((String) operations.get("pathPrefix"))); operations.put("symfonyService", toSymfonyService((String) operations.get("pathPrefix"))); - List authMethods = new ArrayList(); + List authMethods = new ArrayList<>(); List operationList = (List) operations.get("operation"); for (CodegenOperation op : operationList) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index 58e12fff7015..f55734fafa21 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -109,7 +109,7 @@ public PowerShellClientCodegen() { modelPackage = packageName + File.separator + "Model"; // https://blogs.msdn.microsoft.com/powershell/2010/01/07/how-objects-are-sent-to-and-from-remote-sessions/ - languageSpecificPrimitives = new HashSet(Arrays.asList( + languageSpecificPrimitives = new HashSet<>(Arrays.asList( "Byte", "SByte", "Byte[]", @@ -136,9 +136,9 @@ public PowerShellClientCodegen() { "Version" )); - commonVerbs = new HashMap(); + commonVerbs = new HashMap<>(); - Map> verbMappings = new HashMap>(); + Map> verbMappings = new HashMap<>(); // common verbMappings.put("Add", Arrays.asList("Append", "Attach", "Concatenate", "Insert")); @@ -266,7 +266,7 @@ public PowerShellClientCodegen() { } } - powershellVerbs = new HashSet(Arrays.asList( + powershellVerbs = new HashSet<>(Arrays.asList( "Add", "Clear", "Close", @@ -368,9 +368,9 @@ public PowerShellClientCodegen() { "Use" )); - methodNames = new HashSet(); + methodNames = new HashSet<>(); - nullablePrimitives = new HashSet(Arrays.asList( + nullablePrimitives = new HashSet<>(Arrays.asList( "System.Nullable[Byte]", "System.Nullable[SByte]", "System.Nullable[Int16]", @@ -386,7 +386,7 @@ public PowerShellClientCodegen() { )); // list of reserved words - must be in lower case - reservedWords = new HashSet(Arrays.asList( + reservedWords = new HashSet<>(Arrays.asList( // https://richardspowershellblog.wordpress.com/2009/05/02/powershell-reserved-words/ "begin", "break", @@ -456,7 +456,7 @@ public PowerShellClientCodegen() { "true" )); - paramNameReservedWords = new HashSet(Arrays.asList( + paramNameReservedWords = new HashSet<>(Arrays.asList( "args", "error", "executioncontext", @@ -480,7 +480,7 @@ public PowerShellClientCodegen() { "true" )); - defaultIncludes = new HashSet(Arrays.asList( + defaultIncludes = new HashSet<>(Arrays.asList( "Byte", "SByte", "Byte[]", @@ -507,7 +507,7 @@ public PowerShellClientCodegen() { "Version" )); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("string", "String"); typeMapping.put("boolean", "Boolean"); typeMapping.put("integer", "Int32"); @@ -1012,8 +1012,8 @@ public String toParamName(String name) { @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { Map operations = (Map) objs.get("operations"); - HashMap modelMaps = new HashMap(); - HashMap processedModelMaps = new HashMap(); + HashMap modelMaps = new HashMap<>(); + HashMap processedModelMaps = new HashMap<>(); for (Object o : allModels) { HashMap h = (HashMap) o; @@ -1185,10 +1185,10 @@ private String constructExampleCode(CodegenParameter codegenParameter, HashMap allowableValues) { example.append("\""); List enumValues = (List) allowableValues.get("values"); - example.append(String.valueOf(enumValues.get(0))); + example.append(enumValues.get(0)); example.append("\""); @@ -1474,7 +1474,7 @@ public void postProcessFile(File file, String fileType) { // only process files with ps extension if ("ps".equals(FilenameUtils.getExtension(file.toString()))) { - String command = powershellPostProcessFile + " " + file.toString(); + String command = powershellPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java index 02a01627dd68..f04a58fcf426 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java @@ -86,13 +86,13 @@ public ProtobufSchemaCodegen() { modelPackage = "messages"; apiPackage = "services"; - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "map", "array", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 7b66ec98a396..6273a453183d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -611,12 +611,12 @@ private void fixComposedSchemaRequiredVars(Schema schema, CodegenModel result) { ComposedSchema cs = (ComposedSchema) schema; // these are the properties that are from properties in self cs or cs allOf - Map selfProperties = new LinkedHashMap(); - List selfRequired = new ArrayList(); + Map selfProperties = new LinkedHashMap<>(); + List selfRequired = new ArrayList<>(); // these are the properties that are from properties in cs oneOf or cs anyOf - Map otherProperties = new LinkedHashMap(); - List otherRequired = new ArrayList(); + Map otherProperties = new LinkedHashMap<>(); + List otherRequired = new ArrayList<>(); List oneOfanyOfSchemas = new ArrayList<>(); List oneOf = cs.getOneOf(); @@ -631,7 +631,7 @@ private void fixComposedSchemaRequiredVars(Schema schema, CodegenModel result) { Schema refSchema = ModelUtils.getReferencedSchema(this.openAPI, sc); addProperties(otherProperties, otherRequired, refSchema); } - Set otherRequiredSet = new HashSet(otherRequired); + Set otherRequiredSet = new HashSet<>(otherRequired); List allOf = cs.getAllOf(); if ((schema.getProperties() != null && !schema.getProperties().isEmpty()) || allOf != null) { @@ -641,7 +641,7 @@ private void fixComposedSchemaRequiredVars(Schema schema, CodegenModel result) { if (result.discriminator != null) { selfRequired.add(result.discriminator.getPropertyBaseName()); } - Set selfRequiredSet = new HashSet(selfRequired); + Set selfRequiredSet = new HashSet<>(selfRequired); List reqVars = result.getRequiredVars(); List reqVarsThatMustBeOptional = new ArrayList<>(); @@ -668,7 +668,7 @@ private void fixComposedSchemaRequiredVars(Schema schema, CodegenModel result) { protected void addParentContainer(CodegenModel model, String name, Schema schema) { super.addParentContainer(model, name, schema); - List referencedModelNames = new ArrayList(); + List referencedModelNames = new ArrayList<>(); model.dataType = getTypeString(schema, "", "", referencedModelNames); } @@ -688,7 +688,7 @@ public CodegenModel fromModel(String name, Schema sc) { if (cm.requiredVars.size() > 0 && (cm.oneOf.size() > 0 || cm.anyOf.size() > 0)) { fixComposedSchemaRequiredVars(sc, cm); } - ArrayList> listOfLists = new ArrayList>(); + ArrayList> listOfLists = new ArrayList<>(); listOfLists.add(cm.requiredVars); listOfLists.add(cm.optionalVars); for (List cpList : listOfLists) { @@ -940,7 +940,7 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc // store it in codegenModel.additionalPropertiesType. // The 'addProps' may be a reference, getTypeDeclaration will resolve // the reference. - List referencedModelNames = new ArrayList(); + List referencedModelNames = new ArrayList<>(); getTypeString(addProps, "", "", referencedModelNames); if (referencedModelNames.size() != 0) { // Models that are referenced in the 'additionalPropertiesType' keyword @@ -1235,7 +1235,7 @@ private String toExampleValueRecursive(String modelName, Schema schema, Object o String itemModelName = getModelName(itemSchema); if (objExample instanceof Iterable && itemModelName == null) { // If the example is already a list, return it directly instead of wrongly wrap it in another list - return fullPrefix + objExample.toString() + closeChars; + return fullPrefix + objExample + closeChars; } Set newSeenSchemas = new HashSet<>(seenSchemas); newSeenSchemas.add(schema); @@ -1493,7 +1493,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set protected Map getModelNameToSchemaCache() { if (modelNameToSchemaCache == null) { // Create a cache to efficiently lookup schema based on model name. - Map m = new HashMap(); + Map m = new HashMap<>(); ModelUtils.getSchemas(openAPI).forEach((key, schema) -> { m.put(toModelName(key), schema); }); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index 04fea6b122d9..b24d527646af 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -738,7 +738,7 @@ public String constructExampleCode(CodegenProperty codegenProperty, HashMap) codegenProperty.allowableValues.get("values")).get(0)) + "\""; + return "\"" + ((List) codegenProperty.allowableValues.get("values")).get(0) + "\""; } else { return "\"" + codegenProperty.name + "_example\""; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java index 6ca7dd832d06..265a9afc2080 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java @@ -124,13 +124,13 @@ public RustClientCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "i8", "i16", "i32", "i64", "u8", "u16", "u32", "u64", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index a522c48d60a1..328e18387ead 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -53,7 +53,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(RustServerCodegen.class); - private HashMap modelXmlNames = new HashMap(); + private Map modelXmlNames = new HashMap(); private static final String NO_FORMAT = "%%NO_FORMAT"; @@ -160,13 +160,13 @@ public RustServerCodegen() { ) ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList( "map", "array") ); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "bool", "char", @@ -341,7 +341,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { additionalProperties.put("serverHost", url.getHost()); additionalProperties.put("serverPort", URLPathUtils.getPort(url, serverPort)); - if (packageVersion == null || "".equals(packageVersion)) { + if (packageVersion == null || packageVersion.isEmpty()) { List versionComponents = new ArrayList<>(Arrays.asList(info.getVersion().split("[.]"))); if (versionComponents.size() < 1) { versionComponents.add("1"); @@ -1087,7 +1087,7 @@ private void postProcessOperationWithModels(CodegenOperation op, List al @Override public boolean isDataTypeFile(final String dataType) { - return dataType != null && dataType.equals(typeMapping.get("File").toString()); + return dataType != null && dataType.equals(typeMapping.get("File")); } /** @@ -1176,7 +1176,7 @@ public String getTypeDeclaration(Schema p) { } return datatype; } else if (p instanceof FileSchema) { - return typeMapping.get("File").toString(); + return typeMapping.get("File"); } return super.getTypeDeclaration(p); @@ -1314,7 +1314,7 @@ public Map postProcessSupportingFileData(Map bun // If we have callbacks, add the callbacks module, otherwise remove it boolean hasCallbacks = haveCallbacks(bundle); bundle.put("hasCallbacks", hasCallbacks); - SupportingFile[] callbackFiles = new SupportingFile[]{ + SupportingFile[] callbackFiles = { new SupportingFile("client-callbacks.mustache", "src/client", "callbacks.rs"), new SupportingFile("server-callbacks.mustache", "src/server", "callbacks.rs"), new SupportingFile("example-client-server.mustache", "examples/client", "server.rs") @@ -1674,12 +1674,12 @@ public void postProcessFile(File file, String fileType) { Process p = Runtime.getRuntime().exec(new String[]{commandPrefix, file.toString()}); int exitValue = p.waitFor(); if (exitValue != 0) { - LOGGER.error("Error running the command ({} {}). Exit code: {}", commandPrefix, file.toString(), exitValue); + LOGGER.error("Error running the command ({} {}). Exit code: {}", commandPrefix, file, exitValue); } else { - LOGGER.info("Successfully executed: {} {}", commandPrefix, file.toString()); + LOGGER.info("Successfully executed: {} {}", commandPrefix, file); } } catch (InterruptedException | IOException e) { - LOGGER.error("Error running the command ({} ()). Exception: {}", commandPrefix, file.toString(), e.getMessage()); + LOGGER.error("Error running the command ({} ()). Exception: {}", commandPrefix, file, e.getMessage()); // Restore interrupted state Thread.currentThread().interrupt(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java index 6194ba802a09..146ddf06ccf5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java @@ -87,7 +87,7 @@ public ScalaFinchServerCodegen() { "native") ); - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList("double", "Int", "Long", @@ -107,7 +107,7 @@ public ScalaFinchServerCodegen() { "Map") ); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("string", "String"); typeMapping.put("boolean", "Boolean"); typeMapping.put("integer", "Int"); @@ -158,7 +158,7 @@ public ScalaFinchServerCodegen() { supportingFiles.add(new SupportingFile("endpoint.mustache", sourceFolder, "endpoint.scala")); supportingFiles.add(new SupportingFile("errors.mustache", sourceFolder, "errors.scala")); - languageSpecificPrimitives = new HashSet( + languageSpecificPrimitives = new HashSet<>( Arrays.asList( "String", "Boolean", @@ -175,7 +175,7 @@ public ScalaFinchServerCodegen() { instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("map", "HashMap"); - importMapping = new HashMap(); + importMapping = new HashMap<>(); importMapping.put("UUID", "java.util.UUID"); importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java index dd0dca689fb7..2a359cb0e69b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java @@ -246,7 +246,7 @@ public Map postProcessAllModels(Map objs) { * * @param models processed models to be further processed */ - @SuppressWarnings({"unchecked"}) + @SuppressWarnings("unchecked") private void postProcessUpdateImports(final Map models) { final String prefix = modelPackage() + "."; Map enumRefs = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java index 8cd1e3cc0b6a..4a270fcec9f6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java @@ -57,7 +57,7 @@ public ScalatraServerCodegen() { apiPackage = "org.openapitools.server.api"; modelPackage = "org.openapitools.server.model"; - defaultIncludes = new HashSet( + defaultIncludes = new HashSet<>( Arrays.asList("double", "Int", "Long", @@ -118,7 +118,7 @@ public ScalatraServerCodegen() { supportingFiles.add(new SupportingFile("project/plugins.sbt", "project", "plugins.sbt")); supportingFiles.add(new SupportingFile("sbt", "", "sbt")); - importMapping = new HashMap(); + importMapping = new HashMap<>(); importMapping.put("UUID", "java.util.UUID"); importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index df5de0c1c90a..a1e73c16e47d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -575,7 +575,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera basePath = basePath.substring(0, pos); } - if ("".equals(basePath)) { + if (basePath.isEmpty()) { basePath = "default"; } else { co.subresourceOperation = !co.path.isEmpty(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index a3c9efaab5e7..523c7de0d094 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -67,7 +67,7 @@ public StaticHtml2Generator() { outputFolder = "docs"; embeddedTemplateDir = templateDir = "htmlDocs2"; - defaultIncludes = new HashSet(); + defaultIncludes = new HashSet<>(); cliOptions.add(new CliOption("appName", "short name of the application")); cliOptions.add(new CliOption("appDescription", "description of the application")); @@ -100,10 +100,10 @@ public StaticHtml2Generator() { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); - languageSpecificPrimitives = new HashSet(); - importMapping = new HashMap(); + languageSpecificPrimitives = new HashSet<>(); + importMapping = new HashMap<>(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java index 3804de3160a8..910528d74989 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java @@ -54,7 +54,7 @@ public StaticHtmlGenerator() { outputFolder = "docs"; embeddedTemplateDir = templateDir = "htmlDocs"; - defaultIncludes = new HashSet(); + defaultIncludes = new HashSet<>(); cliOptions.add(new CliOption("appName", "short name of the application")); cliOptions.add(new CliOption("appDescription", "description of the application")); @@ -79,10 +79,10 @@ public StaticHtmlGenerator() { additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); - reservedWords = new HashSet(); + reservedWords = new HashSet<>(); - languageSpecificPrimitives = new HashSet(); - importMapping = new HashMap(); + languageSpecificPrimitives = new HashSet<>(); + importMapping = new HashMap<>(); } /** @@ -196,7 +196,7 @@ public String toModelName(final String name) { public String toVarName(String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); - } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) { + } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains(String.valueOf((char) character)))) { return escape(name, specialCharReplacements, Arrays.asList("_"), null); } else { return name; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java index c3efed944546..0762835b4a58 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java @@ -790,7 +790,7 @@ public void setSwiftUseApiNamespace(boolean swiftUseApiNamespace) { public String toEnumValue(String value, String datatype) { // for string, array of string if ("String".equals(datatype) || "[String]".equals(datatype) || "[String:String]".equals(datatype)) { - return "\"" + String.valueOf(value) + "\""; + return "\"" + value + "\""; } else { return String.valueOf(value); } @@ -963,7 +963,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with swift extension if ("swift".equals(FilenameUtils.getExtension(file.toString()))) { - String command = swiftPostProcessFile + " " + file.toString(); + String command = swiftPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index df038dad8328..31614ac9b656 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -735,7 +735,7 @@ public String toDefaultValue(Schema p) { // In Java, we need to be creative to get the Timestamp in Microseconds as a long. Instant instant = ((OffsetDateTime) p.getDefault()).toInstant(); long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + (instant.get(ChronoField.MICRO_OF_SECOND)); - return "Date(timeIntervalSince1970: " + String.valueOf(epochMicro) + ".0 / 1_000_000)"; + return "Date(timeIntervalSince1970: " + epochMicro + ".0 / 1_000_000)"; } else if (ModelUtils.isStringSchema(p)) { return "\"" + escapeText((String) p.getDefault()) + "\""; } @@ -955,7 +955,7 @@ public void setHashableModels(boolean hashableModels) { public String toEnumValue(String value, String datatype) { // for string, array of string if ("String".equals(datatype) || "[String]".equals(datatype) || "[String: String]".equals(datatype)) { - return "\"" + String.valueOf(value) + "\""; + return "\"" + value + "\""; } else { return String.valueOf(value); } @@ -1115,7 +1115,7 @@ public void postProcessFile(File file, String fileType) { } // only process files with swift extension if ("swift".equals(FilenameUtils.getExtension(file.toString()))) { - String command = swiftPostProcessFile + " " + file.toString(); + String command = swiftPostProcessFile + " " + file; try { Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); @@ -1146,7 +1146,7 @@ public Map postProcessOperationsWithModels(Map o List operations = (List) objectMap.get("operation"); for (CodegenOperation operation : operations) { for (CodegenParameter cp : operation.allParams) { - cp.vendorExtensions.put("x-swift-example", constructExampleCode(cp, modelMaps, new HashSet())); + cp.vendorExtensions.put("x-swift-example", constructExampleCode(cp, modelMaps, new HashSet<>())); } } return objs; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 1d036163a9df..758f2650f5a1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -577,7 +577,7 @@ private void setChildDiscriminatorValue(CodegenModel parent, CodegenModel child) * Parse imports */ private Set parseImports(CodegenModel cm) { - Set newImports = new HashSet(); + Set newImports = new HashSet<>(); if (cm.imports.size() > 0) { for (String name : cm.imports) { if (name.indexOf(" | ") >= 0) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 1c0cbe1af9ea..d371f6177187 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -146,13 +146,13 @@ public TypeScriptClientCodegen() { "Map" )); - languageGenericTypes = new HashSet(Arrays.asList( + languageGenericTypes = new HashSet<>(Arrays.asList( "Array" )); instantiationTypes.put("array", "Array"); - typeMapping = new HashMap(); + typeMapping = new HashMap<>(); typeMapping.put("Array", "Array"); typeMapping.put("array", "Array"); typeMapping.put("List", "Array"); @@ -185,7 +185,7 @@ public TypeScriptClientCodegen() { cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package. If not provided, using the version from the OpenAPI specification file.").defaultValue(this.getNpmVersion())); cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); cliOptions.add(CliOption.newBoolean(SNAPSHOT, - "When setting this property to true, the version will be suffixed with -SNAPSHOT." + this.SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), + "When setting this property to true, the version will be suffixed with -SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), false)); cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase")); @@ -339,7 +339,7 @@ public Map postProcessOperationsWithModels(Map o * @return TypeScript return type */ private String getReturnType(List responses) { - Set returnTypes = new HashSet(); + Set returnTypes = new HashSet<>(); for (CodegenResponse response: responses) { if (response.is2xx) { if (response.dataType != null) { @@ -424,7 +424,7 @@ protected String addSuffix(String name, String suffix) { } protected String toTypescriptTypeName(final String name, String safePrefix) { - ArrayList exceptions = new ArrayList(Arrays.asList("\\|", " ")); + ArrayList exceptions = new ArrayList<>(Arrays.asList("\\|", " ")); String sanName = sanitizeName(name, "(?![| ])\\W", exceptions); sanName = camelize(sanName); @@ -507,7 +507,7 @@ protected String enumValuesToEnumTypeUnion(List values, String dataType) if (!isFirst) { b.append(" | "); } - b.append(toEnumValue(value.toString(), dataType)); + b.append(toEnumValue(value, dataType)); isFirst = false; } return b.toString(); @@ -1220,7 +1220,7 @@ private String toExampleValueRecursive(String modelName, Schema schema, Object o String itemModelName = getModelName(itemSchema); if (objExample instanceof Iterable && itemModelName == null) { // If the example is already a list, return it directly instead of wrongly wrap it in another list - return fullPrefix + objExample.toString() + closeChars; + return fullPrefix + objExample + closeChars; } Set newSeenSchemas = new HashSet<>(seenSchemas); newSeenSchemas.add(schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 71d538186473..bc0a2808aad1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -186,8 +186,8 @@ public boolean isUniqueIdAccordingToNameSuffix(String name) { } return "id".equals(name) || "ids".equals(name) || - (name.length() >= 3 && name.substring(name.length() - 2).equals("Id")) || - (name.length() >= 4 && name.substring(name.length() - 3).equals("Ids")); + (name.length() >= 3 && name.endsWith("Id")) || + (name.length() >= 4 && name.endsWith("Ids")); } @Override @@ -488,7 +488,7 @@ public ExtendedCodegenOperation fromOperation(String path, String httpMethod, Op op.returnPassthrough = null; } } - } else if (this.getDetectPassthroughModelsWithSuffixAndField() != null && op.returnBaseType.length() > this.getPassthroughSuffix().length() && op.returnBaseType.substring(op.returnBaseType.length() - this.getPassthroughSuffix().length()).equals(this.getPassthroughSuffix())) { + } else if (this.getDetectPassthroughModelsWithSuffixAndField() != null && op.returnBaseType.length() > this.getPassthroughSuffix().length() && op.returnBaseType.endsWith(this.getPassthroughSuffix())) { boolean foundMatch = false; for (CodegenProperty var : cm.vars) { if (var.name.equals(this.getPassthroughField())) { @@ -635,7 +635,7 @@ private ExtendedCodegenModel processCodeGenModel(ExtendedCodegenModel cm) { cm.returnPassthrough = null; } } - } else if (this.getDetectPassthroughModelsWithSuffixAndField() != null && cm.name.length() > this.getPassthroughSuffix().length() && cm.name.substring(cm.name.length() - this.getPassthroughSuffix().length()).equals(this.getPassthroughSuffix())) { + } else if (this.getDetectPassthroughModelsWithSuffixAndField() != null && cm.name.length() > this.getPassthroughSuffix().length() && cm.name.endsWith(this.getPassthroughSuffix())) { boolean foundMatch = false; for (CodegenProperty var : cm.vars) { if (var.name.equals(this.getPassthroughField())) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java index 771e66db0a44..524b96209a4a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java @@ -387,14 +387,12 @@ public Map postProcessAllModels(Map objs) { * Parse imports */ private Set parseImports(CodegenModel cm) { - Set newImports = new HashSet(); + Set newImports = new HashSet<>(); if (cm.imports.size() > 0) { for (String name : cm.imports) { if (name.indexOf(" | ") >= 0) { String[] parts = name.split(" \\| "); - for (String s : parts) { - newImports.add(s); - } + newImports.addAll(Arrays.asList(parts)); } else { newImports.add(name); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index 93fefc8403a5..ad8947cb3aeb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -103,7 +103,7 @@ public String getTypeDeclaration(Schema p) { @Override protected void handleMethodResponse(Operation operation, Map schemas, CodegenOperation op, ApiResponse methodResponse) { - handleMethodResponse(operation, schemas, op, methodResponse, Collections.emptyMap()); + handleMethodResponse(operation, schemas, op, methodResponse, Collections.emptyMap()); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java index ef9178e610d4..64ce72b5cf25 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/HandlebarsEngineAdapter.java @@ -42,10 +42,10 @@ public class HandlebarsEngineAdapter extends AbstractTemplatingEngineAdapter { final Logger LOGGER = LoggerFactory.getLogger(HandlebarsEngineAdapter.class); - private final String[] extensions = new String[]{"handlebars", "hbs"}; + private final String[] extensions = {"handlebars", "hbs"}; // We use this as a simple lookup for valid file name extensions. This adapter will inspect .mustache (built-in) and infer the relevant handlebars filename - private final String[] canCompileFromExtensions = new String[]{".handlebars",".hbs",".mustache"}; + private final String[] canCompileFromExtensions = {".handlebars",".hbs",".mustache"}; private boolean infiniteLoops = false; private boolean prettyPrint = false; @@ -92,7 +92,7 @@ public TemplateSource sourceAt(String location) { return tmpl.apply(context); } - @SuppressWarnings({"java:S108"}) + @SuppressWarnings("java:S108") public TemplateSource findTemplate(TemplatingExecutor generator, String templateFile) { String[] possibilities = getModifiedFileLocation(templateFile); for (String file : possibilities) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java index cc7d2a8b98d3..b78199880568 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java @@ -43,7 +43,7 @@ public String getIdentifier() { return "mustache"; } - private final String[] extensions = new String[]{"mustache"}; + private final String[] extensions = {"mustache"}; Mustache.Compiler compiler = Mustache.compiler(); /** @@ -65,7 +65,7 @@ public String compileTemplate(TemplatingExecutor executor, Map b return tmpl.execute(bundle); } - @SuppressWarnings({"java:S108"}) // catch-all is expected, and is later thrown + @SuppressWarnings("java:S108") // catch-all is expected, and is later thrown public Reader findTemplate(TemplatingExecutor generator, String name) { for (String extension : extensions) { final String templateName = name + "." + extension; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index e26bbcaa4583..b5e10d5c4b60 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1073,7 +1073,7 @@ private static Schema getSchemaFromContent(Content content) { */ public static Schema unaliasSchema(OpenAPI openAPI, Schema schema) { - return unaliasSchema(openAPI, schema, Collections.emptyMap()); + return unaliasSchema(openAPI, schema, Collections.emptyMap()); } /** @@ -1258,7 +1258,7 @@ public static List getInterfaces(ComposedSchema composed) { } else if (composed.getOneOf() != null && !composed.getOneOf().isEmpty()) { return composed.getOneOf(); } else { - return Collections.emptyList(); + return Collections.emptyList(); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java index 47a43e04bdaa..e77bec480e13 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java @@ -119,10 +119,7 @@ public void addToImplementor(CodegenConfig cc, CodegenModel implcm, List oneImport : additionalImports) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java index f8308a1a66c6..afd23f24cd7b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java @@ -153,7 +153,7 @@ public static String camelize(final String inputWord, boolean lowercaseFirstLett m = camelizeSlashPattern.matcher(word); while (m.find()) { - word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/); + word = m.replaceFirst(Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/); m = camelizeSlashPattern.matcher(word); } @@ -256,7 +256,7 @@ public static String escape(final String name, final Map replace EscapedNameOptions ns = new EscapedNameOptions(name, replacementMap.keySet(), charactersToAllow, appendToReplacement); return escapedWordsCache.get(ns, wordToEscape -> { String result = name.chars().mapToObj(c -> { - String character = "" + (char) c; + String character = String.valueOf((char) c); if (charactersToAllow != null && charactersToAllow.contains(character)) { return character; } else if (replacementMap.containsKey(character)) { @@ -264,7 +264,7 @@ public static String escape(final String name, final Map replace } else { return character; } - }).reduce( (c1, c2) -> "" + c1 + c2).orElse(null); + }).reduce( (c1, c2) -> c1 + c2).orElse(null); if (result != null) return result; throw new RuntimeException("Word '" + name + "' could not be escaped."); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index f1e0cd6b9b6d..7afce7c43915 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -2425,7 +2425,7 @@ public void inlineAllOfSchemaDoesNotThrowException() { Schema sc = openAPI.getComponents().getSchemas().get(modelName); CodegenModel cm = codegen.fromModel(modelName, sc); - final Set expectedMappedModels = new HashSet<>(Arrays.asList(new CodegenDiscriminator.MappedModel("UserSleep", "UserSleep"))); + final Set expectedMappedModels = Sets.newHashSet(new CodegenDiscriminator.MappedModel("UserSleep", "UserSleep")); final Set mappedModels = cm.getDiscriminator().getMappedModels(); assertEquals(mappedModels, expectedMappedModels); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java index d1d5fe81dfbd..e82c584a4c59 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java @@ -116,12 +116,12 @@ public static WrittenTemplateBasedFile getTemplateBasedFile(MockDefaultGenerator public static void ensureContainsFile(List generatedFiles, File root, String filename) { Path path = root.toPath().resolve(filename); - assertTrue(generatedFiles.contains(path.toFile()), "File '" + path.toAbsolutePath().toString() + "' was not found in the list of generated files"); + assertTrue(generatedFiles.contains(path.toFile()), "File '" + path.toAbsolutePath() + "' was not found in the list of generated files"); } public static void ensureDoesNotContainsFile(List generatedFiles, File root, String filename) { Path path = root.toPath().resolve(filename); - assertFalse(generatedFiles.contains(path.toFile()), "File '" + path.toAbsolutePath().toString() + "' was found in the list of generated files"); + assertFalse(generatedFiles.contains(path.toFile()), "File '" + path.toAbsolutePath() + "' was found in the list of generated files"); } public static void validateJavaSourceFiles(Map fileMap) { @@ -167,7 +167,7 @@ public static void assertFileContains(Path path, String... lines) { for (String line : lines) assertTrue(file.contains(linearize(line)), "File does not contain line [" + line + "]"); } catch (IOException e) { - fail("Unable to evaluate file " + path.toString()); + fail("Unable to evaluate file " + path); } } @@ -180,7 +180,7 @@ public static void assertFileNotContains(Path path, String... lines) { try { generatedFile = new String(Files.readAllBytes(path), StandardCharsets.UTF_8); } catch (IOException e) { - fail("Unable to evaluate file " + path.toString()); + fail("Unable to evaluate file " + path); } String file = linearize(generatedFile); assertNotNull(file); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java index 58ab3d67bfdd..56738caef3fb 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java @@ -52,7 +52,7 @@ public void assertOuterEnumIsString() { } public boolean outerEnumVarsIsString(final AbstractCSharpCodegen codegen, final int openApiVersion, final Boolean nullableReferenceTypes){ - final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/" + Integer.toString(openApiVersion) + "_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml"); + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/" + openApiVersion + "_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml"); codegen.setNullableReferenceTypes(nullableReferenceTypes); codegen.setOpenAPI(openAPI); Schema schema = openAPI.getComponents().getSchemas().get("Enum_Test"); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpOperationTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpOperationTest.java index 175446c9a949..b0054e9a6f21 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpOperationTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpOperationTest.java @@ -45,7 +45,7 @@ public void assertMethodOptionalParameterDataType() { } public String getOperationOptionalParameterDataType(final AbstractCSharpCodegen codegen, final int openApiVersion, final Boolean nullableReferenceTypes){ - final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/" + Integer.toString(openApiVersion) + "_0/petstore-with-fake-endpoints-models-for-testing.yaml"); + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/" + openApiVersion + "_0/petstore-with-fake-endpoints-models-for-testing.yaml"); codegen.setNullableReferenceTypes(nullableReferenceTypes); codegen.setOpenAPI(openAPI); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java index a49ee4e825cc..36b3e4edb65a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -67,7 +68,7 @@ public void testKeywords() throws Exception { List reservedWordsList = new ArrayList(); try { - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8"))); + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), StandardCharsets.UTF_8)); while(reader.ready()) { reservedWordsList.add(reader.readLine()); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java index 95a47ba87fe9..c395fba38d4a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientCodegenTest.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -66,7 +67,7 @@ public void testKeywords() throws Exception { List reservedWordsList = new ArrayList(); try { - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8"))); + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), StandardCharsets.UTF_8)); while(reader.ready()) { reservedWordsList.add(reader.readLine()); } reader.close(); } catch (Exception e) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java index 898e32810b3c..7166ac04044b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioNextClientCodegenTest.java @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -67,7 +68,7 @@ public void testKeywords() throws Exception { List reservedWordsList = new ArrayList(); try { - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8"))); + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), StandardCharsets.UTF_8)); while(reader.ready()) { reservedWordsList.add(reader.readLine()); } reader.close(); } catch (Exception e) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java index fb822ec2df88..c53b804c8521 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/fsharp/FSharpServerCodegenTest.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Arrays; -import java.lang.Exception; @SuppressWarnings("static-method") public class FSharpServerCodegenTest { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 21950902f874..ccb5ac4caf0d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -568,7 +568,7 @@ public void toDefaultValueTest() { Double doubleValue = 100.0; numberSchema.setDefault(doubleValue); defaultValue = codegen.toDefaultValue(numberSchema); - Assert.assertEquals(defaultValue, "new BigDecimal(\"" + doubleValue.toString() + "\")"); + Assert.assertEquals(defaultValue, "new BigDecimal(\"" + doubleValue + "\")"); // Test default value for number with format set to double numberSchema.setFormat("double"); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index c9d4090b050a..2e25fa70a24a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -131,7 +131,7 @@ public void testParametersAreCorrectlyOrderedWhenUsingRetrofit() { CodegenParameter pathParam2 = createPathParam("pathParam2"); codegenOperation.allParams = Arrays.asList(queryParamRequired, pathParam1, pathParam2, queryParamOptional); - Map operations = ImmutableMap.of("operation", Arrays.asList(codegenOperation)); + Map operations = ImmutableMap.of("operation", Arrays.asList(codegenOperation)); Map objs = ImmutableMap.of("operations", operations, "imports", new ArrayList>()); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java index 54e122aa03c9..bb7fb2d93131 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java @@ -119,7 +119,7 @@ public void testMultipartJerseyServer() throws Exception { final Map files = generateFiles(codegen, "src/test/resources/3_0/form-multipart-binary-array.yaml"); // Check files for Single, Mixed - String[] fileS = new String[] { + String[] fileS = { "MultipartSingleApi.java", "MultipartSingleApiService.java", "MultipartSingleApiServiceImpl.java", "MultipartMixedApi.java", "MultipartMixedApiService.java", "MultipartMixedApiServiceImpl.java" }; for (String f : fileS){ @@ -127,7 +127,7 @@ public void testMultipartJerseyServer() throws Exception { } // Check files for Array - final String[] fileA = new String[] { "MultipartArrayApiService.java", "MultipartArrayApi.java", "MultipartArrayApiServiceImpl.java"}; + final String[] fileA = { "MultipartArrayApiService.java", "MultipartArrayApi.java", "MultipartArrayApiServiceImpl.java"}; for (String f : fileA) { assertFileContains( files.get(f).toPath(), "List files"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java index 16e65c34c5b6..452d38f05ec1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java @@ -238,7 +238,7 @@ public static String readFile(String path) { file = linearize(generatedFile); assertNotNull(file); } catch (IOException e) { - fail("Unable to evaluate file " + path.toString()); + fail("Unable to evaluate file " + path); } return file; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java index a86cf6f13975..324775d1df24 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinTestUtils.java @@ -79,7 +79,7 @@ private static GenerationState compileModule(String moduleName, List sou } else { String s; try { - s = new String(baos.toByteArray(), "UTF-8"); + s = baos.toString("UTF-8"); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 4e7d98d2874d..e59203fd50b2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -43,11 +43,11 @@ public void testSampleMarkdownGeneration() throws IOException { Path expectedPath = this.outputTempDirectory.toPath().relativize(generated.toPath()); File expected = expectedFiles.resolve(expectedPath).toFile(); - Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); + Assert.assertTrue(expected.exists(), "Could not find " + expected); Assert.assertEquals(FileUtils.readFileToString(generated, StandardCharsets.UTF_8).replace("\n", "").replace("\r", ""), FileUtils.readFileToString(expected, StandardCharsets.UTF_8).replace("\n", "").replace("\r", "")); } } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java index d82abade09f1..6df13d473eb9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java @@ -163,7 +163,7 @@ public void bodyParameterTest() { modelMap.put("model", model); final CodegenOperation op = codegen.fromOperation(path, "post", p, null); - Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); + Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); Map objs = ImmutableMap.of("operations", operations, "imports", new ArrayList>()); objs = codegen.postProcessOperationsWithModels(objs, Collections.singletonList(modelMap)); CodegenOperation postProcessedOp = ((List) ((Map) objs.get("operations")).get("operation")).get(0); @@ -627,7 +627,7 @@ public void exampleStringFromExampleParameterOAS2Test() { final Operation p = openAPI.getPaths().get(path).getDelete(); final CodegenOperation op = codegen.fromOperation(path, "delete", p, null); - Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); + Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); Map objs = ImmutableMap.of("operations", operations, "imports", new ArrayList>()); objs = codegen.postProcessOperationsWithModels(objs, Collections.emptyList()); CodegenOperation postProcessedOp = ((List) ((Map) objs.get("operations")).get("operation")).get(0); @@ -647,7 +647,7 @@ public void exampleStringFromXExampleParameterOAS3Test() { final Operation p = openAPI.getPaths().get(path).getDelete(); final CodegenOperation op = codegen.fromOperation(path, "delete", p, null); - Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); + Map operations = ImmutableMap.of("operation", Collections.singletonList(op)); Map objs = ImmutableMap.of("operations", operations, "imports", new ArrayList>()); objs = codegen.postProcessOperationsWithModels(objs, Collections.emptyList()); CodegenOperation postProcessedOp = ((List) ((Map) objs.get("operations")).get("operation")).get(0); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java index 6172b50890cd..bfdb2452bdf7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java @@ -141,8 +141,8 @@ public static void assertFilesAreEqual(final Path expected, final Path actual) { if (!deltas.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("files diff:\n"); - stringBuilder.append("\tfile: '").append(expected.toAbsolutePath().toString()).append("' \n"); - stringBuilder.append("\tfile: '").append(actual.toAbsolutePath().toString()).append("' \n"); + stringBuilder.append("\tfile: '").append(expected.toAbsolutePath()).append("' \n"); + stringBuilder.append("\tfile: '").append(actual.toAbsolutePath()).append("' \n"); stringBuilder.append("\tdiffs:\n"); for (Delta delta : deltas) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java index 4a5e7da18a72..7101d441b2a7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java @@ -35,6 +35,7 @@ import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -206,7 +207,7 @@ public String toString() { private void reload() throws CacheException, UnsupportedEncodingException { root.unload(); - root.load(new ByteArrayInputStream(JSON.getBytes("UTF-8"))); + root.load(new ByteArrayInputStream(JSON.getBytes(StandardCharsets.UTF_8))); } @BeforeMethod(alwaysRun = true) @@ -990,7 +991,7 @@ public void testMerge() throws Exception { + " \"number\": 10" // split + " }" // split + "}"; - ByteArrayInputStream in = new ByteArrayInputStream(incoming.getBytes("UTF-8")); + ByteArrayInputStream in = new ByteArrayInputStream(incoming.getBytes(StandardCharsets.UTF_8)); root.mergePolicy(MergePolicy.NO_MERGE).load(in); assertFalse(root.isDirty(), "cache should not be dirty after second load() in NO_MERGE mode");