diff options
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java | 21 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java | 4 |
2 files changed, 1 insertions, 24 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java deleted file mode 100644 index ee9ecc9fc3e..00000000000 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BsnVersion.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yahoo.jdisc.core; - -import org.osgi.framework.Bundle; -import org.osgi.framework.Version; - -/** - * A bundle's symbolic name and version. - * - * @author gjoranv - */ -public record BsnVersion(String symbolicName, Version version) { - - public BsnVersion(Bundle bundle) { - this(bundle.getSymbolicName(), bundle.getVersion()); - } - - public String toReadableString() { - return symbolicName + " version:" + 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 |