Removing HK2 @optional annotation.

Change-Id: I139fb9b7c58c6b952de0f9a97c4cf2cd2fe33017

Author: Petr Bouda

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

@@ -54,8 +54,6 @@
 
 import org.glassfish.hk2.api.PerLookup;
 
-import org.jvnet.hk2.annotations.Optional;
-
 import org.junit.Test;
 import static org.junit.Assert.assertSame;
 
@@ -77,10 +75,8 @@ private Foo(int value) {
     private static class ValueInjected {
 
         @Inject
-        @Optional
         Foo foo;
         @Inject
-        @Optional
         List<Integer> integers;
         @Inject
         List<String> strings;
@@ -143,11 +139,6 @@ protected void configure() {
     public void testReferencedBinding() {
         InjectionManager injectionManager = Injections.createInjectionManager(this);
 
-        ValueInjected emptyValues = injectionManager.createAndInitialize(ValueInjected.class);
-        assertSame(expectedFoo, emptyValues.foo);
-        assertSame(expectedIntegers, emptyValues.integers);
-        assertSame(expectedStrings, emptyValues.strings);
-
         RefInjected refValues = injectionManager.createAndInitialize(RefInjected.class);
         expectedFoo = new Foo(10);
         refValues.foo.set(expectedFoo);

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

@@ -62,10 +62,6 @@
 import org.glassfish.jersey.spi.ScheduledThreadPoolExecutorProvider;
 import org.glassfish.jersey.spi.ThreadPoolExecutorProvider;
 
-import org.glassfish.hk2.api.Unqualified;
-
-import org.jvnet.hk2.annotations.Optional;
-
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
@@ -189,16 +185,6 @@ public static class InjectedExecutorClient {
         @Inject
         private PreDestroyNotifier preDestroyNotifier;
 
-        @Inject
-        @Unqualified // this will prevent HK2 from injecting using qualified injection bindings
-        @Optional // This will prevent HK2 to fail due to an unsatisfied injection binding
-        private ExecutorService unqualifiedExecutor;
-
-        @Inject
-        @Unqualified // this will prevent HK2 from injecting using qualified injection bindings
-        @Optional // This will prevent HK2 to fail due to an unsatisfied injection binding
-        private ScheduledExecutorService unqualifiedScheduler;
-
         @Inject
         @CustomExecutor
         private ExecutorService customExecutor;
@@ -207,16 +193,6 @@ public static class InjectedExecutorClient {
         @Named("custom-executor")
         private ExecutorService customNamedExecutor;
 
-        @Inject
-        @Optional
-        @CustomExecutor
-        private ScheduledExecutorService customExecutorAsScheduler;
-
-        @Inject
-        @Named("custom-executor")
-        @Optional
-        private ScheduledExecutorService customNamedExecutorAsScheduler;
-
         @Inject
         @CustomScheduler
         private ScheduledExecutorService customScheduler;
@@ -264,14 +240,8 @@ public void setup() {
     public void testExecutorInjectionAndReleasing() throws Exception {
         final InjectedExecutorClient executorClient = Injections.getOrCreate(injectionManager, InjectedExecutorClient.class);
 
-        // Check expected injection points state
-        assertThat(executorClient.unqualifiedExecutor, Matchers.nullValue());
-        assertThat(executorClient.unqualifiedScheduler, Matchers.nullValue());
-
         assertThat(executorClient.customExecutor, Matchers.notNullValue());
         assertThat(executorClient.customNamedExecutor, Matchers.notNullValue());
-        assertThat(executorClient.customExecutorAsScheduler, Matchers.nullValue());
-        assertThat(executorClient.customNamedExecutorAsScheduler, Matchers.nullValue());
 
         assertThat(executorClient.customScheduler, Matchers.notNullValue());
         assertThat(executorClient.customNamedScheduler, Matchers.notNullValue());

ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerDefaultConfigurationFactory.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2017 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,13 +40,11 @@
 
 package org.glassfish.jersey.server.mvc.freemarker;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
 import javax.servlet.ServletContext;
 
 import freemarker.cache.ClassTemplateLoader;
@@ -55,7 +53,6 @@
 import freemarker.cache.TemplateLoader;
 import freemarker.cache.WebappTemplateLoader;
 import freemarker.template.Configuration;
-import org.jvnet.hk2.annotations.Optional;
 
 /**
  * Handy {@link FreemarkerConfigurationFactory} that supplies a minimally
@@ -73,8 +70,7 @@ public class FreemarkerDefaultConfigurationFactory implements FreemarkerConfigur
 
     protected final Configuration configuration;
 
-    @Inject
-    public FreemarkerDefaultConfigurationFactory(@Optional final ServletContext servletContext) {
+    public FreemarkerDefaultConfigurationFactory(ServletContext servletContext) {
         super();
 
         // Create different loaders.

ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerMvcFeature.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2017 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
@@ -45,6 +45,10 @@
 import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.FeatureContext;
 
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+
+import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.server.mvc.MvcFeature;
 
 /**
@@ -60,6 +64,9 @@ public final class FreemarkerMvcFeature implements Feature {
 
     private static final String SUFFIX = ".freemarker";
 
+    @Inject
+    private InjectionManager injectionManager;
+
     /**
      * {@link String} property defining the base path to Freemarker templates. If set, the value of the property is added in front
      * of the template name defined in:
@@ -132,7 +139,9 @@ public boolean configure(final FeatureContext context) {
 
         if (!config.isRegistered(FreemarkerViewProcessor.class)) {
             // Template Processor.
-            context.register(FreemarkerViewProcessor.class);
+            Configuration configuration = injectionManager.getInstance(Configuration.class);
+            ServletContext servletContext = injectionManager.getInstance(ServletContext.class);
+            context.register(new FreemarkerViewProcessor(configuration, servletContext, injectionManager::createAndInitialize));
 
             // MvcFeature.
             if (!config.isRegistered(MvcFeature.class)) {

ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerViewProcessor.java

@@ -47,21 +47,18 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
-import javax.inject.Inject;
 import javax.servlet.ServletContext;
 
-import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.util.collection.Values;
 import org.glassfish.jersey.server.ContainerException;
 import org.glassfish.jersey.server.mvc.Viewable;
 import org.glassfish.jersey.server.mvc.spi.AbstractTemplateProcessor;
 
-import org.jvnet.hk2.annotations.Optional;
-
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -81,17 +78,16 @@ final class FreemarkerViewProcessor extends AbstractTemplateProcessor<Template>
      * Create an instance of this processor with injected {@link javax.ws.rs.core.Configuration config} and
      * (optional) {@link javax.servlet.ServletContext servlet context}.
      *
-     * @param config config to configure this processor from.
-     * @param injectionManager injection manager to initialize template object factory if needed.
-     * @param servletContext (optional) servlet context to obtain template resources from.
+     * @param config         config to configure this processor from.
+     * @param servletContext servlet context to obtain template resources from.
+     * @param createInstance function that delegates a creation and an initialization to injection manager.
      */
-    @Inject
-    public FreemarkerViewProcessor(final javax.ws.rs.core.Configuration config, final InjectionManager injectionManager,
-                                   @Optional final ServletContext servletContext) {
+    public FreemarkerViewProcessor(javax.ws.rs.core.Configuration config, ServletContext servletContext,
+            Function<Class<?>, ?> createInstance) {
         super(config, servletContext, "freemarker", "ftl");
 
-        this.factory = getTemplateObjectFactory(injectionManager, FreemarkerConfigurationFactory.class, () -> {
-            Configuration configuration = getTemplateObjectFactory(injectionManager, Configuration.class, Values.empty());
+        this.factory = getTemplateObjectFactory(createInstance, FreemarkerConfigurationFactory.class, () -> {
+            Configuration configuration = getTemplateObjectFactory(createInstance, Configuration.class, Values.empty());
             if (configuration == null) {
                 return new FreemarkerDefaultConfigurationFactory(servletContext);
             } else {

ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheMvcFeature.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2017 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,6 +46,10 @@
 import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.FeatureContext;
 
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+
+import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.server.mvc.MvcFeature;
 
 /**
@@ -61,6 +65,9 @@ public class MustacheMvcFeature implements Feature {
 
     private static final String SUFFIX = ".mustache";
 
+    @Inject
+    private InjectionManager injectionManager;
+
     /**
      * {@link String} property defining the base path to Mustache templates. If set, the value of the property is added in front
      * of the template name defined in:
@@ -123,7 +130,9 @@ public boolean configure(final FeatureContext context) {
 
         if (!config.isRegistered(MustacheTemplateProcessor.class)) {
             // Template Processor.
-            context.register(MustacheTemplateProcessor.class);
+            Configuration configuration = injectionManager.getInstance(Configuration.class);
+            ServletContext servletContext = injectionManager.getInstance(ServletContext.class);
+            context.register(new MustacheTemplateProcessor(configuration, servletContext, injectionManager::createAndInitialize));
 
             // MvcFeature.
             if (!config.isRegistered(MvcFeature.class)) {

ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheTemplateProcessor.java

@@ -45,22 +45,19 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.function.Function;
 
 import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
-import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.servlet.ServletContext;
 
-import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.server.mvc.Viewable;
 import org.glassfish.jersey.server.mvc.spi.AbstractTemplateProcessor;
 import org.glassfish.jersey.server.mvc.spi.TemplateProcessor;
 
-import org.jvnet.hk2.annotations.Optional;
-
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
@@ -78,19 +75,17 @@ final class MustacheTemplateProcessor extends AbstractTemplateProcessor<Mustache
     private final MustacheFactory factory;
 
     /**
-     * Create an instance of this processor with injected {@link Configuration config} and
-     * (optional) {@link ServletContext servlet context}.
+     * Create an instance of this processor with injected {@link Configuration config} and (nullable)
+     * {@link ServletContext servlet context}.
      *
-     * @param config configuration to configure this processor from.
-     * @param injectionManager injection manager to initialize template object factory if needed.
-     * @param servletContext (optional) servlet context to obtain template resources from.
+     * @param config         configuration to configure this processor from.
+     * @param servletContext servlet context to obtain template resources from.
+     * @param createInstance function that delegates a creation and an initialization to injection manager.
      */
-    @Inject
-    public MustacheTemplateProcessor(final Configuration config, final InjectionManager injectionManager,
-                                     @Optional final ServletContext servletContext) {
+    public MustacheTemplateProcessor(Configuration config, ServletContext servletContext, Function<Class<?>, ?> createInstance) {
         super(config, servletContext, "mustache", "mustache");
 
-        this.factory = getTemplateObjectFactory(injectionManager, MustacheFactory.class, DefaultMustacheFactory::new);
+        this.factory = getTemplateObjectFactory(createInstance, MustacheFactory.class, DefaultMustacheFactory::new);
     }
 
     @Override

ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java

@@ -55,6 +55,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -66,7 +67,6 @@
 
 import javax.servlet.ServletContext;
 
-import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.util.PropertiesHelper;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.collection.DataStructures;
@@ -262,14 +262,13 @@ private Collection<String> getTemplatePaths(final String name) {
      * Retrieve a template object factory. The factory is, at first, looked for in
      * {@link javax.ws.rs.core.Configuration configuration} and if not found, given default value is used.
      *
-     * @param injectionManager injection manager to initialize factory if configured as class or class-name.
-     * @param type type of requested template object factory.
-     * @param defaultValue default value to be used if no factory reference is present in configuration.
+     * @param createInstance function that delegates a creation and an initialization to injection manager.
+     * @param type           type of requested template object factory.
+     * @param defaultValue   default value to be used if no factory reference is present in configuration.
      * @param <F> type of requested template object factory.
      * @return non-{@code null} template object factory.
      */
-    protected <F> F getTemplateObjectFactory(final InjectionManager injectionManager, final Class<F> type,
-                                             final Value<F> defaultValue) {
+    protected <F> F getTemplateObjectFactory(Function<Class<?>, ?> createInstance, Class<F> type, Value<F> defaultValue) {
         final Object objectFactoryProperty = config.getProperty(MvcFeature.TEMPLATE_OBJECT_FACTORY + suffix);
 
         if (objectFactoryProperty != null) {
@@ -286,7 +285,7 @@ protected <F> F getTemplateObjectFactory(final InjectionManager injectionManager
 
                 if (factoryClass != null) {
                     if (type.isAssignableFrom(factoryClass)) {
-                        return type.cast(injectionManager.createAndInitialize(factoryClass));
+                        return type.cast(createInstance.apply(factoryClass));
                     } else {
                         LOGGER.log(Level.CONFIG, LocalizationMessages.WRONG_TEMPLATE_OBJECT_FACTORY(factoryClass, type));
                     }

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java

@@ -65,8 +65,6 @@
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.spi.TestContainerException;
 
-import org.jvnet.hk2.annotations.Optional;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -119,16 +117,11 @@ public static class FactoryTemplateProcessor extends AbstractTemplateProcessor<S
         private final TestFactory factory;
 
         @Inject
-        public FactoryTemplateProcessor(final Configuration config, final InjectionManager injectionManager,
-                                        @Optional final ServletContext servletContext) {
-            super(config, servletContext, "factory", "fct");
-
-            this.factory = getTemplateObjectFactory(injectionManager, TestFactory.class, Values.lazy(new Value<TestFactory>() {
-                @Override
-                public TestFactory get() {
-                    return new TestFactory("Default Test Factory");
-                }
-            }));
+        public FactoryTemplateProcessor(Configuration config, InjectionManager injectionManager) {
+            super(config, injectionManager.getInstance(ServletContext.class), "factory", "fct");
+
+            this.factory = getTemplateObjectFactory(injectionManager::createAndInitialize, TestFactory.class, Values.lazy(
+                    (Value<TestFactory>) () -> new TestFactory("Default Test Factory")));
         }
 
         @Override
@@ -213,8 +206,8 @@ public static class CacheTemplateProcessor extends AbstractTemplateProcessor<Str
         private int i = 0;
 
         @Inject
-        public CacheTemplateProcessor(final Configuration config, @Optional final ServletContext servletContext) {
-            super(config, servletContext, "factory", "fct");
+        public CacheTemplateProcessor(Configuration config, InjectionManager injectionManager) {
+            super(config, injectionManager.getInstance(ServletContext.class), "factory", "fct");
         }
 
         @Override