Fix for J-321: @DefaultValue does not work with ParamConverter

   - added a few tests and fixed the issue

Change-Id: I3c81789040fb0fa323e8df325cc35f9dcc1dbd67

Author: japod

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/SingleValueExtractor.java

@@ -79,7 +79,7 @@ public SingleValueExtractor(ParamConverter<T> converter, String parameterName, S
     public T extract(MultivaluedMap<String, String> parameters) {
         String v = parameters.getFirst(getName());
         try {
-            return fromString(v);
+            return fromString((v == null && isDefaultValueRegistered()) ? getDefaultValueString() : v);
         } catch (WebApplicationException ex) {
             throw ex;
         } catch (ProcessingException ex) {

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/ParamConverterTest.java

@@ -46,6 +46,7 @@
 import java.util.SortedSet;
 
 import javax.ws.rs.CookieParam;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -155,6 +156,47 @@ public void testStringParamInResponse() {
 
     }
 
+    @Test
+    public void testMyBeanFormParamDefault() {
+        Form form = new Form();
+        Response response = target().path("resource/myBeanFormDefault")
+                .request().post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+        String str = response.readEntity(String.class);
+        assertEquals("*form-default*", str);
+    }
+
+    @Test
+    public void testMyBeanQueryParamDefault() {
+        final Response response = target().path("resource/myBeanQueryDefault")
+                .request().get();
+        final String str = response.readEntity(String.class);
+        assertEquals("*query-default*", str);
+    }
+
+    @Test
+    public void testMyBeanMatrixParamDefault() {
+        final Response response = target().path("resource/myBeanMatrixDefault")
+                .request().get();
+        final String str = response.readEntity(String.class);
+        assertEquals("*matrix-default*", str);
+    }
+
+    @Test
+    public void testMyBeanCookieParamDefault() {
+        final Response response = target().path("resource/myBeanCookieDefault")
+                .request().get();
+        final String str = response.readEntity(String.class);
+        assertEquals("*cookie-default*", str);
+    }
+
+    @Test
+    public void testMyBeanHeaderParamDefault() {
+        final Response response = target().path("resource/myBeanHeaderDefault")
+                .request().get();
+        final String str = response.readEntity(String.class);
+        assertEquals("*header-default*", str);
+    }
+
     @Path("resource")
     public static class Resource {
         @POST
@@ -199,6 +241,36 @@ public String postMyBean(@QueryParam("q") SortedSet<MyBean> query) {
             return sb.toString();
         }
 
+        @POST
+        @Path("myBeanFormDefault")
+        public String postMyBeanFormDefault(@DefaultValue("form-default") @FormParam("form") MyBean pathParam) {
+            return pathParam.getValue();
+        }
+
+        @GET
+        @Path("myBeanQueryDefault")
+        public String getMyBeanQueryDefault(@DefaultValue("query-default") @QueryParam("q") MyBean queryParam) {
+            return queryParam.getValue();
+        }
+
+        @GET
+        @Path("myBeanMatrixDefault")
+        public String getMyBeanMatrixDefault(@DefaultValue("matrix-default") @MatrixParam("m") MyBean matrixParam) {
+            return matrixParam.getValue();
+        }
+
+        @GET
+        @Path("myBeanCookieDefault")
+        public String getMyBeanCookieDefault(@DefaultValue("cookie-default") @CookieParam("c") MyBean cookieParam) {
+            return cookieParam.getValue();
+        }
+
+        @GET
+        @Path("myBeanHeaderDefault")
+        public String getMyBeanHeaderDefault(@DefaultValue("header-default") @HeaderParam("h") MyBean headerParam) {
+            return headerParam.getValue();
+        }
+
         @POST
         @Path("string/{path}")
         public String postString(@PathParam("path") String pathParam, @MatrixParam("matrix") String matrix,