Removing @optional from MessageBodyFactory constructor.

Change-Id: Ifa6cfcadbd2f711e9fd4a8717920ffead1e059e0

Author: pavelbucek

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

@@ -100,8 +100,6 @@
 import org.glassfish.jersey.message.ReaderModel;
 import org.glassfish.jersey.message.WriterModel;
 
-import org.jvnet.hk2.annotations.Optional;
-
 /**
  * A factory for managing {@link MessageBodyReader}, {@link MessageBodyWriter} instances.
  *
@@ -211,7 +209,7 @@ private int compare(List<MediaType> mediaTypeList1, List<MediaType> mediaTypeLis
      * @param configuration configuration. Optional - can be null.
      */
     @Inject
-    public MessageBodyFactory(final InjectionManager injectionManager, @Optional final Configuration configuration) {
+    public MessageBodyFactory(final InjectionManager injectionManager, final Configuration configuration) {
         this.injectionManager = injectionManager;
         this.legacyProviderOrdering = configuration != null
                 && PropertiesHelper.isProperty(configuration.getProperty(MessageProperties.LEGACY_WORKERS_ORDERING));

core-common/src/test/java/org/glassfish/jersey/internal/JaxrsProvidersTest.java

@@ -44,6 +44,7 @@
 import java.util.concurrent.Callable;
 
 import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ContextResolver;
@@ -54,6 +55,8 @@
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Injections;
 import org.glassfish.jersey.message.internal.MessagingBinders;
+import org.glassfish.jersey.model.internal.CommonConfig;
+import org.glassfish.jersey.model.internal.ComponentBag;
 import org.glassfish.jersey.process.internal.RequestScope;
 
 import org.junit.Test;
@@ -76,6 +79,8 @@ public String getContext(Class<?> type) {
                 }
             }).to(new GenericType<ContextResolver<String>>() {
             });
+
+            bind(new CommonConfig(RuntimeType.SERVER, ComponentBag.EXCLUDE_EMPTY)).to(Configuration.class);
         }
     }
 

core-server/src/test/java/org/glassfish/jersey/server/model/ValidatorTest.java

@@ -61,16 +61,22 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Configuration;
 
 import javax.inject.Singleton;
 
 import org.glassfish.jersey.Severity;
 import org.glassfish.jersey.internal.Errors;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.util.Producer;
+import org.glassfish.jersey.model.internal.CommonConfig;
+import org.glassfish.jersey.model.internal.ComponentBag;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.ContainerResponse;
@@ -95,8 +101,8 @@
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  */
 public class ValidatorTest {
-    private static final Logger LOGGER = Logger.getLogger(ValidatorTest.class.getName());
 
+    private static final Logger LOGGER = Logger.getLogger(ValidatorTest.class.getName());
 
     @Path("rootNonAmbigCtors")
     public static class TestRootResourceNonAmbigCtors {
@@ -122,7 +128,7 @@ public void testRootResourceNonAmbigConstructors() throws Exception {
         LOGGER.info("No issue should be reported if more public ctors exists with the same number of params, "
                 + "but another just one is presented with more params at a root resource:");
         Resource resource = Resource.builder(TestRootResourceNonAmbigCtors.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
         assertTrue(validator.getIssueList().isEmpty());
     }
@@ -323,7 +329,8 @@ public List<ResourceModelIssue> call() {
                 }
 
                 ResourceModel model = new ResourceModel.Builder(resources, false).build();
-                ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+                InjectionManager injectionManager = createInjectionManager();
+                ComponentModelValidator validator = new ComponentModelValidator(injectionManager);
                 validator.validate(model);
                 return ModelErrors.getErrorsAsResourceModelIssues();
             }
@@ -445,7 +452,7 @@ public void srLocator() {
     public void testSRLReturningVoid() throws Exception {
         LOGGER.info("An issue should be reported if a sub-resource locator returns void:");
         Resource resource = Resource.builder(TestSRLReturningVoid.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
         assertTrue(validator.fatalIssuesFound());
     }
@@ -521,7 +528,7 @@ public void testMultipleHttpMethodDesignatorsRM() throws Exception {
         LOGGER.info("An issue should be reported if more than one HTTP method designator exist on a resource "
                 + "method:");
         Resource resource = Resource.builder(TestMultipleHttpMethodDesignatorsRM.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
         assertTrue(validator.fatalIssuesFound());
     }
@@ -542,7 +549,7 @@ public void testMultipleHttpMethodDesignatorsSRM() throws Exception {
         LOGGER.info("An issue should be reported if more than one HTTP method designator exist on a sub-resource "
                 + "method:");
         Resource resource = Resource.builder(TestMultipleHttpMethodDesignatorsSRM.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
         assertTrue(validator.fatalIssuesFound());
     }
@@ -560,7 +567,7 @@ public String locator(String s) {
     public void testEntityParamOnSRL() throws Exception {
         LOGGER.info("An issue should be reported if an entity parameter exists on a sub-resource locator:");
         Resource resource = Resource.builder(TestEntityParamOnSRL.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
         assertTrue(validator.fatalIssuesFound());
     }
@@ -639,7 +646,7 @@ public void testAmbiguousParams() throws Exception {
             @Override
             public void run() {
                 Resource resource = Resource.builder(TestAmbiguousParams.class).build();
-                ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+                ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
                 validator.validate(resource);
 
                 assertTrue(!validator.fatalIssuesFound());
@@ -663,7 +670,7 @@ public String get() {
     public void testEmptyPathSegment() throws Exception {
         LOGGER.info("A warning should be reported if @Path with \"/\" or empty string value is seen");
         Resource resource = Resource.builder(TestEmptyPathSegment.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
 
         assertTrue(!validator.fatalIssuesFound());
@@ -706,7 +713,7 @@ public void testTypeVariableResource() throws Exception {
             @Override
             public void run() {
                 Resource resource = Resource.builder(TypeVariableResource.class).build();
-                ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+                ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
                 validator.validate(resource);
 
                 assertTrue(!validator.fatalIssuesFound());
@@ -751,7 +758,7 @@ public static class ConcreteParameterizedTypeResource extends ParameterizedTypeR
     public void testParameterizedTypeResource() throws Exception {
         LOGGER.info("");
         Resource resource = Resource.builder(ConcreteParameterizedTypeResource.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
 
         assertTrue(!validator.fatalIssuesFound());
@@ -788,7 +795,7 @@ public static class ConcreteGenericArrayResource extends GenericArrayResource<St
     public void testGenericArrayResource() throws Exception {
         LOGGER.info("");
         Resource resource = Resource.builder(ConcreteGenericArrayResource.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
 
         assertTrue(!validator.fatalIssuesFound());
@@ -853,7 +860,7 @@ public String moreNonAnnotatedParameters(@HeaderParam("something") String header
     @Test
     public void testNotAnnotatedParameters() throws Exception {
         Resource resource = Resource.builder(AmbiguousParameterResource.class).build();
-        ComponentModelValidator validator = new ComponentModelValidator(InjectionManagerFactory.createInjectionManager());
+        ComponentModelValidator validator = new ComponentModelValidator(createInjectionManager());
         validator.validate(resource);
 
         final List<ResourceModelIssue> errorMessages = validator.getIssueList();
@@ -1160,4 +1167,15 @@ public void testDisableFailOnErrors() throws ExecutionException, InterruptedExce
         assertEquals(200, response.getStatus());
         assertEquals("PASSED", response.getEntity());
     }
+
+    private InjectionManager createInjectionManager() {
+        InjectionManager injectionManager = InjectionManagerFactory.createInjectionManager();
+        injectionManager.register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                bind(new CommonConfig(RuntimeType.SERVER, ComponentBag.EXCLUDE_EMPTY)).to(Configuration.class);
+            }
+        });
+        return injectionManager;
+    }
 }

media/sse/src/test/java/org/glassfish/jersey/media/sse/InboundEventReaderTest.java

@@ -48,6 +48,7 @@
 import java.util.Collections;
 
 import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.MediaType;
 
 import javax.inject.Singleton;
@@ -59,6 +60,8 @@
 import org.glassfish.jersey.message.MessageBodyWorkers;
 import org.glassfish.jersey.message.internal.MessageBodyFactory;
 import org.glassfish.jersey.message.internal.MessagingBinders;
+import org.glassfish.jersey.model.internal.CommonConfig;
+import org.glassfish.jersey.model.internal.ComponentBag;
 
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
@@ -151,6 +154,7 @@ protected void configure() {
             install(new MessagingBinders.MessageBodyProviders(null, RuntimeType.SERVER));
             bindAsContract(MessageBodyFactory.class).to(MessageBodyWorkers.class).in(Singleton.class);
             bind(InboundEventReader.class).to(InboundEventReader.class);
+            bind(new CommonConfig(RuntimeType.SERVER, ComponentBag.EXCLUDE_EMPTY)).to(Configuration.class);
         }
     }
 }