diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-18 20:37:35 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-18 20:37:35 +0100 |
commit | b01ecd72d26a45ff4b498881446f5e62237c64be (patch) | |
tree | c6b4626e262d234900929132e4554b00cda03c49 /container-disc | |
parent | 804b5ea7d3822847d2b732c79fd35a5eceba15b4 (diff) |
Non-functional-changes-only
Diffstat (limited to 'container-disc')
14 files changed, 45 insertions, 48 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java b/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java index c17b9d445a2..b22a8314d2b 100644 --- a/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java @@ -74,4 +74,5 @@ public final class FilterConfigProvider implements Provider<FilterConfig> { @Override public void deconstruct() {} + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java index 0e3110e26a8..09febdabc60 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java @@ -14,6 +14,7 @@ import java.util.List; * @author mortent */ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityProvider> { + private static final ThrowingAthenzIdentityProvider instance = new ThrowingAthenzIdentityProvider(); @Override @@ -84,4 +85,5 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr throw new UnsupportedOperationException(message); } } + } 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 a8acaf7dd10..baf7ac8c4dc 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 @@ -22,25 +22,19 @@ public class RestrictedBundleContext implements BundleContext { @Override public ServiceRegistration<?> registerService(String[] strings, Object o, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(strings, o, stringDictionary); } @Override public ServiceRegistration<?> registerService(String localHostname, Object o, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(localHostname, o, stringDictionary); } @Override public <S> ServiceRegistration<S> registerService(Class<S> sClass, S s, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(sClass, s, stringDictionary); } @@ -51,57 +45,43 @@ public class RestrictedBundleContext implements BundleContext { @Override public ServiceReference<?>[] getServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException { - if (wrapped == null) { - return new ServiceReference<?>[0]; - } + if (wrapped == null) return new ServiceReference<?>[0]; return wrapped.getServiceReferences(localHostname, localHostname2); } @Override public ServiceReference<?>[] getAllServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException { - if (wrapped == null) { - return new ServiceReference<?>[0]; - } + if (wrapped == null) return new ServiceReference<?>[0]; return wrapped.getAllServiceReferences(localHostname, localHostname2); } @Override public ServiceReference<?> getServiceReference(String localHostname) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getServiceReference(localHostname); } @Override public <S> ServiceReference<S> getServiceReference(Class<S> sClass) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getServiceReference(sClass); } @Override public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> sClass, String localHostname) throws InvalidSyntaxException { - if (wrapped == null) { - return Collections.<ServiceReference<S>>emptyList(); - } + if (wrapped == null) return Collections.<ServiceReference<S>>emptyList(); return wrapped.getServiceReferences(sClass, localHostname); } @Override public <S> S getService(ServiceReference<S> sServiceReference) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getService(sServiceReference); } @Override public boolean ungetService(ServiceReference<?> serviceReference) { - if (wrapped == null) { - return false; - } + if (wrapped == null) return false; return wrapped.ungetService(serviceReference); } @@ -110,10 +90,6 @@ public class RestrictedBundleContext implements BundleContext { return null; } - - //--------------------- - - @Override public String getProperty(String localHostname) { throw newException(); 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 9c1dd00fdd4..eca62bc6ae6 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 @@ -34,4 +34,5 @@ public class SecretStoreProvider implements Provider<SecretStore> { throw new SecretNotFoundException("A secret store is not available"); } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java index 0bb3832ddf5..b25517ec1f7 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java @@ -19,9 +19,12 @@ public class SystemInfoProvider extends AbstractComponent implements Provider<Sy private final SystemInfo instance; - @Inject public SystemInfoProvider(ConfigserverConfig config) { + @Inject + public SystemInfoProvider(ConfigserverConfig config) { this.instance = new SystemInfo(new Zone(Environment.valueOf(config.environment()), config.region())); } - @Override public SystemInfo get() { return instance; } + @Override + public SystemInfo get() { return instance; } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index 10bf96749e8..26014dba08c 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -11,6 +11,7 @@ import java.util.List; * @author mortent */ public interface AthenzIdentityProvider { + String domain(); String service(); SSLContext getIdentitySslContext(); @@ -22,4 +23,5 @@ public interface AthenzIdentityProvider { List<X509Certificate> getIdentityCertificate(); PrivateKey getPrivateKey(); Path trustStorePath(); + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java index fd5839bfc45..039a0535c32 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java @@ -13,4 +13,5 @@ public class AthenzIdentityProviderException extends RuntimeException { public AthenzIdentityProviderException(String message, Throwable cause) { super(message, cause); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java index 5c205cd5157..b168b21ac1c 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java @@ -28,4 +28,5 @@ public class DisableGuiceMetric implements Metric { private static RuntimeException newException() { return new UnsupportedOperationException("The Metric framework is only available to components."); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java index c9caaa9d4b5..60b7b0335bf 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java @@ -55,4 +55,5 @@ public final class ForwardingMetricConsumer implements MetricConsumer { this.contexts = contexts; } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java index c452fb2435d..17effe2136a 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java @@ -17,6 +17,7 @@ import java.util.Map; * @author ollivir */ public class GarbageCollectionMetrics { + private static final String GC_COUNT = "jdisc.gc.count"; private static final String GC_TIME = "jdisc.gc.ms"; private static final String DIMENSION_KEY = "gcName"; @@ -35,7 +36,7 @@ public class GarbageCollectionMetrics { } } - private Map<String, LinkedList<GcStats>> gcStatistics; + private final Map<String, LinkedList<GcStats>> gcStatistics; private final Clock clock; @@ -92,4 +93,5 @@ public class GarbageCollectionMetrics { Map<String, LinkedList<GcStats>> getGcStatistics() { return gcStatistics; } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java index b29d7fe1f21..22a335a8171 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java @@ -38,4 +38,5 @@ class JrtMetrics { metric.add(metricName, countIncrement, null); } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 05c3b88b788..0c26d6eefd9 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -20,7 +20,6 @@ import java.util.TimerTask; * * @author bjorncs * @author vegardh - * */ public class MetricUpdater extends AbstractComponent { @@ -139,5 +138,6 @@ public class MetricUpdater extends AbstractComponent { void schedule(Runnable runnable, Duration frequency); void cancel(); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java index 7cd8e11c677..8af1f9860bf 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java @@ -8,6 +8,7 @@ import java.util.List; * @author mortent */ public interface SecretStore { + /** Returns the secret for this key */ String getSecret(String key); @@ -18,4 +19,5 @@ public interface SecretStore { default List<Integer> listSecretVersions(String key) { throw new UnsupportedOperationException("Secret store does not support listing versions"); } + } 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 ae65fc3ad68..709441999d0 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 @@ -57,7 +57,7 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { @Override protected com.yahoo.jdisc.Response newResponse() { com.yahoo.jdisc.Response response = new com.yahoo.jdisc.Response(statusToReturn); - response.headers().add("Content-Type", Arrays.asList(new String[]{"application/json"})); + response.headers().add("Content-Type", List.of("application/json")); return response; } }.connect(handler)); @@ -110,12 +110,10 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } private static JSONArray renderBindings(List<String> bindings) { - JSONArray ret = new JSONArray(); - + JSONArray array = new JSONArray(); for (String binding : bindings) - ret.put(binding); - - return ret; + array.put(binding); + return array; } private static JSONObject renderComponent(Object component, ComponentId id) { @@ -136,9 +134,9 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { try { Bundle bundle = FrameworkUtil.getBundle(component.getClass()); - String bundleName = bundle != null ? - bundle.getSymbolicName() + ":" + bundle.getVersion() : - "From classpath"; + String bundleName = bundle != null + ? bundle.getSymbolicName() + ":" + bundle.getVersion() + : "From classpath"; return new BundleInfo(component.getClass().getName(), bundleName); } catch (Exception | NoClassDefFoundError e) { return new BundleInfo("Unavailable, reconfiguration in progress.", ""); @@ -155,12 +153,15 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } static final class BundleInfo { + public final String className; public final String bundleName; + BundleInfo(String className, String bundleName) { this.className = className; this.bundleName = bundleName; } + } static final class StatusResponse { @@ -182,7 +183,8 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } - private class IgnoredContent implements ContentChannel { + private static class IgnoredContent implements ContentChannel { + @Override public void write(ByteBuffer buf, CompletionHandler handler) { handler.completed(); @@ -192,5 +194,7 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { public void close(CompletionHandler handler) { handler.completed(); } + } + } |