Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !10808

Non functional Java styling changes

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/agilob/java-warning-formatting into master 3 years ago
  • Overview 0
  • Commits 9
  • Pipelines 0
  • Changes 115

Created by: agilob

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.
Compare
  • master (base)

and
  • latest version
    88780da7
    9 commits, 2 years ago

115 files
+ 523
- 531

    Preferences

    File browser
    Compare changes
modules/openap‎i-generator/src‎
main/java/org/ope‎napitools/codegen‎
con‎fig‎
CodegenConfi‎gurator.java‎ +1 -3
exam‎ples‎
ExampleGen‎erator.java‎ +1 -1
XmlExampleGe‎nerator.java‎ +1 -1
ignore‎/rules‎
RootedFil‎eRule.java‎ +1 -1
lang‎uages‎
AbstractAda‎Codegen.java‎ +13 -13
AbstractCShar‎pCodegen.java‎ +11 -11
AbstractCpp‎Codegen.java‎ +1 -1
AbstractDart‎Codegen.java‎ +2 -2
AbstractEiffe‎lCodegen.java‎ +4 -4
AbstractFShar‎pCodegen.java‎ +16 -17
AbstractGoC‎odegen.java‎ +8 -8
AbstractGraph‎QLCodegen.java‎ +3 -3
AbstractJava‎Codegen.java‎ +9 -10
AbstractJavaJAXRS‎ServerCodegen.java‎ +1 -1
AbstractKotli‎nCodegen.java‎ +7 -7
AbstractPhp‎Codegen.java‎ +3 -3
AbstractPytho‎nCodegen.java‎ +1 -1
AbstractRuby‎Codegen.java‎ +2 -2
AbstractScal‎aCodegen.java‎ +1 -1
AbstractTypeScript‎ClientCodegen.java‎ +2 -2
AndroidClien‎tCodegen.java‎ +1 -1
ApexClientC‎odegen.java‎ +3 -3
AsciidocDocument‎ationCodegen.java‎ +10 -10
AspNetCoreServ‎erCodegen.java‎ +3 -3
BashClientC‎odegen.java‎ +1 -1
CLibcurlClien‎tCodegen.java‎ +2 -2
CSharpClient‎Codegen.java‎ +1 -1
CSharpNetCoreCl‎ientCodegen.java‎ +1 -1
ConfluenceWik‎iCodegen.java‎ +4 -4
CppPistacheSer‎verCodegen.java‎ +3 -3
CppQtAbstrac‎tCodegen.java‎ +11 -11
CppRestSdkClie‎ntCodegen.java‎ +4 -4
CppRestbedServ‎erCodegen.java‎ +7 -7
CppTinyClien‎tCodegen.java‎ +6 -6
CppTizenClien‎tCodegen.java‎ +7 -7
CppUE4Client‎Codegen.java‎ +7 -7
CrystalClien‎tCodegen.java‎ +5 -5
ElixirClient‎Codegen.java‎ +5 -5
ElmClientC‎odegen.java‎ +10 -12
FsharpGiraffeSe‎rverCodegen.java‎ +1 -1
HaskellHttpCli‎entCodegen.java‎ +6 -6
HaskellServan‎tCodegen.java‎ +10 -10
HaskellYesodSer‎verCodegen.java‎ +9 -9
JMeterClient‎Codegen.java‎ +1 -1
JavaCXFClien‎tCodegen.java‎ +1 -1
JavaCXFExtServ‎erCodegen.java‎ +3 -3
JavaInflectorSe‎rverCodegen.java‎ +1 -1
JavaMicronautCl‎ientCodegen.java‎ +1 -1
JavaPKMSTServ‎erCodegen.java‎ +1 -1
JavaUndertowSer‎verCodegen.java‎ +1 -1
JavaVertXServ‎erCodegen.java‎ +1 -1
JavascriptApolloC‎lientCodegen.java‎ +5 -5
JavascriptClie‎ntCodegen.java‎ +5 -5
JavascriptClosureAngu‎larClientCodegen.java‎ +13 -13
JavascriptFlowtype‎dClientCodegen.java‎ +4 -4
K6ClientCo‎degen.java‎ +3 -3
KotlinSpringSer‎verCodegen.java‎ +1 -1
KtormSchema‎Codegen.java‎ +1 -1
LuaClientC‎odegen.java‎ +4 -4
MarkdownDocument‎ationCodegen.java‎ +1 -1
MysqlSchema‎Codegen.java‎ +27 -27
NimClientC‎odegen.java‎ +2 -2
NodeJSExpressSe‎rverCodegen.java‎ +1 -1
OCamlClient‎Codegen.java‎ +2 -2
ObjcClientC‎odegen.java‎ +4 -4
PerlClientC‎odegen.java‎ +1 -1
PhpSilexServe‎rCodegen.java‎ +2 -2
PhpSymfonyServ‎erCodegen.java‎ +8 -8
PowerShellClie‎ntCodegen.java‎ +23 -23
ProtobufSchem‎aCodegen.java‎ +2 -2
PythonClient‎Codegen.java‎ +11 -11
RClientCo‎degen.java‎ +1 -1
RustClientC‎odegen.java‎ +2 -2
RustServerC‎odegen.java‎ +10 -10
ScalaFinchServ‎erCodegen.java‎ +4 -4
ScalaSttpClie‎ntCodegen.java‎ +1 -1
ScalatraServe‎rCodegen.java‎ +2 -2
SpringCod‎egen.java‎ +1 -1
StaticHtml2G‎enerator.java‎ +4 -4
StaticHtmlGe‎nerator.java‎ +5 -5
Swift4Cod‎egen.java‎ +2 -2
Swift5Client‎Codegen.java‎ +4 -4
TypeScriptAngular‎ClientCodegen.java‎ +1 -1
TypeScriptClie‎ntCodegen.java‎ +7 -7
TypeScriptFetchC‎lientCodegen.java‎ +4 -4
TypeScriptNestjsC‎lientCodegen.java‎ +2 -4
TypeScriptNodeCl‎ientCodegen.java‎ +1 -1
templ‎ating‎
HandlebarsEngi‎neAdapter.java‎ +3 -3
MustacheEngin‎eAdapter.java‎ +2 -2
ut‎ils‎
ModelUt‎ils.java‎ +2 -2
OneOfImplementorA‎dditionalData.java‎ +1 -4
StringUt‎ils.java‎ +3 -3
CodegenConfi‎gLoader.java‎ +1 -1
CodegenM‎odel.java‎ +18 -18
DefaultCo‎degen.java‎ +74 -74
SpecValidation‎Exception.java‎ +1 -1
TemplateMa‎nager.java‎ +1 -1
TemplatingEng‎ineLoader.java‎ +2 -2
test/java/org/ope‎napitools/codegen‎
csh‎arp‎
CSharpMode‎lTest.java‎ +1 -1
CSharpOperat‎ionTest.java‎ +1 -1
da‎rt‎
d‎io‎
DartDioClientC‎odegenTest.java‎ +2 -1
DartDioNextClien‎tCodegenTest.java‎ +2 -1
DartClientCod‎egenTest.java‎ +2 -1
fsh‎arp‎
FSharpServerCo‎degenTest.java‎ +0 -1
ja‎va‎
ja‎xrs‎
JavaJerseyServer‎CodegenTest.java‎ +2 -2
micr‎onaut‎
MicronautClient‎CodegenTest.java‎ +1 -1
AbstractJavaCo‎degenTest.java‎ +1 -1
JavaClientCod‎egenTest.java‎ +1 -1
kot‎lin‎
KotlinTest‎Utils.java‎ +1 -1
mark‎down‎
MarkdownSampleGe‎neratorTest.java‎ +2 -2
ru‎by‎
RubyClientCod‎egenTest.java‎ +3 -3
test‎utils‎
AssertF‎ile.java‎ +2 -2
ut‎ils‎
JsonCache‎Test.java‎ +3 -2
DefaultCode‎genTest.java‎ +1 -1
TestUti‎ls.java‎ +4 -4
modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+ 1
- 3
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -535,9 +535,7 @@ public class CodegenConfigurator {
Set<String> warnings = new HashSet<>();
if (specification != null) {
List<String> 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()) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+ 1
- 3
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -535,9 +535,7 @@ public class CodegenConfigurator {
Set<String> warnings = new HashSet<>();
if (specification != null) {
List<String> 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()) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
+ 1
- 1
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -165,7 +165,7 @@ public class ExampleGenerator {
}
} else if (modelName != null && mediaType.startsWith(MIME_TYPE_XML)) {
final Schema schema = this.examples.get(modelName);
String example = new XmlExampleGenerator(this.examples).toXml(schema, 0, Collections.<String>emptySet());
String example = new XmlExampleGenerator(this.examples).toXml(schema, 0, Collections.emptySet());
if (example != null) {
kv.put(EXAMPLE, example);
output.add(kv);
modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java
+ 1
- 1
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -44,7 +44,7 @@ public class XmlExampleGenerator {
}
public String toXml(Schema schema) {
return toXml(null, schema, 0, Collections.<String>emptySet());
return toXml(null, schema, 0, Collections.emptySet());
}
protected String toXml(Schema schema, int indent, Collection<String> path) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/RootedFileRule.java
+ 1
- 1
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -41,7 +41,7 @@ public class RootedFileRule extends Rule {
}
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
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+ 13
- 13
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -50,7 +50,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
protected List<Map<String, Object>> orderedModels;
protected final Map<String, List<String>> modelDepends;
protected final Map<String, String> nullableTypeMapping;
protected final HashMap<String, String> operationsScopes;
protected final Map<String, String> operationsScopes;
protected int scopeIndex = 0;
public AbstractAdaCodegen() {
@@ -155,7 +155,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
"xor")
);
typeMapping = new HashMap<String, String>();
typeMapping = new HashMap<>();
typeMapping.put("date", "Swagger.Date");
typeMapping.put("DateTime", "Swagger.Datetime");
typeMapping.put("string", "Swagger.UString");
@@ -172,7 +172,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
typeMapping.put("binary", "Swagger.Binary");
// Mapping to convert an Ada required type to an optional type (nullable).
nullableTypeMapping = new HashMap<String, String>();
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 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
nullableTypeMapping.put("Boolean", "Swagger.Nullable_Boolean");
nullableTypeMapping.put("Swagger.Object", "Swagger.Object");
modelDepends = new HashMap<String, List<String>>();
orderedModels = new ArrayList<Map<String, Object>>();
operationsScopes = new HashMap<String, String>();
super.importMapping = new HashMap<String, String>();
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 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
modelNameSuffix = "Type";
embeddedTemplateDir = templateDir = "Ada";
languageSpecificPrimitives = new HashSet<String>(
languageSpecificPrimitives = new HashSet<>(
Arrays.asList("integer", "boolean", "number", "long", "float",
"double", "object", "string", "date", "DateTime", "binary"));
}
@@ -651,7 +651,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
Object v = model.get("model");
if (v instanceof CodegenModel) {
CodegenModel m = (CodegenModel) v;
List<String> d = new ArrayList<String>();
List<String> d = new ArrayList<>();
for (CodegenProperty p : m.vars) {
boolean isModel = false;
CodegenProperty item = p;
@@ -687,8 +687,8 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
// 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<Map<String, Object>> revisedOrderedModels = new ArrayList<Map<String, Object>>();
List<String> collectedModelNames = new ArrayList<String>();
List<Map<String, Object>> revisedOrderedModels = new ArrayList<>();
List<String> collectedModelNames = new ArrayList<>();
int sizeOrderedModels = orderedModels.size();
for (int i = 0; i < sizeOrderedModels; i++) {
Map<String, Object> independentModel = null;
@@ -760,7 +760,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
* @return the authMethods to be used by the operation with its required scopes.
*/
private List<CodegenSecurity> postProcessAuthMethod(List<CodegenSecurity> authMethods, Map<String, List<String>> scopes) {
List<CodegenSecurity> result = (scopes == null) ? null : new ArrayList<CodegenSecurity>();
List<CodegenSecurity> result = (scopes == null) ? null : new ArrayList<>();
if (authMethods != null) {
for (CodegenSecurity authMethod : authMethods) {
if (authMethod.scopes != null) {
@@ -803,7 +803,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
opSecurity.isKeyInQuery = authMethod.isKeyInQuery;
opSecurity.flow = authMethod.flow;
opSecurity.tokenUrl = authMethod.tokenUrl;
List<Map<String, Object>> opAuthScopes = new ArrayList<Map<String, Object>>();
List<Map<String, Object>> opAuthScopes = new ArrayList<>();
for (String opScopeName : opScopes) {
for (Map<String, Object> scope : authMethod.scopes) {
String name = (String) scope.get("scope");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+ 11
- 11
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -81,9 +81,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
protected boolean supportNullable = Boolean.FALSE;
// nullable type
protected Set<String> nullableType = new HashSet<String>();
protected Set<String> nullableType = new HashSet<>();
protected Set<String> valueTypes = new HashSet<String>();
protected Set<String> valueTypes = new HashSet<>();
private final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class);
@@ -104,14 +104,14 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
outputFolder = "generated-code" + File.separator + this.getName();
embeddedTemplateDir = templateDir = this.getName();
collectionTypes = new HashSet<String>(
collectionTypes = new HashSet<>(
Arrays.asList(
"IList", "List",
"ICollection", "Collection",
"IEnumerable")
);
mapTypes = new HashSet<String>(
mapTypes = new HashSet<>(
Arrays.asList("IDictionary")
);
@@ -141,7 +141,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
);
// TODO: Either include fully qualified names here or handle in DefaultCodegen via lastIndexOf(".") search
languageSpecificPrimitives = new HashSet<String>(
languageSpecificPrimitives = new HashSet<>(
Arrays.asList(
"String",
"string",
@@ -184,7 +184,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// Nullable types here assume C# 2 support is not part of base
typeMapping = new HashMap<String, String>();
typeMapping = new HashMap<>();
typeMapping.put("string", "string");
typeMapping.put("binary", "byte[]");
typeMapping.put("ByteArray", "byte[]");
@@ -207,11 +207,11 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
typeMapping.put("AnyType", "Object");
// nullable type
nullableType = new HashSet<String>(
nullableType = new HashSet<>(
Arrays.asList("decimal", "bool", "int", "float", "long", "double", "DateTime", "DateTimeOffset", "Guid")
);
// value Types
valueTypes = new HashSet<String>(
valueTypes = new HashSet<>(
Arrays.asList("decimal", "bool", "int", "float", "long", "double")
);
}
@@ -463,9 +463,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
*
* @param models processed models to be further processed for enum references
*/
@SuppressWarnings({"unchecked"})
@SuppressWarnings("unchecked")
private void postProcessEnumRefs(final Map<String, Object> models) {
Map<String, CodegenModel> enumRefs = new HashMap<String, CodegenModel>();
Map<String, CodegenModel> enumRefs = new HashMap<>();
for (Map.Entry<String, Object> entry : models.entrySet()) {
CodegenModel model = ModelUtils.getModelByName(entry.getKey(), models);
if (model.isEnum) {
@@ -1325,7 +1325,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// 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();
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+ 1
- 1
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -323,7 +323,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
}
// 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();
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+ 2
- 2
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -340,7 +340,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
// 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 abstract class AbstractDartCodegen extends DefaultCodegen {
// 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();
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+ 4
- 4
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -53,9 +53,9 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
"redefine", "rename", "require", "rescue", "Result", "retry", "select", "separate", "then", "True",
"TUPLE", "undefine", "until", "variant", "Void", "when", "xor"));
defaultIncludes = new HashSet<String>(Arrays.asList("map", "array"));
defaultIncludes = new HashSet<>(Arrays.asList("map", "array"));
languageSpecificPrimitives = new HashSet<String>(
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 abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
}
public Map<String, String> createMapping(String key, String value) {
Map<String, String> customImport = new HashMap<String, String>();
Map<String, String> customImport = new HashMap<>();
customImport.put(key, value);
return customImport;
@@ -592,7 +592,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
public String toEiffelFeatureStyle(String operationId) {
if (operationId.startsWith("get_")) {
return operationId.substring(4, operationId.length());
return operationId.substring(4);
} else {
return operationId;
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+ 16
- 17
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -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<String> nullableType = new HashSet<String>();
protected Set<String> nullableType = new HashSet<>();
private final Logger LOGGER = LoggerFactory.getLogger(AbstractFSharpCodegen.class);
@@ -89,9 +89,9 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
outputFolder = this.getName();
embeddedTemplateDir = templateDir = this.getName();
collectionTypes = new HashSet<String>(Arrays.asList("list", "seq"));
collectionTypes = new HashSet<>(Arrays.asList("list", "seq"));
mapTypes = new HashSet<String>(
mapTypes = new HashSet<>(
Arrays.asList("IDictionary")
);
@@ -114,7 +114,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
);
// TODO - these are based on C# generator, do we need to add any more?
languageSpecificPrimitives = new HashSet<String>(
languageSpecificPrimitives = new HashSet<>(
Arrays.asList(
"String",
"string",
@@ -156,7 +156,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
instantiationTypes.put("map", "IDictionary");
typeMapping = new HashMap<String, String>();
typeMapping = new HashMap<>();
typeMapping.put("string", "string");
typeMapping.put("binary", "byte[]");
typeMapping.put("ByteArray", "byte[]");
@@ -177,7 +177,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
typeMapping.put("URI", "string");
// nullable type
nullableType = new HashSet<String>(
nullableType = new HashSet<>(
Arrays.asList("decimal", "bool", "int", "float", "long", "double", "string", "Guid", "apiKey")
);
}
@@ -349,12 +349,12 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
* 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<String, Object> postProcessDependencyOrders(final Map<String, Object> objs) {
Map<String, Set<String>> dependencies = new HashMap<String, Set<String>>();
Map<String, Set<String>> dependencies = new HashMap<>();
List<String> classNames = new ArrayList<String>();
List<String> classNames = new ArrayList<>();
for (String k : objs.keySet()) {
CodegenModel model = ModelUtils.getModelByName(k, objs);
@@ -381,7 +381,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
}
}
Map<String, Object> sorted = new LinkedHashMap<String, Object>();
Map<String, Object> 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 abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
*
* @param models processed models to be further processed for enum references
*/
@SuppressWarnings({"unchecked"})
@SuppressWarnings("unchecked")
private void postProcessEnumRefs(final Map<String, Object> models) {
Map<String, CodegenModel> enumRefs = new HashMap<String, CodegenModel>();
Map<String, CodegenModel> enumRefs = new HashMap<>();
for (Map.Entry<String, Object> entry : models.entrySet()) {
CodegenModel model = ModelUtils.getModelByName(entry.getKey(), models);
if (model.isEnum) {
@@ -455,10 +455,9 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
// 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<Map<String, String>> enumVars = (ArrayList<Map<String, String>>) model.allowableValues.get("enumVars");
List<Map<String, Object>> newEnumVars = new ArrayList<Map<String, Object>>();
List<Map<String, Object>> newEnumVars = new ArrayList<>();
for (Map<String, String> enumVar : enumVars) {
Map<String, Object> mixedVars = new HashMap<String, Object>();
mixedVars.putAll(enumVar);
Map<String, Object> mixedVars = new HashMap<>(enumVar);
mixedVars.put("isString", isString);
mixedVars.put("isLong", isLong);
@@ -473,7 +472,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
}
}
} 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 abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
// 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();
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+ 8
- 8
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -56,7 +56,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
supportsInheritance = true;
hideGenerationTimestamp = Boolean.FALSE;
defaultIncludes = new HashSet<String>(
defaultIncludes = new HashSet<>(
Arrays.asList(
"map",
"array")
@@ -77,7 +77,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// Added "error" as it's used so frequently that it may as well be a keyword
);
languageSpecificPrimitives = new HashSet<String>(
languageSpecificPrimitives = new HashSet<>(
Arrays.asList(
"string",
"bool",
@@ -133,14 +133,14 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
typeMapping.put("object", "map[string]interface{}");
typeMapping.put("AnyType", "interface{}");
numberTypes = new HashSet<String>(
numberTypes = new HashSet<>(
Arrays.asList(
"uint", "uint8", "uint16", "uint32", "uint64",
"int", "int8", "int16", "int32", "int64",
"float32", "float64")
);
importMapping = new HashMap<String, String>();
importMapping = new HashMap<>();
cliOptions.clear();
cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).")
@@ -252,7 +252,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
String[] parts = name.split("_");
String suffix = parts[parts.length - 1];
Set<String> reservedSuffixes = new HashSet<String>(Arrays.asList(
Set<String> reservedSuffixes = new HashSet<>(Arrays.asList(
// Test
"test",
// $GOOS
@@ -699,7 +699,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
}
public Map<String, String> createMapping(String key, String value) {
Map<String, String> customImport = new HashMap<String, String>();
Map<String, String> customImport = new HashMap<>();
customImport.put(key, value);
return customImport;
@@ -813,7 +813,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
}
// only process the following type (or we can simply rely on the file extension to check if it's a Go file)
Set<String> supportedFileType = new HashSet<String>(
Set<String> supportedFileType = new HashSet<>(
Arrays.asList(
"supporting-mustache",
"model-test",
@@ -828,7 +828,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
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();
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
+ 3
- 3
  • View file @ 88780da7

  • Edit in single-file editor

  • Open in Web IDE


@@ -55,13 +55,13 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C
)
);
defaultIncludes = new HashSet<String>(
defaultIncludes = new HashSet<>(
Arrays.asList(
"map",
"array")
);
languageSpecificPrimitives = new HashSet<String>(
languageSpecificPrimitives = new HashSet<>(
Arrays.asList(
"null",
"ID",
@@ -344,7 +344,7 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C
}
public Map<String, String> createMapping(String key, String value) {
Map<String, String> customImport = new HashMap<String, String>();
Map<String, String> customImport = new HashMap<>();
customImport.put(key, value);
return customImport;
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
1
Enhancement: Code Cleanup
1
Enhancement: Code Cleanup
    Assign labels
  • Manage project labels

Milestone
5.3.1
5.3.1 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
Administrator
Reference: OpenAPITools/openapi-generator!10808
Source branch: github/fork/agilob/java-warning-formatting

Menu

Explore Projects Groups Snippets