diff options
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java | 2 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 2 | ||||
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java | 2 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java (renamed from jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java) | 2 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java | 4 | ||||
-rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java (renamed from jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java) | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index 0717ca51dc5..7311641b1bd 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -3,7 +3,7 @@ package com.yahoo.container.core.config; import com.yahoo.config.FileReference; import com.yahoo.container.di.Osgi.GenerationStatus; -import com.yahoo.jdisc.core.BsnVersion; +import com.yahoo.jdisc.application.BsnVersion; import com.yahoo.osgi.Osgi; import org.osgi.framework.Bundle; diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 85797444de8..13c07ffb14b 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -16,7 +16,7 @@ import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.logging.AccessLog; import com.yahoo.filedistribution.fileacquirer.FileAcquirer; import com.yahoo.jdisc.application.OsgiFramework; -import com.yahoo.jdisc.core.BsnVersion; +import com.yahoo.jdisc.application.BsnVersion; import com.yahoo.jdisc.handler.RequestHandler; import com.yahoo.jdisc.service.ClientProvider; import com.yahoo.jdisc.service.ServerProvider; diff --git a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java index 764771bc285..e973dd28838 100644 --- a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java +++ b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java @@ -2,7 +2,7 @@ package com.yahoo.container.core.config; import com.yahoo.container.di.Osgi.GenerationStatus; -import com.yahoo.jdisc.core.BsnVersion; +import com.yahoo.jdisc.application.BsnVersion; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java index ee9ecc9fc3e..40573eee3b2 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BsnVersion.java @@ -1,4 +1,4 @@ -package com.yahoo.jdisc.core; +package com.yahoo.jdisc.application; import org.osgi.framework.Bundle; import org.osgi.framework.Version; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java index e78f3251890..203c2e975e4 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; +import com.yahoo.jdisc.application.BsnVersion; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.Version; import org.osgi.framework.hooks.bundle.CollisionHook; import org.osgi.framework.hooks.bundle.EventHook; import org.osgi.framework.hooks.bundle.FindHook; @@ -15,10 +15,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.logging.Logger; -import java.util.stream.Collectors; /** * A bundle {@link CollisionHook} that contains a set of bundles that are allowed to collide with bundles diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java index baeb36d28a8..484c4c9fb3c 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/BsnVersionTest.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BsnVersionTest.java @@ -1,4 +1,4 @@ -package com.yahoo.jdisc.core; +package com.yahoo.jdisc.application; import org.junit.jupiter.api.Test; import org.osgi.framework.Version; |