From 1f68d0f7b0661789bc81c2bf07359b1e5cbe5783 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 3 Dec 2015 00:44:15 +0800 Subject: [PATCH 1/3] fix issue with petstore in windows --- .../java/io/swagger/codegen/languages/PhpClientCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 5b22fbdbadb..917342f9bbf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -15,6 +15,7 @@ import java.io.File; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.regex.Matcher; import org.apache.commons.lang3.StringUtils; @@ -129,7 +130,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { return (getPackagePath() + File.separatorChar + basePath // Replace period, backslash, forward slash with file separator in package name - + packageName.replaceAll("[\\.\\\\/]", File.separator) + + packageName.replaceAll("[\\.\\\\/]", Matcher.quoteReplacement(File.separator)) // Trim prefix file separators from package path .replaceAll(regFirstPathSeparator, "")) // Trim trailing file separators from the overall path From e182ad7897fe2c186b85d37c383999ef2692aac5 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 4 Dec 2015 22:29:29 +0800 Subject: [PATCH 2/3] add log to php code gen --- .../codegen/languages/PhpClientCodegen.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 917342f9bbf..29f029acda9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -19,7 +19,12 @@ import java.util.regex.Matcher; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { + static Logger LOGGER = LoggerFactory.getLogger(PhpClientCodegen.class); + public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; public static final String PACKAGE_PATH = "packagePath"; public static final String SRC_BASE_PATH = "srcBasePath"; @@ -109,6 +114,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } public String toPackagePath(String packageName, String basePath) { + LOGGER.info("============================"); + LOGGER.info("packageName = " + packageName); packageName = packageName.replace(invokerPackage, ""); if (basePath != null && basePath.length() > 0) { basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; @@ -120,6 +127,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } else { // for windows regFirstPathSeparator = "^\\\\"; } + LOGGER.info("regFirstPathSeparator = " + regFirstPathSeparator); String regLastPathSeparator; if ("/".equals(File.separator)) { // for mac, linux @@ -127,6 +135,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } else { // for windows regLastPathSeparator = "\\\\$"; } + LOGGER.info("regLastPathSeparator= " + regLastPathSeparator); + LOGGER.info("packageName = " + packageName); return (getPackagePath() + File.separatorChar + basePath // Replace period, backslash, forward slash with file separator in package name @@ -218,11 +228,11 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String apiFileFolder() { - return (outputFolder + "/" + toPackagePath(apiPackage(), srcBasePath)); + return (outputFolder + "/" + toPackagePath(apiPackage, srcBasePath)); } public String modelFileFolder() { - return (outputFolder + "/" + toPackagePath(modelPackage(), srcBasePath)); + return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath)); } @Override From ddd52f613f6f4cc64285c6a1654900d9888a27f1 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 4 Dec 2015 22:37:16 +0800 Subject: [PATCH 3/3] remove logging from php generator --- .../java/io/swagger/codegen/languages/PhpClientCodegen.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 29f029acda9..56df40219f5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -114,8 +114,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } public String toPackagePath(String packageName, String basePath) { - LOGGER.info("============================"); - LOGGER.info("packageName = " + packageName); packageName = packageName.replace(invokerPackage, ""); if (basePath != null && basePath.length() > 0) { basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; @@ -127,7 +125,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } else { // for windows regFirstPathSeparator = "^\\\\"; } - LOGGER.info("regFirstPathSeparator = " + regFirstPathSeparator); String regLastPathSeparator; if ("/".equals(File.separator)) { // for mac, linux @@ -135,8 +132,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { } else { // for windows regLastPathSeparator = "\\\\$"; } - LOGGER.info("regLastPathSeparator= " + regLastPathSeparator); - LOGGER.info("packageName = " + packageName); return (getPackagePath() + File.separatorChar + basePath // Replace period, backslash, forward slash with file separator in package name