JERSEY-2721 | fixed entity handling in proxy client

Author: Adam Walczak

ext/proxy-client/src/main/java/org/glassfish/jersey/client/proxy/WebResourceFactory.java

@@ -47,6 +47,7 @@
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.security.AccessController;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -96,6 +97,9 @@ public final class WebResourceFactory implements InvocationHandler {
 
     private static final MultivaluedMap<String, Object> EMPTY_HEADERS = new MultivaluedHashMap<String, Object>();
     private static final Form EMPTY_FORM = new Form();
+    private static final List<Class> PARAM_ANNOTATION_CLASSES = Arrays.<Class>asList(
+        PathParam.class, QueryParam.class, HeaderParam.class, CookieParam.class, MatrixParam.class, FormParam.class
+    );
 
     /**
      * Creates a new client-side representation of a resource described by
@@ -201,7 +205,7 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
             }
             Annotation ann;
             Object value = args[i];
-            if (anns.isEmpty()) {
+            if (!hasAnyParamAnnotation(anns)) {
                 entityType = method.getGenericParameterTypes()[i];
                 entity = value;
             } else {
@@ -335,6 +339,15 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
         return result;
     }
 
+    private boolean hasAnyParamAnnotation(Map<Class, Annotation> anns) {
+        for (Class paramAnnotationClass : PARAM_ANNOTATION_CLASSES) {
+            if (anns.containsKey(paramAnnotationClass)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private Object[] convert(final Collection value) {
         return value.toArray();
     }

ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyResource.java

@@ -57,6 +57,11 @@ public List<MyBean> postIt(List<MyBean> entity) {
         return entity;
     }
 
+    @Override
+    public MyBean postValid(@Valid MyBean entity) {
+        return entity;
+    }
+
     @Override
     public String getId(String id) {
         return id;

ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyResourceIfc.java

@@ -69,6 +69,10 @@ public interface MyResourceIfc {
     @Produces({MediaType.APPLICATION_XML})
     List<MyBean> postIt(List<MyBean> entity);
 
+    @POST
+    @Produces({MediaType.APPLICATION_XML})
+    MyBean postValid(@Valid MyBean entity);
+
     @Path("{id}")
     @GET
     @Produces(MediaType.TEXT_PLAIN)

ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/Valid.java

@@ -0,0 +1,4 @@
+package org.glassfish.jersey.client.proxy;
+
+public @interface Valid {
+}

ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/WebResourceFactoryTest.java

@@ -88,6 +88,13 @@ public void testPostIt() {
         assertEquals("Ahoj", resource.postIt(Collections.singletonList(bean)).get(0).name);
     }
 
+    @Test
+    public void testPostValid() {
+        MyBean bean = new MyBean();
+        bean.name = "Ahoj";
+        assertEquals("Ahoj", resource.postValid(bean).name);
+    }
+
     @Test
     public void testPathParam() {
         assertEquals("jouda", resource.getId("jouda"));