Enclose Bindings to innate package and provide a HK2 version of AbstractBinder

Signed-off-by: jansupol <jan.supol@oracle.com>

Author: jansupol

containers/glassfish/jersey-gf-ejb/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2019 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -50,11 +50,10 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.innate.inject.InternalBinder;
+import org.glassfish.jersey.innate.inject.Bindings;
 import org.glassfish.jersey.internal.inject.Binding;
-import org.glassfish.jersey.internal.inject.Bindings;
 import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.internal.inject.InstanceBinding;
 import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.model.Invocable;
 import org.glassfish.jersey.server.spi.ComponentProvider;
@@ -152,7 +151,7 @@ public EjbFactory(Class<T> rawType, InitialContext ctx, EjbComponentProvider ejb
     public void initialize(final InjectionManager injectionManager) {
         this.injectionManager = injectionManager;
 
-        InstanceBinding<EjbComponentProvider> descriptor = Bindings.service(EjbComponentProvider.this)
+        Binding descriptor = Bindings.service(EjbComponentProvider.this)
                 .to(ResourceMethodInvocationHandlerProvider.class);
         this.injectionManager.register(descriptor);
     }
@@ -304,7 +303,7 @@ public void done() {
     }
 
     private void registerEjbExceptionMapper() {
-        injectionManager.register(new AbstractBinder() {
+        injectionManager.register(new InternalBinder() {
             @Override
             protected void configure() {
                 bind(EjbExceptionMapper.class).to(ExceptionMapper.class).in(Singleton.class);

containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpContainer.java

@@ -38,7 +38,7 @@
 
 import org.glassfish.jersey.grizzly2.httpserver.internal.LocalizationMessages;
 import org.glassfish.jersey.innate.inject.InjectionIds;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
 import org.glassfish.jersey.internal.util.ExtendedLogger;
 import org.glassfish.jersey.internal.util.collection.Ref;
@@ -119,7 +119,7 @@ public GrizzlyResponseReferencingFactory(final Provider<Ref<Response>> reference
      * the injection of Grizzly request instance into singleton JAX-RS and Jersey providers is only supported via
      * {@link jakarta.inject.Provider injection provider}.
      */
-    static class GrizzlyBinder extends AbstractBinder {
+    static class GrizzlyBinder extends InternalBinder {
 
         @Override
         protected void configure() {

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletBootstrapPreinitialization.java

@@ -23,13 +23,12 @@
 import jakarta.ws.rs.RuntimeType;
 import org.glassfish.jersey.innate.BootstrapPreinitialization;
 import org.glassfish.jersey.innate.inject.InjectionIds;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.servlet.internal.PersistenceUnitBinder;
 
 import java.lang.reflect.Proxy;
-import java.security.AccessController;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -40,7 +39,7 @@ public void preregister(RuntimeType runtimeType, InjectionManager injectionManag
         if (RuntimeType.SERVER == runtimeType) {
             injectionManager.register(
                     new WebComponent.WebComponentBinder(Collections.emptyMap(), new BootstrapWebConfig(), false));
-            injectionManager.register(new AbstractBinder() {
+            injectionManager.register(new InternalBinder() {
                 @Override
                 protected void configure() {
                     bindFactory(() -> (FilterConfig) null).to(FilterConfig.class).in(Singleton.class)

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java

@@ -54,9 +54,9 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.innate.inject.InjectionIds;
 import org.glassfish.jersey.internal.ServiceFinderBinder;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Providers;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
@@ -161,7 +161,7 @@ public HttpServletResponseReferencingFactory(final Provider<Ref<HttpServletRespo
         }
     }
 
-    static final class WebComponentBinder extends AbstractBinder {
+    static final class WebComponentBinder extends InternalBinder {
 
         private final Map<String, Object> applicationProperties;
         private final WebConfig webConfig;
@@ -327,7 +327,7 @@ public WebComponent(final WebConfig webConfig, ResourceConfig resourceConfig) th
         requestScopedInitializer = rsiProvider != null ? rsiProvider : DEFAULT_REQUEST_SCOPE_INITIALIZER_PROVIDER;
         requestResponseBindingExternalized = rrbExternalized;
 
-        final AbstractBinder webComponentBinder =
+        final InternalBinder webComponentBinder =
                 new WebComponentBinder(resourceConfig.getProperties(), webConfig, requestResponseBindingExternalized);
         resourceConfig.register(webComponentBinder);
 

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java

@@ -29,7 +29,7 @@
 import jakarta.servlet.ServletConfig;
 
 import org.glassfish.jersey.innate.inject.InjectionIds;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.inject.Injectee;
 import org.glassfish.jersey.internal.inject.InjectionResolver;
 import org.glassfish.jersey.server.ContainerException;
@@ -39,7 +39,7 @@
  *
  * @author Michal Gajdos
  */
-public class PersistenceUnitBinder extends AbstractBinder {
+public class PersistenceUnitBinder extends InternalBinder {
 
     private final ServletConfig servletConfig;
 

containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java

@@ -43,8 +43,8 @@
 import org.eclipse.jetty.security.AuthenticationState;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.util.Callback;
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
 import org.glassfish.jersey.internal.util.ExtendedLogger;
 import org.glassfish.jersey.internal.util.collection.Ref;
@@ -114,7 +114,7 @@ public JettyResponseReferencingFactory(final Provider<Ref<Response>> referenceFa
      * the injection of Jetty request instance into singleton JAX-RS and Jersey providers is only supported via
      * {@link jakarta.inject.Provider injection provider}.
      */
-    private static class JettyBinder extends AbstractBinder {
+    private static class JettyBinder extends InternalBinder {
 
         @Override
         protected void configure() {

core-client/src/main/java/org/glassfish/jersey/client/ClientBinder.java

@@ -30,8 +30,8 @@
 import jakarta.inject.Singleton;
 
 import org.glassfish.jersey.innate.inject.InjectionIds;
+import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.PropertiesDelegate;
-import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.ReferencingFactory;
 import org.glassfish.jersey.internal.util.collection.Ref;
 import org.glassfish.jersey.message.internal.MessagingBinders;
@@ -44,7 +44,7 @@
  * @author Jakub Podlesak
  * @author Libor Kramolis
  */
-class ClientBinder extends AbstractBinder {
+class ClientBinder extends InternalBinder {
 
     private final Map<String, Object> clientRuntimeProperties;
 

core-client/src/main/java/org/glassfish/jersey/client/ClientConfig.java

@@ -39,7 +39,9 @@
 import org.glassfish.jersey.client.internal.inject.ParameterUpdaterConfigurator;
 import org.glassfish.jersey.client.spi.Connector;
 import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.innate.inject.Bindings;
 import org.glassfish.jersey.innate.inject.InjectionIds;
+import org.glassfish.jersey.innate.inject.ProviderBinder;
 import org.glassfish.jersey.internal.AutoDiscoverableConfigurator;
 import org.glassfish.jersey.internal.BootstrapBag;
 import org.glassfish.jersey.internal.BootstrapConfigurator;
@@ -48,10 +50,8 @@
 import org.glassfish.jersey.internal.FeatureConfigurator;
 import org.glassfish.jersey.internal.JaxrsProviders;
 import org.glassfish.jersey.internal.ServiceFinder;
-import org.glassfish.jersey.internal.inject.Bindings;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Injections;
-import org.glassfish.jersey.internal.inject.ProviderBinder;
 import org.glassfish.jersey.internal.spi.AutoDiscoverable;
 import org.glassfish.jersey.internal.util.collection.LazyValue;
 import org.glassfish.jersey.internal.util.collection.Value;

core-client/src/main/java/org/glassfish/jersey/client/ClientExecutorProvidersConfigurator.java

@@ -24,16 +24,15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.glassfish.jersey.innate.inject.Bindings;
 import org.glassfish.jersey.innate.inject.InjectionIds;
 import org.glassfish.jersey.internal.BootstrapBag;
-import org.glassfish.jersey.internal.inject.Bindings;
+import org.glassfish.jersey.internal.inject.Binding;
 import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.internal.inject.InstanceBinding;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.collection.Value;
 import org.glassfish.jersey.internal.util.collection.Values;
 import org.glassfish.jersey.model.internal.ComponentBag;
-import org.glassfish.jersey.model.internal.ManagedObjectsFinalizer;
 import org.glassfish.jersey.process.internal.AbstractExecutorProvidersConfigurator;
 import org.glassfish.jersey.spi.ExecutorServiceProvider;
 import org.glassfish.jersey.spi.ScheduledExecutorServiceProvider;
@@ -92,7 +91,7 @@ public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
             if (asyncThreadPoolSize != null) {
                 // TODO: Do we need to register DEFAULT Executor and ScheduledExecutor to InjectionManager?
                 asyncThreadPoolSize = (asyncThreadPoolSize < 0) ? 0 : asyncThreadPoolSize;
-                InstanceBinding<Integer> asyncThreadPoolSizeBinding = Bindings
+                Binding<Integer, ?> asyncThreadPoolSizeBinding = Bindings
                         .service(asyncThreadPoolSize)
                         .named("ClientAsyncThreadPoolSize");
                 injectionManager.register(asyncThreadPoolSizeBinding);
@@ -107,7 +106,7 @@ public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
             }
         }
 
-        InstanceBinding<ExecutorServiceProvider> executorBinding = Bindings
+        Binding<ExecutorServiceProvider, ?> executorBinding = Bindings
                 .service(defaultAsyncExecutorProvider)
                 .to(ExecutorServiceProvider.class)
                 .forClient(true)
@@ -133,7 +132,7 @@ public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
                         : new ClientScheduledExecutorServiceProvider(Values.of(scheduledExecutorService));
         }
 
-        InstanceBinding<ScheduledExecutorServiceProvider> schedulerBinding = Bindings
+        Binding<ScheduledExecutorServiceProvider, ?> schedulerBinding = Bindings
                 .service(defaultScheduledExecutorProvider)
                 .to(ScheduledExecutorServiceProvider.class)
                 .forClient(true)

core-client/src/main/java/org/glassfish/jersey/client/ClientMessageBodyFactory.java

@@ -16,12 +16,12 @@
 
 package org.glassfish.jersey.client;
 
+import org.glassfish.jersey.innate.inject.Bindings;
 import org.glassfish.jersey.innate.inject.InjectionIds;
 import org.glassfish.jersey.internal.BootstrapBag;
 import org.glassfish.jersey.internal.BootstrapConfigurator;
-import org.glassfish.jersey.internal.inject.Bindings;
+import org.glassfish.jersey.internal.inject.Binding;
 import org.glassfish.jersey.internal.inject.InjectionManager;
-import org.glassfish.jersey.internal.inject.InstanceBinding;
 import org.glassfish.jersey.internal.util.collection.LazyValue;
 import org.glassfish.jersey.internal.util.collection.Value;
 import org.glassfish.jersey.internal.util.collection.Values;
@@ -65,7 +65,7 @@ static class MessageBodyWorkersConfigurator implements BootstrapConfigurator {
         @Override
         public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
             messageBodyFactory = new ClientMessageBodyFactory(bootstrapBag.getConfiguration(), () -> clientRuntime);
-            InstanceBinding<ClientMessageBodyFactory> binding =
+            Binding<ClientMessageBodyFactory, ?> binding =
                     Bindings.service(messageBodyFactory).to(MessageBodyWorkers.class)
                             .forClient(true)
                             .id(InjectionIds.SERVER_MESSAGE_BODY_WORKERS.id());