Fix package issue

machaval · machaval · commit 05b4e09c2af1 · 2019-05-15T14:37:05.000-03:00
diff --git a/raml-client-generator-core/src/main/java/org/mule/client/codegen/RestClientGenerator.java b/raml-client-generator-core/src/main/java/org/mule/client/codegen/RestClientGenerator.java
@@ -12,12 +12,7 @@
 
 public interface RestClientGenerator {
 
-	/**
-	 * @deprecated use {@link #callHttpMethod(JCodeModel, JDefinedClass, JType, OutputVersion, JBodyType, JType, JType, Action, ApiModel))} instead.
-	 */
-	@Deprecated
-	void callHttpMethod(@Nonnull JCodeModel cm, @Nonnull JDefinedClass resourceClass, @Nonnull JType returnType, @Nullable JBodyType bodyType, @Nullable JType queryParameterType, @Nullable JType headerParameterType, @Nonnull Action action, ApiModel apiModel);
-	
+
     void callHttpMethod(@Nonnull JCodeModel cm, @Nonnull JDefinedClass resourceClass, @Nonnull JType returnType, @Nonnull OutputVersion outputVersion, @Nullable JBodyType bodyType, @Nullable JType queryParameterType, @Nullable JType headerParameterType, @Nonnull Action action, ApiModel apiModel);
 
     JMethod createClient(JCodeModel cm, JDefinedClass resourceClass, JMethod baseUrlField);
diff --git a/raml-client-generator-core/src/main/java/org/mule/client/codegen/clientgenerator/Jersey2RestClientGeneratorImpl.java b/raml-client-generator-core/src/main/java/org/mule/client/codegen/clientgenerator/Jersey2RestClientGeneratorImpl.java
@@ -62,10 +62,6 @@ public class Jersey2RestClientGeneratorImpl implements RestClientGenerator {
     private static JClass exceptionClass;
     private static JClass responseClass;
 
-    @Override
-    public void callHttpMethod(@Nonnull JCodeModel cm, @Nonnull JDefinedClass resourceClass, @Nonnull JType returnType, @Nullable JBodyType bodyType, @Nullable JType queryParameterType, @Nullable JType headerParameterType, @Nonnull Action action, ApiModel apiModel) {
-        callHttpMethod(cm, resourceClass, returnType, OutputVersion.v1, bodyType, queryParameterType, headerParameterType, action, apiModel);
-    }
 
     @Override
     public void callHttpMethod(@Nonnull JCodeModel cm, @Nonnull JDefinedClass resourceClass, @Nonnull JType returnType, @Nonnull OutputVersion outputVersion, @Nullable JBodyType bodyType, @Nullable JType queryParameterType, @Nullable JType headerParameterType, @Nonnull Action action, ApiModel apiModel) {
@@ -205,8 +201,8 @@ public void callHttpMethod(@Nonnull JCodeModel cm, @Nonnull JDefinedClass resour
                 jInvocation = responseVal.invoke("getEntity");
             } else {
                 if (returnType instanceof JClass && !((JClass) returnType).getTypeParameters().isEmpty()) {
-                    final JClass narrow = cm.anonymousClass(cm.ref(GenericType.class).narrow(returnType));
-                    jInvocation = responseVal.invoke("readEntity").arg(JExpr._new(narrow));
+                    jInvocation = responseVal.invoke("readEntity").arg(JExpr.direct("\n" +
+                            "new " + GenericType.class.getName() + "<" + returnType.fullName() + ">() {}"));
                 } else {
                     jInvocation = responseVal.invoke("readEntity").arg(JExpr.dotclass(cm.ref(returnType.fullName())));
                 }
diff --git a/raml-client-generator-core/src/test/java/org/mule/client/codegen/RamlJavaClientGeneratorTest.java b/raml-client-generator-core/src/test/java/org/mule/client/codegen/RamlJavaClientGeneratorTest.java
@@ -55,7 +55,8 @@ public static Iterable<Object[]> folders() {
                 {"same_path_multiple_times"},
                 {"type_decl"},
                 {"use_optional"},
-                {"x-www-form-urlencoded"}
+                {"x-www-form-urlencoded"},
+                {"xml_mimetype"},
         });
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v1/from-example/output/from-example/resource/users/Users.java b/raml-client-generator-core/src/test/resources/v1/from-example/output/from-example/resource/users/Users.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -46,11 +45,8 @@ public List<UsersGETResponse> get() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new ClientAPIException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<UsersGETResponse>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<from-example.resource.users.model.UsersGETResponse>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v1/include_schema/output/include_schema/resource/cs/login/Login.java b/raml-client-generator-core/src/test/resources/v1/include_schema/output/include_schema/resource/cs/login/Login.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -42,11 +41,8 @@ public List<AuthorizationJson> post() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new FooException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<AuthorizationJson>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<include_schema.resource.cs.login.model.AuthorizationJson>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v1/list/output/list/resource/users/Users.java b/raml-client-generator-core/src/test/resources/v1/list/output/list/resource/users/Users.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -46,11 +45,8 @@ public List<UsersGETResponse> get() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new FooException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<UsersGETResponse>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<list.resource.users.model.UsersGETResponse>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v1/oauth20-global/output/oauth20-global/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v1/oauth20-global/output/oauth20-global/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -47,11 +46,8 @@ public List<ApiGETResponse> get(String authorizationToken) {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<ApiGETResponse>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth20-global.resource.api.model.ApiGETResponse>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v1/oauth20/output/oauth20/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v1/oauth20/output/oauth20/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -47,11 +46,8 @@ public List<ApiGETResponse> get(String authorizationToken) {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<ApiGETResponse>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth20.resource.api.model.ApiGETResponse>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v1/oauth_override/output/oauth_override/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v1/oauth_override/output/oauth_override/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -51,11 +50,8 @@ public List<ApiGETResponse> get(String authorizationToken) {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        return response.readEntity(new GenericType<List<ApiGETResponse>>() {
-
-
-        }
-        );
+        return response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth_override.resource.api.model.ApiGETResponse>>() {}));
     }
 
 }
diff --git a/raml-client-generator-core/src/test/resources/v2/from-example/output/from-example/resource/users/Users.java b/raml-client-generator-core/src/test/resources/v2/from-example/output/from-example/resource/users/Users.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -47,11 +46,8 @@ public ClientAPIResponse<List<UsersGETResponseBody>> get() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new ClientAPIException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        ClientAPIResponse<List<UsersGETResponseBody>> apiResponse = new ClientAPIResponse<List<UsersGETResponseBody>>(response.readEntity(new GenericType<List<UsersGETResponseBody>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        ClientAPIResponse<List<UsersGETResponseBody>> apiResponse = new ClientAPIResponse<List<UsersGETResponseBody>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<from-example.resource.users.model.UsersGETResponseBody>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/include_schema/output/include_schema/resource/cs/login/Login.java b/raml-client-generator-core/src/test/resources/v2/include_schema/output/include_schema/resource/cs/login/Login.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -43,11 +42,8 @@ public FooResponse<List<AuthorizationJson>> post() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new FooException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        FooResponse<List<AuthorizationJson>> apiResponse = new FooResponse<List<AuthorizationJson>>(response.readEntity(new GenericType<List<AuthorizationJson>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        FooResponse<List<AuthorizationJson>> apiResponse = new FooResponse<List<AuthorizationJson>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<include_schema.resource.cs.login.model.AuthorizationJson>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/java_8_dates/output/java_8_dates/resource/cs/login/Login.java b/raml-client-generator-core/src/test/resources/v2/java_8_dates/output/java_8_dates/resource/cs/login/Login.java
@@ -7,7 +7,6 @@
 import java_8_dates.responses.FooResponse;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -43,11 +42,8 @@ public FooResponse<List<AuthorizationJson>> post() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new FooException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        FooResponse<List<AuthorizationJson>> apiResponse = new FooResponse<List<AuthorizationJson>>(response.readEntity(new GenericType<List<AuthorizationJson>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        FooResponse<List<AuthorizationJson>> apiResponse = new FooResponse<List<AuthorizationJson>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<java_8_dates.resource.cs.login.model.AuthorizationJson>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/list/output/list/resource/users/Users.java b/raml-client-generator-core/src/test/resources/v2/list/output/list/resource/users/Users.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -47,11 +46,8 @@ public FooResponse<List<UsersGETResponseBody>> get() {
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new FooException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        FooResponse<List<UsersGETResponseBody>> apiResponse = new FooResponse<List<UsersGETResponseBody>>(response.readEntity(new GenericType<List<UsersGETResponseBody>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        FooResponse<List<UsersGETResponseBody>> apiResponse = new FooResponse<List<UsersGETResponseBody>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<list.resource.users.model.UsersGETResponseBody>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/oauth20-global/output/oauth20-global/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v2/oauth20-global/output/oauth20-global/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -48,11 +47,8 @@ public CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> get(String aut
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity(new GenericType<List<ApiGETResponseBody>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth20-global.resource.api.model.ApiGETResponseBody>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/oauth20/output/oauth20/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v2/oauth20/output/oauth20/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -48,11 +47,8 @@ public CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> get(String aut
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity(new GenericType<List<ApiGETResponseBody>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth20.resource.api.model.ApiGETResponseBody>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/oauth_override/output/oauth_override/resource/api/Api.java b/raml-client-generator-core/src/test/resources/v2/oauth_override/output/oauth_override/resource/api/Api.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status.Family;
@@ -52,11 +51,8 @@ public CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> get(String aut
             Response.StatusType statusInfo = response.getStatusInfo();
             throw new CoreServicesAPIReferenceException(statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), response.getStringHeaders(), response);
         }
-        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity(new GenericType<List<ApiGETResponseBody>>() {
-
-
-        }
-        ), response.getStringHeaders(), response);
+        CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>> apiResponse = new CoreServicesAPIReferenceResponse<List<ApiGETResponseBody>>(response.readEntity((
+new javax.ws.rs.core.GenericType<java.util.List<oauth_override.resource.api.model.ApiGETResponseBody>>() {})), response.getStringHeaders(), response);
         return apiResponse;
     }
 
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/api.raml b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/api.raml
@@ -0,0 +1,29 @@
+#%RAML 1.0
+
+title: "t"
+types:
+  MyAPI:
+  Error:
+
+/myapi:
+  description: "Some description"
+  put:
+    description: "some description."
+    queryParameters:
+      someName:
+        description: "Some name"
+        type: "string"
+        required: true
+        example: "some example"
+    body:
+      application/xml:
+        type: MyAPI
+    responses:
+      200:
+        body:
+          application/xml:
+            type: "string"
+      500:
+        body:
+          application/xml:
+            type: Error
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/api/TClient.java b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/api/TClient.java
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/exceptions/TException.java b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/exceptions/TException.java
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/resource/myapi/Myapi.java b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/resource/myapi/Myapi.java
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/resource/myapi/model/MyapiPUTQueryParam.java b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/resource/myapi/model/MyapiPUTQueryParam.java
diff --git a/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/responses/TResponse.java b/raml-client-generator-core/src/test/resources/v2/xml_mimetype/output/xml_mimetype/responses/TResponse.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public static Iterable<Object[]> folders() {`
`55`	`55`	`{"same_path_multiple_times"},`
`56`	`56`	`{"type_decl"},`
`57`	`57`	`{"use_optional"},`
`58`		`- {"x-www-form-urlencoded"}`
	`58`	`+ {"x-www-form-urlencoded"},`
	`59`	`+ {"xml_mimetype"},`
`59`	`60`	`});`
`60`	`61`	`}`
`61`	`62`