Skip to content

Commit 253c46a

Browse files
committed
Merge pull request #1309 from wing328/fix_springmvc_object
[SpringMVC] fix compilation error by removing import of Object
2 parents 053af7a + 17bdd73 commit 253c46a

36 files changed

+87
-49
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.HashSet;
1313
import java.util.List;
1414
import java.util.Map;
15+
import java.util.Iterator;
1516

1617
public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
1718
protected String invokerPackage = "io.swagger.api";
@@ -187,5 +188,17 @@ public String toApiName(String name) {
187188
public void setConfigPackage(String configPackage) {
188189
this.configPackage = configPackage;
189190
}
191+
192+
@Override
193+
public Map<String, Object> postProcessModels(Map<String, Object> objs) {
194+
// remove the import of "Object" to avoid compilation error
195+
List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
196+
Iterator<Map<String, String>> iterator = imports.iterator();
197+
while (iterator.hasNext()) {
198+
String _import = iterator.next().get("import");
199+
if (_import.endsWith(".Object")) iterator.remove();
200+
}
201+
return objs;
202+
}
190203
}
191204

samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import io.swagger.client.auth.ApiKeyAuth;
4040
import io.swagger.client.auth.OAuth;
4141

42-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-24T21:52:56.159+08:00")
42+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
4343
public class ApiClient {
4444
private Map<String, Client> hostMap = new HashMap<String, Client>();
4545
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();

samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Map;
44
import java.util.List;
55

6-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
77
public class ApiException extends Exception {
88
private int code = 0;
99
private Map<String, List<String>> responseHeaders = null;

samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
44
public class Configuration {
55
private static ApiClient defaultApiClient = new ApiClient();
66

samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import java.io.IOException;
88

9-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
9+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
1010
public class JSON {
1111
private ObjectMapper mapper;
1212

samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
44
public class Pair {
55
private String name = "";
66
private String value = "";

samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
44
public class StringUtil {
55
/**
66
* Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.lang.reflect.ParameterizedType;
44
import java.lang.reflect.Type;
55

6-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
77
public class TypeRef<T> {
88
private final Type type;
99

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Map;
1818
import java.util.HashMap;
1919

20-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
20+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
2121
public class PetApi {
2222
private ApiClient apiClient;
2323

@@ -272,7 +272,7 @@ public Pet getPetById (Long petId) throws ApiException {
272272
};
273273
final String contentType = apiClient.selectHeaderContentType(contentTypes);
274274

275-
String[] authNames = new String[] { "petstore_auth", "api_key" };
275+
String[] authNames = new String[] { "api_key", "petstore_auth" };
276276

277277

278278

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Map;
1818
import java.util.HashMap;
1919

20-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-11T11:35:58.351+08:00")
20+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-09-30T16:27:52.437+08:00")
2121
public class StoreApi {
2222
private ApiClient apiClient;
2323

0 commit comments

Comments
 (0)