Replace HK2 PerLookup by Jersey PerLookup.

Change-Id: Id7648aeb5fd42b4c982a4d6a9e20a296c61add1d

Author: Petr Bouda

core-common/src/main/java/org/glassfish/jersey/hk2/Hk2Helper.java

@@ -54,6 +54,7 @@
 import org.glassfish.jersey.internal.inject.DisposableSupplier;
 import org.glassfish.jersey.internal.inject.InjectionResolverBinding;
 import org.glassfish.jersey.internal.inject.InstanceBinding;
+import org.glassfish.jersey.internal.inject.PerLookup;
 import org.glassfish.jersey.internal.inject.SupplierClassBinding;
 import org.glassfish.jersey.internal.inject.SupplierInstanceBinding;
 
@@ -232,7 +233,7 @@ private static void bindSupplierClassBinding(ServiceLocator locator, SupplierCla
                 }
             });
             binding.getQualifiers().forEach(supplierBuilder::qualifiedBy);
-            supplierBuilder.in(binding.getSupplierScope());
+            supplierBuilder.in(replaceScope(binding.getSupplierScope()));
             binder.bind(supplierBuilder);
 
             // Register wrapper for factory functionality, wrapper automatically call service locator which is able to retrieve
@@ -257,7 +258,7 @@ private static void setupSupplierFactoryBridge(Binding<?, ?> binding, ServiceBin
         builder.named(binding.getName());
         binding.getContracts().forEach(builder::to);
         binding.getQualifiers().forEach(builder::qualifiedBy);
-        builder.in(binding.getScope());
+        builder.in(replaceScope(binding.getScope()));
 
         if (binding.getRank() != null) {
             builder.ranked(binding.getRank());
@@ -277,7 +278,7 @@ static ActiveDescriptor<?> translateToActiveDescriptor(ClassBinding<?> desc) {
                 .analyzeWith(desc.getAnalyzer());
 
         if (desc.getScope() != null) {
-            binding.in(desc.getScope());
+            binding.in(replaceScope(desc.getScope()));
         }
 
         if (desc.getRank() != null) {
@@ -402,4 +403,11 @@ protected void configure() {
             }
         };
     }
+
+    private static Class<? extends Annotation> replaceScope(Class<? extends Annotation> scope) {
+        if (scope == PerLookup.class) {
+            return org.glassfish.hk2.api.PerLookup.class;
+        }
+        return scope;
+    }
 }

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

@@ -53,12 +53,11 @@
 import javax.inject.Provider;
 
 import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.internal.inject.PerLookup;
 import org.glassfish.jersey.message.MessageBodyWorkers;
 import org.glassfish.jersey.spi.ContextResolvers;
 import org.glassfish.jersey.spi.ExceptionMappers;
 
-import org.glassfish.hk2.api.PerLookup;
-
 /**
  * Jersey implementation of JAX-RS {@link javax.ws.rs.ext.Providers} contract.
  *

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

@@ -0,0 +1,64 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 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
+ * 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.internal.inject;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * PerLookup is the scope for objects that are created every time they are looked up. PerLookup objects
+ * will be destroyed whenever a service containing them is destroyed.
+ *
+ * @author John Wells (john.wells at oracle.com)
+ */
+@Documented
+@Retention(RUNTIME)
+@Scope
+@Target({ TYPE, METHOD })
+public @interface PerLookup {
+}

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

@@ -59,8 +59,6 @@
 import org.glassfish.jersey.model.ContractProvider;
 import org.glassfish.jersey.model.internal.ComponentBag;
 
-import org.glassfish.hk2.api.PerLookup;
-
 /**
  * Class used for registration of the custom providers into injection manager.
  * <p>

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

@@ -52,8 +52,6 @@
 
 import org.glassfish.jersey.internal.util.collection.Ref;
 
-import org.glassfish.hk2.api.PerLookup;
-
 import org.junit.Test;
 import static org.junit.Assert.assertSame;
 
@@ -120,14 +118,14 @@ public ListOfStringReferencingFactory(Provider<Ref<List<String>>> referenceFacto
 
     @Override
     protected void configure() {
-        bindFactory(FooReferencingFactory.class).to(Foo.class).in(PerLookup.class);
-        bindFactory(ReferencingFactory.<Foo>referenceFactory()).to(new GenericType<Ref<Foo>>() {}).in(Singleton.class);
+        bindFactory(FooReferencingFactory.class).to(Foo.class);
+        bindFactory(ReferencingFactory.referenceFactory()).to(new GenericType<Ref<Foo>>() {}).in(Singleton.class);
 
-        bindFactory(ListOfIntegerReferencingFactory.class).to(new GenericType<List<Integer>>() {}).in(PerLookup.class);
-        bindFactory(ReferencingFactory.<List<Integer>>referenceFactory()).to(new GenericType<Ref<List<Integer>>>() {
+        bindFactory(ListOfIntegerReferencingFactory.class).to(new GenericType<List<Integer>>() {});
+        bindFactory(ReferencingFactory.referenceFactory()).to(new GenericType<Ref<List<Integer>>>() {
         }).in(Singleton.class);
 
-        bindFactory(ListOfStringReferencingFactory.class).to(new GenericType<List<String>>() {}).in(PerLookup.class);
+        bindFactory(ListOfStringReferencingFactory.class).to(new GenericType<List<String>>() {});
         bindFactory(ReferencingFactory.referenceFactory(expectedStrings)).to(new GenericType<Ref<List<String>>>() {
         }).in(Singleton.class);
     }

core-server/src/main/java/org/glassfish/jersey/server/internal/ProcessingProviders.java

@@ -62,8 +62,6 @@
 import org.glassfish.jersey.model.internal.RankedComparator;
 import org.glassfish.jersey.model.internal.RankedProvider;
 
-import org.glassfish.hk2.api.PerLookup;
-
 /**
  * Injectable encapsulating class containing processing providers like filters, interceptors,
  * name bound providers, dynamic features.
@@ -337,7 +335,7 @@ public static class Binder extends AbstractBinder {
         @Override
         protected void configure() {
 
-            bindFactory(ProcessingProvidersReferencingFactory.class).to(ProcessingProviders.class).in(PerLookup.class);
+            bindFactory(ProcessingProvidersReferencingFactory.class).to(ProcessingProviders.class);
             bindFactory(ReferencingFactory.<ProcessingProviders>referenceFactory())
                     .to(new GenericType<Ref<ProcessingProviders>>() {
                     }).in(Singleton.class);

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/MonitoringFeature.java

@@ -61,8 +61,6 @@
 import org.glassfish.jersey.server.monitoring.MonitoringStatistics;
 import org.glassfish.jersey.server.monitoring.MonitoringStatisticsListener;
 
-import org.glassfish.hk2.api.PerLookup;
-
 /**
  * Feature that enables calculating of {@link MonitoringStatistics monitoring statistics} and
  * optionally also enables exposure of monitoring MBeans.
@@ -138,7 +136,7 @@ protected void configure() {
                             .in(Singleton.class);
 
                     bindFactory(ApplicationInfoInjectionFactory.class)
-                            .to(ApplicationInfo.class).in(PerLookup.class);
+                            .to(ApplicationInfo.class);
                 }
             });
         }
@@ -152,7 +150,7 @@ protected void configure() {
                             .to(new GenericType<Ref<MonitoringStatistics>>() { })
                             .in(Singleton.class);
 
-                    bindFactory(StatisticsInjectionFactory.class).to(MonitoringStatistics.class).in(PerLookup.class);
+                    bindFactory(StatisticsInjectionFactory.class).to(MonitoringStatistics.class);
 
                     bind(StatisticsListener.class).to(MonitoringStatisticsListener.class).in(Singleton.class);
                 }

core-server/src/main/java/org/glassfish/jersey/server/model/InvocableValidator.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-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
@@ -47,11 +47,10 @@
 import javax.inject.Singleton;
 
 import org.glassfish.jersey.internal.Errors;
+import org.glassfish.jersey.internal.inject.PerLookup;
 import org.glassfish.jersey.internal.inject.Providers;
 import org.glassfish.jersey.server.internal.LocalizationMessages;
 
-import org.glassfish.hk2.api.PerLookup;
-
 /**
  * Validator ensuring that {@link Invocable invocable} and {@link HandlerConstructor constructor} is correctly defined (for
  * example correctly annotated with scope annotation). This validator is stateful and therefore new instance must be created

core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ActiveBindingBindingTest.java

@@ -55,6 +55,7 @@
 import javax.inject.Singleton;
 
 import org.glassfish.jersey.internal.inject.InjectionManager;
+import org.glassfish.jersey.internal.inject.PerLookup;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.process.internal.RequestScoped;
 import org.glassfish.jersey.server.ContainerResponse;
@@ -64,7 +65,6 @@
 
 import org.glassfish.hk2.api.DescriptorType;
 import org.glassfish.hk2.api.DescriptorVisibility;
-import org.glassfish.hk2.api.PerLookup;
 import org.glassfish.hk2.api.ServiceHandle;
 import org.glassfish.hk2.utilities.AbstractActiveDescriptor;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;

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

@@ -75,6 +75,7 @@
 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.inject.PerLookup;
 import org.glassfish.jersey.internal.util.Producer;
 import org.glassfish.jersey.model.internal.CommonConfig;
 import org.glassfish.jersey.model.internal.ComponentBag;
@@ -87,8 +88,6 @@
 import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.server.model.internal.ModelErrors;
 
-import org.glassfish.hk2.api.PerLookup;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;