valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-08 03:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1927 from xhh/java-imports

Browse Source 
[Java] Improve imports in api/models of Java clients
This commit is contained in:
wing328 2016-02-22 11:02:05 +08:00
commit 508ae51f84
31 changed files with 129 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
import java.util.regex.Pattern;
public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
@SuppressWarnings("hiding")
@ -201,6 +202,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
additionalProperties.put(FULL_JAVA_UTIL, fullJavaUtil);
additionalProperties.put("javaUtilPrefix", javaUtilPrefix);
importMapping.put("List", "java.util.List");
if (fullJavaUtil) {
typeMapping.put("array", "java.util.List");
typeMapping.put("map", "java.util.Map");
@ -532,6 +535,12 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
}
}
if ("array".equals(property.containerType)) {
model.imports.add("ArrayList");
} else if ("map".equals(property.containerType)) {
model.imports.add("HashMap");
}
if(!BooleanUtils.toBoolean(model.isEnum)) {
// needed by all pojos, but not enums
model.imports.add("ApiModelProperty");
@ -618,6 +627,17 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override
public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
// Remove imports of List, ArrayList, Map and HashMap as they are
// imported in the template already.
List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
Pattern pattern = Pattern.compile("java\\.util\\.(List|ArrayList|Map|HashMap)");
for (Iterator<Map<String, String>> itr = imports.iterator(); itr.hasNext();) {
String _import = itr.next().get("import");
if (pattern.matcher(_import).matches()) {
itr.remove();
}
}
if(usesAnyRetrofitLibrary()) {
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
if (operations != null) {

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

@ -11,7 +11,10 @@ import {{invokerPackage}}.Pair;
{{/imports}}
{{^fullJavaUtil}}
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
{{>generatedAnnotation}}

6
modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
View File

@ -5,7 +5,11 @@ import {{invokerPackage}}.ApiClient;
{{#imports}}import {{import}};
{{/imports}}
{{^fullJavaUtil}}import java.util.*;
{{^fullJavaUtil}}
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
import feign.*;

5
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
View File

@ -11,7 +11,10 @@ import javax.ws.rs.core.GenericType;
{{/imports}}
{{^fullJavaUtil}}
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
{{>generatedAnnotation}}

5
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
View File

@ -22,7 +22,10 @@ import java.io.IOException;
import java.lang.reflect.Type;
{{^fullJavaUtil}}
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
{{#operations}}

5
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
View File

@ -10,7 +10,10 @@ import retrofit.mime.*;
{{/imports}}
{{^fullJavaUtil}}
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
{{#operations}}

5
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
View File

@ -12,7 +12,10 @@ import okhttp3.RequestBody;
{{/imports}}
{{^fullJavaUtil}}
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
{{/fullJavaUtil}}
{{#operations}}

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

@ -10,7 +10,10 @@ import io.swagger.client.Pair;
import io.swagger.client.model.Pet;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:20.498+08:00")
public class PetApi {

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

@ -7,10 +7,12 @@ import io.swagger.client.ApiClient;
import io.swagger.client.Configuration;
import io.swagger.client.Pair;
import java.util.Map;
import io.swagger.client.model.Order;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:20.498+08:00")
public class StoreApi {

6
samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -8,9 +8,11 @@ import io.swagger.client.Configuration;
import io.swagger.client.Pair;
import io.swagger.client.model.User;
import java.util.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-12T18:48:10.013-08:00")
public class UserApi {

3
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
View File

@ -7,7 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;

5
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -5,7 +5,10 @@ import io.swagger.client.ApiClient;
import io.swagger.client.model.Pet;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:23.375+08:00")

6
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -2,10 +2,12 @@ package io.swagger.client.api;
import io.swagger.client.ApiClient;
import java.util.Map;
import io.swagger.client.model.Order;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-11T21:48:33.457Z")

6
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -3,9 +3,11 @@ package io.swagger.client.api;
import io.swagger.client.ApiClient;
import io.swagger.client.model.User;
import java.util.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-11T21:48:33.457Z")

3
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
View File

@ -7,7 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;

5
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -10,7 +10,10 @@ import javax.ws.rs.core.GenericType;
import io.swagger.client.model.Pet;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:21.885+08:00")
public class PetApi {

6
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -7,10 +7,12 @@ import io.swagger.client.Pair;
import javax.ws.rs.core.GenericType;
import java.util.Map;
import io.swagger.client.model.Order;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:21.885+08:00")
public class StoreApi {

6
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -8,9 +8,11 @@ import io.swagger.client.Pair;
import javax.ws.rs.core.GenericType;
import io.swagger.client.model.User;
import java.util.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-28T16:23:25.238+01:00")
public class UserApi {

3
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
View File

@ -7,7 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;

5
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -21,7 +21,10 @@ import io.swagger.client.model.Pet;
import java.io.File;
import java.lang.reflect.Type;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class PetApi {
private ApiClient apiClient;

6
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -17,11 +17,13 @@ import com.squareup.okhttp.Response;
import java.io.IOException;
import java.util.Map;
import io.swagger.client.model.Order;
import java.lang.reflect.Type;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class StoreApi {
private ApiClient apiClient;

6
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -18,10 +18,12 @@ import com.squareup.okhttp.Response;
import java.io.IOException;
import io.swagger.client.model.User;
import java.util.*;
import java.lang.reflect.Type;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class UserApi {
private ApiClient apiClient;

3
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
View File

@ -5,7 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import com.google.gson.annotations.SerializedName;

5
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -9,7 +9,10 @@ import retrofit.mime.*;
import io.swagger.client.model.Pet;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface PetApi {

6
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -6,10 +6,12 @@ import retrofit.Callback;
import retrofit.http.*;
import retrofit.mime.*;
import java.util.Map;
import io.swagger.client.model.Order;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface StoreApi {

6
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -7,9 +7,11 @@ import retrofit.http.*;
import retrofit.mime.*;
import io.swagger.client.model.User;
import java.util.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface UserApi {

3
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
View File

@ -5,7 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import com.google.gson.annotations.SerializedName;

5
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -11,7 +11,10 @@ import okhttp3.RequestBody;
import io.swagger.client.model.Pet;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface PetApi {

6
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -8,10 +8,12 @@ import retrofit2.http.*;
import okhttp3.RequestBody;
import java.util.Map;
import io.swagger.client.model.Order;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface StoreApi {

6
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -9,9 +9,11 @@ import retrofit2.http.*;
import okhttp3.RequestBody;
import io.swagger.client.model.User;
import java.util.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface UserApi {

3
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
View File

@ -5,7 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import com.google.gson.annotations.SerializedName;