JERSEY-2707: char cannot be used as the type of a @*Param

Added ValueExtractor and ParamConverter for char and Character types.

Change-Id: If066ee537103a521874aacade320c5371d023969

Author: pavelbucek

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

@@ -153,6 +153,9 @@ private MultivaluedParameterExtractor<?> process(
 
         if (rawType == String.class) {
             return new SingleStringValueExtractor(parameterName, defaultValue);
+        } else if(rawType == Character.class) {
+            Object defaultDefaultValue = PrimitiveMapper.primitiveToDefaultValueMap.get(rawType);
+            return new PrimitiveCharacterExtractor(parameterName, defaultValue, defaultDefaultValue);
         } else if (rawType.isPrimitive()) {
             // Convert primitive to wrapper class
             rawType = PrimitiveMapper.primitiveToClassMap.get(rawType);
@@ -161,6 +164,11 @@ private MultivaluedParameterExtractor<?> process(
                 return null;
             }
 
+            if(rawType == Character.class) {
+                Object defaultDefaultValue = PrimitiveMapper.primitiveToDefaultValueMap.get(rawType);
+                return new PrimitiveCharacterExtractor(parameterName, defaultValue, defaultDefaultValue);
+            }
+
             // Check for static valueOf(String )
             Method valueOf = AccessController.doPrivileged(ReflectionHelper.getValueOfStringMethodPA(rawType));
             if (valueOf != null) {

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

@@ -59,6 +59,7 @@
 import org.glassfish.jersey.internal.inject.ExtractorException;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.message.internal.HttpDateFormat;
+import org.glassfish.jersey.server.internal.LocalizationMessages;
 
 import org.glassfish.hk2.api.ServiceLocator;
 
@@ -78,7 +79,7 @@ private static abstract class AbstractStringReader<T> implements ParamConverter<
         @Override
         public T fromString(final String value) {
             if (value == null) {
-                throw new IllegalArgumentException("Supplied value is null");
+                throw new IllegalArgumentException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
             }
             try {
                 return _fromString(value);
@@ -102,6 +103,9 @@ public T fromString(final String value) {
 
         @Override
         public String toString(final T value) throws IllegalArgumentException {
+            if(value == null) {
+                throw new IllegalArgumentException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
+            }
             return value.toString();
         }
 
@@ -187,6 +191,40 @@ public <T> ParamConverter<T> getConverter(final Class<T> rawType, final Type gen
         }
     }
 
+    @Singleton
+    public static class CharacterProvider implements ParamConverterProvider {
+        @Override
+        public <T> ParamConverter<T> getConverter(final Class<T> rawType, final Type genericType, final Annotation[] annotations) {
+            if(rawType.equals(Character.class)) {
+                return new ParamConverter<T>() {
+                    @Override
+                    public T fromString(String value) {
+                        if(value == null || value.isEmpty()) {
+                            return null;
+                            // throw new IllegalStateException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
+                        }
+
+                        if(value.length() == 1) {
+                            return rawType.cast(value.charAt(0));
+                        }
+
+                        throw new ExtractorException(LocalizationMessages.ERROR_PARAMETER_INVALID_CHAR_VALUE(value));
+                    }
+
+                    @Override
+                    public String toString(T value) {
+                        if(value == null) {
+                            throw new IllegalArgumentException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
+                        }
+                        return value.toString();
+                    }
+                };
+            }
+
+            return null;
+        }
+    }
+
     /**
      * Provider of {@link ParamConverter param converter} that convert the supplied string into a Java
      * {@link Date} instance using conversion method from the
@@ -202,7 +240,7 @@ public <T> ParamConverter<T> getConverter(final Class<T> rawType, final Type gen
                 @Override
                 public T fromString(final String value) {
                     if (value == null) {
-                        throw new IllegalArgumentException("Supplied value is null");
+                        throw new IllegalArgumentException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
                     }
                     try {
                         return rawType.cast(HttpDateFormat.readDate(value));
@@ -213,6 +251,9 @@ public T fromString(final String value) {
 
                 @Override
                 public String toString(final T value) throws IllegalArgumentException {
+                    if(value == null) {
+                        throw new IllegalArgumentException(LocalizationMessages.METHOD_PARAMETER_CANNOT_BE_NULL("value"));
+                    }
                     return value.toString();
                 }
             };
@@ -239,6 +280,7 @@ public AggregatedProvider(@Context final ServiceLocator locator) {
                     locator.createAndInitialize(DateProvider.class),
                     locator.createAndInitialize(TypeFromStringEnum.class),
                     locator.createAndInitialize(TypeValueOf.class),
+                    locator.createAndInitialize(CharacterProvider.class),
                     locator.createAndInitialize(TypeFromString.class),
                     locator.createAndInitialize(StringConstructor.class),
             };

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

@@ -0,0 +1,94 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.server.internal.inject;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.glassfish.jersey.internal.inject.ExtractorException;
+import org.glassfish.jersey.server.internal.LocalizationMessages;
+
+/**
+ * Value extractor for {@link java.lang.Character} and {@code char} parameters.
+ *
+ * @author Pavel Bucek (pavel.bucek at oracle.com)
+ */
+class PrimitiveCharacterExtractor implements MultivaluedParameterExtractor<Object> {
+
+    final String parameter;
+    final String defaultStringValue;
+    final Object defaultPrimitiveTypeValue;
+
+    public PrimitiveCharacterExtractor(String parameter, String defaultStringValue, Object defaultPrimitiveTypeValue) {
+        this.parameter = parameter;
+        this.defaultStringValue = defaultStringValue;
+        this.defaultPrimitiveTypeValue = defaultPrimitiveTypeValue;
+    }
+
+    @Override
+    public String getName() {
+        return parameter;
+    }
+
+    @Override
+    public String getDefaultValueString() {
+        return defaultStringValue;
+    }
+
+    @Override
+    public Object extract(MultivaluedMap<String, String> parameters) {
+        String v = parameters.getFirst(parameter);
+        if (v != null && !v.trim().isEmpty()) {
+            if(v.length() == 1) {
+                return v.charAt(0);
+            } else {
+                throw new ExtractorException(LocalizationMessages.ERROR_PARAMETER_INVALID_CHAR_VALUE(v));
+            }
+        } else if (defaultStringValue != null && !defaultStringValue.trim().isEmpty()) {
+            if(defaultStringValue.length() == 1) {
+                return defaultStringValue.charAt(0);
+            } else {
+                throw new ExtractorException(LocalizationMessages.ERROR_PARAMETER_INVALID_CHAR_VALUE(defaultStringValue));
+            }
+        }
+
+        return defaultPrimitiveTypeValue;
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -63,6 +63,7 @@ private static Map<Class, Class> getPrimitiveToClassMap() {
         // that for Character
         m.put(Boolean.TYPE, Boolean.class);
         m.put(Byte.TYPE, Byte.class);
+        m.put(Character.TYPE, Character.class);
         m.put(Short.TYPE, Short.class);
         m.put(Integer.TYPE, Integer.class);
         m.put(Long.TYPE, Long.class);
@@ -76,6 +77,7 @@ private static Map<Class, Object> getPrimitiveToDefaultValueMap() {
         Map<Class, Object> m = new WeakHashMap<Class, Object>();
         m.put(Boolean.class, Boolean.valueOf(false));
         m.put(Byte.class, Byte.valueOf((byte) 0));
+        m.put(Character.class, Character.valueOf((char)0x00));
         m.put(Short.class, Short.valueOf((short) 0));
         m.put(Integer.class, Integer.valueOf(0));
         m.put(Long.class, Long.valueOf(0l));

core-server/src/main/resources/org/glassfish/jersey/server/internal/localization.properties

@@ -81,6 +81,7 @@ error.monitoring.queue.response=Failed to add the monitoring event into the Resp
   registered MonitoringStatisticsListeners might be blocking the event processing.
 error.monitoring.queue.mapper=Failed to add the monitoring event into the Exception Mapper Events Queue - queue is full. One of \
   the registered MonitoringStatisticsListeners might be blocking the event processing.
+error.parameter.invalid.char.value=Value "{0}" is not a character.
 error.parameter.missing.value.provider=No injection source found for a parameter of type {1} at index {0}.
 error.primitive.type.null=The request entity cannot be empty.
 error.processing.method=Error processing resource method, {0}, for ResourceMethodDispatchProvider, {1}.