From 49346407810110d0cf9ed7fc9470e0fbb4562499 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 18:23:57 +0200 Subject: [PATCH] Mechanical code cleanup (sal-common-api) * 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: I710395170295960e00d46ceb9540994c9c49c96e Signed-off-by: Stephen Kitt --- .../common/api/data/AsyncConfigurationCommitHandler.java | 2 +- .../md/sal/common/api/data/AsyncDataBroker.java | 8 ++++---- .../md/sal/common/api/data/AsyncReadOnlyTransaction.java | 2 +- .../md/sal/common/api/data/AsyncTransaction.java | 2 +- .../md/sal/common/api/data/TransactionChain.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java index 6025e139ab..a0d029c0bb 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java @@ -76,7 +76,7 @@ public interface AsyncConfigurationCommitHandler

, D> { * @param * Type of data (payload), which represents data payload */ - static interface ConfigurationCommitRequest

, D> { + interface ConfigurationCommitRequest

, D> { /** * diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataBroker.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataBroker.java index 8b62fd25e8..8265fc4057 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataBroker.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataBroker.java @@ -100,7 +100,7 @@ public interface AsyncDataBroker

, D, L extends AsyncDataChange * @see http://www.idevelopment.info/data/LDAP/LDAP_Resources/ * SEARCH_Setting_the_SCOPE_Parameter.shtml */ - public enum DataChangeScope { + enum DataChangeScope { /** * Represents only a direct change of the node, such as replacement of a node, addition or @@ -159,19 +159,19 @@ public interface AsyncDataBroker

, D, L extends AsyncDataChange * {@inheritDoc} */ @Override - public AsyncReadOnlyTransaction newReadOnlyTransaction(); + AsyncReadOnlyTransaction newReadOnlyTransaction(); /** * {@inheritDoc} */ @Override - public AsyncReadWriteTransaction newReadWriteTransaction(); + AsyncReadWriteTransaction newReadWriteTransaction(); /** * {@inheritDoc} */ @Override - public AsyncWriteTransaction newWriteOnlyTransaction(); + AsyncWriteTransaction newWriteOnlyTransaction(); /** * Registers a {@link AsyncDataChangeListener} to receive diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadOnlyTransaction.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadOnlyTransaction.java index 46c90b9756..ab4b44fbde 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadOnlyTransaction.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadOnlyTransaction.java @@ -27,5 +27,5 @@ public interface AsyncReadOnlyTransaction

, D> extends AsyncRea * */ @Override - public void close(); + void close(); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncTransaction.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncTransaction.java index 08ddfe6898..9855b2245c 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncTransaction.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncTransaction.java @@ -32,7 +32,7 @@ public interface AsyncTransaction

,D> extends // Identifiable { @Override - public Object getIdentifier(); + Object getIdentifier(); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/TransactionChain.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/TransactionChain.java index 32e32f94eb..11f28039be 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/TransactionChain.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/TransactionChain.java @@ -62,7 +62,7 @@ public interface TransactionChain

, D> extends AutoCloseable, * if the chain has been closed. */ @Override - public AsyncReadOnlyTransaction newReadOnlyTransaction(); + AsyncReadOnlyTransaction newReadOnlyTransaction(); /** * Create a new read-write transaction which will continue the chain. @@ -89,7 +89,7 @@ public interface TransactionChain

, D> extends AutoCloseable, * if the chain has been closed. */ @Override - public AsyncReadWriteTransaction newReadWriteTransaction(); + AsyncReadWriteTransaction newReadWriteTransaction(); /** * Create a new write-only transaction which will continue the chain. @@ -116,7 +116,7 @@ public interface TransactionChain

, D> extends AutoCloseable, * if the chain has been closed. */ @Override - public AsyncWriteTransaction newWriteOnlyTransaction(); + AsyncWriteTransaction newWriteOnlyTransaction(); @Override void close(); -- 2.36.6