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

Merge pull request #59 from radius314/feature/escaping-forward-slash-windows

Browse Source 
fixing replaceAll bug on windows with escaping paths, changed replaceAll...
This commit is contained in:
Tony Tam 2013-06-05 08:18:19 -07:00
commit 9e8f817a6b
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/client/petstore/csharp/CSharpPetstoreCodegen.scala
View File

@ -37,8 +37,8 @@ object CSharpPetstoreCodegen extends BasicCSharpGenerator {
// supporting classes // supporting classes
override def supportingFiles = override def supportingFiles =
List( List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.cs"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.cs"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.cs"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.cs"),
("Newtonsoft.Json.dll", "samples/client/petstore/csharp/bin", "Newtonsoft.Json.dll"), ("Newtonsoft.Json.dll", "samples/client/petstore/csharp/bin", "Newtonsoft.Json.dll"),
("compile.mustache", "samples/client/petstore/csharp", "compile.bat")) ("compile.mustache", "samples/client/petstore/csharp", "compile.bat"))
} }

6
samples/client/petstore/java/JavaPetstoreCodegen.scala
View File

@ -42,8 +42,8 @@ object JavaPetstoreCodegen extends BasicJavaGenerator {
// supporting classes // supporting classes
override def supportingFiles = override def supportingFiles =
List( List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"), ("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("pom.mustache", "samples/client/petstore/java", "pom.xml")) ("pom.mustache", "samples/client/petstore/java", "pom.xml"))
} }

2
samples/client/petstore/scala/ScalaPetstoreCodegen.scala
View File

@ -33,7 +33,7 @@ object ScalaPetstoreCodegen extends BasicScalaGenerator {
// supporting classes // supporting classes
override def supportingFiles = List( override def supportingFiles = List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.scala"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.scala"),
("pom.mustache", "samples/client/petstore/scala", "pom.xml") ("pom.mustache", "samples/client/petstore/scala", "pom.xml")
) )
} }

6
samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala
View File

@ -44,8 +44,8 @@ object JavaWordnikApiCodegen extends BasicJavaGenerator {
// supporting classes // supporting classes
override def supportingFiles = override def supportingFiles =
List( List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"), ("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("pom.mustache", destinationRoot, "pom.xml")) ("pom.mustache", destinationRoot, "pom.xml"))
} }

2
samples/client/wordnik-api/scala/ScalaWordnikApiCodegen.scala
View File

@ -35,6 +35,6 @@ object ScalaWordnikApiCodegen extends BasicScalaGenerator {
// supporting classes // supporting classes
override def supportingFiles = List( override def supportingFiles = List(
("apiInvoker.mustache", destinationDir + "/" + invokerPackage.get.replaceAll("\\.", java.io.File.separator), "ApiInvoker.scala"), ("apiInvoker.mustache", destinationDir + "/" + invokerPackage.get.replace(".", java.io.File.separator), "ApiInvoker.scala"),
("pom.mustache", destinationRoot, "pom.xml")) ("pom.mustache", destinationRoot, "pom.xml"))
} }

4
src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
View File

@ -182,8 +182,8 @@ class BasicCSharpGenerator extends BasicGenerator {
// supporting classes // supporting classes
override def supportingFiles = override def supportingFiles =
List( List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("Newtonsoft.Json.dll", "generated-code/csharp/bin", "Newtonsoft.Json.dll"), ("Newtonsoft.Json.dll", "generated-code/csharp/bin", "Newtonsoft.Json.dll"),
("compile.mustache", "generated-code/csharp", "compile.bat")) ("compile.mustache", "generated-code/csharp", "compile.bat"))
} }

4
src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
View File

@ -151,7 +151,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
m += "models" -> List((name, schema)) m += "models" -> List((name, schema))
m += "package" -> modelPackage m += "package" -> modelPackage
m += "invokerPackage" -> invokerPackage m += "invokerPackage" -> invokerPackage
m += "outputDirectory" -> (destinationDir + File.separator + modelPackage.getOrElse("").replaceAll("\\.", File.separator)) m += "outputDirectory" -> (destinationDir + File.separator + modelPackage.getOrElse("").replace(".", File.separator))
m += "newline" -> "\n" m += "newline" -> "\n"
Some(m.toMap) Some(m.toMap)
@ -177,7 +177,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
m += "invokerPackage" -> invokerPackage m += "invokerPackage" -> invokerPackage
m += "apis" -> Map(className -> operationList.toList) m += "apis" -> Map(className -> operationList.toList)
m += "models" -> None m += "models" -> None
m += "outputDirectory" -> (destinationDir + File.separator + apiPackage.getOrElse("").replaceAll("\\.", File.separator)) m += "outputDirectory" -> (destinationDir + File.separator + apiPackage.getOrElse("").replace(".", File.separator))
m += "newline" -> "\n" m += "newline" -> "\n"
Some(m.toMap) Some(m.toMap)

6
src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
View File

@ -172,8 +172,8 @@ class BasicJavaGenerator extends BasicGenerator {
// supporting classes // supporting classes
override def supportingFiles = override def supportingFiles =
List( List(
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"), ("JsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("pom.mustache", "generated-code/java", "pom.xml")) ("pom.mustache", "generated-code/java", "pom.xml"))
} }