Merge "Remove the default JAX-B providers from Jersey Client: - introduced new media module, jersey-media-jaxb - enabled injection support for ForcedAutoDiscoverable types - incorporated feedback from Marek"

Author: Marek Potociar

bom/pom.xml

@@ -231,6 +231,11 @@
                 <artifactId>jersey-declarative-linking</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.media</groupId>
+                <artifactId>jersey-media-jaxb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.media</groupId>
                 <artifactId>html-json</artifactId>

bundles/jaxrs-ri/pom.xml

@@ -79,6 +79,11 @@
             <artifactId>jersey-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -107,6 +112,12 @@
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-jaxb</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -243,7 +254,7 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeGroupIds>javax.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers</includeGroupIds>
+                            <includeGroupIds>javax.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers,org.glassfish.jersey.jaxb</includeGroupIds>
                             <includeClassifiers>sources</includeClassifiers>
                             <outputDirectory>${generated.src.dir}</outputDirectory>
                         </configuration>

core-client/pom.xml

@@ -117,14 +117,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-common</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-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
@@ -161,9 +161,6 @@ public void testCustomProvidersFeature() {
 
         final ClientConfig runtimeConfig = runtime.getConfig();
 
-        assertEquals(1, runtimeConfig.getClasses().size());
-        assertEquals(1, runtimeConfig.getInstances().size());
-
         assertTrue(runtimeConfig.isRegistered(MyProvider.class));
         assertTrue(runtimeConfig.isEnabled(feature));
 

core-common/pom.xml

@@ -177,13 +177,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <!-- TODO scope as provided -->
-            <!--scope>provided</scope-->
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
             <artifactId>jersey-guava</artifactId>

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ExtractorException.java renamed to core-common/src/main/java/org/glassfish/jersey/internal/inject/ExtractorException.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
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-package org.glassfish.jersey.server.internal.inject;
+package org.glassfish.jersey.internal.inject;
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.WebApplicationException;

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-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
@@ -56,7 +56,7 @@
  *
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
-class EntityInputStream extends InputStream {
+public class EntityInputStream extends InputStream {
     private InputStream input;
     private boolean closed;
 
@@ -82,7 +82,7 @@ public static EntityInputStream create(InputStream inputStream) {
      *
      * @param input underlying wrapped input stream.
      */
-    protected EntityInputStream(InputStream input) {
+    public EntityInputStream(InputStream input) {
         this.input = input;
     }
 
@@ -240,7 +240,7 @@ public boolean isClosed() {
      *
      * @return wrapped input stream instance.
      */
-    protected final InputStream getWrappedStream() {
+    public final InputStream getWrappedStream() {
         return input;
     }
 
@@ -249,7 +249,7 @@ protected final InputStream getWrappedStream() {
      *
      * @param wrapped new input stream instance to be wrapped.
      */
-    protected final void setWrappedStream(InputStream wrapped) {
+    public final void setWrappedStream(InputStream wrapped) {
         input = wrapped;
     }
 }

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-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
@@ -46,15 +46,10 @@
 import javax.ws.rs.ext.MessageBodyWriter;
 
 import javax.inject.Singleton;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.transform.TransformerFactory;
 
 import org.glassfish.jersey.internal.ServiceFinderBinder;
 import org.glassfish.jersey.spi.HeaderDelegateProvider;
 
-import org.glassfish.hk2.api.PerThread;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
 /**
@@ -98,7 +93,6 @@ protected void configure() {
             // Message body providers (both readers & writers)
             bindSingletonWorker(ByteArrayProvider.class);
             bindSingletonWorker(DataSourceProvider.class);
-            bindSingletonWorker(DocumentProvider.class);
             bindSingletonWorker(FileProvider.class);
             bindSingletonWorker(FormMultivaluedMapProvider.class);
             bindSingletonWorker(FormProvider.class);
@@ -108,25 +102,10 @@ protected void configure() {
             bindSingletonWorker(RenderedImageProvider.class);
             bindSingletonWorker(StringMessageProvider.class);
 
-            bindSingletonWorker(XmlJaxbElementProvider.App.class);
-            bindSingletonWorker(XmlJaxbElementProvider.Text.class);
-            bindSingletonWorker(XmlJaxbElementProvider.General.class);
-
-            bindSingletonWorker(XmlCollectionJaxbProvider.App.class);
-            bindSingletonWorker(XmlCollectionJaxbProvider.Text.class);
-            bindSingletonWorker(XmlCollectionJaxbProvider.General.class);
-
-            bindSingletonWorker(XmlRootElementJaxbProvider.App.class);
-            bindSingletonWorker(XmlRootElementJaxbProvider.Text.class);
-            bindSingletonWorker(XmlRootElementJaxbProvider.General.class);
-
             // Message body readers
             bind(SourceProvider.StreamSourceReader.class).to(MessageBodyReader.class).in(Singleton.class);
             bind(SourceProvider.SaxSourceReader.class).to(MessageBodyReader.class).in(Singleton.class);
             bind(SourceProvider.DomSourceReader.class).to(MessageBodyReader.class).in(Singleton.class);
-            bind(XmlRootObjectJaxbProvider.App.class).to(MessageBodyReader.class).in(Singleton.class);
-            bind(XmlRootObjectJaxbProvider.Text.class).to(MessageBodyReader.class).in(Singleton.class);
-            bind(XmlRootObjectJaxbProvider.General.class).to(MessageBodyReader.class).in(Singleton.class);
             /*
              * TODO: com.sun.jersey.core.impl.provider.entity.EntityHolderReader
              */
@@ -136,11 +115,6 @@ protected void configure() {
             bind(SourceProvider.SourceWriter.class).to(MessageBodyWriter.class).in(Singleton.class);
             install(new ServiceFinderBinder<HeaderDelegateProvider>(HeaderDelegateProvider.class, applicationProperties, runtimeType));
 
-            // XML factory injection points
-            bindFactory(DocumentBuilderFactoryInjectionProvider.class).to(DocumentBuilderFactory.class).in(PerThread.class);
-            bindFactory(SaxParserFactoryInjectionProvider.class).to(SAXParserFactory.class).in(PerThread.class);
-            bindFactory(XmlInputFactoryInjectionProvider.class).to(XMLInputFactory.class).in(PerThread.class);
-            bindFactory(TransformerFactoryInjectionProvider.class).to(TransformerFactory.class).in(PerThread.class);
         }
 
         private <T extends MessageBodyReader & MessageBodyWriter> void bindSingletonWorker(Class<T> worker) {

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-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
@@ -601,8 +601,11 @@ public int compare(final AutoDiscoverable o1, final AutoDiscoverable o2) {
             });
 
             // Forced (always invoked).
-            providers.addAll(Arrays.asList(
-                    ServiceFinder.find(ForcedAutoDiscoverable.class, true).toArray()));
+            final List<ForcedAutoDiscoverable> forcedAutoDiscroverables = new LinkedList<ForcedAutoDiscoverable>();
+            for (Class<ForcedAutoDiscoverable> forcedADType : ServiceFinder.find(ForcedAutoDiscoverable.class, true).toClassArray()) {
+                forcedAutoDiscroverables.add(locator.createAndInitialize(forcedADType));
+            }
+            providers.addAll(forcedAutoDiscroverables);
 
             // Regular.
             if (!forcedOnly) {

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

@@ -46,7 +46,7 @@ committing.stream.already.initialized=Stream provider has already been initializ
 committing.stream.buffering.illegal.state=Cannot setup buffering as bytes have already been written to the output stream. The entity buffering can be initialized only before first bytes are written to the entity output stream.
 component.cannot.be.null=Registered component instance cannot be null.
 component.class.cannot.be.null=Registered component class cannot be null.
-component.type.already.registered=Cannot new create registration for component type {0}: Existing previous registration found for the type.
+component.type.already.registered=Cannot create new registration for component type {0}: Existing previous registration found for the type.
 component.contracts.empty.or.null=Attempt to register component of type {0} to null or empty array of contracts  is ignored.
 configuration.not.modifiable=The configuration is not modifiable in this context.
 contract.not.assignable=Contract {0} can not be registered for component {1}: Contract not assignable to component.
@@ -90,7 +90,6 @@ error.template.parser.illegal.char.start.name=Illegal character "{0}" at positio
 error.template.parser.invalid.syntax=Invalid syntax for the expression "{0}" associated with the name "{1}" in a path template "{2}".
 error.template.parser.invalid.syntax.terminated=Invalid syntax in the template "{0}". Check if a path parameter is terminated with a "}".
 error.template.parser.name.more.than.once=The name "{0}" is declared more than once with different regular expressions in a path template "{1}".
-error.unmarshalling.jaxb=Error un-marshalling JAXB object of type: {0}.
 # {0} - List of localized messages, e.g.: [FATAL] <localized_message>; source=<object>
 errors.and.warnings.detected=Following issues have been detected: {0}
 exception.caught.while.loading.spi.providers=Exception caught while loading SPI providers.