From d18426c69a85500f71bc5b0b7d1e62162aeefbfd Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 23 Jun 2015 22:30:43 +0800 Subject: [PATCH] fix reg expression --- .../codegen/languages/PhpClientCodegen.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 e504a888f8a..7f92a06fe76 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 @@ -99,14 +99,20 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar; } + String regFirstPathSeparator; + if ("/".equals(File.separator)) { // for mac, linux + regFirstPathSeparator = "^/"; + } else { // for windows + regFirstPathSeparator = "^\\"; + } + return (getPackagePath() + File.separatorChar + basePath // Replace period, backslash, forward slash with file separator in package name - + packageName.replace("\\", File.separator). - replace(".", File.separator).replace("/", File.separator)); + + packageName.replaceAll("[\\.\\\\/]", File.separator) // Trim prefix file separators from package path - //.replaceAll("^" + File.separator, "")) + .replaceAll(regFirstPathSeparator, "")) // Trim trailing file separators from the overall path - //.replaceAll(File.separator + "$", ""); + .replaceAll(File.separator + "$", ""); } public CodegenType getTag() {