From 8aa59fb1d2d9591ecd8af541e7f5d89167bae7af Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 17:35:14 +0200 Subject: [PATCH] Mechanical code cleanup (sal-dom-spi) * 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: I68a6f9ee118c8ff47bc2511efa234b93b09de32a Signed-off-by: Stephen Kitt --- .../dom/spi/ForwardingDOMNotificationPublishService.java | 6 +++--- .../controller/md/sal/dom/spi/RegistrationTreeNode.java | 2 +- .../spi/data/AbstractSnapshotBackedTransactionChain.java | 5 +++-- .../controller/sal/core/spi/data/DOMStoreTransaction.java | 2 +- .../sal/core/spi/data/SnapshotBackedTransactions.java | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java index 6bc11079e2..c9e6bccbd3 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java @@ -22,17 +22,17 @@ public abstract class ForwardingDOMNotificationPublishService extends Forwarding protected abstract DOMNotificationPublishService delegate(); @Override - public ListenableFuture putNotification(final DOMNotification notification) throws InterruptedException { + public ListenableFuture putNotification(final DOMNotification notification) throws InterruptedException { return delegate().putNotification(notification); } @Override - public ListenableFuture offerNotification(final DOMNotification notification) { + public ListenableFuture offerNotification(final DOMNotification notification) { return delegate().offerNotification(notification); } @Override - public ListenableFuture offerNotification(final DOMNotification notification, final long timeout, + public ListenableFuture offerNotification(final DOMNotification notification, final long timeout, final TimeUnit unit) throws InterruptedException { return delegate().offerNotification(notification, timeout, unit); } diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java index 41e80ead7a..378e9edb6e 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java @@ -97,7 +97,7 @@ public final class RegistrationTreeNode implements Identifiable RegistrationTreeNode ensureChild(@Nonnull final PathArgument child) { RegistrationTreeNode potential = children.get(Preconditions.checkNotNull(child)); if (potential == null) { - potential = new RegistrationTreeNode(this, child); + potential = new RegistrationTreeNode<>(this, child); children.put(child, potential); } return potential; diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java index 7b6e68dc51..9898ce9bb9 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java @@ -140,7 +140,8 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact do { entry = getSnapshot(transactionId); - ret = new SnapshotBackedReadWriteTransaction(transactionId, getDebugTransactions(), entry.getValue(), this); + ret = new SnapshotBackedReadWriteTransaction<>(transactionId, getDebugTransactions(), entry.getValue(), + this); } while (!recordTransaction(entry.getKey(), ret)); return ret; @@ -157,7 +158,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact do { entry = getSnapshot(transactionId); - ret = new SnapshotBackedWriteTransaction(transactionId, getDebugTransactions(), entry.getValue(), this); + ret = new SnapshotBackedWriteTransaction<>(transactionId, getDebugTransactions(), entry.getValue(), this); } while (!recordTransaction(entry.getKey(), ret)); return ret; diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java index 76ea78b299..b225576ba7 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java @@ -21,7 +21,7 @@ public interface DOMStoreTransaction extends AutoCloseable, Identifiable * Unique identifier of the transaction */ @Override - public Object getIdentifier(); + Object getIdentifier(); @Override void close(); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java index 3368c8aee1..927e224cec 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java @@ -28,7 +28,7 @@ public final class SnapshotBackedTransactions { * @param snapshot Snapshot which will be modified. */ public static SnapshotBackedReadTransaction newReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot) { - return new SnapshotBackedReadTransaction(identifier, debug, snapshot); + return new SnapshotBackedReadTransaction<>(identifier, debug, snapshot); } /** @@ -41,7 +41,7 @@ public final class SnapshotBackedTransactions { */ public static SnapshotBackedReadWriteTransaction newReadWriteTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype readyImpl) { - return new SnapshotBackedReadWriteTransaction(identifier, debug, snapshot, readyImpl); + return new SnapshotBackedReadWriteTransaction<>(identifier, debug, snapshot, readyImpl); } /** @@ -54,6 +54,6 @@ public final class SnapshotBackedTransactions { */ public static SnapshotBackedWriteTransaction newWriteTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype readyImpl) { - return new SnapshotBackedWriteTransaction(identifier, debug, snapshot, readyImpl); + return new SnapshotBackedWriteTransaction<>(identifier, debug, snapshot, readyImpl); } } -- 2.36.6