From: Stephen Kitt Date: Thu, 22 Sep 2016 14:57:35 +0000 (+0200) Subject: Mechanical code cleanup (benchmark) X-Git-Tag: release/carbon~483 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f1df4d4b606bd729b9f13b7ed19e35203708645d Mechanical code cleanup (benchmark) * 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: I8405a58fccb12123bc7f2b5902b85c64ca35887e Signed-off-by: Stephen Kitt --- diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java index b46089d30f..2c25951986 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java @@ -58,7 +58,7 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer private static final InstanceIdentifier TEST_STATUS_IID = InstanceIdentifier.builder(TestStatus.class).build(); - private final AtomicReference execStatus = new AtomicReference( ExecStatus.Idle ); + private final AtomicReference execStatus = new AtomicReference<>(ExecStatus.Idle); private final DsbenchmarkListenerProvider listenerProvider = new DsbenchmarkListenerProvider(); private final DOMDataBroker domDataBroker; // Async DOM Broker for use with all DOM operations private final DataBroker bindingDataBroker; // Async Binding-Aware Broker for use in tx chains; initialized to diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java index e2deb46374..e589818360 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java @@ -25,7 +25,7 @@ public class DsbenchmarkListenerProvider { private static final InstanceIdentifier TEST_EXEC_IID = InstanceIdentifier.builder(TestExec.class).build(); private final List> listeners = - new ArrayList>(); + new ArrayList<>(); private DataBroker dataBroker; public void setDataBroker(DataBroker dataBroker) { @@ -37,9 +37,9 @@ public class DsbenchmarkListenerProvider { for (int i = 0; i < numListeners; i++) { DsbenchmarkListener listener = new DsbenchmarkListener(); listeners.add(dataBroker.registerDataTreeChangeListener( - new DataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID), listener)); + new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID), listener)); listeners.add(dataBroker.registerDataTreeChangeListener( - new DataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID), listener)); + new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID), listener)); } LOG.info("DsbenchmarkListenerProvider created {} listeneres", numListeners); diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java index f4db3693c4..ce2adc9683 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java @@ -29,10 +29,10 @@ public class NtfbenchNonblockingProducer extends AbstractNtfbenchProducer { public void run() { int ntfOk = 0; int ntfError = 0; - ListenableFuture lastOkFuture = null; + ListenableFuture lastOkFuture = null; for (int i = 0; i < this.iterations; i++) { try { - final ListenableFuture result = this.publishService.offerNotification(this.ntf); + final ListenableFuture result = this.publishService.offerNotification(this.ntf); if (NotificationPublishService.REJECTED == result) { ntfError++; } else { diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java index e2c876dba4..cad1d359ea 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java @@ -29,7 +29,7 @@ public class NtfbenchTestListener implements NtfbenchPayloadListener { if (expectedSize == notification.getPayload().size()) { received++; } - }; + } public int getReceived() { return received; diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCClient.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCClient.java index ea426ba990..dd2cad1cef 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCClient.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/GlobalBindingRTCClient.java @@ -74,10 +74,7 @@ public class GlobalBindingRTCClient implements RTCClient { rpcError++; } } - } catch (InterruptedException e) { - rpcError++; - LOG.error("Execution failed: ", e); - } catch (ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { rpcError++; LOG.error("Execution failed: ", e); } diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTClient.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTClient.java index c0e362bd4d..201ed2dc15 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTClient.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RoutedBindingRTClient.java @@ -83,10 +83,7 @@ public class RoutedBindingRTClient implements RTCClient { rpcError++; } } - } catch (InterruptedException e) { - rpcError++; - LOG.error("Execution failed: ", e); - } catch (ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { rpcError++; LOG.error("Execution failed: ", e); } diff --git a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java index a9c7d38090..14358eac0e 100644 --- a/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java +++ b/benchmark/rpcbenchmark/src/main/java/rpcbenchmark/impl/RpcbenchmarkProvider.java @@ -45,7 +45,7 @@ public class RpcbenchmarkProvider implements BindingAwareProvider, AutoCloseable private static final Logger LOG = LoggerFactory.getLogger(RpcbenchmarkProvider.class); private static final GlobalBindingRTCServer gServer = new GlobalBindingRTCServer(); private static final int testTimeout = 5; - private final AtomicReference execStatus = new AtomicReference(ExecStatus.Idle ); + private final AtomicReference execStatus = new AtomicReference<>(ExecStatus.Idle); private RpcConsumerRegistry consumerRegistry; private RpcProviderRegistry providerRegistry;