summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-12-02 11:26:50 -0800
committerJon Bratseth <bratseth@oath.com>2018-12-02 11:26:50 -0800
commitab4b31704e80a309bfa225306bd6f27efaf6ce31 (patch)
tree34f3a80542859f97c7704de8f2a314f0a8650f27 /container-disc
parent9e07e7a3e7e06c7d26b975faff028a1ba4fa4708 (diff)
Non-functional changes only
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/CertificateStoreProvider.java1
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/DisableOsgiFramework.java2
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java5
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java2
-rw-r--r--container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java1
5 files changed, 7 insertions, 4 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/CertificateStoreProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/CertificateStoreProvider.java
index c689c378011..5670d9965aa 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/CertificateStoreProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/CertificateStoreProvider.java
@@ -12,6 +12,7 @@ import com.yahoo.jdisc.http.CertificateStore;
*
* @author bratseth
*/
+@SuppressWarnings("unused")
public class CertificateStoreProvider implements Provider<CertificateStore> {
private static final ThrowingCertificateStore instance = new ThrowingCertificateStore();
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/DisableOsgiFramework.java b/container-disc/src/main/java/com/yahoo/container/jdisc/DisableOsgiFramework.java
index 3978d39a89a..362fefa405d 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/DisableOsgiFramework.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/DisableOsgiFramework.java
@@ -12,6 +12,7 @@ import java.util.List;
* @author Tony Vaagenes
*/
public final class DisableOsgiFramework implements OsgiFramework {
+
private final RestrictedBundleContext restrictedBundleContext;
public DisableOsgiFramework() {
@@ -63,4 +64,5 @@ public final class DisableOsgiFramework implements OsgiFramework {
private RuntimeException newException() {
return new UnsupportedOperationException("The OSGi framework is not available to components.");
}
+
}
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
index c9cc8dfdfa4..a8acaf7dd10 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
@@ -10,10 +10,10 @@ import java.util.Collections;
import java.util.Dictionary;
/**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.22.0
+ * @author Einar M R Rosenvinge
*/
public class RestrictedBundleContext implements BundleContext {
+
private final BundleContext wrapped;
public RestrictedBundleContext(BundleContext wrapped) {
@@ -197,4 +197,5 @@ public class RestrictedBundleContext implements BundleContext {
private RuntimeException newException() {
return new UnsupportedOperationException("This BundleContext operation is not available to components.");
}
+
}
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
index 28169524c90..d966e66f502 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
@@ -11,7 +11,7 @@ import com.yahoo.container.di.componentgraph.Provider;
*
* @author bratseth
*/
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation", "unused"})
public class SecretStoreProvider implements Provider<com.yahoo.jdisc.http.SecretStore> {
private static final ThrowingSecretStore instance = new ThrowingSecretStore();
diff --git a/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java b/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java
index 662c6a3a4d6..ae65fc3ad68 100644
--- a/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java
+++ b/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java
@@ -30,7 +30,6 @@ import java.util.Map;
/**
* @author gjoranv
- * @since 5.18
*/
public class BindingsOverviewHandler extends AbstractRequestHandler {