From 3314dddc5692bed5eb837b0739ac3bb5ed1962ab Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 17:12:00 +0200 Subject: [PATCH] Mechanical code cleanup (config) * Remove unnecessary type specifiers (use Java 7 <>) * Remove unnecessary "extends Object" declarations * Remove unnecessary semi-colons * Merge identical catch blocks * Remove redundant modifiers: - enum constructors are private by default - interface properties are public static final by default - interface methods are public abstract by default - interfaces are abstract by default - inner interfaces are static by default - inner classes in interfaces are public static by default Change-Id: Iefd8363a5eb120fdd43a4632b9e3db0e7e347dba Signed-off-by: Stephen Kitt --- .../controller/config/api/ConfigRegistry.java | 4 ++-- .../api/RuntimeBeanRegistratorAwareModule.java | 2 +- .../annotations/AbstractServiceInterface.java | 2 +- .../jmx/notifications/ConfigJMXNotification.java | 2 +- .../config/api/osgi/WaitingServiceTracker.java | 4 ++-- .../controller/config/spi/Module.java | 2 +- .../controller/config/spi/ModuleFactory.java | 8 ++++---- .../fromxml/AttributeReadingStrategy.java | 2 +- .../mapping/SimpleAttributeMappingStrategy.java | 2 +- .../ArrayAttributeResolvingStrategy.java | 3 ++- .../SimpleAttributeResolvingStrategy.java | 2 +- .../config/facade/xml/mapping/config/Config.java | 4 ++-- .../facade/xml/osgi/YangStoreActivator.java | 6 ++++-- .../config/facade/xml/osgi/YangStoreService.java | 2 +- .../DependencyResolverImpl.java | 2 +- .../impl/dynamicmbean/AnnotationsHelper.java | 2 +- .../impl/dynamicmbean/AttributeHolder.java | 2 +- .../impl/dynamicmbean/ReadOnlyAtomicBoolean.java | 2 +- .../impl/jmx/ServiceReferenceRegistrator.java | 16 ++++++++-------- .../osgi/BlankTransactionServiceTracker.java | 2 +- .../impl/osgi/ExtensibleBundleTracker.java | 2 +- .../config/manager/impl/AbstractConfigTest.java | 2 +- .../AbstractLockedPlatformMBeanServerTest.java | 2 +- .../manager/impl/ClassBasedModuleFactory.java | 2 +- .../impl/dynamicmbean/AnnotationsTest.java | 13 ++++++------- .../TestingParallelAPSPConfigMXBean.java | 2 +- .../TestingParallelAPSPModuleFactory.java | 2 +- .../test/MockedDependenciesTest.java | 4 ++-- ...stingScheduledThreadPoolConfigBeanMXBean.java | 6 +++--- .../TestingScheduledThreadPoolModuleFactory.java | 2 +- .../TestingThreadPoolServiceInterface.java | 2 +- .../TestingFixedThreadPoolConfigMXBean.java | 6 +++--- .../TestingFixedThreadPoolModuleFactory.java | 2 +- .../TestingThreadPoolConfigMXBean.java | 2 +- .../config/persist/api/ConfigPusher.java | 2 +- .../ConfigPusherFeatureActivator.java | 2 +- .../internal/ChildAwareFeatureWrapper.java | 4 ++-- .../internal/ConfigFeaturesListener.java | 2 +- .../internal/ConfigPusherCustomizer.java | 2 +- .../internal/ConfigPushingRunnable.java | 2 +- .../internal/FeatureConfigPusher.java | 6 +++--- .../internal/FeatureConfigSnapshotHolder.java | 2 +- .../config/persist/impl/ConfigPusherImpl.java | 1 - .../config/util/capability/Capability.java | 12 ++++++------ .../util/TestingConfigTransactionController.java | 4 ++-- .../yang/logback/config/ContextSetter.java | 2 +- .../AutoCloseableEventExecutor.java | 2 +- .../threadgroup/NettyThreadgroupModule.java | 2 +- .../yang/netty/timer/HashedWheelTimerModule.java | 2 +- .../config/threadpool/ScheduledThreadPool.java | 2 +- .../controller/config/threadpool/ThreadPool.java | 4 ++-- .../util/FlexibleThreadPoolWrapper.java | 2 +- .../ModuleMXBeanEntryNameConflictTest.java | 2 +- .../yangjmxgenerator/ModuleMXBeanEntryTest.java | 6 +++--- .../yangjmxgenerator/RuntimeBeanEntryTest.java | 2 +- 55 files changed, 93 insertions(+), 92 deletions(-) diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java index 96fa1ae0c6..275858cbed 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConfigRegistry.java @@ -23,8 +23,8 @@ public interface ConfigRegistry extends LookupRegistry, ServiceReferenceReadable * Only well-known ObjectName in configuration system, under which * ConfigRegisry is registered. */ - public static final ObjectName OBJECT_NAME = ConfigRegistryConstants.OBJECT_NAME; - public static final ObjectName OBJECT_NAME_NO_NOTIFICATIONS = ConfigRegistryConstants.OBJECT_NAME_NO_NOTIFICATIONS; + ObjectName OBJECT_NAME = ConfigRegistryConstants.OBJECT_NAME; + ObjectName OBJECT_NAME_NO_NOTIFICATIONS = ConfigRegistryConstants.OBJECT_NAME_NO_NOTIFICATIONS; /** * Opens new configuration transaction. diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/RuntimeBeanRegistratorAwareModule.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/RuntimeBeanRegistratorAwareModule.java index 2e6e0f34e6..41673bce72 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/RuntimeBeanRegistratorAwareModule.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/RuntimeBeanRegistratorAwareModule.java @@ -23,7 +23,7 @@ public interface RuntimeBeanRegistratorAwareModule extends Module { * * @param rootRuntimeBeanRegistrator */ - public void setRuntimeBeanRegistrator( + void setRuntimeBeanRegistrator( RootRuntimeBeanRegistrator rootRuntimeBeanRegistrator); } diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/annotations/AbstractServiceInterface.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/annotations/AbstractServiceInterface.java index 261c5f5841..0b1d7872fc 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/annotations/AbstractServiceInterface.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/annotations/AbstractServiceInterface.java @@ -13,5 +13,5 @@ package org.opendaylight.controller.config.api.annotations; * one SI can extend another one, in which case all annotations in hierarchy * will be observed. */ -public abstract interface AbstractServiceInterface { +public interface AbstractServiceInterface { } diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java index 0d9e549720..13efafb79d 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java @@ -58,7 +58,7 @@ public abstract class ConfigJMXNotification extends Notification { } enum NotificationType { - COMMIT; + COMMIT } } diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java index 1549e6b26a..d6abc64dda 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java @@ -66,7 +66,7 @@ public final class WaitingServiceTracker implements AutoCloseable { public static WaitingServiceTracker create(@Nonnull Class serviceInterface, @Nonnull BundleContext context) { ServiceTracker tracker = new ServiceTracker<>(context, serviceInterface, null); tracker.open(); - return new WaitingServiceTracker(serviceInterface, tracker); + return new WaitingServiceTracker<>(serviceInterface, tracker); } /** @@ -83,7 +83,7 @@ public final class WaitingServiceTracker implements AutoCloseable { try { ServiceTracker tracker = new ServiceTracker<>(context, context.createFilter(newFilter), null); tracker.open(); - return new WaitingServiceTracker(serviceInterface, tracker); + return new WaitingServiceTracker<>(serviceInterface, tracker); } catch(InvalidSyntaxException e) { throw new IllegalArgumentException(String.format("Invalid OSGi filter %s", newFilter), e); } diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java index 53f03a2398..4766ad8a47 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java @@ -64,7 +64,7 @@ public interface Module extends Identifiable{ * @param oldModule old instance of Module * @return true if the instance produced by oldModule can be reused with current instance as well. */ - public boolean canReuse(Module oldModule); + boolean canReuse(Module oldModule); } diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java index e28608a198..9926363265 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/ModuleFactory.java @@ -32,7 +32,7 @@ public interface ModuleFactory { * * @return human-friendly implementation name */ - public String getImplementationName(); + String getImplementationName(); /** * Create a new Module instance. The returned object is expected to use the @@ -49,7 +49,7 @@ public interface ModuleFactory { * @return newly created module * */ - public Module createModule(String instanceName, + Module createModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext); /** @@ -90,7 +90,7 @@ public interface ModuleFactory { * leaves server in a running state but no configuration * transaction can be created. */ - public Module createModule(String instanceName, DependencyResolver dependencyResolver, + Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old, BundleContext bundleContext) throws Exception; boolean isModuleImplementingServiceInterface( @@ -112,7 +112,7 @@ public interface ModuleFactory { * * @return set of default modules. Null is not allowed. */ - public Set getDefaultModules(DependencyResolverFactory dependencyResolverFactory, + Set getDefaultModules(DependencyResolverFactory dependencyResolverFactory, BundleContext bundleContext); } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/AttributeReadingStrategy.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/AttributeReadingStrategy.java index 368f3dc505..eeb538bd5f 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/AttributeReadingStrategy.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/fromxml/AttributeReadingStrategy.java @@ -14,6 +14,6 @@ import org.opendaylight.controller.config.util.xml.XmlElement; public interface AttributeReadingStrategy { - public abstract AttributeConfigElement readElement(List element) throws DocumentedException; + AttributeConfigElement readElement(List element) throws DocumentedException; } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/mapping/SimpleAttributeMappingStrategy.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/mapping/SimpleAttributeMappingStrategy.java index 9acc4dd1f6..5b9c2a2b2f 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/mapping/SimpleAttributeMappingStrategy.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/mapping/SimpleAttributeMappingStrategy.java @@ -48,7 +48,7 @@ public class SimpleAttributeMappingStrategy extends AbstractAttributeMappingStra /** * Custom writer plugins must implement this interface. */ - static interface WriterPlugin { + interface WriterPlugin { String writeObject(Object value); } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/ArrayAttributeResolvingStrategy.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/ArrayAttributeResolvingStrategy.java index 021e065e7e..73b9dd9cbc 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/ArrayAttributeResolvingStrategy.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/ArrayAttributeResolvingStrategy.java @@ -77,7 +77,8 @@ final class ArrayAttributeResolvingStrategy extends AbstractAttributeResolvingSt // Rebuild open type. Underlying composite types might have changed if (innerTypeResolvingStrategy.getOpenType() instanceof CompositeType) { try { - final ArrayType openType = new ArrayType(getOpenType().getDimension(), innerTypeResolvingStrategy.getOpenType()); + final ArrayType openType = + new ArrayType<>(getOpenType().getDimension(), innerTypeResolvingStrategy.getOpenType()); setOpenType(openType); } catch (OpenDataException e) { throw new IllegalStateException("An error occurred during restoration of array type " + this diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/SimpleAttributeResolvingStrategy.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/SimpleAttributeResolvingStrategy.java index 38f58ea9a1..6c53b80872 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/SimpleAttributeResolvingStrategy.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/attributes/resolving/SimpleAttributeResolvingStrategy.java @@ -71,7 +71,7 @@ final class SimpleAttributeResolvingStrategy extends AbstractAttributeResolvingS resolverPlugins.put(BigDecimal.class.getCanonicalName(), new BigDecimalResolver()); } - static interface Resolver { + interface Resolver { Object resolveObject(Class type, String attrName, String value) throws DocumentedException; } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java index 9bee7a1085..30726db82e 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java @@ -293,7 +293,7 @@ public class Config { } private interface ResolvingStrategy { - public T resolveElement(ModuleConfig moduleMapping, XmlElement moduleElement, ServiceRegistryWrapper serviceTracker, - String instanceName, String moduleNamespace, EditStrategyType defaultStrategy) throws DocumentedException; + T resolveElement(ModuleConfig moduleMapping, XmlElement moduleElement, ServiceRegistryWrapper serviceTracker, + String instanceName, String moduleNamespace, EditStrategyType defaultStrategy) throws DocumentedException; } } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreActivator.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreActivator.java index 32e064a27a..4c5674a57a 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreActivator.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreActivator.java @@ -81,7 +81,8 @@ public class YangStoreActivator implements BundleActivator { yangStoreService.refresh(runtimeContext); } - yangStoreServiceServiceRegistration = context.registerService(YangStoreService.class, yangStoreService, new Hashtable()); + yangStoreServiceServiceRegistration = context.registerService(YangStoreService.class, yangStoreService, + new Hashtable<>()); configRegistryLookup = new ConfigRegistryLookupThread(yangStoreService); configRegistryLookup.start(); return yangStoreService; @@ -186,7 +187,8 @@ public class YangStoreActivator implements BundleActivator { final ConfigSubsystemFacadeFactory configSubsystemFacade = new ConfigSubsystemFacadeFactory(jmxClient, jmxClientNoNotifications, yangStoreService); - osgiRegistrayion = context.registerService(ConfigSubsystemFacadeFactory.class, configSubsystemFacade, new Hashtable()); + osgiRegistrayion = context.registerService(ConfigSubsystemFacadeFactory.class, configSubsystemFacade, + new Hashtable<>()); } } } diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreService.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreService.java index 969b1296d1..f89d26b0cd 100644 --- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreService.java +++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/osgi/YangStoreService.java @@ -43,7 +43,7 @@ public class YangStoreService implements YangStoreContext { * of the listener set. */ @GuardedBy("listeners") - private final Set listeners = new HashSet(); + private final Set listeners = new HashSet<>(); /** * This is the latest snapshot. Some of its state is always initialized, but the MXBean maps potentially cause diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java index 8948c56e9b..10128a2f55 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java @@ -257,7 +257,7 @@ final class DependencyResolverImpl implements DependencyResolver, transactionStatus.checkCommitStarted(); if (maxDependencyDepth == null) { maxDependencyDepth = getMaxDepth(this, manager, - new LinkedHashSet()); + new LinkedHashSet<>()); } } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java index fba9844dbf..7fa70ca10a 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java @@ -78,7 +78,7 @@ public class AnnotationsHelper { */ static List findClassAnnotationInSuperClassesAndIfcs( final Class clazz, final Class annotationType, final Set> interfaces) { - List result = new ArrayList(); + List result = new ArrayList<>(); Class declaringClass = clazz; do { T annotation = declaringClass.getAnnotation(annotationType); diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AttributeHolder.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AttributeHolder.java index 35ba29ed17..8618456cf8 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AttributeHolder.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AttributeHolder.java @@ -131,7 +131,7 @@ class AttributeHolder { .findMethodAnnotationInSuperClassesAndIfcs(setter, RequireInterface.class, inspectedInterfaces); // make sure the list if not empty contains always annotation with same // value - Set> foundValues = new HashSet>(); + Set> foundValues = new HashSet<>(); for (RequireInterface ri : foundRequireInterfaces) { foundValues.add(ri.value()); } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/ReadOnlyAtomicBoolean.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/ReadOnlyAtomicBoolean.java index deccde0f24..583e8b46e8 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/ReadOnlyAtomicBoolean.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/ReadOnlyAtomicBoolean.java @@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public interface ReadOnlyAtomicBoolean { boolean get(); - public static class ReadOnlyAtomicBooleanImpl implements + class ReadOnlyAtomicBooleanImpl implements ReadOnlyAtomicBoolean { private final AtomicBoolean atomicBoolean; diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java index f1ceb7e227..eafe760ddc 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java @@ -13,7 +13,7 @@ import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; public interface ServiceReferenceRegistrator extends AutoCloseable { - public String getNullableTransactionName(); + String getNullableTransactionName(); ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object, ObjectName on) throws InstanceAlreadyExistsException; @@ -21,7 +21,7 @@ public interface ServiceReferenceRegistrator extends AutoCloseable { @Override void close(); - public static class ServiceReferenceJMXRegistration implements AutoCloseable { + class ServiceReferenceJMXRegistration implements AutoCloseable { private final InternalJMXRegistration registration; ServiceReferenceJMXRegistration(InternalJMXRegistration registration) { @@ -34,11 +34,11 @@ public interface ServiceReferenceRegistrator extends AutoCloseable { } } - public static interface ServiceReferenceTransactionRegistratorFactory { - public ServiceReferenceRegistrator create(); + interface ServiceReferenceTransactionRegistratorFactory { + ServiceReferenceRegistrator create(); } - public static class ServiceReferenceRegistratorImpl implements ServiceReferenceRegistrator { + class ServiceReferenceRegistratorImpl implements ServiceReferenceRegistrator { private final InternalJMXRegistrator currentJMXRegistrator; private final String nullableTransactionName; @@ -73,13 +73,13 @@ public interface ServiceReferenceRegistrator extends AutoCloseable { public void close() { currentJMXRegistrator.close(); } - public static interface ServiceReferenceTransactionRegistratorFactory { - public ServiceReferenceRegistrator create(); + public interface ServiceReferenceTransactionRegistratorFactory { + ServiceReferenceRegistrator create(); } } - public static class ServiceReferenceTransactionRegistratorFactoryImpl implements ServiceReferenceTransactionRegistratorFactory { + class ServiceReferenceTransactionRegistratorFactoryImpl implements ServiceReferenceTransactionRegistratorFactory { private final NestableJMXRegistrator parentRegistrator; private final String nullableTransactionName; diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java index fa46cae516..6c7f38b87d 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java @@ -108,7 +108,7 @@ public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer< } @VisibleForTesting - static interface BlankTransaction { + interface BlankTransaction { CommitStatus hit() throws ValidationException, ConflictingVersionException; } } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java index 31bd5fa25e..a0d9122ac6 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java @@ -132,7 +132,7 @@ public final class ExtensibleBundleTracker extends BundleTracker> { } } - private static interface BundleStrategy { + private interface BundleStrategy { void execute(BundleTrackerCustomizer tracker); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java index 38ff0d9f87..d65133c783 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java @@ -203,7 +203,7 @@ public abstract class AbstractConfigTest extends AbstractLockedPlatformMBeanServ return mock(BindingRuntimeContext.class); } - public static interface BundleContextServiceRegistrationHandler { + public interface BundleContextServiceRegistrationHandler { void handleServiceRegistration(Class clazz, Object serviceInstance, Dictionary props); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractLockedPlatformMBeanServerTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractLockedPlatformMBeanServerTest.java index 4c896e7e83..fbb3d555cc 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractLockedPlatformMBeanServerTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractLockedPlatformMBeanServerTest.java @@ -35,7 +35,7 @@ public abstract class AbstractLockedPlatformMBeanServerTest { } - public static interface SimpleBeanMBean { + public interface SimpleBeanMBean { } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ClassBasedModuleFactory.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ClassBasedModuleFactory.java index 3c237d37f0..170878a6ed 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ClassBasedModuleFactory.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ClassBasedModuleFactory.java @@ -105,7 +105,7 @@ public class ClassBasedModuleFactory implements ModuleFactory { @Override public Set getDefaultModules(DependencyResolverFactory dependencyResolverFactory, BundleContext bundleContext) { - return new HashSet(); + return new HashSet<>(); } @Override diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java index 853f8c090d..029b347cca 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java @@ -96,7 +96,7 @@ public class AnnotationsTest { @ServiceInterfaceAnnotation(value = SIMPLE, osgiRegistrationType = Executor.class, namespace = "ns", revision = "rev", localName = SIMPLE) - static interface SimpleSI extends AbstractServiceInterface { + interface SimpleSI extends AbstractServiceInterface { } @@ -155,14 +155,13 @@ public class AnnotationsTest { emptySetOfInterfaces(), "class"); } - static interface SubSI extends SimpleSI { + interface SubSI extends SimpleSI { } @ServiceInterfaceAnnotation(value = SUBCLASS2, osgiRegistrationType = ExecutorService.class, namespace = "ns", revision = "rev", localName = SUBCLASS2) - - static interface SubSI2 extends SubSI { + interface SubSI2 extends SubSI { } @@ -192,7 +191,7 @@ public class AnnotationsTest { } } - public static interface HasSomeMethod { + public interface HasSomeMethod { void setSomething(ObjectName objectName); } @@ -245,7 +244,7 @@ public class AnnotationsTest { } @Description("class") - static interface HasSomeMethodWithAnnotations { + interface HasSomeMethodWithAnnotations { @RequireInterface(SubSI2.class) @Description("descr") @@ -273,7 +272,7 @@ public class AnnotationsTest { assertDescriptionOnClass( HasSomeMethodWithAnnotationsImpl.class, - new HashSet>(Arrays + new HashSet<>(Arrays .asList(HasSomeMethodWithAnnotations.class)), "class"); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPConfigMXBean.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPConfigMXBean.java index d838e7b93e..68f6102987 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPConfigMXBean.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPConfigMXBean.java @@ -14,7 +14,7 @@ import org.opendaylight.controller.config.api.annotations.ServiceInterfaceAnnota namespace = "namespace", revision = "rev", localName = TestingParallelAPSPConfigMXBean.NAME) public interface TestingParallelAPSPConfigMXBean { - static final String NAME = "apsp"; + String NAME = "apsp"; ObjectName getThreadPool(); diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModuleFactory.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModuleFactory.java index 89b70e3e7a..b08cdcb20d 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModuleFactory.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModuleFactory.java @@ -67,7 +67,7 @@ public class TestingParallelAPSPModuleFactory implements ModuleFactory { @Override public Set getDefaultModules(DependencyResolverFactory dependencyResolverFactory, BundleContext context) { - return new HashSet(); + return new HashSet<>(); } @Override diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java index 95de90d3af..6d151c4788 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java @@ -39,9 +39,9 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest { mockedThreadPoolConfigFactory)); } - public static interface MockedTestingThreadPoolConfigMXBean extends + public interface MockedTestingThreadPoolConfigMXBean extends TestingThreadPoolConfigMXBean { - public void setThreadCount(int threadCount); + void setThreadCount(int threadCount); } public static class MockedThreadPoolModule implements Module, diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolConfigBeanMXBean.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolConfigBeanMXBean.java index 6ccb2418f0..e2610d9773 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolConfigBeanMXBean.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolConfigBeanMXBean.java @@ -12,10 +12,10 @@ import org.opendaylight.controller.config.manager.testingservices.threadpool.Tes public interface TestingScheduledThreadPoolConfigBeanMXBean extends TestingThreadPoolConfigMXBean { - public boolean isRecreate(); + boolean isRecreate(); - public void setRecreate(boolean recreate); + void setRecreate(boolean recreate); - public void setThreadCount(int threadCount); + void setThreadCount(int threadCount); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModuleFactory.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModuleFactory.java index d34e73ec47..295d348503 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModuleFactory.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModuleFactory.java @@ -67,7 +67,7 @@ public class TestingScheduledThreadPoolModuleFactory implements ModuleFactory { @Override public Set getDefaultModules(final DependencyResolverFactory dependencyResolverFactory, final BundleContext bundleContext) { - return new HashSet(); + return new HashSet<>(); } @Override diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/seviceinterface/TestingThreadPoolServiceInterface.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/seviceinterface/TestingThreadPoolServiceInterface.java index 0a886e5fb0..2d99b25e0a 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/seviceinterface/TestingThreadPoolServiceInterface.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/seviceinterface/TestingThreadPoolServiceInterface.java @@ -15,5 +15,5 @@ import org.opendaylight.controller.config.manager.testingservices.threadpool.Tes namespace = "ns", revision = "foo", localName = "testing-threadpool") public interface TestingThreadPoolServiceInterface extends AbstractServiceInterface { - public static final String QNAME = "(ns?revision=foo)testing-threadpool"; + String QNAME = "(ns?revision=foo)testing-threadpool"; } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolConfigMXBean.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolConfigMXBean.java index 115eb83b7f..34f24c6802 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolConfigMXBean.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolConfigMXBean.java @@ -10,10 +10,10 @@ package org.opendaylight.controller.config.manager.testingservices.threadpool; public interface TestingFixedThreadPoolConfigMXBean extends TestingThreadPoolConfigMXBean { - public void setThreadCount(int threadCount); + void setThreadCount(int threadCount); - public boolean isTriggerNewInstanceCreation(); + boolean isTriggerNewInstanceCreation(); - public void setTriggerNewInstanceCreation(boolean boolTest); + void setTriggerNewInstanceCreation(boolean boolTest); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModuleFactory.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModuleFactory.java index d385a7db5a..2fef47eb10 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModuleFactory.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModuleFactory.java @@ -69,7 +69,7 @@ public class TestingFixedThreadPoolModuleFactory extends AbstractTestingFixedThr @Override public Set getDefaultModules(final DependencyResolverFactory dependencyResolverFactory, final BundleContext bundleContext) { - return new HashSet(); + return new HashSet<>(); } @Override diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingThreadPoolConfigMXBean.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingThreadPoolConfigMXBean.java index 792a66676f..b537ad2080 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingThreadPoolConfigMXBean.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingThreadPoolConfigMXBean.java @@ -9,5 +9,5 @@ package org.opendaylight.controller.config.manager.testingservices.threadpool; public interface TestingThreadPoolConfigMXBean { - public int getThreadCount(); + int getThreadCount(); } diff --git a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java index 2dade8a82b..106ab6b9f6 100644 --- a/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java +++ b/opendaylight/config/config-persister-api/src/main/java/org/opendaylight/controller/config/persist/api/ConfigPusher.java @@ -17,5 +17,5 @@ public interface ConfigPusher { * Pushes configs into the config subsystem */ - public void pushConfigs(List configs) throws InterruptedException; + void pushConfigs(List configs) throws InterruptedException; } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java index ea99579f16..0b4f6f7781 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java @@ -22,7 +22,7 @@ public class ConfigPusherFeatureActivator implements BundleActivator { public void start(BundleContext context) throws Exception { bc = context; cpc = new ConfigPusherCustomizer(); - cpst = new ServiceTracker(bc, ConfigPusher.class.getName(), cpc); + cpst = new ServiceTracker<>(bc, ConfigPusher.class.getName(), cpc); cpst.open(); } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java index 7da9b9f9a3..672784a54b 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java @@ -54,7 +54,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements */ public LinkedHashSet getChildFeatures() throws Exception { List dependencies = feature.getDependencies(); - LinkedHashSet childFeatures = new LinkedHashSet(); + LinkedHashSet childFeatures = new LinkedHashSet<>(); if(dependencies != null) { for(Dependency dependency: dependencies) { Feature fi = extractFeatureFromDependency(dependency); @@ -73,7 +73,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements @Override public LinkedHashSet getFeatureConfigSnapshotHolders() throws Exception { - LinkedHashSet snapShotHolders = new LinkedHashSet(); + LinkedHashSet snapShotHolders = new LinkedHashSet<>(); for(ChildAwareFeatureWrapper c: getChildFeatures()) { for(FeatureConfigSnapshotHolder h: c.getFeatureConfigSnapshotHolders()) { final Optional featureConfigSnapshotHolder = getFeatureConfigSnapshotHolder(h.getFileInfo()); diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java index 72abca1c99..3297ba4939 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; public class ConfigFeaturesListener implements FeaturesListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(ConfigFeaturesListener.class); private static final int QUEUE_SIZE = 1000; - private BlockingQueue queue = new LinkedBlockingQueue(QUEUE_SIZE); + private BlockingQueue queue = new LinkedBlockingQueue<>(QUEUE_SIZE); Thread pushingThread = null; public ConfigFeaturesListener(ConfigPusher p, FeaturesService f) { diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java index 52bca76555..420e8d7a35 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java @@ -28,7 +28,7 @@ public class ConfigPusherCustomizer implements ServiceTrackerCustomizer(bc, FeaturesService.class.getName(), featureServiceCustomizer); + fsst = new ServiceTracker<>(bc, FeaturesService.class.getName(), featureServiceCustomizer); fsst.open(); return cpService; } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java index a32a0ac28f..e94d6155c9 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java @@ -32,7 +32,7 @@ public class ConfigPushingRunnable implements Runnable { @Override public void run() { - List toInstall = new ArrayList(); + List toInstall = new ArrayList<>(); FeatureEvent event = null; boolean interuppted = false; while(true) { diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java index 0d30545641..f11da079c6 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java @@ -36,7 +36,7 @@ public class FeatureConfigPusher { * chains. Also, preserves the *original* Feature chain for which we pushed the config. * (which is handy for logging). */ - LinkedHashSet pushedConfigs = new LinkedHashSet(); + LinkedHashSet pushedConfigs = new LinkedHashSet<>(); /* * LinkedHashMultimap to track which configs we pushed for each Feature installation * For future use @@ -118,7 +118,7 @@ public class FeatureConfigPusher { } private LinkedHashSet pushConfig(final LinkedHashSet configs, final Feature feature) throws InterruptedException { - LinkedHashSet configsToPush = new LinkedHashSet(configs); + LinkedHashSet configsToPush = new LinkedHashSet<>(configs); configsToPush.removeAll(pushedConfigs); if (!configsToPush.isEmpty()) { @@ -134,7 +134,7 @@ public class FeatureConfigPusher { pushedConfigs.addAll(configsToPush); } - LinkedHashSet configsPushed = new LinkedHashSet(pushedConfigs); + LinkedHashSet configsPushed = new LinkedHashSet<>(pushedConfigs); configsPushed.retainAll(configs); return configsPushed; } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java index 15c14daea5..135211727a 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java @@ -40,7 +40,7 @@ import org.opendaylight.controller.config.persist.storage.file.xml.model.ConfigS public class FeatureConfigSnapshotHolder implements ConfigSnapshotHolder { private ConfigSnapshot unmarshalled = null; private ConfigFileInfo fileInfo = null; - private List featureChain = new ArrayList(); + private List featureChain = new ArrayList<>(); /* * @param holder - FeatureConfigSnapshotHolder that we diff --git a/opendaylight/config/config-persister-impl/src/main/java/org/opendaylight/controller/config/persist/impl/ConfigPusherImpl.java b/opendaylight/config/config-persister-impl/src/main/java/org/opendaylight/controller/config/persist/impl/ConfigPusherImpl.java index 90f71ca51a..d93bd7daf5 100644 --- a/opendaylight/config/config-persister-impl/src/main/java/org/opendaylight/controller/config/persist/impl/ConfigPusherImpl.java +++ b/opendaylight/config/config-persister-impl/src/main/java/org/opendaylight/controller/config/persist/impl/ConfigPusherImpl.java @@ -72,7 +72,6 @@ public class ConfigPusherImpl implements ConfigPusher { public void process(List autoCloseables, MBeanServerConnection platformMBeanServer, Persister persisterAggregator, boolean propagateExceptions) throws InterruptedException { while(processSingle(autoCloseables, platformMBeanServer, persisterAggregator, propagateExceptions)) { - ; } } diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/Capability.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/Capability.java index f9288abe2a..28134617f0 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/Capability.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/Capability.java @@ -18,15 +18,15 @@ import java.util.Collection; // TODO this should be placed into API bundle for netconf public interface Capability { - public String getCapabilityUri(); + String getCapabilityUri(); - public Optional getModuleNamespace(); + Optional getModuleNamespace(); - public Optional getModuleName(); + Optional getModuleName(); - public Optional getRevision(); + Optional getRevision(); - public Optional getCapabilitySchema(); + Optional getCapabilitySchema(); - public Collection getLocation(); + Collection getLocation(); } diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java index 73ab6dad7b..d3b8add96d 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/TestingConfigTransactionController.java @@ -49,8 +49,8 @@ public class TestingConfigTransactionController implements + ":type=Module," + ObjectNameUtil.MODULE_FACTORY_NAME_KEY + "=" + moduleName2 + "," + ObjectNameUtil.INSTANCE_NAME_KEY + "=" + instName2); - mapSub = new HashMap(); - map = new HashMap>(); + mapSub = new HashMap<>(); + map = new HashMap<>(); } @Override diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetter.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetter.java index 4c83668ab6..8caa647cbb 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetter.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetter.java @@ -12,6 +12,6 @@ package org.opendaylight.controller.config.yang.logback.config; */ public interface ContextSetter { - public void updateContext(LogbackModule module); + void updateContext(LogbackModule module); } diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java index 99d94d08e3..b77126b16d 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java +++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/AutoCloseableEventExecutor.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; public interface AutoCloseableEventExecutor extends EventExecutor, AutoCloseable { - public static class CloseableEventExecutorMixin implements AutoCloseable { + class CloseableEventExecutorMixin implements AutoCloseable { public static final int DEFAULT_SHUTDOWN_SECONDS = 1; private final EventExecutor eventExecutor; diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java index fa11652850..2ae57156b4 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java +++ b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java @@ -74,6 +74,6 @@ public final class NettyThreadgroupModule extends org.opendaylight.controller.co this.bundleContext = bundleContext; } - private static interface AutoCloseableEventLoopGroupInterface extends EventLoopGroup, AutoCloseable { + private interface AutoCloseableEventLoopGroupInterface extends EventLoopGroup, AutoCloseable { } } diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java index d1d55405a9..579806f804 100644 --- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java +++ b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java @@ -81,6 +81,6 @@ public final class HashedWheelTimerModule extends this.bundleContext = bundleContext; } - private static interface AutoCloseableTimerInterface extends Timer, AutoCloseable { + private interface AutoCloseableTimerInterface extends Timer, AutoCloseable { } } diff --git a/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ScheduledThreadPool.java b/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ScheduledThreadPool.java index bf6c016d35..79ed26b2d2 100644 --- a/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ScheduledThreadPool.java +++ b/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ScheduledThreadPool.java @@ -16,5 +16,5 @@ import java.util.concurrent.ScheduledExecutorService; public interface ScheduledThreadPool extends ThreadPool { @Override - public ScheduledExecutorService getExecutor(); + ScheduledExecutorService getExecutor(); } \ No newline at end of file diff --git a/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ThreadPool.java b/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ThreadPool.java index 701b0bcdf8..68ecb80fe3 100644 --- a/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ThreadPool.java +++ b/opendaylight/config/threadpool-config-api/src/main/java/org/opendaylight/controller/config/threadpool/ThreadPool.java @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutorService; */ public interface ThreadPool { - public ExecutorService getExecutor(); + ExecutorService getExecutor(); - public int getMaxThreadCount(); + int getMaxThreadCount(); } \ No newline at end of file diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java index d013a0a4b8..f416ed665c 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FlexibleThreadPoolWrapper.java @@ -54,7 +54,7 @@ public class FlexibleThreadPoolWrapper implements ThreadPool, Closeable { * This impl saturates threadpool first, then queue. When both are full caller will get blocked. */ private static ForwardingBlockingQueue getQueue(Optional capacity) { - final BlockingQueue delegate = capacity.isPresent() ? new LinkedBlockingQueue(capacity.get()) : new LinkedBlockingQueue(); + final BlockingQueue delegate = capacity.isPresent() ? new LinkedBlockingQueue<>(capacity.get()) : new LinkedBlockingQueue<>(); return new ForwardingBlockingQueue(delegate); } diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java index ed4437df0e..e7f1025c4d 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java @@ -54,7 +54,7 @@ public class ModuleMXBeanEntryNameConflictTest extends AbstractYangTest { try { LOG.debug("Testing {}", yangFile); ModuleMXBeanEntry.create(testedModule, - new HashMap(), context, + new HashMap<>(), context, new TypeProviderWrapper(new TypeProviderImpl(context)), PACKAGE_NAME); fail(yangFile.toString() diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java index 50f38e3978..06819737ab 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java @@ -273,18 +273,18 @@ public class ModuleMXBeanEntryTest extends AbstractYangTest { assertThat(toAttr.getLowerCaseCammelCase(), is("peer")); assertThat(toAttr.getUpperCaseCammelCase(), is("Peer")); assertThat(toAttr.getOpenType(), isA(CompositeType.class)); - Set propsExpected = new HashSet(2); + Set propsExpected = new HashSet<>(2); propsExpected.add("port"); propsExpected.add("core-size"); assertThat(toAttr.getYangPropertiesToTypesMap().keySet(), is(propsExpected)); - propsExpected = new HashSet(2); + propsExpected = new HashSet<>(2); propsExpected.add("Port"); propsExpected.add("CoreSize"); assertThat( toAttr.getCapitalizedPropertiesToTypesMap().keySet(), is(propsExpected)); - propsExpected = new HashSet(2); + propsExpected = new HashSet<>(2); propsExpected.add("port"); propsExpected.add("coreSize"); assertThat(toAttr.getJmxPropertiesToTypesMap().keySet(), diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java index 98b1f752af..dcb9089bb8 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java @@ -103,7 +103,7 @@ public class RuntimeBeanEntryTest extends AbstractYangTest { assertEquals(THREAD_RUNTIME_BEAN_YANG_NAME, runtimeBeanEntry.getYangName()); // get thread runtime bean rpcs - List rpcs = new ArrayList( + List rpcs = new ArrayList<>( runtimeBeanEntry.getRpcs()); assertEquals(2, rpcs.size()); -- 2.36.6