Skip to content

Commit d345283

Browse files
xhhxhh
committed
Merge branch 'develop_2.0' into java-accept-contenttype
Conflicts: modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache modules/swagger-codegen/src/main/resources/Java/api.mustache samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java
2 parents d707421 + ddbef8b commit d345283

File tree

86 files changed

+2673
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2673
-401
lines changed

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

Lines changed: 97 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,6 @@ public AndroidClientCodegen() {
4747
"native", "super", "while")
4848
);
4949

50-
additionalProperties.put("invokerPackage", invokerPackage);
51-
additionalProperties.put("groupId", groupId);
52-
additionalProperties.put("artifactId", artifactId);
53-
additionalProperties.put("artifactVersion", artifactVersion);
54-
55-
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
56-
additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
57-
58-
supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
59-
supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
60-
supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
61-
supportingFiles.add(new SupportingFile("apiInvoker.mustache",
62-
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
63-
supportingFiles.add(new SupportingFile("httpPatch.mustache",
64-
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java"));
65-
supportingFiles.add(new SupportingFile("jsonUtil.mustache",
66-
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
67-
supportingFiles.add(new SupportingFile("apiException.mustache",
68-
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
69-
7050
languageSpecificPrimitives = new HashSet<String>(
7151
Arrays.asList(
7252
"String",
@@ -80,6 +60,13 @@ public AndroidClientCodegen() {
8060
);
8161
instantiationTypes.put("array", "ArrayList");
8262
instantiationTypes.put("map", "HashMap");
63+
64+
cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code"));
65+
cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml"));
66+
cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml"));
67+
cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml"));
68+
cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
69+
cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true."));
8370
}
8471

8572
@Override
@@ -177,6 +164,96 @@ public String toOperationId(String operationId) {
177164

178165
return camelize(operationId, true);
179166
}
167+
168+
@Override
169+
public void processOpts() {
170+
super.processOpts();
171+
172+
if(additionalProperties.containsKey("invokerPackage")) {
173+
this.setInvokerPackage((String)additionalProperties.get("invokerPackage"));
174+
}
175+
else{
176+
//not set, use default to be passed to template
177+
additionalProperties.put("invokerPackage", invokerPackage);
178+
}
179+
180+
if(additionalProperties.containsKey("groupId")) {
181+
this.setGroupId((String)additionalProperties.get("groupId"));
182+
}
183+
else{
184+
//not set, use to be passed to template
185+
additionalProperties.put("groupId", groupId);
186+
}
187+
188+
if(additionalProperties.containsKey("artifactId")) {
189+
this.setArtifactId((String)additionalProperties.get("artifactId"));
190+
}
191+
else{
192+
//not set, use to be passed to template
193+
additionalProperties.put("artifactId", artifactId);
194+
}
195+
196+
if(additionalProperties.containsKey("artifactVersion")) {
197+
this.setArtifactVersion((String)additionalProperties.get("artifactVersion"));
198+
}
199+
else{
200+
//not set, use to be passed to template
201+
additionalProperties.put("artifactVersion", artifactVersion);
202+
}
203+
204+
if(additionalProperties.containsKey("sourceFolder")) {
205+
this.setSourceFolder((String)additionalProperties.get("sourceFolder"));
206+
}
180207

208+
if(additionalProperties.containsKey("useAndroidMavenGradlePlugin")) {
209+
this.setUseAndroidMavenGradlePlugin((Boolean)additionalProperties.get("useAndroidMavenGradlePlugin"));
210+
}
211+
else{
212+
additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
213+
}
214+
215+
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
216+
additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
217+
218+
supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
219+
supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
220+
supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
221+
supportingFiles.add(new SupportingFile("apiInvoker.mustache",
222+
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
223+
supportingFiles.add(new SupportingFile("httpPatch.mustache",
224+
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java"));
225+
supportingFiles.add(new SupportingFile("jsonUtil.mustache",
226+
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
227+
supportingFiles.add(new SupportingFile("apiException.mustache",
228+
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
229+
}
230+
231+
public Boolean getUseAndroidMavenGradlePlugin() {
232+
return useAndroidMavenGradlePlugin;
233+
}
234+
235+
public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) {
236+
this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin;
237+
}
238+
239+
public void setInvokerPackage(String invokerPackage) {
240+
this.invokerPackage = invokerPackage;
241+
}
242+
243+
public void setGroupId(String groupId) {
244+
this.groupId = groupId;
245+
}
246+
247+
public void setArtifactId(String artifactId) {
248+
this.artifactId = artifactId;
249+
}
250+
251+
public void setArtifactVersion(String artifactVersion) {
252+
this.artifactVersion = artifactVersion;
253+
}
254+
255+
public void setSourceFolder(String sourceFolder) {
256+
this.sourceFolder = sourceFolder;
257+
}
181258

182259
}

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,19 @@ public void processOpts() {
106106
this.setSourceFolder((String)additionalProperties.get("sourceFolder"));
107107
}
108108

109+
final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
109110
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
110-
supportingFiles.add(new SupportingFile("ApiClient.mustache",
111-
(sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "ApiClient.java"));
112-
supportingFiles.add(new SupportingFile("Configuration.mustache",
113-
(sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "Configuration.java"));
114-
supportingFiles.add(new SupportingFile("JsonUtil.mustache",
115-
(sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "JsonUtil.java"));
116-
supportingFiles.add(new SupportingFile("StringUtil.mustache",
117-
(sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "StringUtil.java"));
118-
supportingFiles.add(new SupportingFile("apiException.mustache",
119-
(sourceFolder + File.separator + invokerPackage).replace(".", File.separator), "ApiException.java"));
111+
supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
112+
supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java"));
113+
supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
114+
supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java"));
115+
supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
116+
117+
final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
118+
supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
119+
supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
120+
supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
121+
supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
120122
}
121123

122124

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

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public String getHelp() {
2727
}
2828

2929
public JaxRSServerCodegen() {
30-
super();
30+
super.processOpts();
3131

3232
sourceFolder = "src/gen/java";
3333

@@ -37,7 +37,6 @@ public JaxRSServerCodegen() {
3737
apiTemplateFiles.put("apiService.mustache", ".java");
3838
apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
3939
apiTemplateFiles.put("apiServiceFactory.mustache", ".java");
40-
4140
templateDir = "JavaJaxRS";
4241
apiPackage = System.getProperty( "swagger.codegen.jaxrs.apipackage", "io.swagger.api") ;
4342
modelPackage = System.getProperty( "swagger.codegen.jaxrs.modelpackage", "io.swagger.model" );
@@ -48,6 +47,24 @@ public JaxRSServerCodegen() {
4847
additionalProperties.put("artifactVersion", artifactVersion);
4948
additionalProperties.put("title", title);
5049

50+
51+
languageSpecificPrimitives = new HashSet<String>(
52+
Arrays.asList(
53+
"String",
54+
"boolean",
55+
"Boolean",
56+
"Double",
57+
"Integer",
58+
"Long",
59+
"Float")
60+
);
61+
}
62+
63+
64+
@Override
65+
public void processOpts() {
66+
super.processOpts();
67+
5168
supportingFiles.clear();
5269
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
5370
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -62,16 +79,6 @@ public JaxRSServerCodegen() {
6279
supportingFiles.add(new SupportingFile("web.mustache",
6380
("src/main/webapp/WEB-INF"), "web.xml"));
6481

65-
languageSpecificPrimitives = new HashSet<String>(
66-
Arrays.asList(
67-
"String",
68-
"boolean",
69-
"Boolean",
70-
"Double",
71-
"Integer",
72-
"Long",
73-
"Float")
74-
);
7582
}
7683

7784
@Override

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ public void processOpts() {
140140
supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m"));
141141
supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", sourceFolder, "JSONValueTransformer+ISO8601.m"));
142142
supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h"));
143+
supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m"));
144+
supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h"));
143145
supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
144146
}
145147

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public PhpClientCodegen() {
8282
typeMapping.put("map", "map");
8383
typeMapping.put("array", "array");
8484
typeMapping.put("list", "array");
85+
typeMapping.put("object", "object");
8586

8687
supportingFiles.add(new SupportingFile("composer.mustache", packagePath.replace('/', File.separatorChar), "composer.json"));
8788
supportingFiles.add(new SupportingFile("configuration.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "Configuration.php"));

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ public PythonClientCodegen() {
2727
super();
2828

2929
eggPackage = module + "-python";
30-
invokerPackage = eggPackage + "/" + module;
30+
31+
invokerPackage = eggPackage + File.separatorChar + module;
3132

32-
outputFolder = "generated-code/python";
33+
outputFolder = "generated-code" + File.separatorChar + "python";
3334
modelTemplateFiles.put("model.mustache", ".py");
3435
apiTemplateFiles.put("api.mustache", ".py");
3536
templateDir = "python";
3637

37-
apiPackage = invokerPackage + ".apis";
38-
modelPackage = invokerPackage + ".models";
38+
apiPackage = invokerPackage + File.separatorChar + "apis";
39+
modelPackage = invokerPackage + File.separatorChar + "models";
3940

4041
languageSpecificPrimitives.clear();
4142
languageSpecificPrimitives.add("int");
@@ -68,13 +69,12 @@ public PythonClientCodegen() {
6869

6970
supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md"));
7071
supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py"));
71-
supportingFiles.add(new SupportingFile("swagger.mustache", invokerPackage, "swagger.py"));
72+
supportingFiles.add(new SupportingFile("api_client.mustache", invokerPackage, "api_client.py"));
7273
supportingFiles.add(new SupportingFile("rest.mustache", invokerPackage, "rest.py"));
73-
supportingFiles.add(new SupportingFile("util.mustache", invokerPackage, "util.py"));
74-
supportingFiles.add(new SupportingFile("config.mustache", invokerPackage, "config.py"));
74+
supportingFiles.add(new SupportingFile("configuration.mustache", invokerPackage, "configuration.py"));
7575
supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py"));
76-
supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage.replace('.', File.separatorChar), "__init__.py"));
77-
supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage.replace('.', File.separatorChar), "__init__.py"));
76+
supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage, "__init__.py"));
77+
supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage, "__init__.py"));
7878
}
7979

8080
@Override
@@ -84,11 +84,11 @@ public String escapeReservedWord(String name) {
8484

8585
@Override
8686
public String apiFileFolder() {
87-
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
87+
return outputFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar);
8888
}
8989

9090
public String modelFileFolder() {
91-
return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
91+
return outputFolder + File.separatorChar + modelPackage().replace('.', File.separatorChar);
9292
}
9393

9494
@Override

0 commit comments

Comments
 (0)