From dea3effede98cfb561c44d66b24c2d71a44b10a3 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 17:28:27 +0200 Subject: [PATCH] Mechanical code cleanup (sal-distributed-datastore) * 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: I3eb023d9f5b34ce83e69c746efd1ff464bfd6789 Signed-off-by: Stephen Kitt --- .../cluster/databroker/DOMBrokerTransactionChain.java | 2 +- .../cluster/databroker/actors/dds/AbstractClientHistory.java | 2 +- .../databroker/actors/dds/ModuleShardBackendResolver.java | 2 +- .../datastore/DatastoreContextConfigAdminOverlay.java | 2 +- .../controller/cluster/datastore/DistributedDataStore.java | 5 +++-- .../controller/cluster/datastore/TransactionProxy.java | 2 +- .../cluster/datastore/TransactionRateLimitingCallback.java | 2 +- .../datastore/entityownership/EntityOwnershipShard.java | 2 +- .../cluster/datastore/shardmanager/ShardManager.java | 4 ++-- .../controller/cluster/datastore/utils/Dispatchers.java | 4 ++-- .../cluster/datastore/utils/SerializationUtils.java | 2 +- .../cluster/databroker/ConcurrentDOMDataBrokerTest.java | 2 +- .../cluster/datastore/DatastoreContextIntrospectorTest.java | 2 +- .../controller/cluster/datastore/MemberNode.java | 2 +- .../controller/cluster/datastore/MockIdentifiers.java | 2 +- .../controller/cluster/datastore/ShardDataTreeTest.java | 2 +- .../controller/cluster/datastore/TransactionProxyTest.java | 4 ++-- .../entityownership/EntityOwnerChangeListenerTest.java | 1 - .../cluster/datastore/shardmanager/ShardManagerTest.java | 4 ++-- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java index 9610647fff..aef9f0d47f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; final class DOMBrokerTransactionChain extends AbstractDOMTransactionFactory implements DOMTransactionChain { - private static enum State { + private enum State { RUNNING, CLOSING, CLOSED, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistory.java index 7608556e6e..593944f081 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractClientHistory.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; * @author Robert Varga */ abstract class AbstractClientHistory extends LocalAbortable implements Identifiable { - static enum State { + enum State { IDLE, TX_OPEN, CLOSED, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java index 249cd4524d..495681cfdf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java @@ -112,7 +112,7 @@ final class ModuleShardBackendResolver extends BackendInfoResolver ret = new CompletableFuture(); + final CompletableFuture ret = new CompletableFuture<>(); FutureConverters.toJava(actorContext.findPrimaryShardAsync(shardName)).thenCompose(info -> { LOG.debug("Looking up primary info for {} from {}", shardName, info); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextConfigAdminOverlay.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextConfigAdminOverlay.java index 448e810641..fcd72fa74f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextConfigAdminOverlay.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextConfigAdminOverlay.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; public class DatastoreContextConfigAdminOverlay implements AutoCloseable { public static final String CONFIG_ID = "org.opendaylight.controller.cluster.datastore"; - public static interface Listener { + public interface Listener { void onDatastoreContextUpdated(DatastoreContextFactory contextFactory); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java index a925e93566..e4d17ac976 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java @@ -174,7 +174,7 @@ public class DistributedDataStore implements DistributedDataStoreInterface, Sche LOG.debug("Registering tree listener: {} for tree: {} shard: {}", listener, treeId, shardName); final DataTreeChangeListenerProxy listenerRegistrationProxy = - new DataTreeChangeListenerProxy(actorContext, listener); + new DataTreeChangeListenerProxy<>(actorContext, listener); listenerRegistrationProxy.init(shardName, treeId); return listenerRegistrationProxy; @@ -192,7 +192,8 @@ public class DistributedDataStore implements DistributedDataStoreInterface, Sche final String shardName = actorContext.getShardStrategyFactory().getStrategy(treeId).findShard(treeId); LOG.debug("Registering cohort: {} for tree: {} shard: {}", cohort, treeId, shardName); - DataTreeCohortRegistrationProxy cohortProxy = new DataTreeCohortRegistrationProxy(actorContext, subtree, cohort); + DataTreeCohortRegistrationProxy cohortProxy = + new DataTreeCohortRegistrationProxy<>(actorContext, subtree, cohort); cohortProxy.init(shardName); return cohortProxy; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java index 191cb2ef1e..164dc5ef73 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java @@ -51,7 +51,7 @@ import scala.concurrent.Promise; * A transaction potentially spanning multiple backend shards. */ public class TransactionProxy extends AbstractDOMStoreTransaction implements DOMStoreReadWriteTransaction { - private static enum TransactionState { + private enum TransactionState { OPEN, READY, CLOSED, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallback.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallback.java index 8ba2cb9ad9..3da5bed5a7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallback.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallback.java @@ -22,7 +22,7 @@ import org.opendaylight.controller.cluster.datastore.utils.ActorContext; public class TransactionRateLimitingCallback implements OperationCallback{ private static Ticker TICKER = Ticker.systemTicker(); - private static enum State { + private enum State { STOPPED, RUNNING, PAUSED diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java index 4a6a37aabe..f1e898ae23 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java @@ -599,7 +599,7 @@ class EntityOwnershipShard extends Shard { } @FunctionalInterface - private static interface EntityWalker { + private interface EntityWalker { void onEntity(MapEntryNode entityTypeNode, MapEntryNode entityNode); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java index 8386e669b8..bbb5985960 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java @@ -1518,14 +1518,14 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { }, new Dispatchers(context().system().dispatchers()).getDispatcher(Dispatchers.DispatcherType.Client)); } - private static interface RunnableMessage extends Runnable { + private interface RunnableMessage extends Runnable { } /** * The FindPrimaryResponseHandler provides specific callback methods which are invoked when a response to the * a remote or local find primary message is processed */ - private static interface FindPrimaryResponseHandler { + private interface FindPrimaryResponseHandler { /** * Invoked when a Failure message is received as a response * diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/Dispatchers.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/Dispatchers.java index 8de8a9d193..15f49c3cbc 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/Dispatchers.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/Dispatchers.java @@ -20,14 +20,14 @@ public class Dispatchers { private final akka.dispatch.Dispatchers dispatchers; - public static enum DispatcherType { + public enum DispatcherType { Client(CLIENT_DISPATCHER_PATH), Transaction(TXN_DISPATCHER_PATH), Shard(SHARD_DISPATCHER_PATH), Notification(NOTIFICATION_DISPATCHER_PATH); private final String path; - private DispatcherType(String path){ + DispatcherType(String path){ this.path = path; } private String path(akka.dispatch.Dispatchers dispatchers){ diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java index 1cb436d5a3..97e3383490 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java @@ -35,7 +35,7 @@ public final class SerializationUtils { public static final ThreadLocal REUSABLE_WRITER_TL = new ThreadLocal<>(); public static final ThreadLocal REUSABLE_READER_TL = new ThreadLocal<>(); - public static interface Applier { + public interface Applier { void apply(T instance, YangInstanceIdentifier path, NormalizedNode node); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java index 3a88a729cc..8686cc4981 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java @@ -74,7 +74,7 @@ public class ConcurrentDOMDataBrokerTest { private final DOMStoreThreePhaseCommitCohort mockCohort1 = mock(DOMStoreThreePhaseCommitCohort.class); private final DOMStoreThreePhaseCommitCohort mockCohort2 = mock(DOMStoreThreePhaseCommitCohort.class); private final ThreadPoolExecutor futureExecutor = - new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue()); + new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue<>()); private ConcurrentDOMDataBroker coordinator; @Before diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java index 9ae1e0a9a8..ea7afbf414 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java @@ -112,7 +112,7 @@ public class DatastoreContextIntrospectorTest { updated = introspector.update(null); assertEquals("updated", false, updated); - updated = introspector.update(new Hashtable()); + updated = introspector.update(new Hashtable<>()); assertEquals("updated", false, updated); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java index de751beeb9..3aaf027b22 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java @@ -292,7 +292,7 @@ public class MemberNode { } } - public static interface RaftStateVerifier { + public interface RaftStateVerifier { void verify(OnDemandRaftState raftState); } } \ No newline at end of file diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MockIdentifiers.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MockIdentifiers.java index a4062c1193..ae07ffdeda 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MockIdentifiers.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MockIdentifiers.java @@ -26,5 +26,5 @@ public final class MockIdentifiers { public static TransactionIdentifier transactionIdentifier(final Class clazz, final String memberName) { return new TransactionIdentifier(historyIdentifier(clazz, memberName), 0); - }; + } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 9ae74bb47c..0e24c3b863 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -233,7 +233,7 @@ public class ShardDataTreeTest extends AbstractTest { } @FunctionalInterface - private static interface DataTreeOperation { + private interface DataTreeOperation { void execute(DataTreeModification snapshot); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java index f9ae1bbd0f..d5f2d6c420 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java @@ -82,7 +82,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { static class TestException extends RuntimeException { } - static interface Invoker { + interface Invoker { CheckedFuture invoke(TransactionProxy proxy) throws Exception; } @@ -775,7 +775,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { eq(actorSelection(actorRef)), isA(CloseTransaction.class)); } - private static interface TransactionProxyOperation { + private interface TransactionProxyOperation { void run(TransactionProxy transactionProxy); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListenerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListenerTest.java index 17c6d11f68..1251ba51da 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListenerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListenerTest.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; -; /** * Unit tests for EntityOwnerChangeListener. diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 2164450ed5..40bee07b1d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -316,8 +316,8 @@ public class ShardManagerTest extends AbstractActorTest { final Map> shardInfoMap = Collections.synchronizedMap( new HashMap>()); - shardInfoMap.put("default", new AbstractMap.SimpleEntry(defaultShardActor, null)); - shardInfoMap.put("topology", new AbstractMap.SimpleEntry(topologyShardActor, null)); + shardInfoMap.put("default", new AbstractMap.SimpleEntry<>(defaultShardActor, null)); + shardInfoMap.put("topology", new AbstractMap.SimpleEntry<>(topologyShardActor, null)); final PrimaryShardInfoFutureCache primaryShardInfoCache = new PrimaryShardInfoFutureCache(); final CountDownLatch newShardActorLatch = new CountDownLatch(2); -- 2.36.6