Fix Java 5 IDE migration warnings

- 'StringBuffer' can be replaced with 'StringBuilder'
- get rid of unnecessary boxing and unboxing
- 'while' loop replaceable with 'foreach'

Change-Id: I2e8558f1aef8a2598cfc022e614b2f4f6e212785
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>

diff --git a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
index cdb0462d8f95ef0a0acd704ba87d12ac680acb75..ae4ccc86490d996cd723102af98b35dbc3d83be1 100644 (file)
--- a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
+++ b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
@@ -79,7 +79,7 @@ public class ContextKeyTest {
         // expect
         assertTrue(instance1.equals(instance1));
         assertFalse(instance1.equals(null));
-        assertFalse(instance1.equals(new Long(123456)));
+        assertFalse(instance1.equals(123456L));
         assertFalse(instance1.equals(instance2));
         assertFalse(instance1.equals(instance3));
         assertFalse(instance1.equals(instance4));

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
index 2dbc49fe83ddee6ada9035a4ff10b70cf514d43d..5db8a6c811d247c34d78d751e822cabeda1b9f58 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
@@ -82,7 +82,7 @@ public class NetconfHelloMessageAdditionalHeader {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("NetconfHelloMessageAdditionalHeader{");
+        final StringBuilder sb = new StringBuilder("NetconfHelloMessageAdditionalHeader{");
         sb.append("userName='").append(userName).append('\'');
         sb.append(", hostAddress='").append(hostAddress).append('\'');
         sb.append(", port='").append(port).append('\'');

diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
index 7f25c250314e6b3583341d826e17279d873b7f68..094b570700880263300ed45e69cf5f191713ebd9 100644 (file)
--- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
+++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
@@ -87,7 +87,7 @@ public class TestingNetconfClient implements Closeable {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("TestingNetconfClient{");
+        final StringBuilder sb = new StringBuilder("TestingNetconfClient{");
         sb.append("label=").append(label);
         sb.append(", sessionId=").append(sessionId);
         sb.append('}');

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
index 29fe99fcb043dee6d76cf3073b1e7be60d6372c2..e74a9a10386c2c72be55737cff66d6c7f41647e6 100644 (file)
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java
@@ -105,7 +105,7 @@ public abstract class AbstractNetconfSession<S extends NetconfSession,L extends
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer(getClass().getSimpleName() + "{");
+        final StringBuilder sb = new StringBuilder(getClass().getSimpleName() + "{");
         sb.append("sessionId=").append(sessionId);
         sb.append(", channel=").append(channel);
         sb.append('}');

diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
index fb6a8ed26e522a07e3993ac965d09e64e5305c94..a9ab6994d76b6e94e87b049beda395d8cfa7f769 100644 (file)
--- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
+++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java
@@ -129,7 +129,7 @@ public abstract class AbstractNetconfOperation implements NetconfOperation {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer(getClass().getName());
+        final StringBuilder sb = new StringBuilder(getClass().getName());
         try {
             sb.append("{name=").append(getOperationName());
         } catch (UnsupportedOperationException e) {

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
index d5383afda7921ce54cc5ec6913f85570b5ba0531..dcff0f294b65791c5394fac8d13ead94913c8b02 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Maps;
 import java.net.URI;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.netconf.client.NetconfClientSession;
@@ -86,9 +85,8 @@ public final class NetconfSessionPreferences {
 
     // allows partial matches - assuming parameters are in the same order
     public boolean containsPartialNonModuleCapability(final String capability) {
-        final Iterator<String> iterator = getNonModuleCaps().iterator();
-        while (iterator.hasNext()) {
-            if (iterator.next().startsWith(capability)) {
+        for (final String nonModuleCap : getNonModuleCaps()) {
+            if (nonModuleCap.startsWith(capability)) {
                 LOG.trace("capability {} partially matches {}", capability, nonModuleCaps);
                 return true;
             }

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
index 627bf226fd30449b6fe504f4205ba21b39fc1a97..ad587eac879c621836d09ae74ad10e54a82f987d 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
@@ -51,7 +51,7 @@ public class UserPreferences {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("UserPreferences{");
+        final StringBuilder sb = new StringBuilder("UserPreferences{");
         sb.append("sessionPreferences=").append(sessionPreferences);
         sb.append(", overrideModuleCapabilities=").append(overrideModuleCapabilities);
         sb.append(", overrideNonModuleCapabilities=").append(overrideNonModuleCapabilities);

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
index fc7e99a31d3cf0b72cb56b05e872a3b20f79b882..8d62d3ada118fcc6e5ddfcc359911166fd7f1a68 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
@@ -138,7 +138,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer("Notifications{");
+            final StringBuilder sb = new StringBuilder("Notifications{");
             sb.append("notificationList=").append(notificationList);
             sb.append('}');
             return sb.toString();
@@ -170,7 +170,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer("Notification{");
+            final StringBuilder sb = new StringBuilder("Notification{");
             sb.append("delayInSeconds=").append(delayInSeconds);
             sb.append(", times=").append(times);
             sb.append(", content='").append(content).append('\'');

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
index 62c656c56990316a553c28aada64351a7baab2df..3828abd6a70a20bb1e4114553473bc8caee9f2ec 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
@@ -19,7 +19,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
@@ -386,9 +385,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper<Restco
 
     private static void writeDataRoot(final OutputStreamWriter outputWriter, final NormalizedNodeWriter nnWriter,
                                       final ContainerNode data) throws IOException {
-        final Iterator<DataContainerChild<? extends PathArgument, ?>> iterator = data.getValue().iterator();
-        while (iterator.hasNext()) {
-            final DataContainerChild<? extends PathArgument, ?> child = iterator.next();
+        for (final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
             nnWriter.write(child);
             nnWriter.flush();
         }

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
index 57428b90b60f26eefb17a2ed4a973fa0e4bd55ca..c15363dcb601e933513d8dc51299a53ac7174992 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
@@ -48,7 +48,7 @@ final class BatchedExistenceCheck {
             Futures.addCallback(f, new FutureCallback<Boolean>() {
                 @Override
                 public void onSuccess(@Nonnull final Boolean result) {
-                    ret.complete(path, result.booleanValue());
+                    ret.complete(path, result);
                 }
 
                 @Override

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
index 95010cff19a18baef51440411ac18610a3dbc248..f1b88155b70650d7dc3b84e5bf521fe44388dc1e 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
@@ -1465,7 +1465,7 @@ public final class RestconfImpl implements RestconfService {
         final DataSchemaNode replaySupportSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(replaySupportSchemaNode instanceof LeafSchemaNode);
         streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) replaySupportSchemaNode)
-                .withValue(Boolean.valueOf(true)).build());
+                .withValue(Boolean.TRUE).build());
 
         instanceDataChildrenByName =
                 ControllerContext.findInstanceDataChildrenByName(listStreamSchemaNode, "replay-log-creation-time");

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
index f82fc170fa661834d89c897ad72e43612b33b5a6..d81d11e985d1bc301e1f196d4b8b2cf3719016f6 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
@@ -212,27 +212,27 @@ public class CnSnToJsonBasicDataTypesTest extends YangAndXmlAndDataSchemaLoader
         jsonReader.beginObject();
 
         final Map<String, LeafVerifier> expectedMap = Maps.newHashMap();
-        expectedMap.put("lfnint8Min", new NumberVerifier(Integer.valueOf(-128)));
-        expectedMap.put("lfnint8Max", new NumberVerifier(Integer.valueOf(127)));
-        expectedMap.put("lfnint16Min", new NumberVerifier(Integer.valueOf(-32768)));
-        expectedMap.put("lfnint16Max", new NumberVerifier(Integer.valueOf(32767)));
-        expectedMap.put("lfnint32Min", new NumberVerifier(Integer.valueOf(-2147483648)));
-        expectedMap.put("lfnint32Max", new NumberVerifier(Long.valueOf(2147483647)));
-        expectedMap.put("lfnint64Min", new NumberVerifier(Long.valueOf(-9223372036854775808L)));
-        expectedMap.put("lfnint64Max", new NumberVerifier(Long.valueOf(9223372036854775807L)));
-        expectedMap.put("lfnuint8Max", new NumberVerifier(Integer.valueOf(255)));
-        expectedMap.put("lfnuint16Max", new NumberVerifier(Integer.valueOf(65535)));
-        expectedMap.put("lfnuint32Max", new NumberVerifier(Long.valueOf(4294967295L)));
+        expectedMap.put("lfnint8Min", new NumberVerifier(-128));
+        expectedMap.put("lfnint8Max", new NumberVerifier(127));
+        expectedMap.put("lfnint16Min", new NumberVerifier(-32768));
+        expectedMap.put("lfnint16Max", new NumberVerifier(32767));
+        expectedMap.put("lfnint32Min", new NumberVerifier(-2147483648));
+        expectedMap.put("lfnint32Max", new NumberVerifier(2147483647L));
+        expectedMap.put("lfnint64Min", new NumberVerifier(-9223372036854775808L));
+        expectedMap.put("lfnint64Max", new NumberVerifier(9223372036854775807L));
+        expectedMap.put("lfnuint8Max", new NumberVerifier(255));
+        expectedMap.put("lfnuint16Max", new NumberVerifier(65535));
+        expectedMap.put("lfnuint32Max", new NumberVerifier(4294967295L));
         expectedMap.put("lfstr", new StringVerifier("lfstr"));
         expectedMap.put("lfstr1", new StringVerifier(""));
         expectedMap.put("lfbool1", new BooleanVerifier(true));
         expectedMap.put("lfbool2", new BooleanVerifier(false));
         expectedMap.put("lfbool3", new BooleanVerifier(false));
-        expectedMap.put("lfdecimal1", new NumberVerifier(new Double(43.32)));
-        expectedMap.put("lfdecimal2", new NumberVerifier(new Double(-0.43)));
-        expectedMap.put("lfdecimal3", new NumberVerifier(new Double(43)));
-        expectedMap.put("lfdecimal4", new NumberVerifier(new Double(43E3)));
-        expectedMap.put("lfdecimal6", new NumberVerifier(new Double(33.12345)));
+        expectedMap.put("lfdecimal1", new NumberVerifier(43.32));
+        expectedMap.put("lfdecimal2", new NumberVerifier(-0.43));
+        expectedMap.put("lfdecimal3", new NumberVerifier(43d));
+        expectedMap.put("lfdecimal4", new NumberVerifier(43E3));
+        expectedMap.put("lfdecimal6", new NumberVerifier(33.12345));
         expectedMap.put("lfenum", new StringVerifier("enum3"));
         expectedMap.put("lfbits", new StringVerifier("bit3 bit2"));
         expectedMap.put("lfbinary", new StringVerifier("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
index ad9637ca1617b20399d780c45f897584bb032dc5..3c87380b116cb1265a455e1c22779bbe2070e7ed 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
@@ -433,7 +433,7 @@ public class JSONRestconfServiceImplTest {
         assertTrue("Expected ContainerNode. Actual " + capturedNode.getValue().getClass(),
                 capturedNode.getValue() instanceof ContainerNode);
         final ContainerNode actualNode = (ContainerNode) capturedNode.getValue();
-        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, Long.valueOf(10));
+        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, 10L);
         verifyLeafNode(actualNode, TOASTER_TYPE_QNAME, WHEAT_BREAD_QNAME);
     }
 

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
index 92a4361004a5298301ec100200d42ed94ba724ef..3af3bca77ad90a35b6afbbf04f5fa8b058fabff7 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
@@ -89,7 +89,7 @@ public class RestconfImplTest {
     @Test
     public void binaryKeyTest() {
         final List<Byte> al = new ArrayList<>();
-        al.add(new Byte((byte) 1));
+        al.add((byte) 1);
         binaryKeyTest(al, al);
     }
 
@@ -113,7 +113,7 @@ public class RestconfImplTest {
     @Test
     public void binaryKeyFailTest() {
         final List<Byte> al = new ArrayList<>();
-        al.add(new Byte((byte) 1));
+        al.add((byte) 1);
         final List<Byte> al2 = new ArrayList<>();
         try {
             binaryKeyTest(al, al2);

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
index 2e7721c108ef7cc77ac9c508b9ee5f322998107a..530378ce5db2bd57f0c284b0d53fd5838e54f477 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingStreamConstants.java
@@ -14,7 +14,7 @@ package org.opendaylight.restconf.nb.rfc8040.utils.mapping;
 public final class RestconfMappingStreamConstants {
 
     public static final String DESCRIPTION = "DESCRIPTION_PLACEHOLDER";
-    public static final Boolean REPLAY_SUPPORT = Boolean.valueOf(true);
+    public static final Boolean REPLAY_SUPPORT = Boolean.TRUE;
     public static final String REPLAY_LOG = "";
     public static final String EVENTS = "";
 

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
index 78c1999f1bf094b34822c12731a12b3d349a036f..32523e815b6481f05f9885b742fbf1d87219539e 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java
@@ -489,7 +489,7 @@ public class JSONRestconfServiceRfc8040ImplTest {
         assertTrue("Expected ContainerNode. Actual " + capturedNode.getValue().getClass(),
                 capturedNode.getValue() instanceof ContainerNode);
         final ContainerNode actualNode = (ContainerNode) capturedNode.getValue();
-        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, Long.valueOf(10));
+        verifyLeafNode(actualNode, TOASTER_DONENESS_QNAME, 10L);
         verifyLeafNode(actualNode, TOASTER_TYPE_QNAME, WHEAT_BREAD_QNAME);
     }