Skip to content

Commit 473e28b

Browse files
DarkWingDuckWingfrantuma
DarkWingDuckWing
authored and
frantuma
committed
Fix for: Methods and field names should not be the same or differ only by capitalization
 squid:S1845
1 parent 5f2f8e1 commit 473e28b

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
2626
protected ClientOptInput opts;
2727
protected Swagger swagger;
2828
protected CodegenIgnoreProcessor ignoreProcessor;
29-
protected Boolean generateApis = null;
30-
protected Boolean generateModels = null;
31-
protected Boolean generateSupportingFiles = null;
32-
protected Boolean generateApiTests = null;
33-
protected Boolean generateApiDocumentation = null;
34-
protected Boolean generateModelTests = null;
35-
protected Boolean generateModelDocumentation = null;
36-
protected Boolean generateSwaggerMetadata = true;
29+
protected Boolean isGenerateApis = null;
30+
protected Boolean isGenerateModels = null;
31+
protected Boolean isGenerateSupportingFiles = null;
32+
protected Boolean isGenerateApiTests = null;
33+
protected Boolean isGenerateApiDocumentation = null;
34+
protected Boolean isGenerateModelTests = null;
35+
protected Boolean isGenerateModelDocumentation = null;
36+
protected Boolean isGenerateSwaggerMetadata = true;
3737
protected String basePath;
3838
protected String basePathWithoutHost;
3939
protected String contextPath;
@@ -70,7 +70,7 @@ public Generator opts(ClientOptInput opts) {
7070
*/
7171
@SuppressWarnings("WeakerAccess")
7272
public void setGenerateSwaggerMetadata(Boolean generateSwaggerMetadata) {
73-
this.generateSwaggerMetadata = generateSwaggerMetadata;
73+
this.isGenerateSwaggerMetadata = generateSwaggerMetadata;
7474
}
7575

7676
/**
@@ -125,43 +125,43 @@ private String getHost() {
125125
protected void configureGeneratorProperties() {
126126
// allows generating only models by specifying a CSV of models to generate, or empty for all
127127
// NOTE: Boolean.TRUE is required below rather than `true` because of JVM boxing constraints and type inference.
128-
generateApis = System.getProperty(CodegenConstants.APIS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.APIS, null);
129-
generateModels = System.getProperty(CodegenConstants.MODELS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODELS, null);
130-
generateSupportingFiles = System.getProperty(CodegenConstants.SUPPORTING_FILES) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.SUPPORTING_FILES, null);
128+
isGenerateApis = System.getProperty(CodegenConstants.APIS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.APIS, null);
129+
isGenerateModels = System.getProperty(CodegenConstants.MODELS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODELS, null);
130+
isGenerateSupportingFiles = System.getProperty(CodegenConstants.SUPPORTING_FILES) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.SUPPORTING_FILES, null);
131131

132-
if (generateApis == null && generateModels == null && generateSupportingFiles == null) {
132+
if (isGenerateApis == null && isGenerateModels == null && isGenerateSupportingFiles == null) {
133133
// no specifics are set, generate everything
134-
generateApis = generateModels = generateSupportingFiles = true;
134+
isGenerateApis = isGenerateModels = isGenerateSupportingFiles = true;
135135
} else {
136-
if (generateApis == null) {
137-
generateApis = false;
136+
if(isGenerateApis == null) {
137+
isGenerateApis = false;
138138
}
139-
if (generateModels == null) {
140-
generateModels = false;
139+
if(isGenerateModels == null) {
140+
isGenerateModels = false;
141141
}
142-
if (generateSupportingFiles == null) {
143-
generateSupportingFiles = false;
142+
if(isGenerateSupportingFiles == null) {
143+
isGenerateSupportingFiles = false;
144144
}
145145
}
146146
// model/api tests and documentation options rely on parent generate options (api or model) and no other options.
147147
// They default to true in all scenarios and can only be marked false explicitly
148-
generateModelTests = System.getProperty(CodegenConstants.MODEL_TESTS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.MODEL_TESTS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODEL_TESTS, true);
149-
generateModelDocumentation = System.getProperty(CodegenConstants.MODEL_DOCS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.MODEL_DOCS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODEL_DOCS, true);
150-
generateApiTests = System.getProperty(CodegenConstants.API_TESTS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.API_TESTS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.API_TESTS, true);
151-
generateApiDocumentation = System.getProperty(CodegenConstants.API_DOCS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.API_DOCS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.API_DOCS, true);
148+
isGenerateModelTests = System.getProperty(CodegenConstants.MODEL_TESTS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.MODEL_TESTS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODEL_TESTS, true);
149+
isGenerateModelDocumentation = System.getProperty(CodegenConstants.MODEL_DOCS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.MODEL_DOCS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.MODEL_DOCS, true);
150+
isGenerateApiTests = System.getProperty(CodegenConstants.API_TESTS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.API_TESTS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.API_TESTS, true);
151+
isGenerateApiDocumentation = System.getProperty(CodegenConstants.API_DOCS) != null ? Boolean.valueOf(System.getProperty(CodegenConstants.API_DOCS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.API_DOCS, true);
152152

153153

154154
// Additional properties added for tests to exclude references in project related files
155-
config.additionalProperties().put(CodegenConstants.GENERATE_API_TESTS, generateApiTests);
156-
config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_TESTS, generateModelTests);
155+
config.additionalProperties().put(CodegenConstants.GENERATE_API_TESTS, isGenerateApiTests);
156+
config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_TESTS, isGenerateModelTests);
157157

158-
config.additionalProperties().put(CodegenConstants.GENERATE_API_DOCS, generateApiDocumentation);
159-
config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation);
158+
config.additionalProperties().put(CodegenConstants.GENERATE_API_DOCS, isGenerateApiDocumentation);
159+
config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, isGenerateModelDocumentation);
160160

161-
config.additionalProperties().put(CodegenConstants.GENERATE_APIS, generateApis);
162-
config.additionalProperties().put(CodegenConstants.GENERATE_MODELS, generateModels);
161+
config.additionalProperties().put(CodegenConstants.GENERATE_APIS, isGenerateApis);
162+
config.additionalProperties().put(CodegenConstants.GENERATE_MODELS, isGenerateModels);
163163

164-
if (!generateApiTests && !generateModelTests) {
164+
if(!isGenerateApiTests && !isGenerateModelTests) {
165165
config.additionalProperties().put(CodegenConstants.EXCLUDE_TESTS, true);
166166
}
167167
if (System.getProperty("debugSwagger") != null) {
@@ -278,7 +278,7 @@ protected void generateModelDocumentation(List<File> files, Map<String, Object>
278278

279279
protected void generateModels(List<File> files, List<Object> allModels) {
280280

281-
if (!generateModels) {
281+
if (!isGenerateModels) {
282282
return;
283283
}
284284

@@ -414,10 +414,10 @@ private Model getParent(Model model) {
414414
files.add(written);
415415
}
416416
}
417-
if (generateModelTests) {
417+
if(isGenerateModelTests) {
418418
generateModelTests(files, models, modelName);
419419
}
420-
if (generateModelDocumentation) {
420+
if(isGenerateModelDocumentation) {
421421
// to generate model documentation files
422422
generateModelDocumentation(files, models, modelName);
423423
}
@@ -433,7 +433,7 @@ private Model getParent(Model model) {
433433
}
434434

435435
protected void generateApis(List<File> files, List<Object> allOperations, List<Object> allModels) {
436-
if (!generateApis) {
436+
if (!isGenerateApis) {
437437
return;
438438
}
439439
Map<String, List<CodegenOperation>> paths = processPaths(swagger.getPaths());
@@ -509,7 +509,7 @@ public int compare(CodegenOperation one, CodegenOperation another) {
509509
}
510510
}
511511

512-
if (generateApiTests) {
512+
if(isGenerateApiTests) {
513513
// to generate api test files
514514
for (String templateName : config.apiTestTemplateFiles().keySet()) {
515515
String filename = config.apiTestFilename(templateName, tag);
@@ -527,7 +527,7 @@ public int compare(CodegenOperation one, CodegenOperation another) {
527527
}
528528

529529

530-
if (generateApiDocumentation) {
530+
if(isGenerateApiDocumentation) {
531531
// to generate api documentation files
532532
for (String templateName : config.apiDocTemplateFiles().keySet()) {
533533
String filename = config.apiDocFilename(templateName, tag);
@@ -555,7 +555,7 @@ public int compare(CodegenOperation one, CodegenOperation another) {
555555
}
556556

557557
protected void generateSupportingFiles(List<File> files, Map<String, Object> bundle) {
558-
if (!generateSupportingFiles) {
558+
if (!isGenerateSupportingFiles) {
559559
return;
560560
}
561561
Set<String> supportingFilesToGenerate = null;
@@ -645,7 +645,7 @@ public Reader getTemplate(String name) {
645645
final String swaggerCodegenIgnore = ".swagger-codegen-ignore";
646646
String ignoreFileNameTarget = config.outputFolder() + File.separator + swaggerCodegenIgnore;
647647
File ignoreFile = new File(ignoreFileNameTarget);
648-
if (generateSwaggerMetadata && !ignoreFile.exists()) {
648+
if (isGenerateSwaggerMetadata && !ignoreFile.exists()) {
649649
String ignoreFileNameSource = File.separator + config.getCommonTemplateDir() + File.separator + swaggerCodegenIgnore;
650650
String ignoreFileContents = readResourceContents(ignoreFileNameSource);
651651
try {
@@ -656,7 +656,7 @@ public Reader getTemplate(String name) {
656656
files.add(ignoreFile);
657657
}
658658

659-
if(generateSwaggerMetadata) {
659+
if(isGenerateSwaggerMetadata) {
660660
final String swaggerVersionMetadata = config.outputFolder() + File.separator + ".swagger-codegen" + File.separator + "VERSION";
661661
File swaggerVersionMetadataFile = new File(swaggerVersionMetadata);
662662
try {

0 commit comments

Comments
 (0)