From f15a70157daee3e17c8b86fd14bd2f81dba3461f Mon Sep 17 00:00:00 2001 From: Petr Bouda Date: Tue, 7 Mar 2017 22:48:28 +0100 Subject: [PATCH] ServiceHolder moved to internal/inject package. Change-Id: I6ad280f9d3721c8e496716104fa8acba22669cdc --- .../java/org/glassfish/jersey/hk2/HK2InjectionManager.java | 4 ++-- .../org/glassfish/jersey/internal/ExceptionMapperFactory.java | 2 +- .../glassfish/jersey/internal/inject/InjectionManager.java | 2 -- .../java/org/glassfish/jersey/internal/inject/Providers.java | 1 - .../jersey/{spi => internal/inject}/ServiceHolder.java | 4 +--- .../jersey/{spi => internal/inject}/ServiceHolderImpl.java | 4 +--- 6 files changed, 5 insertions(+), 12 deletions(-) rename core-common/src/main/java/org/glassfish/jersey/{spi => internal/inject}/ServiceHolder.java (96%) rename core-common/src/main/java/org/glassfish/jersey/{spi => internal/inject}/ServiceHolderImpl.java (97%) 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 index 3f3fab502a..01b8500a55 100644 --- 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 index 8a71e48c64..9489a55c43 100644 --- 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 index 5b99add020..c1c9903dbf 100644 --- 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 *

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 index a8e3b37f9a..e76447413e 100644 --- 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/core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolder.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ServiceHolder.java similarity index 96% rename from core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolder.java rename to core-common/src/main/java/org/glassfish/jersey/internal/inject/ServiceHolder.java index 5d5a1b6a97..71633eb56b 100644 --- a/core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolder.java +++ b/core-common/src/main/java/org/glassfish/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/core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolderImpl.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ServiceHolderImpl.java similarity index 97% rename from core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolderImpl.java rename to core-common/src/main/java/org/glassfish/jersey/internal/inject/ServiceHolderImpl.java index e88681ebbc..c2f45daa56 100644 --- a/core-common/src/main/java/org/glassfish/jersey/spi/ServiceHolderImpl.java +++ b/core-common/src/main/java/org/glassfish/jersey/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.