From: Stephen Kitt Date: Thu, 22 Sep 2016 16:18:12 +0000 (+0200) Subject: Mechanical code cleanup (sal-dom-broker) X-Git-Tag: release/carbon~474 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=908a421ebb9f54b3b268082ac562dded5cf51b87;hp=8aa59fb1d2d9591ecd8af541e7f5d89167bae7af Mechanical code cleanup (sal-dom-broker) * 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: I4fa4890915dd1bf80dfb69378a38dd2b6c9d7043 Signed-off-by: Stephen Kitt --- diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java index 8ee928e878..fef26fe603 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java @@ -152,7 +152,7 @@ abstract class AbstractDOMForwardedTransactionFactory store : storeTxFactories.entrySet()) { txns.put(store.getKey(), store.getValue().newWriteOnlyTransaction()); } - return new DOMForwardedWriteTransaction(newTransactionIdentifier(), txns, this); + return new DOMForwardedWriteTransaction<>(newTransactionIdentifier(), txns, this); } /** diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java index da7a0d19f0..efe4c19c59 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * support of cancellation. */ final class CommitCoordinationTask implements Callable { - private static enum Phase { + private enum Phase { canCommit, preCommit, doCommit, diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java index fd216ec942..dff375e51b 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; */ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransactionFactory implements DOMTransactionChain { - private static enum State { + private enum State { RUNNING, CLOSING, CLOSED, diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java index 64c6b9e1fd..41dfcb9549 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java @@ -193,7 +193,7 @@ public final class DOMNotificationRouter implements AutoCloseable, DOMNotificati } @Override - public ListenableFuture putNotification(final DOMNotification notification) throws InterruptedException { + public ListenableFuture putNotification(final DOMNotification notification) throws InterruptedException { final Collection> subscribers = listeners.get(notification.getType()); if (subscribers.isEmpty()) { return NO_LISTENERS; @@ -203,7 +203,7 @@ public final class DOMNotificationRouter implements AutoCloseable, DOMNotificati return publish(seq, notification, subscribers); } - private ListenableFuture tryPublish(final DOMNotification notification, final Collection> subscribers) { + private ListenableFuture tryPublish(final DOMNotification notification, final Collection> subscribers) { final long seq; try { seq = disruptor.getRingBuffer().tryNext(); @@ -215,7 +215,7 @@ public final class DOMNotificationRouter implements AutoCloseable, DOMNotificati } @Override - public ListenableFuture offerNotification(final DOMNotification notification) { + public ListenableFuture offerNotification(final DOMNotification notification) { final Collection> subscribers = listeners.get(notification.getType()); if (subscribers.isEmpty()) { return NO_LISTENERS; @@ -225,7 +225,7 @@ public final class DOMNotificationRouter implements AutoCloseable, DOMNotificati } @Override - public ListenableFuture offerNotification(final DOMNotification notification, final long timeout, + public ListenableFuture offerNotification(final DOMNotification notification, final long timeout, final TimeUnit unit) throws InterruptedException { final Collection> subscribers = listeners.get(notification.getType()); if (subscribers.isEmpty()) { @@ -233,7 +233,7 @@ public final class DOMNotificationRouter implements AutoCloseable, DOMNotificati } // Attempt to perform a non-blocking publish first - final ListenableFuture noBlock = tryPublish(notification, subscribers); + final ListenableFuture noBlock = tryPublish(notification, subscribers); if (!DOMNotificationPublishService.REJECTED.equals(noBlock)) { return noBlock; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java index 827baa55da..638e585535 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java @@ -100,7 +100,7 @@ public final class ShardedDOMDataTree implements DOMDataTreeService, DOMDataTree // FIXME: wrap the shard in a proper adaptor based on implemented interface - reg = new ShardRegistration(this, prefix, shard); + reg = new ShardRegistration<>(this, prefix, shard); storeShard(prefix, reg);