From 383553dbada5e4c3078133c81a42d05990031992 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 18:19:18 +0200 Subject: [PATCH] Mechanical code cleanup (sal-binding-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: Ia9ab5959dab860bc8220aff4390ca62c87ec8ecf Signed-off-by: Stephen Kitt --- .../impl/BindingDOMDataTreeChangeServiceAdapter.java | 6 +++--- .../binding/impl/BindingDOMMountPointServiceAdapter.java | 2 +- .../impl/BindingDOMNotificationPublishServiceAdapter.java | 4 ++-- .../md/sal/binding/impl/BindingToNormalizedNodeCodec.java | 2 +- .../md/sal/binding/impl/BindingNormalizedCodecTest.java | 2 +- .../sal/binding/impl/test/DataTreeChangeListenerTest.java | 4 ++-- .../controller/sal/binding/test/AugmentationVerifier.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java index d693e66b95..28ca144b97 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java @@ -53,9 +53,9 @@ final class BindingDOMDataTreeChangeServiceAdapter implements DataTreeChangeServ @SuppressWarnings({ "rawtypes", "unchecked" }) final BindingDOMDataTreeChangeListenerAdapter domListener = listener instanceof ClusteredDataTreeChangeListener ? - new BindingClusteredDOMDataTreeChangeListenerAdapter( - codec, (ClusteredDataTreeChangeListener)listener, treeId.getDatastoreType()) : - new BindingDOMDataTreeChangeListenerAdapter(codec, listener, treeId.getDatastoreType()); + new BindingClusteredDOMDataTreeChangeListenerAdapter<>( + codec, (ClusteredDataTreeChangeListener) listener, treeId.getDatastoreType()) : + new BindingDOMDataTreeChangeListenerAdapter<>(codec, listener, treeId.getDatastoreType()); final ListenerRegistration> domReg = dataTreeChangeService.registerDataTreeChangeListener(domIdentifier, domListener); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java index 759c470f06..8b88f0f5c0 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java @@ -56,7 +56,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService { @Override public ListenerRegistration registerListener(InstanceIdentifier path, T listener) { - return new BindingDOMMountPointListenerAdapter(listener,codec,mountService); + return new BindingDOMMountPointListenerAdapter<>(listener, codec, mountService); } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java index 1fe81ea3f4..83fa1969d9 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationPublishServiceAdapter.java @@ -52,7 +52,7 @@ public class BindingDOMNotificationPublishServiceAdapter implements Notification } @Override - public ListenableFuture offerNotification(final Notification notification) { + public ListenableFuture offerNotification(final Notification notification) { ListenableFuture offerResult = domPublishService.offerNotification(toDomNotification(notification)); return DOMNotificationPublishService.REJECTED.equals(offerResult) ? NotificationPublishService.REJECTED @@ -60,7 +60,7 @@ public class BindingDOMNotificationPublishServiceAdapter implements Notification } @Override - public ListenableFuture offerNotification(final Notification notification, final int timeout, final TimeUnit unit) throws InterruptedException { + public ListenableFuture offerNotification(final Notification notification, final int timeout, final TimeUnit unit) throws InterruptedException { ListenableFuture offerResult = domPublishService.offerNotification(toDomNotification(notification), timeout, unit); return DOMNotificationPublishService.REJECTED.equals(offerResult) ? NotificationPublishService.REJECTED diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java index b1bb174355..fd9eec6337 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java @@ -356,7 +356,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto * return non-null value. */ final BindingCodecTreeNode codecContext = currentCodecTree.getSubtreeCodec(bindingPath); - return new SimpleEntry, BindingCodecTreeNode>(bindingPath, codecContext); + return new SimpleEntry<>(bindingPath, codecContext); } @SuppressWarnings("unchecked") diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java index 2716fb7c54..aef168ddf0 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java @@ -71,7 +71,7 @@ public class BindingNormalizedCodecTest extends AbstractSchemaAwareTest { final DataObjectSerializerGenerator streamWriter = StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault())); final BindingNormalizedNodeCodecRegistry registry = new BindingNormalizedNodeCodecRegistry(streamWriter); codec = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), registry, true); - }; + } @Test public void testComplexAugmentationSerialization() { diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java index 4a4137c2a5..cc40a2e0e1 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java @@ -55,8 +55,8 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest { private static final InstanceIdentifier BAR_PATH = path(TOP_BAR_KEY); private static final PathArgument BAR_ARGUMENT = Iterables.getLast(BAR_PATH.getPathArguments()); private static final TopLevelList BAR_DATA = topLevelList(TOP_BAR_KEY); -private static final DataTreeIdentifier TOP_IDENTIFIER = new DataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, - TOP_PATH); + private static final DataTreeIdentifier TOP_IDENTIFIER = + new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, TOP_PATH); private static final Top TOP_INITIAL_DATA = top(FOO_DATA); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java index 4ef25ae02e..3df048bdaa 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java @@ -31,7 +31,7 @@ public class AugmentationVerifier> { } public static > AugmentationVerifier from(T obj) { - return new AugmentationVerifier(obj); + return new AugmentationVerifier<>(obj); } } -- 2.36.6