From: Jakub Morvay Date: Tue, 4 Dec 2018 12:08:21 +0000 (+0100) Subject: Fix Java 5 IDE migration warnings X-Git-Tag: release/neon~87^2~2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=956285fc6f3ffeabd828f164700e7f997eda2faa;p=netconf.git 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 --- 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 cdb0462d8f..ae4ccc8649 100644 --- 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 2dbc49fe83..5db8a6c811 100644 --- 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 7f25c25031..094b570700 100644 --- 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 29fe99fcb0..e74a9a1038 100644 --- 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> iterator = data.getValue().iterator(); - while (iterator.hasNext()) { - final DataContainerChild child = iterator.next(); + for (final DataContainerChild 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 57428b90b6..c15363dcb6 100644 --- 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() { @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 95010cff19..f1b88155b7 100644 --- 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 f82fc170fa..d81d11e985 100644 --- 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 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 ad9637ca16..3c87380b11 100644 --- 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 92a4361004..3af3bca77a 100644 --- 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 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 al = new ArrayList<>(); - al.add(new Byte((byte) 1)); + al.add((byte) 1); final List 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 2e7721c108..530378ce5d 100644 --- 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 78c1999f1b..32523e815b 100644 --- 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); }