Make sure the ParameterServiceProvider from core-server is the first …

…in the list Signed-off-by: Jan Supol <jan.supol@oracle.com>
eclipse-ee4j · Apr 11, 2019 · 4ad07a6 · 4ad07a6
1 parent d6b839b
commit 4ad07a6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/core-common/src/main/java/org/glassfish/jersey/model/Parameter.java b/core-common/src/main/java/org/glassfish/jersey/model/Parameter.java
@@ -15,6 +15,7 @@
  */
 package org.glassfish.jersey.model;
 
+import org.glassfish.jersey.internal.LocalizationMessages;
 import org.glassfish.jersey.internal.ServiceFinder;
 import org.glassfish.jersey.internal.guava.Lists;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
@@ -46,6 +47,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class Parameter implements AnnotatedElement {
     private static final Logger LOGGER = Logger.getLogger(Parameter.class.getName());
@@ -105,16 +107,22 @@ public enum Source {
         UNKNOWN
     }
 
-    private static final List<ParameterServiceProvider> PARAMETER_SERVICE_PROVIDERS = Collections
-            .unmodifiableList(Lists.newArrayList(ServiceFinder.find(ParameterServiceProvider.class)));
-    private static final List<ParamCreationFactory> PARAM_CREATION_FACTORIES = Collections.unmodifiableList(
-            PARAMETER_SERVICE_PROVIDERS.stream().map(a -> a.getParameterCreationFactory()).collect(Collectors.toList())
-    );
-
-    private static final Map<Class, ParamAnnotationHelper> ANNOTATION_HELPER_MAP = Collections.unmodifiableMap(
-            PARAMETER_SERVICE_PROVIDERS.stream().map(a -> a.getParameterAnnotationHelperMap())
-                    .collect(WeakHashMap::new, Map::putAll, Map::putAll)
-    );
+    static {
+        List<ParameterServiceProvider> PARAMETER_SERVICE_PROVIDERS = Lists
+                .newArrayList(ServiceFinder.find(ParameterServiceProvider.class));
+        PARAMETER_SERVICE_PROVIDERS.add(new ParameterService());
+        PARAM_CREATION_FACTORIES = Collections.unmodifiableList(
+                PARAMETER_SERVICE_PROVIDERS.stream().map(a -> a.getParameterCreationFactory())
+                        .collect(Collectors.toList())
+        );
+        ANNOTATION_HELPER_MAP = Collections.unmodifiableMap(
+                PARAMETER_SERVICE_PROVIDERS.stream()
+                        .map(a -> a.getParameterAnnotationHelperMap())
+                        .collect(WeakHashMap::new, Map::putAll, Map::putAll)
+        );
+    };
+    private static final List<ParamCreationFactory> PARAM_CREATION_FACTORIES;
+    private static final Map<Class, ParamAnnotationHelper> ANNOTATION_HELPER_MAP;
 
     public interface ParamAnnotationHelper<T extends Annotation> {
 
@@ -307,7 +315,11 @@ private static <PARAMETER extends Parameter>  PARAMETER createBeanParameter(Anno
                         defaultValue);
             }
         }
-        return null;
+
+        if (LOGGER.isLoggable(Level.FINER)) {
+            LOGGER.log(Level.FINER, LocalizationMessages.PARAM_CREATION_FACTORY_NOT_FOUND(parameterClass.getName()));
+        }
+        throw new IllegalStateException(LocalizationMessages.PARAM_CREATION_FACTORY_NOT_FOUND(parameterClass.getName()));
     }
 
     private static <PARAMETER extends Parameter> PARAMETER createParameter(Annotation[] markers, Annotation marker,
@@ -320,7 +332,11 @@ private static <PARAMETER extends Parameter> PARAMETER createParameter(Annotatio
                         defaultValue);
             }
         }
-        return null;
+
+        if (LOGGER.isLoggable(Level.FINER)) {
+            LOGGER.log(Level.FINER, LocalizationMessages.PARAM_CREATION_FACTORY_NOT_FOUND(parameterClass.getName()));
+        }
+        throw new IllegalStateException(LocalizationMessages.PARAM_CREATION_FACTORY_NOT_FOUND(parameterClass.getName()));
     }
 
     /**

diff --git a/...ources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider b/...ources/META-INF/services/org.glassfish.jersey.model.internal.spi.ParameterServiceProvider
diff --git a/core-common/src/main/resources/org/glassfish/jersey/internal/localization.properties b/core-common/src/main/resources/org/glassfish/jersey/internal/localization.properties
@@ -117,6 +117,7 @@ osgi.registry.error.opening.resource.stream=Unable to open an input stream for r
 osgi.registry.error.processing.resource.stream=Unexpected error occurred while processing resource stream {0}.
 output.stream.closed=The output stream has already been closed.
 overriding.method.cannot.be.found=Method that overrides {0} cannot be found on class {1}.
+param.creation.factory.not.found=No ParamCreationFactory found for Parameter source {0}.
 param.null="{0}" parameter is null.
 # {0} - value to string; {1} - type of value; {2} - desired value type/class
 properties.helper.get.value.no.transform=There is no way how to transform value "{0}" [{1}] to type [{2}].