loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cleanup] erefactor/EclipseJdt - Use primitive parse methods instead of wrapper. (#9113)

Browse Source 
EclipseJdt cleanup 'ParsePrimitive' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.19/jdt.php
For erefactor see https://github.com/cal101/erefactor
This commit is contained in:
cal 2021-03-29 15:02:51 +02:00 committed by GitHub
parent 6c8bc1ec88
commit 6daecb88c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -275,12 +275,12 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
} }
if (additionalProperties.containsKey(SUPPORT_JAVA6)) { if (additionalProperties.containsKey(SUPPORT_JAVA6)) {
this.setSupportJava6(Boolean.valueOf(additionalProperties.get(SUPPORT_JAVA6).toString())); this.setSupportJava6(Boolean.parseBoolean(additionalProperties.get(SUPPORT_JAVA6).toString()));
} }
additionalProperties.put(SUPPORT_JAVA6, supportJava6); additionalProperties.put(SUPPORT_JAVA6, supportJava6);
if (additionalProperties.containsKey(DISABLE_HTML_ESCAPING)) { if (additionalProperties.containsKey(DISABLE_HTML_ESCAPING)) {
this.setDisableHtmlEscaping(Boolean.valueOf(additionalProperties.get(DISABLE_HTML_ESCAPING).toString())); this.setDisableHtmlEscaping(Boolean.parseBoolean(additionalProperties.get(DISABLE_HTML_ESCAPING).toString()));
} }
additionalProperties.put(DISABLE_HTML_ESCAPING, disableHtmlEscaping); additionalProperties.put(DISABLE_HTML_ESCAPING, disableHtmlEscaping);
@ -290,7 +290,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
additionalProperties.put(BOOLEAN_GETTER_PREFIX, booleanGetterPrefix); additionalProperties.put(BOOLEAN_GETTER_PREFIX, booleanGetterPrefix);
if (additionalProperties.containsKey(IGNORE_ANYOF_IN_ENUM)) { if (additionalProperties.containsKey(IGNORE_ANYOF_IN_ENUM)) {
this.setIgnoreAnyOfInEnum(Boolean.valueOf(additionalProperties.get(IGNORE_ANYOF_IN_ENUM).toString())); this.setIgnoreAnyOfInEnum(Boolean.parseBoolean(additionalProperties.get(IGNORE_ANYOF_IN_ENUM).toString()));
} }
additionalProperties.put(IGNORE_ANYOF_IN_ENUM, ignoreAnyOfInEnum); additionalProperties.put(IGNORE_ANYOF_IN_ENUM, ignoreAnyOfInEnum);
@ -427,17 +427,17 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
} }
if (additionalProperties.containsKey(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING)) { if (additionalProperties.containsKey(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING)) {
this.setSerializeBigDecimalAsString(Boolean.valueOf(additionalProperties.get(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING).toString())); this.setSerializeBigDecimalAsString(Boolean.parseBoolean(additionalProperties.get(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING).toString()));
} }
// need to put back serializableModel (boolean) into additionalProperties as value in additionalProperties is string // need to put back serializableModel (boolean) into additionalProperties as value in additionalProperties is string
additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel);
if (additionalProperties.containsKey(FULL_JAVA_UTIL)) { if (additionalProperties.containsKey(FULL_JAVA_UTIL)) {
this.setFullJavaUtil(Boolean.valueOf(additionalProperties.get(FULL_JAVA_UTIL).toString())); this.setFullJavaUtil(Boolean.parseBoolean(additionalProperties.get(FULL_JAVA_UTIL).toString()));
} }
if (additionalProperties.containsKey(DISCRIMINATOR_CASE_SENSITIVE)) { if (additionalProperties.containsKey(DISCRIMINATOR_CASE_SENSITIVE)) {
this.setDiscriminatorCaseSensitive(Boolean.valueOf(additionalProperties.get(DISCRIMINATOR_CASE_SENSITIVE).toString())); this.setDiscriminatorCaseSensitive(Boolean.parseBoolean(additionalProperties.get(DISCRIMINATOR_CASE_SENSITIVE).toString()));
} else { } else {
// By default, the discriminator lookup should be case sensitive. There is nothing in the OpenAPI specification // By default, the discriminator lookup should be case sensitive. There is nothing in the OpenAPI specification
// that indicates the lookup should be case insensitive. However, some implementations perform // that indicates the lookup should be case insensitive. However, some implementations perform
@ -453,12 +453,12 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
additionalProperties.put("javaUtilPrefix", javaUtilPrefix); additionalProperties.put("javaUtilPrefix", javaUtilPrefix);
if (additionalProperties.containsKey(WITH_XML)) { if (additionalProperties.containsKey(WITH_XML)) {
this.setWithXml(Boolean.valueOf(additionalProperties.get(WITH_XML).toString())); this.setWithXml(Boolean.parseBoolean(additionalProperties.get(WITH_XML).toString()));
} }
additionalProperties.put(WITH_XML, withXml); additionalProperties.put(WITH_XML, withXml);
if (additionalProperties.containsKey(OPENAPI_NULLABLE)) { if (additionalProperties.containsKey(OPENAPI_NULLABLE)) {
this.setOpenApiNullable(Boolean.valueOf(additionalProperties.get(OPENAPI_NULLABLE).toString())); this.setOpenApiNullable(Boolean.parseBoolean(additionalProperties.get(OPENAPI_NULLABLE).toString()));
} }
additionalProperties.put(OPENAPI_NULLABLE, openApiNullable); additionalProperties.put(OPENAPI_NULLABLE, openApiNullable);

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
View File

@ -198,11 +198,11 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
} }
public void setFeatureCORS(String val) { public void setFeatureCORS(String val) {
this.featureCORS = Boolean.valueOf(val); this.featureCORS = Boolean.parseBoolean(val);
} }
public void setUseNose(String val) { public void setUseNose(String val) {
this.useNose = Boolean.valueOf(val); this.useNose = Boolean.parseBoolean(val);
} }
public void setPythonSrcRoot(String val) { public void setPythonSrcRoot(String val) {

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
View File

@ -556,7 +556,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
*/ */
if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) { if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) {
this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.valueOf(additionalProperties this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.parseBoolean(additionalProperties
.get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString())); .get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString()));
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
View File

@ -420,7 +420,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
} else if (ModelUtils.isBooleanSchema(p)) { } else if (ModelUtils.isBooleanSchema(p)) {
if (p.getDefault() != null) { if (p.getDefault() != null) {
return Boolean.valueOf(p.getDefault().toString()) ? "True" : "False"; return Boolean.parseBoolean(p.getDefault().toString()) ? "True" : "False";
} }
} else if (ModelUtils.isNumberSchema(p)) { } else if (ModelUtils.isNumberSchema(p)) {
if (p.getDefault() != null) { if (p.getDefault() != null) {

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
View File

@ -238,7 +238,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
} }
if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) { if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) {
this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.valueOf(additionalProperties this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.parseBoolean(additionalProperties
.get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString())); .get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString()));
} }

20
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
View File

@ -226,26 +226,26 @@ public class JavaClientCodegen extends AbstractJavaCodegen
// RxJava // RxJava
if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) { if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
LOGGER.warn("You specified all RxJava versions 1, 2 and 3 but they are mutually exclusive. Defaulting to v3."); LOGGER.warn("You specified all RxJava versions 1, 2 and 3 but they are mutually exclusive. Defaulting to v3.");
this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString())); this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
} else { } else {
if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) { if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {
LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2."); LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");
this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString())); this.setUseRxJava2(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA2).toString()));
} else if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA3)) { } else if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA3)) {
LOGGER.warn("You specified both RxJava versions 1 and 3 but they are mutually exclusive. Defaulting to v3."); LOGGER.warn("You specified both RxJava versions 1 and 3 but they are mutually exclusive. Defaulting to v3.");
this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString())); this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
} else if (additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) { } else if (additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
LOGGER.warn("You specified both RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3."); LOGGER.warn("You specified both RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3.");
this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString())); this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
} else { } else {
if (additionalProperties.containsKey(USE_RX_JAVA)) { if (additionalProperties.containsKey(USE_RX_JAVA)) {
this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString())); this.setUseRxJava(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA).toString()));
} }
if (additionalProperties.containsKey(USE_RX_JAVA2)) { if (additionalProperties.containsKey(USE_RX_JAVA2)) {
this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString())); this.setUseRxJava2(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA2).toString()));
} }
if (additionalProperties.containsKey(USE_RX_JAVA3)) { if (additionalProperties.containsKey(USE_RX_JAVA3)) {
this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString())); this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
} }
} }
} }
@ -256,7 +256,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
// Java Play // Java Play
if (additionalProperties.containsKey(USE_PLAY_WS)) { if (additionalProperties.containsKey(USE_PLAY_WS)) {
this.setUsePlayWS(Boolean.valueOf(additionalProperties.get(USE_PLAY_WS).toString())); this.setUsePlayWS(Boolean.parseBoolean(additionalProperties.get(USE_PLAY_WS).toString()));
} }
additionalProperties.put(USE_PLAY_WS, usePlayWS); additionalProperties.put(USE_PLAY_WS, usePlayWS);
@ -279,7 +279,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
} }
if (additionalProperties.containsKey(PARCELABLE_MODEL)) { if (additionalProperties.containsKey(PARCELABLE_MODEL)) {
this.setParcelableModel(Boolean.valueOf(additionalProperties.get(PARCELABLE_MODEL).toString())); this.setParcelableModel(Boolean.parseBoolean(additionalProperties.get(PARCELABLE_MODEL).toString()));
} }
// put the boolean value back to PARCELABLE_MODEL in additionalProperties // put the boolean value back to PARCELABLE_MODEL in additionalProperties
additionalProperties.put(PARCELABLE_MODEL, parcelableModel); additionalProperties.put(PARCELABLE_MODEL, parcelableModel);
@ -313,7 +313,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
} }
if (additionalProperties.containsKey(DYNAMIC_OPERATIONS)) { if (additionalProperties.containsKey(DYNAMIC_OPERATIONS)) {
this.setDynamicOperations(Boolean.valueOf(additionalProperties.get(DYNAMIC_OPERATIONS).toString())); this.setDynamicOperations(Boolean.parseBoolean(additionalProperties.get(DYNAMIC_OPERATIONS).toString()));
} }
additionalProperties.put(DYNAMIC_OPERATIONS, dynamicOperations); additionalProperties.put(DYNAMIC_OPERATIONS, dynamicOperations);

10
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
View File

@ -108,16 +108,16 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
@Override @Override
public void processOpts() { public void processOpts() {
if (additionalProperties.containsKey(GENERATE_POM)) { if (additionalProperties.containsKey(GENERATE_POM)) {
generatePom = Boolean.valueOf(additionalProperties.get(GENERATE_POM).toString()); generatePom = Boolean.parseBoolean(additionalProperties.get(GENERATE_POM).toString());
} }
if (additionalProperties.containsKey(INTERFACE_ONLY)) { if (additionalProperties.containsKey(INTERFACE_ONLY)) {
interfaceOnly = Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString()); interfaceOnly = Boolean.parseBoolean(additionalProperties.get(INTERFACE_ONLY).toString());
if (!interfaceOnly) { if (!interfaceOnly) {
additionalProperties.remove(INTERFACE_ONLY); additionalProperties.remove(INTERFACE_ONLY);
} }
} }
if (additionalProperties.containsKey(RETURN_RESPONSE)) { if (additionalProperties.containsKey(RETURN_RESPONSE)) {
returnResponse = Boolean.valueOf(additionalProperties.get(RETURN_RESPONSE).toString()); returnResponse = Boolean.parseBoolean(additionalProperties.get(RETURN_RESPONSE).toString());
if (!returnResponse) { if (!returnResponse) {
additionalProperties.remove(RETURN_RESPONSE); additionalProperties.remove(RETURN_RESPONSE);
} }
@ -126,7 +126,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
useSwaggerAnnotations = false; useSwaggerAnnotations = false;
} else { } else {
if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) { if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString()); useSwaggerAnnotations = Boolean.parseBoolean(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
} }
} }
if (KUMULUZEE_LIBRARY.equals(library)){ if (KUMULUZEE_LIBRARY.equals(library)){
@ -135,7 +135,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations); writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);
if (additionalProperties.containsKey(GENERATE_BUILDERS)) { if (additionalProperties.containsKey(GENERATE_BUILDERS)) {
generateBuilders = Boolean.valueOf(additionalProperties.get(GENERATE_BUILDERS).toString()); generateBuilders = Boolean.parseBoolean(additionalProperties.get(GENERATE_BUILDERS).toString());
} }
additionalProperties.put(GENERATE_BUILDERS, generateBuilders); additionalProperties.put(GENERATE_BUILDERS, generateBuilders);

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
View File

@ -145,7 +145,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen {
} }
if (this.additionalProperties.containsKey(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING)) { if (this.additionalProperties.containsKey(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING)) {
this.setSerializeBigDecimalAsString(Boolean.valueOf( this.setSerializeBigDecimalAsString(Boolean.parseBoolean(
this.additionalProperties.get(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING).toString())); this.additionalProperties.get(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING).toString()));
} }
if (this.additionalProperties.containsKey(CodegenConstants.SERIALIZABLE_MODEL)) { if (this.additionalProperties.containsKey(CodegenConstants.SERIALIZABLE_MODEL)) {
@ -157,7 +157,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen {
} }
this.additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel); this.additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel);
if (this.additionalProperties.containsKey(FULL_JAVA_UTIL)) { if (this.additionalProperties.containsKey(FULL_JAVA_UTIL)) {
this.setFullJavaUtil(Boolean.valueOf(this.additionalProperties.get(FULL_JAVA_UTIL).toString())); this.setFullJavaUtil(Boolean.parseBoolean(this.additionalProperties.get(FULL_JAVA_UTIL).toString()));
} }
if (this.additionalProperties.containsKey(EUREKA_URI)) { if (this.additionalProperties.containsKey(EUREKA_URI)) {
@ -178,7 +178,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen {
this.additionalProperties.put("java8", true); this.additionalProperties.put("java8", true);
if (this.additionalProperties.containsKey(WITH_XML)) { if (this.additionalProperties.containsKey(WITH_XML)) {
this.setWithXml(Boolean.valueOf(additionalProperties.get(WITH_XML).toString())); this.setWithXml(Boolean.parseBoolean(additionalProperties.get(WITH_XML).toString()));
} }
this.additionalProperties.put(WITH_XML, withXml); this.additionalProperties.put(WITH_XML, withXml);

8
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
View File

@ -311,13 +311,13 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
if (hasConflict) { if (hasConflict) {
LOGGER.warn("You specified RxJava versions 1 and 2 and 3 or Coroutines together, please choose one of them."); LOGGER.warn("You specified RxJava versions 1 and 2 and 3 or Coroutines together, please choose one of them.");
} else if (hasRx) { } else if (hasRx) {
this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString())); this.setUseRxJava(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA).toString()));
} else if (hasRx2) { } else if (hasRx2) {
this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString())); this.setUseRxJava2(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA2).toString()));
} else if (hasRx3) { } else if (hasRx3) {
this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString())); this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
} else if (hasCoroutines) { } else if (hasCoroutines) {
this.setUseCoroutines(Boolean.valueOf(additionalProperties.get(USE_COROUTINES).toString())); this.setUseCoroutines(Boolean.parseBoolean(additionalProperties.get(USE_COROUTINES).toString()));
} }
if (!hasRx && !hasRx2 && !hasRx3 && !hasCoroutines) { if (!hasRx && !hasRx2 && !hasRx3 && !hasCoroutines) {

14
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
View File

@ -319,27 +319,27 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
} }
if (additionalProperties.containsKey(EXCEPTION_HANDLER)) { if (additionalProperties.containsKey(EXCEPTION_HANDLER)) {
this.setExceptionHandler(Boolean.valueOf(additionalProperties.get(EXCEPTION_HANDLER).toString())); this.setExceptionHandler(Boolean.parseBoolean(additionalProperties.get(EXCEPTION_HANDLER).toString()));
} }
writePropertyBack(EXCEPTION_HANDLER, exceptionHandler); writePropertyBack(EXCEPTION_HANDLER, exceptionHandler);
if (additionalProperties.containsKey(GRADLE_BUILD_FILE)) { if (additionalProperties.containsKey(GRADLE_BUILD_FILE)) {
this.setGradleBuildFile(Boolean.valueOf(additionalProperties.get(GRADLE_BUILD_FILE).toString())); this.setGradleBuildFile(Boolean.parseBoolean(additionalProperties.get(GRADLE_BUILD_FILE).toString()));
} }
writePropertyBack(GRADLE_BUILD_FILE, gradleBuildFile); writePropertyBack(GRADLE_BUILD_FILE, gradleBuildFile);
if (additionalProperties.containsKey(SWAGGER_ANNOTATIONS)) { if (additionalProperties.containsKey(SWAGGER_ANNOTATIONS)) {
this.setSwaggerAnnotations(Boolean.valueOf(additionalProperties.get(SWAGGER_ANNOTATIONS).toString())); this.setSwaggerAnnotations(Boolean.parseBoolean(additionalProperties.get(SWAGGER_ANNOTATIONS).toString()));
} }
writePropertyBack(SWAGGER_ANNOTATIONS, swaggerAnnotations); writePropertyBack(SWAGGER_ANNOTATIONS, swaggerAnnotations);
if (additionalProperties.containsKey(SERVICE_INTERFACE)) { if (additionalProperties.containsKey(SERVICE_INTERFACE)) {
this.setServiceInterface(Boolean.valueOf(additionalProperties.get(SERVICE_INTERFACE).toString())); this.setServiceInterface(Boolean.parseBoolean(additionalProperties.get(SERVICE_INTERFACE).toString()));
} }
writePropertyBack(SERVICE_INTERFACE, serviceInterface); writePropertyBack(SERVICE_INTERFACE, serviceInterface);
if (additionalProperties.containsKey(SERVICE_IMPLEMENTATION)) { if (additionalProperties.containsKey(SERVICE_IMPLEMENTATION)) {
this.setServiceImplementation(Boolean.valueOf(additionalProperties.get(SERVICE_IMPLEMENTATION).toString())); this.setServiceImplementation(Boolean.parseBoolean(additionalProperties.get(SERVICE_IMPLEMENTATION).toString()));
} }
writePropertyBack(SERVICE_IMPLEMENTATION, serviceImplementation); writePropertyBack(SERVICE_IMPLEMENTATION, serviceImplementation);
@ -357,11 +357,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
writePropertyBack(EXCEPTION_HANDLER, exceptionHandler); writePropertyBack(EXCEPTION_HANDLER, exceptionHandler);
if (additionalProperties.containsKey(INTERFACE_ONLY)) { if (additionalProperties.containsKey(INTERFACE_ONLY)) {
this.setInterfaceOnly(Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString())); this.setInterfaceOnly(Boolean.parseBoolean(additionalProperties.get(INTERFACE_ONLY).toString()));
} }
if (additionalProperties.containsKey(DELEGATE_PATTERN)) { if (additionalProperties.containsKey(DELEGATE_PATTERN)) {
this.setDelegatePattern(Boolean.valueOf(additionalProperties.get(DELEGATE_PATTERN).toString())); this.setDelegatePattern(Boolean.parseBoolean(additionalProperties.get(DELEGATE_PATTERN).toString()));
if (!this.interfaceOnly) { if (!this.interfaceOnly) {
this.setSwaggerAnnotations(true); this.setSwaggerAnnotations(true);
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
View File

@ -750,7 +750,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
} }
if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) { if (additionalProperties.containsKey(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT)) {
this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.valueOf(additionalProperties this.setDisallowAdditionalPropertiesIfNotPresent(Boolean.parseBoolean(additionalProperties
.get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString())); .get(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT).toString()));
} }
@ -1330,7 +1330,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
public String toDefaultValue(Schema p) { public String toDefaultValue(Schema p) {
if (p.getDefault() != null) { if (p.getDefault() != null) {
if (ModelUtils.isBooleanSchema(p)) { if (ModelUtils.isBooleanSchema(p)) {
if (Boolean.valueOf(p.getDefault().toString())) { if (Boolean.parseBoolean(p.getDefault().toString())) {
return "$true"; return "$true";
} else { } else {
return "$false"; return "$false";

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonLegacyClientCodegen.java
View File

@ -405,7 +405,7 @@ public class PythonLegacyClientCodegen extends AbstractPythonCodegen implements
public void setUseNose(String val) { public void setUseNose(String val) {
this.useNose = Boolean.valueOf(val); this.useNose = Boolean.parseBoolean(val);
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
View File

@ -183,7 +183,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
if (additionalProperties.containsKey(CodegenConstants.EXCEPTION_ON_FAILURE)) { if (additionalProperties.containsKey(CodegenConstants.EXCEPTION_ON_FAILURE)) {
boolean booleanValue = Boolean.valueOf(additionalProperties.get(CodegenConstants.EXCEPTION_ON_FAILURE).toString()); boolean booleanValue = Boolean.parseBoolean(additionalProperties.get(CodegenConstants.EXCEPTION_ON_FAILURE).toString());
setReturnExceptionOnFailure(booleanValue); setReturnExceptionOnFailure(booleanValue);
} else { } else {
setReturnExceptionOnFailure(false); setReturnExceptionOnFailure(false);

30
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
View File

@ -217,7 +217,7 @@ public class SpringCodegen extends AbstractJavaCodegen
// Process java8 option before common java ones to change the default dateLibrary to java8. // Process java8 option before common java ones to change the default dateLibrary to java8.
LOGGER.info("----------------------------------"); LOGGER.info("----------------------------------");
if (additionalProperties.containsKey(JAVA_8)) { if (additionalProperties.containsKey(JAVA_8)) {
this.setJava8(Boolean.valueOf(additionalProperties.get(JAVA_8).toString())); this.setJava8(Boolean.parseBoolean(additionalProperties.get(JAVA_8).toString()));
additionalProperties.put(JAVA_8, java8); additionalProperties.put(JAVA_8, java8);
LOGGER.warn("java8 option has been deprecated as it's set to true by default (JDK7 support has been deprecated)"); LOGGER.warn("java8 option has been deprecated as it's set to true by default (JDK7 support has been deprecated)");
} }
@ -257,27 +257,27 @@ public class SpringCodegen extends AbstractJavaCodegen
} }
if (additionalProperties.containsKey(VIRTUAL_SERVICE)) { if (additionalProperties.containsKey(VIRTUAL_SERVICE)) {
this.setVirtualService(Boolean.valueOf(additionalProperties.get(VIRTUAL_SERVICE).toString())); this.setVirtualService(Boolean.parseBoolean(additionalProperties.get(VIRTUAL_SERVICE).toString()));
} }
if (additionalProperties.containsKey(INTERFACE_ONLY)) { if (additionalProperties.containsKey(INTERFACE_ONLY)) {
this.setInterfaceOnly(Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString())); this.setInterfaceOnly(Boolean.parseBoolean(additionalProperties.get(INTERFACE_ONLY).toString()));
} }
if (additionalProperties.containsKey(DELEGATE_PATTERN)) { if (additionalProperties.containsKey(DELEGATE_PATTERN)) {
this.setDelegatePattern(Boolean.valueOf(additionalProperties.get(DELEGATE_PATTERN).toString())); this.setDelegatePattern(Boolean.parseBoolean(additionalProperties.get(DELEGATE_PATTERN).toString()));
} }
if (additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) { if (additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) {
this.setSingleContentTypes(Boolean.valueOf(additionalProperties.get(SINGLE_CONTENT_TYPES).toString())); this.setSingleContentTypes(Boolean.parseBoolean(additionalProperties.get(SINGLE_CONTENT_TYPES).toString()));
} }
if (additionalProperties.containsKey(SKIP_DEFAULT_INTERFACE)) { if (additionalProperties.containsKey(SKIP_DEFAULT_INTERFACE)) {
this.setSkipDefaultInterface(Boolean.valueOf(additionalProperties.get(SKIP_DEFAULT_INTERFACE).toString())); this.setSkipDefaultInterface(Boolean.parseBoolean(additionalProperties.get(SKIP_DEFAULT_INTERFACE).toString()));
} }
if (additionalProperties.containsKey(ASYNC)) { if (additionalProperties.containsKey(ASYNC)) {
this.setAsync(Boolean.valueOf(additionalProperties.get(ASYNC).toString())); this.setAsync(Boolean.parseBoolean(additionalProperties.get(ASYNC).toString()));
//fix for issue/1164 //fix for issue/1164
convertPropertyToBooleanAndWriteBack(ASYNC); convertPropertyToBooleanAndWriteBack(ASYNC);
} }
@ -286,7 +286,7 @@ public class SpringCodegen extends AbstractJavaCodegen
if (!SPRING_BOOT.equals(library)) { if (!SPRING_BOOT.equals(library)) {
throw new IllegalArgumentException("Currently, reactive option is only supported with Spring-boot"); throw new IllegalArgumentException("Currently, reactive option is only supported with Spring-boot");
} }
this.setReactive(Boolean.valueOf(additionalProperties.get(REACTIVE).toString())); this.setReactive(Boolean.parseBoolean(additionalProperties.get(REACTIVE).toString()));
} }
if (additionalProperties.containsKey(RESPONSE_WRAPPER)) { if (additionalProperties.containsKey(RESPONSE_WRAPPER)) {
@ -294,7 +294,7 @@ public class SpringCodegen extends AbstractJavaCodegen
} }
if (additionalProperties.containsKey(USE_TAGS)) { if (additionalProperties.containsKey(USE_TAGS)) {
this.setUseTags(Boolean.valueOf(additionalProperties.get(USE_TAGS).toString())); this.setUseTags(Boolean.parseBoolean(additionalProperties.get(USE_TAGS).toString()));
} }
if (additionalProperties.containsKey(USE_BEANVALIDATION)) { if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
@ -312,27 +312,27 @@ public class SpringCodegen extends AbstractJavaCodegen
} }
if (additionalProperties.containsKey(IMPLICIT_HEADERS)) { if (additionalProperties.containsKey(IMPLICIT_HEADERS)) {
this.setImplicitHeaders(Boolean.valueOf(additionalProperties.get(IMPLICIT_HEADERS).toString())); this.setImplicitHeaders(Boolean.parseBoolean(additionalProperties.get(IMPLICIT_HEADERS).toString()));
} }
if (additionalProperties.containsKey(OPENAPI_DOCKET_CONFIG)) { if (additionalProperties.containsKey(OPENAPI_DOCKET_CONFIG)) {
this.setOpenapiDocketConfig(Boolean.valueOf(additionalProperties.get(OPENAPI_DOCKET_CONFIG).toString())); this.setOpenapiDocketConfig(Boolean.parseBoolean(additionalProperties.get(OPENAPI_DOCKET_CONFIG).toString()));
} }
if (additionalProperties.containsKey(API_FIRST)) { if (additionalProperties.containsKey(API_FIRST)) {
this.setApiFirst(Boolean.valueOf(additionalProperties.get(API_FIRST).toString())); this.setApiFirst(Boolean.parseBoolean(additionalProperties.get(API_FIRST).toString()));
} }
if (additionalProperties.containsKey(HATEOAS)) { if (additionalProperties.containsKey(HATEOAS)) {
this.setHateoas(Boolean.valueOf(additionalProperties.get(HATEOAS).toString())); this.setHateoas(Boolean.parseBoolean(additionalProperties.get(HATEOAS).toString()));
} }
if (additionalProperties.containsKey(RETURN_SUCCESS_CODE)) { if (additionalProperties.containsKey(RETURN_SUCCESS_CODE)) {
this.setReturnSuccessCode(Boolean.valueOf(additionalProperties.get(RETURN_SUCCESS_CODE).toString())); this.setReturnSuccessCode(Boolean.parseBoolean(additionalProperties.get(RETURN_SUCCESS_CODE).toString()));
} }
if (additionalProperties.containsKey(UNHANDLED_EXCEPTION_HANDLING)) { if (additionalProperties.containsKey(UNHANDLED_EXCEPTION_HANDLING)) {
this.setUnhandledException(Boolean.valueOf(additionalProperties.get(UNHANDLED_EXCEPTION_HANDLING).toString())); this.setUnhandledException(Boolean.parseBoolean(additionalProperties.get(UNHANDLED_EXCEPTION_HANDLING).toString()));
} }
additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException()); additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException());

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
View File

@ -177,7 +177,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
} }
if (additionalProperties.containsKey(STRING_ENUMS)) { if (additionalProperties.containsKey(STRING_ENUMS)) {
setStringEnums(Boolean.valueOf(additionalProperties.get(STRING_ENUMS).toString())); setStringEnums(Boolean.parseBoolean(additionalProperties.get(STRING_ENUMS).toString()));
additionalProperties.put("stringEnums", getStringEnums()); additionalProperties.put("stringEnums", getStringEnums());
if (getStringEnums()) { if (getStringEnums()) {
classEnumSeparator = ""; classEnumSeparator = "";

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java
View File

@ -143,7 +143,7 @@ public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodeg
} }
if (additionalProperties.containsKey(STRING_ENUMS)) { if (additionalProperties.containsKey(STRING_ENUMS)) {
setStringEnums(Boolean.valueOf(additionalProperties.get(STRING_ENUMS).toString())); setStringEnums(Boolean.parseBoolean(additionalProperties.get(STRING_ENUMS).toString()));
additionalProperties.put("stringEnums", getStringEnums()); additionalProperties.put("stringEnums", getStringEnums());
if (getStringEnums()) { if (getStringEnums()) {
enumSuffix = ""; enumSuffix = "";

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
View File

@ -1426,7 +1426,7 @@ public class ModelUtils {
} }
if (schema.getExtensions() != null && schema.getExtensions().get("x-nullable") != null) { if (schema.getExtensions() != null && schema.getExtensions().get("x-nullable") != null) {
return Boolean.valueOf(schema.getExtensions().get("x-nullable").toString()); return Boolean.parseBoolean(schema.getExtensions().get("x-nullable").toString());
} }
// In OAS 3.1, the recommended way to define a nullable property or object is to use oneOf. // In OAS 3.1, the recommended way to define a nullable property or object is to use oneOf.
if (schema instanceof ComposedSchema) { if (schema instanceof ComposedSchema) {

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5OptionsTest.java
View File

@ -47,6 +47,6 @@ public class Swift5OptionsTest extends AbstractOptionsTest {
verify(clientCodegen).setObjcCompatible(Boolean.parseBoolean(Swift5OptionsProvider.OBJC_COMPATIBLE_VALUE)); verify(clientCodegen).setObjcCompatible(Boolean.parseBoolean(Swift5OptionsProvider.OBJC_COMPATIBLE_VALUE));
verify(clientCodegen).setLenientTypeCast(Boolean.parseBoolean(Swift5OptionsProvider.LENIENT_TYPE_CAST_VALUE)); verify(clientCodegen).setLenientTypeCast(Boolean.parseBoolean(Swift5OptionsProvider.LENIENT_TYPE_CAST_VALUE));
verify(clientCodegen).setPrependFormOrBodyParameters(Boolean.valueOf(Swift5OptionsProvider.PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)); verify(clientCodegen).setPrependFormOrBodyParameters(Boolean.valueOf(Swift5OptionsProvider.PREPEND_FORM_OR_BODY_PARAMETERS_VALUE));
verify(clientCodegen).setReadonlyProperties(Boolean.valueOf(Swift5OptionsProvider.READONLY_PROPERTIES_VALUE)); verify(clientCodegen).setReadonlyProperties(Boolean.parseBoolean(Swift5OptionsProvider.READONLY_PROPERTIES_VALUE));
} }
} }