From: Robert Varga Date: Wed, 4 Jul 2018 15:36:06 +0000 (+0200) Subject: Eliminate implicit boxing X-Git-Tag: release/fluorine~37 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c79a111ef3ca5153f569bebfecb45fcf0ca3c7ec;p=netconf.git Eliminate implicit boxing There is no need to box values, use Boolean.TRUE/FALSE as needed. Change-Id: I2a71106d7281f5b22e5d14f893f5a67c913e49f3 Signed-off-by: Robert Varga --- diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java index 4aafb58654..c8dc4c3003 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java @@ -234,8 +234,8 @@ class NetconfCapabilityMonitoringService implements CapabilityListener, AutoClos private static NetconfCapabilityChange computeDiff(final Set added, final Set removed) { final NetconfCapabilityChangeBuilder netconfCapabilityChangeBuilder = new NetconfCapabilityChangeBuilder(); netconfCapabilityChangeBuilder - .setChangedBy(new ChangedByBuilder().setServerOrUser(new ServerBuilder().setServer(true).build()) - .build()); + .setChangedBy(new ChangedByBuilder().setServerOrUser( + new ServerBuilder().setServer(Boolean.TRUE).build()).build()); netconfCapabilityChangeBuilder.setDeletedCapability(Lists.newArrayList(Collections2 .transform(removed, CAPABILITY_TO_URI))); netconfCapabilityChangeBuilder.setAddedCapability(Lists.newArrayList(Collections2 diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java index 22e60a3cb1..c7a7d232c0 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java @@ -74,7 +74,7 @@ class ReadAdapter { @Override public void onSuccess(final Boolean result) { if (result == null) { - sender.tell(false, self); + sender.tell(Boolean.FALSE, self); } else { sender.tell(result, self); } diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java index 07e5753914..500a97bced 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java @@ -238,8 +238,8 @@ public class MountPointEndToEndTest { @After public void tearDown() throws Exception { deleteCacheDir(); - TestKit.shutdownActorSystem(slaveSystem, Boolean.TRUE); - TestKit.shutdownActorSystem(masterSystem, Boolean.TRUE); + TestKit.shutdownActorSystem(slaveSystem, true); + TestKit.shutdownActorSystem(masterSystem, true); } private void setupMaster() throws Exception { diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java index 09415d9c67..321f5817aa 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java @@ -189,7 +189,7 @@ public class NetconfNodeActorTest { @After public void teardown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); system = null; } diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java index 873038de33..33c0b70525 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java @@ -186,8 +186,8 @@ public class NetconfNodeManagerTest { @After public void teardown() { - TestKit.shutdownActorSystem(slaveSystem, Boolean.TRUE); - TestKit.shutdownActorSystem(masterSystem, Boolean.TRUE); + TestKit.shutdownActorSystem(slaveSystem, true); + TestKit.shutdownActorSystem(masterSystem, true); } @SuppressWarnings("unchecked") diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java index b1bc972576..9c5c5f4c23 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java @@ -48,7 +48,7 @@ public class ProxyDOMDataBrokerTest { @AfterClass public static void staticTearDown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } @Test diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java index d39a8ed8e3..7dc4faadcb 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java @@ -31,6 +31,6 @@ public class ReadTransactionActorTest extends ReadTransactionActorTestAdapter { @AfterClass public static void staticTearDown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } } diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java index 3d7f2b7c5a..456950a9f2 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java @@ -86,11 +86,11 @@ public abstract class ReadTransactionActorTestAdapter { @Test public void testExists() { - when(mockReadTx.exists(STORE, PATH)).thenReturn(Futures.immediateCheckedFuture(true)); + when(mockReadTx.exists(STORE, PATH)).thenReturn(Futures.immediateCheckedFuture(Boolean.TRUE)); actorRef.tell(new ExistsRequest(STORE, PATH), probe.ref()); verify(mockReadTx).exists(STORE, PATH); - probe.expectMsg(true); + probe.expectMsg(Boolean.TRUE); } @Test diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadWriteTransactionActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadWriteTransactionActorTest.java index dc4d81a8f6..e0dc49542a 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadWriteTransactionActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadWriteTransactionActorTest.java @@ -40,7 +40,7 @@ public class ReadWriteTransactionActorTest { @AfterClass public static void staticTearDown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } @Test diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteTransactionActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteTransactionActorTest.java index 759c11209c..91a4756c6e 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteTransactionActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteTransactionActorTest.java @@ -34,6 +34,6 @@ public class WriteTransactionActorTest extends WriteTransactionActorTestAdapter @AfterClass public static void staticTearDown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } } diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java index ca74457f3d..1d82be370f 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java @@ -74,7 +74,7 @@ public class ProxyReadWriteTransactionTest { @AfterClass public static void staticTearDown() { - TestKit.shutdownActorSystem(system, Boolean.TRUE); + TestKit.shutdownActorSystem(system, true); } private ProxyReadWriteTransaction newSuccessfulProxyTx() { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java index 6310eab644..368c186fe5 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java @@ -112,7 +112,7 @@ public class TesttoolParameters { parser.addArgument("--async-requests") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .dest("async"); parser.addArgument("--thread-amount") @@ -199,25 +199,25 @@ public class TesttoolParameters { parser.addArgument("--ssh") .type(Boolean.class) - .setDefault(true) + .setDefault(Boolean.TRUE) .help("Whether to use ssh for transport or just pure tcp") .dest("ssh"); parser.addArgument("--exi") .type(Boolean.class) - .setDefault(true) + .setDefault(Boolean.TRUE) .help("Whether to use exi to transport xml content") .dest("exi"); parser.addArgument("--debug") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .help("Whether to use debug log level instead of INFO") .dest("debug"); parser.addArgument("--md-sal") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .help("Whether to use md-sal datastore instead of default simulated datastore.") .dest("md-sal"); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java index 4814940f33..78f3eafb37 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java @@ -94,7 +94,7 @@ public class Parameters { parser.addArgument("--async-requests") .type(Boolean.class) - .setDefault(true) + .setDefault(Boolean.TRUE) .dest("async"); parser.addArgument("--thread-amount") @@ -104,7 +104,7 @@ public class Parameters { parser.addArgument("--same-device") .type(Boolean.class) - .setDefault(true) + .setDefault(Boolean.TRUE) .help("If true, every thread edits the device at the first port. " + "If false, n-th thread edits device at n-th port.") .dest("same-device"); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java index 03e7ed988b..d807da5412 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/Parameters.java @@ -111,29 +111,29 @@ public class Parameters { parser.addArgument("--candidate-datastore") .type(Boolean.class) .required(false) - .setDefault(true) + .setDefault(Boolean.TRUE) .help("Edit candidate or running datastore. Defaults to candidate.") .dest("candidate-datastore"); parser.addArgument("--debug") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .help("Whether to use debug log level instead of INFO") .dest("debug"); parser.addArgument("--legacy-framing") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .dest("legacy-framing"); parser.addArgument("--exi") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .dest("exi"); parser.addArgument("--async-requests") .type(Boolean.class) - .setDefault(true) + .setDefault(Boolean.TRUE) .dest("async"); parser.addArgument("--msg-timeout") @@ -143,7 +143,7 @@ public class Parameters { parser.addArgument("--ssh") .type(Boolean.class) - .setDefault(false) + .setDefault(Boolean.FALSE) .dest("ssh"); parser.addArgument("--username") diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java index db15bb2a02..c2868795c9 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java @@ -32,7 +32,7 @@ public class StressClientCallable implements Callable { private static final Logger LOG = LoggerFactory.getLogger(StressClientCallable.class); - private Parameters params; + private final Parameters params; private final NetconfDeviceCommunicator sessionListener; private final NetconfClientDispatcherImpl netconfClientDispatcher; private final NetconfClientConfiguration cfg; @@ -62,7 +62,7 @@ public class StressClientCallable implements Callable { public Boolean call() throws Exception { executionStrategy.invoke(); netconfClientSession.close(); - return true; + return Boolean.TRUE; } private static ExecutionStrategy getExecutionStrategy(final Parameters params,