loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix string comparison (#376)

Browse Source
This commit is contained in:
William Cheng 2018-05-09 10:30:05 +08:00 committed by GitHub
parent 3608a14b40
commit 9ecd3586b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java
View File

@ -21,11 +21,10 @@ import java.io.File;
import java.io.IOException;
import java.io.Writer;
import org.apache.commons.lang3.StringUtils;
import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Template;
import org.openapitools.codegen.*;
import org.openapitools.codegen.utils.ModelUtils;
public class AdaCodegen extends AbstractAdaCodegen implements CodegenConfig {
@ -54,7 +53,7 @@ public class AdaCodegen extends AbstractAdaCodegen implements CodegenConfig {
if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
packageName = (String) additionalProperties.get(CodegenConstants.PACKAGE_NAME);
}
if (packageName == "") {
if (StringUtils.isEmpty(packageName)) {
packageName = modelPackage;
}
String srcPrefix = "src" + File.separator;

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

@ -170,7 +170,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
if (response != null) {
CodegenProperty cm = fromProperty("response", response);
op.vendorExtensions.put("x-codegen-response", cm);
if (cm.datatype == "HttpContent") {
if ("HttpContent".equals(cm.datatype)) {
op.vendorExtensions.put("x-codegen-response-ishttpcontent", true);
}
}

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

@ -53,7 +53,7 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo
outputFolder = "generated-code/qt5cpp";
// set modelNamePrefix as default for QT5CPP
if ("".equals(modelNamePrefix)) {
if (StringUtils.isEmpty(modelNamePrefix)) {
modelNamePrefix = PREFIX;
}

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

@ -241,7 +241,7 @@ public class CppRestClientCodegen extends AbstractCppCodegen {
if (response != null) {
CodegenProperty cm = fromProperty("response", response);
op.vendorExtensions.put("x-codegen-response", cm);
if (cm.datatype == "HttpContent") {
if ("HttpContent".equals(cm.datatype)) {
op.vendorExtensions.put("x-codegen-response-ishttpcontent", true);
}
}

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

@ -281,7 +281,7 @@ public class CppTizenClientCodegen extends DefaultCodegen implements CodegenConf
@Override
public String toOperationId(String operationId) {
// throw exception if method name is empty
if ("".equals(operationId)) {
if (StringUtils.isEmpty(operationId)) {
throw new RuntimeException("Empty method name (operationId) not allowed");
}

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java
View File

@ -20,6 +20,7 @@ package org.openapitools.codegen.languages;
import io.swagger.v3.oas.models.Operation;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
@ -107,7 +108,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty(basePath)) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {

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

@ -19,6 +19,7 @@ package org.openapitools.codegen.languages;
import io.swagger.v3.oas.models.Operation;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
@ -147,7 +148,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty(basePath)) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {
@ -156,7 +157,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
co.subresourceOperation = !co.path.isEmpty();
}
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
if (opList == null || opList.isEmpty()) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java
View File

@ -18,7 +18,6 @@
package org.openapitools.codegen.languages;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
import io.swagger.v3.oas.models.*;
import java.util.*;
@ -171,7 +170,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty(basePath)) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {
@ -180,7 +179,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
co.subresourceOperation = !co.path.isEmpty();
}
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
if (opList == null || opList.isEmpty()) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}

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

@ -152,7 +152,7 @@ public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen {
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty(basePath)) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {

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

@ -126,7 +126,7 @@ public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty("")) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {
@ -135,7 +135,7 @@ public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen
co.subresourceOperation = !co.path.isEmpty();
}
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
if (opList == null || opList.isEmpty()) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java
View File

@ -18,7 +18,6 @@
package org.openapitools.codegen.languages;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
import org.openapitools.codegen.languages.features.JbossFeature;
import io.swagger.v3.oas.models.*;
import org.apache.commons.lang3.BooleanUtils;
@ -129,7 +128,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
basePath = basePath.substring(0, pos);
}
if (basePath == "") {
if (StringUtils.isEmpty(basePath)) {
basePath = "default";
} else {
if (co.path.startsWith("/" + basePath)) {
@ -138,7 +137,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
co.subresourceOperation = !co.path.isEmpty();
}
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
if (opList == null || opList.isEmpty()) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}