J-329: Update MOXy to version 2.6

 - Updated MOXy (2.5.0 -> 2.6.0)
 - Unignored some tests (ignored one other test)
 - Modified OSGi test (disable BV in MOXy)
 - Updated Migration Guide

Change-Id: Ieccb926bfa750e06b31e898af86ffd185d4b6d1a
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

docs/src/main/docbook/migration.xml

@@ -52,6 +52,43 @@
          xml:id="migration">
     <title>Migration Guide</title>
 
+    <section xml:id="mig-2.18">
+        <title>Migrating from Jersey 2.17 to 2.18</title>
+        <section xml:id="mig-2.18-highlights">
+            <title>Release 2.18 Highlights</title>
+
+            <section>
+                <title>Updated to MOXy 2.6</title>
+                <para>
+                    Jersey has updated version of MOXy (XML/JSON provider) to version 2.6. Among some bug fixes there are other
+                    notable changes (some of them breaking) that you should be aware of:
+
+                    <itemizedlist>
+                        <listitem>
+                            <para>
+                                <link xlink:href='https://wiki.eclipse.org/EclipseLink/DesignDocs/459464'>Redesign of type property in JSON processing</link> -
+                                Special handling of JSON <literal>type</literal> property is deprecated. If there is need to
+                                identify type of JSON object - due to missing root element or some special inheritance
+                                requirements, it is necessary to specify fully qualified type property with
+                                <literal>http://www.w3.org/2001/XMLSchema-instance</literal> namespace.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <link xlink:href='https://bugs.eclipse.org/bugs/attachment.cgi?id=241506'>Bean Validation in MOXy</link>
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                <link xlink:href='https://wiki.eclipse.org/EclipseLink/DesignDocs/405161'>MOXy support for for Java API for JSON Processing (JSR-353)</link>
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </para>
+            </section>
+        </section>
+    </section>
+
     <section xml:id="mig-2.17">
         <title>Migrating from Jersey 2.16 to 2.17</title>
         <section xml:id="mig-2.17-highlights">

examples/bean-validation-webapp/src/test/java/org/glassfish/jersey/examples/beanvalidation/webapp/ContactCardTest.java

@@ -55,13 +55,16 @@
 
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.examples.beanvalidation.webapp.domain.ContactCard;
+import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
 import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
 import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.server.validation.ValidationError;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
 import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
 
+import org.eclipse.persistence.jaxb.BeanValidationMode;
+import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -100,6 +103,10 @@ protected void configureClient(final ClientConfig config) {
         super.configureClient(config);
 
         config.register(MoxyJsonFeature.class);
+        // Turn off BV otherwise the entities on client would be validated as well.
+        config.register(new MoxyJsonConfig()
+                .property(MarshallerProperties.BEAN_VALIDATION_MODE, BeanValidationMode.NONE)
+                .resolver());
     }
 
     @Override
@@ -186,7 +193,7 @@ private Set<String> getValidationMessageTemplates(final Response response) {
     }
 
     private Set<String> getValidationMessageTemplates(final List<ValidationError> errors) {
-        final Set<String> templates = new HashSet<String>();
+        final Set<String> templates = new HashSet<>();
         for (final ValidationError error : errors) {
             templates.add(error.getMessageTemplate());
         }

media/moxy/pom.xml

@@ -79,10 +79,6 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.jersey.moxy.*</Export-Package>
-                        <Import-Package>
-                            org.eclipse.persistence.jaxb.rs,
-                            *
-                        </Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>
@@ -122,10 +118,6 @@
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.moxy</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.antlr</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/ConfigurableMoxyJsonProvider.java

@@ -41,11 +41,8 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
 import java.security.AccessController;
 import java.util.Map;
 import java.util.Set;
@@ -58,7 +55,6 @@
 import javax.ws.rs.ext.Providers;
 
 import javax.inject.Singleton;
-import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.PropertyException;
@@ -99,7 +95,7 @@ private static Set<String> getPropertyNames(final Class<?> propertiesClass) {
                     && Modifier.isStatic(field.getModifiers())) {
                 try {
                     propertyNames.add((String) field.get(null));
-                } catch (IllegalAccessException e) {
+                } catch (final IllegalAccessException e) {
                     // NOOP.
                 }
             }
@@ -169,8 +165,9 @@ private void initializeMarshaller(final Marshaller marshaller) throws PropertyEx
     }
 
     private Map<String, Object> getProperties(final boolean forMarshaller) {
-        final Map<String, Object> properties = Maps.newHashMap(
-                forMarshaller ? getGlobalConfig().getMarshallerProperties() : getGlobalConfig().getUnmarshallerProperties());
+        final Map<String, Object> properties = Maps.newHashMap(forMarshaller
+                ? getGlobalConfig().getMarshallerProperties()
+                : getGlobalConfig().getUnmarshallerProperties());
 
         final ContextResolver<MoxyJsonConfig> contextResolver =
                 providers.getContextResolver(MoxyJsonConfig.class, MediaType.APPLICATION_JSON_TYPE);
@@ -187,15 +184,21 @@ private Map<String, Object> getProperties(final boolean forMarshaller) {
     }
 
     @Override
-    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
-        return !isPrimitiveType(type) && !Map.class.isAssignableFrom(type) && super.isReadable(type, genericType, annotations,
-                mediaType);
+    public boolean isReadable(final Class<?> type,
+                              final Type genericType,
+                              final Annotation[] annotations,
+                              final MediaType mediaType) {
+        return !isPrimitiveType(type)
+                && super.isReadable(type, genericType, annotations, mediaType);
     }
 
     @Override
-    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
-        return !isPrimitiveType(type) && !Map.class.isAssignableFrom(type) && super.isWriteable(type, genericType, annotations,
-                mediaType);
+    public boolean isWriteable(final Class<?> type,
+                               final Type genericType,
+                               final Annotation[] annotations,
+                               final MediaType mediaType) {
+        return !isPrimitiveType(type)
+                && super.isWriteable(type, genericType, annotations, mediaType);
     }
 
     private boolean isPrimitiveType(final Class<?> type) {
@@ -209,45 +212,4 @@ private boolean isPrimitiveType(final Class<?> type) {
                 || CoreClassConstants.PBOOLEAN == type || CoreClassConstants.BOOLEAN == type
                 || CoreClassConstants.PBYTE == type || CoreClassConstants.BYTE == type;
     }
-
-    @Override
-    protected Class<?> getDomainClass(Type genericType) {
-        if (null == genericType) {
-            return Object.class;
-        }
-        if (genericType instanceof Class && genericType != JAXBElement.class) {
-            Class<?> clazz = (Class<?>) genericType;
-            if (clazz.isArray()) {
-                return getDomainClass(clazz.getComponentType());
-            }
-            return clazz;
-        } else if (genericType instanceof ParameterizedType) {
-            Type type = ((ParameterizedType) genericType).getActualTypeArguments()[0];
-            if (type instanceof ParameterizedType) {
-                Type rawType = ((ParameterizedType) type).getRawType();
-                if (rawType == JAXBElement.class) {
-                    return getDomainClass(type);
-                } else if (rawType instanceof Class) {
-                    return (Class<?>) rawType;
-                }
-            } else if (type instanceof WildcardType) {
-                Type[] upperTypes = ((WildcardType) type).getUpperBounds();
-                if (upperTypes.length > 0) {
-                    Type upperType = upperTypes[0];
-                    if (upperType instanceof Class) {
-                        return (Class<?>) upperType;
-                    }
-                }
-            } else if (JAXBElement.class == type) {
-                return Object.class;
-            }
-            return (Class<?>) type;
-        } else if (genericType instanceof GenericArrayType) {
-            GenericArrayType genericArrayType = (GenericArrayType) genericType;
-            return getDomainClass(genericArrayType.getGenericComponentType());
-        } else {
-            return Object.class;
-        }
-    }
-
 }

pom.xml

@@ -1254,12 +1254,6 @@
                 <version>${moxy.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.antlr</artifactId>
-                <version>${moxy.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>javax.persistence</groupId>
                 <artifactId>persistence-api</artifactId>
@@ -1618,7 +1612,7 @@
         <jstl.version>1.2</jstl.version>
         <jta.api.version>1.2</jta.api.version>
         <mimepull.version>1.9.5</mimepull.version>
-        <moxy.version>2.5.0</moxy.version>
+        <moxy.version>2.6.0</moxy.version>
         <mustache.version>0.8.17</mustache.version>
         <osgi.version>4.2.0</osgi.version>
         <pax.exam.version>3.3.0</pax.exam.version>