From 5f8e28a39d1b3fbba574ab7de4f4e9438bb7ef0c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 24 Jul 2020 16:43:39 +0800 Subject: [PATCH] Fix string comparison in Python generator's abstract class (#7030) * fix string comparison in PythonAbstractConnexionServerCodegen.java * rename abstract class * put public first --- ...gen.java => AbstractPythonConnexionServerCodegen.java} | 8 ++++---- .../languages/PythonAiohttpConnexionServerCodegen.java | 2 +- .../codegen/languages/PythonBluePlanetServerCodegen.java | 2 +- .../languages/PythonFlaskConnexionServerCodegen.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/{PythonAbstractConnexionServerCodegen.java => AbstractPythonConnexionServerCodegen.java} (99%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java similarity index 99% rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java index e94279d5ac4..4bf8b029e0c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java @@ -43,8 +43,8 @@ import java.util.*; import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.underscore; -public class PythonAbstractConnexionServerCodegen extends DefaultCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(PythonAbstractConnexionServerCodegen.class); +public abstract class AbstractPythonConnexionServerCodegen extends DefaultCodegen implements CodegenConfig { + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPythonConnexionServerCodegen.class); public static final String CONTROLLER_PACKAGE = "controllerPackage"; public static final String DEFAULT_CONTROLLER = "defaultController"; @@ -64,7 +64,7 @@ public class PythonAbstractConnexionServerCodegen extends DefaultCodegen impleme protected boolean useNose = Boolean.FALSE; protected String pythonSrcRoot; - public PythonAbstractConnexionServerCodegen(String templateDirectory, boolean fixBodyNameValue) { + public AbstractPythonConnexionServerCodegen(String templateDirectory, boolean fixBodyNameValue) { super(); modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme)); @@ -248,7 +248,7 @@ public class PythonAbstractConnexionServerCodegen extends DefaultCodegen impleme pySrcRoot = val.replaceAll("[/\\\\]+$", ""); } - if (pySrcRoot.isEmpty() || pySrcRoot == ".") { + if (pySrcRoot.isEmpty() || ".".equals(pySrcRoot)) { this.pythonSrcRoot = ""; } else { this.pythonSrcRoot = pySrcRoot + File.separator; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java index 1e29687eb8c..77fd92ae970 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAiohttpConnexionServerCodegen.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import java.util.EnumSet; -public class PythonAiohttpConnexionServerCodegen extends PythonAbstractConnexionServerCodegen { +public class PythonAiohttpConnexionServerCodegen extends AbstractPythonConnexionServerCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PythonAiohttpConnexionServerCodegen.class); public PythonAiohttpConnexionServerCodegen() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java index 6e7a32ca217..0abd9aa3993 100755 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.EnumSet; -public class PythonBluePlanetServerCodegen extends PythonAbstractConnexionServerCodegen { +public class PythonBluePlanetServerCodegen extends AbstractPythonConnexionServerCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PythonBluePlanetServerCodegen.class); protected String modelDocPath = ""; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java index 085b9e821ef..a1b9abaa7ab 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import java.io.File; -public class PythonFlaskConnexionServerCodegen extends PythonAbstractConnexionServerCodegen { +public class PythonFlaskConnexionServerCodegen extends AbstractPythonConnexionServerCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PythonFlaskConnexionServerCodegen.class); public PythonFlaskConnexionServerCodegen() {