Skip to content

Commit 1253194

Browse files
fehguyfehguy
committed
Merge pull request #438 from swagger-api/develop_2.0
merged to master for patch release
2 parents 279f43d + 3061cd8 commit 1253194

File tree

26 files changed

+195
-97
lines changed

26 files changed

+195
-97
lines changed

‎modules/swagger-codegen-distribution/pom.xml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<parent>
33
<groupId>com.wordnik</groupId>
44
<artifactId>swagger-codegen-project</artifactId>
5-
<version>2.1.0-M1</version>
5+
<version>2.1.1-M1</version>
66
<relativePath>../..</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.wordnik</groupId>
1010
<artifactId>swagger-codegen-distribution</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-codegen (executable)</name>
13-
<version>2.1.0-M1</version>
13+
<version>2.1.1-M1</version>
1414
<build>
1515
<testSourceDirectory>src/test/scala</testSourceDirectory>
1616
<outputDirectory>target/classes</outputDirectory>
@@ -19,6 +19,17 @@
1919
<directory>target</directory>
2020
<finalName>${project.artifactId}-${project.version}</finalName>
2121
<plugins>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-jar-plugin</artifactId>
25+
<configuration>
26+
<archive>
27+
<manifest>
28+
<mainClass>com.wordnik.swagger.codegen.Codegen</mainClass>
29+
</manifest>
30+
</archive>
31+
</configuration>
32+
</plugin>
2233
<plugin>
2334
<groupId>org.apache.maven.plugins</groupId>
2435
<artifactId>maven-shade-plugin</artifactId>
@@ -41,14 +52,21 @@
4152
</plugin>
4253
<plugin>
4354
<groupId>org.apache.maven.plugins</groupId>
44-
<artifactId>maven-jar-plugin</artifactId>
45-
<configuration>
46-
<archive>
47-
<manifest>
48-
<mainClass>com.wordnik.swagger.codegen.Codegen</mainClass>
49-
</manifest>
50-
</archive>
51-
</configuration>
55+
<artifactId>maven-shade-plugin</artifactId>
56+
<version>2.3</version>
57+
<executions>
58+
<execution>
59+
<phase>package</phase>
60+
<goals>
61+
<goal>shade</goal>
62+
</goals>
63+
<configuration>
64+
<transformers>
65+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
66+
</transformers>
67+
</configuration>
68+
</execution>
69+
</executions>
5270
</plugin>
5371
</plugins>
5472
</build>

‎modules/swagger-codegen/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<parent>
33
<groupId>com.wordnik</groupId>
44
<artifactId>swagger-codegen-project</artifactId>
5-
<version>2.1.0-M1</version>
5+
<version>2.1.1-M1</version>
66
<relativePath>../..</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.wordnik</groupId>
1010
<artifactId>swagger-codegen</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-codegen (core library)</name>
13-
<version>2.1.0-M1</version>
13+
<version>2.1.1-M1</version>
1414
<build>
1515
<sourceDirectory>src/main/java</sourceDirectory>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ public String escapeReservedWord(String name) {
7171

7272
@Override
7373
public String apiFileFolder() {
74-
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
74+
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
7575
}
7676

7777
public String modelFileFolder() {
78-
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
78+
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
7979
}
8080

8181
@Override

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public String escapeReservedWord(String name) {
8080

8181
@Override
8282
public String apiFileFolder() {
83-
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
83+
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
8484
}
8585

8686
public String modelFileFolder() {
87-
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
87+
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
8888
}
8989

9090
@Override

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public String escapeReservedWord(String name) {
6969

7070
@Override
7171
public String apiFileFolder() {
72-
return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
72+
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
7373
}
7474

7575
public String modelFileFolder() {
76-
return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
76+
return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
7777
}
7878

7979
@Override

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public PythonClientCodegen() {
5454
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
5555
supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py"));
5656
supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py"));
57-
supportingFiles.add(new SupportingFile("__init__.mustache", modelPackage.replaceAll("\\.", File.separator), "__init__.py"));
57+
supportingFiles.add(new SupportingFile("__init__.mustache", modelPackage.replace('.', File.separatorChar), "__init__.py"));
5858
}
5959

6060
@Override

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ public String escapeReservedWord(String name) {
106106

107107
@Override
108108
public String apiFileFolder() {
109-
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
109+
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
110110
}
111111

112112
public String modelFileFolder() {
113-
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
113+
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
114114
}
115115

116116
@Override

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ public String escapeReservedWord(String name) {
128128

129129
@Override
130130
public String apiFileFolder() {
131-
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
131+
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
132132
}
133133

134134
public String modelFileFolder() {
135-
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
135+
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
136136
}
137137

138138
@Override

‎modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ public class ApiInvoker {
5151
}
5252

5353
public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
54+
if(null != containerType) {
55+
containerType = containerType.toLowerCase();
56+
}
5457
try{
55-
if("List".equals(containerType)) {
58+
if("list".equals(containerType) || "array".equals(containerType)) {
5659
JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
5760
List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
5861
return response;

‎modules/swagger-generator/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.1.0-M1</version>
6+
<version>2.1.1-M1</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<groupId>com.wordnik</groupId>
@@ -200,10 +200,18 @@
200200
<artifactId>jetty-deploy</artifactId>
201201
<version>${jetty-version}</version>
202202
</dependency>
203+
204+
<dependency>
205+
<groupId>org.scalatest</groupId>
206+
<artifactId>scalatest_2.11</artifactId>
207+
<version>${scala-test-version}</version>
208+
<scope>test</scope>
209+
</dependency>
203210
<dependency>
204211
<groupId>org.scala-lang</groupId>
205212
<artifactId>scala-library</artifactId>
206213
<version>${scala-version}</version>
214+
<scope>test</scope>
207215
</dependency>
208216
<dependency>
209217
<groupId>org.scala-lang</groupId>
@@ -228,6 +236,5 @@
228236

229237
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
230238
<scala-version>2.10.0</scala-version>
231-
<scala-test-version>1.9</scala-test-version>
232239
</properties>
233240
</project>

0 commit comments

Comments
 (0)