Replace HK2 PerThread by Jersey PerThread.

Change-Id: I8c0cb2645e6e5a0f469006fddd84a953b1aa35ea

Author: Petr Bouda

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

@@ -55,6 +55,7 @@
 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.PerThread;
 import org.glassfish.jersey.internal.inject.SupplierClassBinding;
 import org.glassfish.jersey.internal.inject.SupplierInstanceBinding;
 
@@ -233,7 +234,7 @@ private static void bindSupplierClassBinding(ServiceLocator locator, SupplierCla
                 }
             });
             binding.getQualifiers().forEach(supplierBuilder::qualifiedBy);
-            supplierBuilder.in(replaceScope(binding.getSupplierScope()));
+            supplierBuilder.in(transformScope(binding.getSupplierScope()));
             binder.bind(supplierBuilder);
 
             // Register wrapper for factory functionality, wrapper automatically call service locator which is able to retrieve
@@ -258,7 +259,7 @@ private static void setupSupplierFactoryBridge(Binding<?, ?> binding, ServiceBin
         builder.named(binding.getName());
         binding.getContracts().forEach(builder::to);
         binding.getQualifiers().forEach(builder::qualifiedBy);
-        builder.in(replaceScope(binding.getScope()));
+        builder.in(transformScope(binding.getScope()));
 
         if (binding.getRank() != null) {
             builder.ranked(binding.getRank());
@@ -278,7 +279,7 @@ static ActiveDescriptor<?> translateToActiveDescriptor(ClassBinding<?> desc) {
                 .analyzeWith(desc.getAnalyzer());
 
         if (desc.getScope() != null) {
-            binding.in(replaceScope(desc.getScope()));
+            binding.in(transformScope(desc.getScope()));
         }
 
         if (desc.getRank() != null) {
@@ -404,9 +405,17 @@ protected void configure() {
         };
     }
 
-    private static Class<? extends Annotation> replaceScope(Class<? extends Annotation> scope) {
+    /**
+     * Transforms Jersey scopes/annotations to HK2 equivalents.
+     *
+     * @param scope Jersey scope/annotation.
+     * @return HK2 equivalent scope/annotation.
+     */
+    private static Class<? extends Annotation> transformScope(Class<? extends Annotation> scope) {
         if (scope == PerLookup.class) {
             return org.glassfish.hk2.api.PerLookup.class;
+        } else if (scope == PerThread.class) {
+            return org.glassfish.hk2.api.PerThread.class;
         }
         return scope;
     }

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

@@ -0,0 +1,65 @@
+/*
+ * 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;
+
+/**
+ * PerThread is a scope that operates like {@link javax.inject.Singleton} scope, except on a per-thread basis. The lifecycle of
+ * the service is determined by the thread it is on. On a single thread only one of the service will be created, but a new
+ * service will be created for each thread.
+ *
+ * @author John Wells (john.wells at oracle.com)
+ */
+@Documented
+@Retention(RUNTIME)
+@Scope
+@Target({ TYPE, METHOD })
+public @interface PerThread {
+}

media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/DocumentBuilderFactoryInjectionProvider.java

@@ -44,8 +44,6 @@
 import javax.inject.Inject;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.glassfish.hk2.api.PerThread;
-
 /**
  * Thread-scoped injection provider of {@link DocumentBuilderFactory document
  * builder factories}.
@@ -67,7 +65,6 @@ public DocumentBuilderFactoryInjectionProvider(final Configuration config) {
     }
 
     @Override
-    @PerThread
     public DocumentBuilderFactory get() {
         DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();
 

media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/JaxbMessagingBinder.java

@@ -50,8 +50,7 @@
 import javax.xml.transform.TransformerFactory;
 
 import org.glassfish.jersey.internal.inject.AbstractBinder;
-
-import org.glassfish.hk2.api.PerThread;
+import org.glassfish.jersey.internal.inject.PerThread;
 
 /**
  * Binder for JAX-B message body workers.

media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/SaxParserFactoryInjectionProvider.java

@@ -44,8 +44,6 @@
 import javax.inject.Inject;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.glassfish.hk2.api.PerThread;
-
 /**
  * Thread-scoped injection provider of {@link SAXParserFactory SAX parser factories}.
  *
@@ -67,7 +65,6 @@ public SaxParserFactoryInjectionProvider(final Configuration config) {
     }
 
     @Override
-    @PerThread
     public SAXParserFactory get() {
         SAXParserFactory factory = SAXParserFactory.newInstance();
 

media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlInputFactoryInjectionProvider.java

@@ -44,8 +44,6 @@
 import javax.inject.Inject;
 import javax.xml.stream.XMLInputFactory;
 
-import org.glassfish.hk2.api.PerThread;
-
 /**
  * Thread-scoped injection provider of {@link XMLInputFactory transformer factories}.
  *
@@ -66,7 +64,6 @@ public XmlInputFactoryInjectionProvider(final Configuration config) {
     }
 
     @Override
-    @PerThread
     public XMLInputFactory get() {
         XMLInputFactory factory = XMLInputFactory.newInstance();
 

media/jaxb/src/test/java/org/glassfish/jersey/jaxb/internal/SaxParserFactoryInjectionProviderTest.java

@@ -63,8 +63,7 @@
 import org.glassfish.jersey.internal.inject.Binder;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Injections;
-
-import org.glassfish.hk2.api.PerThread;
+import org.glassfish.jersey.internal.inject.PerThread;
 
 import org.junit.Before;
 import org.junit.Test;