loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-06-28 19:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/binary' into binary

Browse Source 
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
	modules/swagger-codegen/src/main/resources/Java/api.mustache
This commit is contained in:
b_sapir 2015-08-24 16:15:18 +03:00
commit 564dffa7e8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View File

@ -36,7 +36,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
protected String sourceFolder = "src/main/java"; protected String sourceFolder = "src/main/java";
protected String localVariablePrefix = ""; protected String localVariablePrefix = "";
protected Boolean serializableModel = false; protected Boolean serializableModel = false;
public JavaClientCodegen() { public JavaClientCodegen() {
super(); super();
outputFolder = "generated-code/java"; outputFolder = "generated-code/java";
@ -138,7 +138,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
if (additionalProperties.containsKey("localVariablePrefix")) { if (additionalProperties.containsKey("localVariablePrefix")) {
this.setLocalVariablePrefix((String) additionalProperties.get("localVariablePrefix")); this.setLocalVariablePrefix((String) additionalProperties.get("localVariablePrefix"));
} }
if (additionalProperties.containsKey("serializableModel")) { if (additionalProperties.containsKey("serializableModel")) {
this.setSerializableModel(Boolean.valueOf((String)additionalProperties.get("serializableModel").toString())); this.setSerializableModel(Boolean.valueOf((String)additionalProperties.get("serializableModel").toString()));
} }
@ -380,7 +380,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
public void setLocalVariablePrefix(String localVariablePrefix) { public void setLocalVariablePrefix(String localVariablePrefix) {
this.localVariablePrefix = localVariablePrefix; this.localVariablePrefix = localVariablePrefix;
} }
public Boolean getSerializableModel() { public Boolean getSerializableModel() {
return serializableModel; return serializableModel;
@ -389,7 +389,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
public void setSerializableModel(Boolean serializableModel) { public void setSerializableModel(Boolean serializableModel) {
this.serializableModel = serializableModel; this.serializableModel = serializableModel;
} }
private String sanitizePackageName(String packageName) { private String sanitizePackageName(String packageName) {
packageName = packageName.trim(); packageName = packageName.trim();
packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_"); packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");

10
modules/swagger-codegen/src/main/resources/Java/api.mustache
View File

@ -84,17 +84,17 @@ public class {{classname}} {
{{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
}; };
final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes); final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
{{#responses}} {{#responses}}
{{#isDefault}} {{#isDefault}}
{{#isBinary}} {{#isBinary}}
byte[] {{localVariablePrefix}}response = null; byte[] {{localVariablePrefix}}response = null;
{{localVariablePrefix}}response = {{localVariablePrefix}}apiClient.invokeBinaryAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams,{{localVariablePrefix}} postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames); {{localVariablePrefix}}response = {{localVariablePrefix}}apiClient.invokeBinaryAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams,{{localVariablePrefix}} postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames);
return {{localVariablePrefix}}response; return {{localVariablePrefix}}response;
{{/isBinary}} {{/isBinary}}
{{^isBinary}} {{^isBinary}}
{{#returnType}} {{#returnType}}
TypeRef {{localVariablePrefix}}returnType = new TypeRef<{{{returnType}}}>() {}; TypeRef {{localVariablePrefix}}returnType = new TypeRef<{{{returnType}}}>() {};
@ -103,9 +103,9 @@ public class {{classname}} {
{{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null); {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null);
{{/returnType}} {{/returnType}}
{{/isBinary}} {{/isBinary}}
{{/isDefault}} {{/isDefault}}
{{/responses}} {{/responses}}
} }
{{/operation}} {{/operation}}
} }