ServiceHolder moved to internal/inject package.

Change-Id: I6ad280f9d3721c8e496716104fa8acba22669cdc
DineshGuptaa · Mar 8, 2017 · f15a701 · f15a701
1 parent 372b0e5
commit f15a701
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/core-common/src/main/java/org/glassfish/jersey/hk2/HK2InjectionManager.java b/core-common/src/main/java/org/glassfish/jersey/hk2/HK2InjectionManager.java
@@ -57,8 +57,8 @@
 import org.glassfish.jersey.internal.inject.ForeignDescriptorImpl;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.InstanceBinding;
-import org.glassfish.jersey.spi.ServiceHolder;
-import org.glassfish.jersey.spi.ServiceHolderImpl;
+import org.glassfish.jersey.internal.inject.ServiceHolder;
+import org.glassfish.jersey.internal.inject.ServiceHolderImpl;
 
 import org.glassfish.hk2.api.ActiveDescriptor;
 import org.glassfish.hk2.api.ServiceLocator;

diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/ExceptionMapperFactory.java b/core-common/src/main/java/org/glassfish/jersey/internal/ExceptionMapperFactory.java
@@ -65,7 +65,7 @@
 import org.glassfish.jersey.internal.util.collection.ClassTypePair;
 import org.glassfish.jersey.spi.ExceptionMappers;
 import org.glassfish.jersey.spi.ExtendedExceptionMapper;
-import org.glassfish.jersey.spi.ServiceHolder;
+import org.glassfish.jersey.internal.inject.ServiceHolder;
 
 /**
  * {@link ExceptionMappers Exception mappers} implementation that aggregates

diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/InjectionManager.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/InjectionManager.java
@@ -44,8 +44,6 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-import org.glassfish.jersey.spi.ServiceHolder;
-
 /**
  * Interface provides the communication API between Jersey and Dependency Injection provider
  * <p>

diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/Providers.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/Providers.java
@@ -68,7 +68,6 @@
 import org.glassfish.jersey.model.internal.RankedComparator;
 import org.glassfish.jersey.model.internal.RankedProvider;
 import org.glassfish.jersey.spi.Contract;
-import org.glassfish.jersey.spi.ServiceHolder;
 
 /**
  * Utility class providing a set of utility methods for easier and more type-safe

diff --git a/...g/glassfish/jersey/spi/ServiceHolder.java → ...jersey/internal/inject/ServiceHolder.java b/...g/glassfish/jersey/spi/ServiceHolder.java → ...jersey/internal/inject/ServiceHolder.java
@@ -38,13 +38,11 @@
  * holder.
  */
 
-package org.glassfish.jersey.spi;
+package org.glassfish.jersey.internal.inject;
 
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import org.glassfish.jersey.internal.inject.InjectionManager;
-
 /**
  * Implementation of this class is used as a holder for service instance from
  * {@link InjectionManager} along with other information about the provided service.

diff --git a/...assfish/jersey/spi/ServiceHolderImpl.java → ...ey/internal/inject/ServiceHolderImpl.java b/...assfish/jersey/spi/ServiceHolderImpl.java → ...ey/internal/inject/ServiceHolderImpl.java
@@ -38,14 +38,12 @@
  * holder.
  */
 
-package org.glassfish.jersey.spi;
+package org.glassfish.jersey.internal.inject;
 
 import java.lang.reflect.Type;
 import java.util.Objects;
 import java.util.Set;
 
-import org.glassfish.jersey.internal.inject.InjectionManager;
-
 /**
  * Implementation of the instance keeper which kept the instance of the class from
  * {@link InjectionManager} and the other information about this instance.