Skip to content

Commit 1e2abbe

Browse files
committed
Merge pull request #1774 from DevFactory/staging/redundant-field-initializer-fix-2
Redundant Field Initializer
2 parents f73acc7 + 7a63dd1 commit 1e2abbe

15 files changed

+30
-30
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class CodegenProperty {
3131
public Double maximum;
3232
public Boolean exclusiveMinimum;
3333
public Boolean exclusiveMaximum;
34-
public Boolean hasMore = null, required = null, secondaryParam = null;
34+
public Boolean hasMore, required, secondaryParam;
3535
public Boolean isPrimitiveType, isContainer, isNotContainer;
3636
public boolean isEnum;
3737
public Boolean isReadOnly = false;

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public class DefaultCodegen {
7171
protected List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
7272
protected List<CliOption> cliOptions = new ArrayList<CliOption>();
7373
protected boolean skipOverwrite;
74-
protected boolean supportsInheritance = false;
74+
protected boolean supportsInheritance;
7575
protected Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
76-
protected String library = null;
76+
protected String library;
7777
protected Boolean sortParamsByRequiredFlag = true;
7878
protected Boolean ensureUniqueParams = true;
7979

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
2222
Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
2323

2424
protected CodegenConfig config;
25-
protected ClientOptInput opts = null;
26-
protected Swagger swagger = null;
25+
protected ClientOptInput opts;
26+
protected Swagger swagger;
2727

2828
@Override
2929
public Generator opts(ClientOptInput opts) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import org.slf4j.LoggerFactory;
1818

1919
public class InlineModelResolver {
20-
private Swagger swagger = null;
21-
private boolean skipMatches = false;
20+
private Swagger swagger;
21+
private boolean skipMatches;
2222
static Logger LOGGER = LoggerFactory.getLogger(InlineModelResolver.class);
2323

2424
Map<String, Model> addedModels = new HashMap<String, Model>();
@@ -118,8 +118,8 @@ else if (model instanceof ArrayModel) {
118118
ap.setItems(new RefProperty(modelName));
119119
addGenerated(modelName, innerModel);
120120
swagger.addDefinition(modelName, innerModel);
121-
}
122-
}
121+
}
122+
}
123123
} else if (property instanceof MapProperty) {
124124
MapProperty mp = (MapProperty) property;
125125

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class CodegenConfigurator {
4141
private String lang;
4242
private String inputSpec;
4343
private String outputDir;
44-
private boolean verbose = false;
45-
private boolean skipOverwrite = false;
44+
private boolean verbose;
45+
private boolean skipOverwrite;
4646
private String templateDir;
4747
private String auth;
4848
private String apiPackage;

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenCo
3333
protected String sourceFolder = "src/main/scala";
3434
protected String clientName = "SwaggerClient";
3535
protected String authScheme = "";
36-
protected boolean authPreemptive = false;
36+
protected boolean authPreemptive;
3737
protected boolean asyncHttpClient = !authScheme.isEmpty();
3838

3939
public AsyncScalaClientCodegen() {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
2626
private static final String PROJECT_LICENSE_URL = "projectLicenseUrl";
2727
private static final String BASE_NAMESPACE = "baseNamespace";
2828

29-
protected String projectName = null;
30-
protected String projectDescription = null;
31-
protected String projectVersion = null;
32-
protected String baseNamespace = null;
29+
protected String projectName;
30+
protected String projectDescription;
31+
protected String projectVersion;
32+
protected String baseNamespace;
3333

3434
protected String sourceFolder = "src";
3535

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig {
2828
protected String packageName = "io.swagger";
29-
protected String packageVersion = null;
29+
protected String packageVersion;
3030

3131
protected String invokerPackage = "io.swagger";
3232
protected String sourceFolder = "src/main/flex";

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
2828
protected String projectFolder = "src" + File.separator + "main";
2929
protected String sourceFolder = projectFolder + File.separator + "java";
3030
protected String localVariablePrefix = "";
31-
protected boolean fullJavaUtil = false;
31+
protected boolean fullJavaUtil;
3232
protected String javaUtilPrefix = "";
3333
protected Boolean serializableModel = false;
3434
protected boolean serializeBigDecimalAsString = false;

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
4040
private static final String PROJECT_VERSION = "projectVersion";
4141
private static final String PROJECT_LICENSE_NAME = "projectLicenseName";
4242

43-
protected String projectName = null;
44-
protected String moduleName = null;
45-
protected String projectDescription = null;
46-
protected String projectVersion = null;
43+
protected String projectName;
44+
protected String moduleName;
45+
protected String projectDescription;
46+
protected String projectVersion;
4747

4848
protected String sourceFolder = "src";
4949
protected String localVariablePrefix = "";

0 commit comments

Comments
 (0)