Fixed missing propagation of media type parameters into entity providers.

- See new test method in MessageBodyWriterTest in E2E tests for the reproducer test.
- Some additional core media type and header parser refactoring & cleanup.
  - Consolidation and renaming in MediaTypes utility.
  - Quality source parameters reuse the same parsing as quality parameters; this means that values higher than "1.0" throw ParseException.
  - Header parser (and any dependent code) updated to work with CharSequence
  - MethodSelectingRouter updated to re-use common entity provider information

Change-Id: If16fe49345b32edf9f6e121ac238f1ad7716e1a4
Signed-off-by: Marek Potociar <[email protected]>

Author: Marek Potociar

core-client/src/main/java/org/glassfish/jersey/client/JerseyInvocation.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-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
@@ -105,7 +105,7 @@ private enum EntityPresence {
         OPTIONAL
     }
 
-    private static Map<String, EntityPresence> METHODS = initializeMap();
+    private static final Map<String, EntityPresence> METHODS = initializeMap();
 
     private static Map<String, EntityPresence> initializeMap() {
         final Map<String, EntityPresence> map = new HashMap<String, EntityPresence>();

core-common/src/main/java/org/glassfish/jersey/filter/LoggingFilter.java

@@ -37,7 +37,6 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
 package org.glassfish.jersey.filter;
 
 import java.io.BufferedInputStream;
@@ -72,7 +71,6 @@
 
 import javax.annotation.Priority;
 
-import org.glassfish.jersey.internal.util.collection.StringIgnoreCaseKeyComparator;
 import org.glassfish.jersey.message.MessageUtils;
 
 /**
@@ -100,7 +98,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
 
                 @Override
                 public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
-                    return StringIgnoreCaseKeyComparator.SINGLETON.compare(o1.getKey(), o2.getKey());
+                    return o1.getKey().compareToIgnoreCase(o2.getKey());
                 }
             };
 

core-common/src/main/java/org/glassfish/jersey/internal/ContextResolverFactory.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 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
@@ -37,7 +37,6 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
 package org.glassfish.jersey.internal;
 
 import java.lang.reflect.Type;
@@ -126,7 +125,7 @@ public ContextResolverFactory(final ServiceLocator locator) {
 
         for (final Map.Entry<Type, Map<MediaType, List<ContextResolver>>> e : rs.entrySet()) {
             final Map<MediaType, ContextResolver> mr = new KeyComparatorHashMap<MediaType, ContextResolver>(
-                    4, MessageBodyFactory.MEDIA_TYPE_COMPARATOR);
+                    4, MessageBodyFactory.MEDIA_TYPE_KEY_COMPARATOR);
             resolver.put(e.getKey(), mr);
 
             cache.put(e.getKey(), new ConcurrentHashMap<MediaType, ContextResolver>(4));
@@ -219,22 +218,22 @@ public <T> ContextResolver<T> resolve(final Type t, MediaType m) {
         }
 
         if (m == null) {
-            m = MediaTypes.GENERAL_MEDIA_TYPE;
+            m = MediaType.WILDCARD_TYPE;
         }
 
         ContextResolver<T> cr = crMapCache.get(m);
         if (cr == null) {
             final Map<MediaType, ContextResolver> crMap = resolver.get(t);
 
             if (m.isWildcardType()) {
-                cr = crMap.get(MediaTypes.GENERAL_MEDIA_TYPE);
+                cr = crMap.get(MediaType.WILDCARD_TYPE);
                 if (cr == null) {
                     cr = NULL_CONTEXT_RESOLVER;
                 }
             } else if (m.isWildcardSubtype()) {
                 // Include x, x/* and */*
                 final ContextResolver<T> subTypeWildCard = crMap.get(m);
-                final ContextResolver<T> wildCard = crMap.get(MediaTypes.GENERAL_MEDIA_TYPE);
+                final ContextResolver<T> wildCard = crMap.get(MediaType.WILDCARD_TYPE);
 
                 cr = new ContextResolverAdapter(subTypeWildCard, wildCard).reduce();
             } else {

core-common/src/main/java/org/glassfish/jersey/internal/util/collection/KeyComparator.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2013 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
@@ -40,15 +40,14 @@
 package org.glassfish.jersey.internal.util.collection;
 
 import java.io.Serializable;
-import java.util.Comparator;
 
 /**
  * A key comparator.
  *
  * @param <K> Key's type
  * @author Paul Sandoz
  */
-public interface KeyComparator<K> extends Comparator<K>, Serializable {
+public interface KeyComparator<K> extends Serializable {
 
     /**
      * Compare two keys for equality.

core-common/src/main/java/org/glassfish/jersey/internal/util/collection/StringIgnoreCaseKeyComparator.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2013 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
@@ -51,16 +51,14 @@ public class StringIgnoreCaseKeyComparator implements KeyComparator<String> {
 
     public static final StringIgnoreCaseKeyComparator SINGLETON = new StringIgnoreCaseKeyComparator();
 
+    @Override
     public int hash(String k) {
         return k.toLowerCase().hashCode();
     }
 
+    @Override
     public boolean equals(String x, String y) {
         return x.equalsIgnoreCase(y);
     }
 
-    public int compare(String o1, String o2) {
-        return o1.compareToIgnoreCase(o2);
-    }
-
 }

core-common/src/main/java/org/glassfish/jersey/message/AbstractEntityProviderModel.java

@@ -0,0 +1,126 @@
+/*
+ * 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.message;
+
+import java.util.List;
+
+import javax.ws.rs.core.MediaType;
+
+import org.glassfish.jersey.internal.util.ReflectionHelper;
+
+/**
+ * Abstract entity provider model.
+ *
+ * @author Marek Potociar (marek.potociar at oracle.com)
+ * @since 2.16
+ */
+public abstract class AbstractEntityProviderModel<T> {
+
+    private final T provider;
+    private final List<MediaType> declaredTypes;
+    private final boolean custom;
+    private final Class<?> providedType;
+
+    /**
+     * Create new entity provider model.
+     *
+     * NOTE: The constructor is package private on purpose as we do not support extensions of this class from another package.
+     *
+     * @param provider      entity provider instance.
+     * @param declaredTypes declared supported media types.
+     * @param custom        custom flag; {@code true} is the provider is custom, {@code false} if the provider is one of the
+     *                      default Jersey providers.
+     * @param providerType  parameterized entity provider type (used to retrieve the provided Java type).
+     */
+    AbstractEntityProviderModel(final T provider,
+                                final List<MediaType> declaredTypes,
+                                final boolean custom,
+                                final Class<T> providerType) {
+        this.provider = provider;
+        this.declaredTypes = declaredTypes;
+        this.custom = custom;
+        this.providedType = getProviderClassParam(provider, providerType);
+    }
+
+    /**
+     * Get the modelled entity provider instance.
+     *
+     * @return entity provider instance.
+     */
+    public T provider() {
+        return provider;
+    }
+
+    /**
+     * Get types declared as supported (via {@code @Produces} or {@code @Consumes}) on the entity provider.
+     *
+     * @return declared supported types.
+     */
+    public List<MediaType> declaredTypes() {
+        return declaredTypes;
+    }
+
+    /**
+     * Get the {@code custom} flag value.
+     *
+     * @return {@code true} if the provider is a custom implementation, {@code false} if the provider is
+     * one of the default providers supplied with Jersey.
+     */
+    public boolean isCustom() {
+        return custom;
+    }
+
+    /**
+     * Get the provided Java type.
+     *
+     * @return provided Java type.
+     */
+    public Class<?> providedType() {
+        return providedType;
+    }
+
+    private static Class<?> getProviderClassParam(Object provider, Class<?> providerType) {
+        final ReflectionHelper.DeclaringClassInterfacePair pair =
+                ReflectionHelper.getClass(provider.getClass(), providerType);
+        final Class[] classArgs = ReflectionHelper.getParameterizedClassArguments(pair);
+
+        return classArgs != null ? classArgs[0] : Object.class;
+    }
+}

core-common/src/main/java/org/glassfish/jersey/message/MessageBodyWorkers.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2013 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
@@ -223,6 +223,17 @@ <T> MessageBodyWriter<T> getMessageBodyWriter(Class<T> type, Type genericType, A
      */
     List<MessageBodyReader> getMessageBodyReadersForType(Class<?> type);
 
+    /**
+     * Get a list of {@code MessageBodyReader} models that are suitable for the given {@code type}.
+     *
+     * The list is sorted based on the class hierarchy (most specific readers are first).
+     *
+     * @param type the class of object readers are requested for.
+     * @return the list of supported {@code MessageBodyReader} models for given class.
+     * @since 2.16
+     */
+    List<ReaderModel> getReaderModelsForType(Class<?> type);
+
     /**
      * Get the list of media types supported for a Java type.
      *
@@ -257,6 +268,17 @@ <T> MessageBodyWriter<T> getMessageBodyWriter(Class<T> type, Type genericType, A
      */
     List<MessageBodyWriter> getMessageBodyWritersForType(Class<?> type);
 
+    /**
+     * Get a list of {@code MessageBodyWriter} models that are suitable for the given {@code type}.
+     *
+     * The list is sorted based on the class hierarchy (most specific writers are first).
+     *
+     * @param type the class of object writers are requested for.
+     * @return the list of supported {@code MessageBodyWriter} models for given class.
+     * @since 2.16
+     */
+    List<WriterModel> getWritersModelsForType(Class<?> type);
+
     /**
      * Get the most acceptable media type supported for a Java type given a set of
      * acceptable media types.