remove unnecesary boxing / unboxing 16/62316/4
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Fri, 25 Aug 2017 11:28:57 +0000 (13:28 +0200)
committerDana Kutenicsova <dana.kutenics@gmail.com>
Sat, 9 Sep 2017 14:46:18 +0000 (14:46 +0000)
Change-Id: Ia0600f1684cb122bd41b2b0bb056ac60f50593c6
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
14 files changed:
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/TrafficMarkingEcHandler.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java
concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java

index 52e0d6018326bc4a5ba5cd306f23ca9a8d23da36..e878942bdb7a7da7c2244ee93d6ed9ecf1ed4fa1 100644 (file)
@@ -50,7 +50,7 @@ public class PeerDownHandler extends AbstractBmpPerPeerMessageParser<PeerDownNot
         if (peerDown.isLocalSystemClosed()) {
             if (peerDown.getData() instanceof FsmEventCode) {
                 ByteBufWriteUtil.writeUnsignedByte(REASON_TWO.getValue(), buffer);
-                ByteBufWriteUtil.writeUnsignedShort(((FsmEventCode) peerDown.getData()).getFsmEventCode().intValue(), buffer);
+                ByteBufWriteUtil.writeUnsignedShort(((FsmEventCode) peerDown.getData()).getFsmEventCode(), buffer);
             } else if (peerDown.getData() instanceof
                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.peer.down.data.Notification) {
                 ByteBufWriteUtil.writeUnsignedByte(REASON_ONE.getValue(), buffer);
index 52f8319a06512fbfbcd70519ec108a459378b8ff..e46e80e624dbb03cafb5dddf61275bb886adbbd4 100644 (file)
@@ -35,7 +35,7 @@ public class TrafficMarkingEcHandler implements ExtendedCommunityParser, Extende
                 "The extended community %s is not TrafficMarkingExtendedCommunity type.", extendedCommunity);
         final TrafficMarkingExtendedCommunity trafficMarking = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.TrafficMarkingExtendedCommunity) extendedCommunity).getTrafficMarkingExtendedCommunity();
         byteAggregator.writeZero(RESERVED);
-        ByteBufWriteUtil.writeUnsignedByte(trafficMarking.getGlobalAdministrator().getValue().shortValue(), byteAggregator);
+        ByteBufWriteUtil.writeUnsignedByte(trafficMarking.getGlobalAdministrator().getValue(), byteAggregator);
     }
 
     @Override
index 40cb5bd1fb44643e53f7b57e0ad2dd2c4d9991d2..9283c1196cdaa4aef7ef139b3a5f4be004da7cd5 100644 (file)
@@ -290,8 +290,8 @@ public class FlowspecL3vpnIpv6NlriParserTest {
 
     private static FlowspecType createLabel() {
         final List<FlowLabel> labels = new ArrayList<>(2);
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build());
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(16777222L).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(258L).build());
         return new FlowLabelCaseBuilder().setFlowLabel(labels).build();
     }
 
index 1da44f219a5d923211f6f107cdb98f0bfbab5f95..7fce35b47e494b1e4c0be164f59c1b8c27002396 100644 (file)
@@ -267,8 +267,8 @@ public class SimpleFlowspecIpv6NlriParserTest {
 
     private static FlowspecType createLabel() {
         final List<FlowLabel> labels = new ArrayList<>(2);
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build());
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(16777222L).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(258L).build());
         return new FlowLabelCaseBuilder().setFlowLabel(labels).build();
     }
 
index 06ca1c8208e015503fbc90f84cc56d1dfec57501..3016872cd7a89629580d5264f5430b9171e27135 100644 (file)
@@ -51,7 +51,7 @@ public class UnrecognizedAttributesTest {
         assertEquals(UNRECOGNIZED_ATTRIBUTE_COUNT, unrecogAttribs.size());
         final UnrecognizedAttributes unrecogAttrib = unrecogAttribs.get(FIRST_ATTRIBUTE);
         final UnrecognizedAttributesKey expectedAttribKey =
-            new UnrecognizedAttributesKey(unrecogAttrib.getType().shortValue());
+            new UnrecognizedAttributesKey(unrecogAttrib.getType());
 
         assertTrue(unrecogAttrib.isPartial());
         assertTrue(unrecogAttrib.isTransitive());
index 2b2efc609cb29e729db662e0fa60280549e51484..f80960ef99df353fc9f25448a453929e33867d7b 100644 (file)
@@ -70,7 +70,7 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
 
         final BGPProtocolSessionPromise<?> lock = this;
         try {
-            LOG.debug("Promise {} attempting connect for {}ms", lock, Integer.valueOf(CONNECT_TIMEOUT));
+            LOG.debug("Promise {} attempting connect for {}ms", lock, CONNECT_TIMEOUT);
             if (this.address.isUnresolved()) {
                 this.address = new InetSocketAddress(this.address.getHostName(), this.address.getPort());
             }
index 0245ce31450156de3d34d8d8d4807cd5912d3305..ddc1de879e208031a1df7e55ff8ff7e66ca84451 100644 (file)
@@ -163,8 +163,8 @@ public class BGPSessionImplTest {
         assertEquals(BGP_ID.getValue(), state.getLocalPeerPreferences().getBgpId().getValue());
         assertEquals(1, state.getLocalPeerPreferences().getAdvertizedTableTypes().size());
         assertEquals(HOLD_TIMER, state.getLocalPeerPreferences().getHoldtimer().intValue());
-        assertTrue(state.getLocalPeerPreferences().getFourOctetAsCapability().booleanValue());
-        assertTrue(state.getLocalPeerPreferences().getBgpExtendedMessageCapability().booleanValue());
+        assertTrue(state.getLocalPeerPreferences().getFourOctetAsCapability());
+        assertTrue(state.getLocalPeerPreferences().getBgpExtendedMessageCapability());
         assertTrue(state.getLocalPeerPreferences().getGrCapability());
         assertEquals(LOCAL_IP, new String(state.getRemotePeerPreferences().getHost().getValue()));
         assertEquals(LOCAL_PORT, state.getRemotePeerPreferences().getPort().getValue().intValue());
index 0f60733349a589a840d6148221a975e3e445b608..2e04675560a18ee32d946b2e3a4fb3e32b6b6888 100644 (file)
@@ -46,7 +46,7 @@ public class UriBuilderTest {
         final UriBuilder c = new UriBuilder(b, "foo");
         assertEquals("bgpls://1:Direct:10/type=foo", c.toString());
 
-        a.add("foo", new Long(25L));
+        a.add("foo", 25L);
         assertEquals("bgpls://Direct:10/&foo=25", a.toString());
 
         final LinkCaseBuilder linkB = new LinkCaseBuilder();
index 8afd6c7ed27b75b91a5281582d5d2e85b8fdb276..020688999ddd1954f0ff33a8780df4c228b84519 100644 (file)
@@ -32,7 +32,7 @@ public class MultiRegistryTest {
 
         assertEquals(Integer.valueOf(22), registry.get("second"));
 
-        registry.register(Character.valueOf('c'), 5);
+        registry.register('c', 5);
 
         assertEquals(Integer.valueOf(5), registry.get('c'));
 
@@ -46,14 +46,14 @@ public class MultiRegistryTest {
         final MultiRegistry<Object, Number> registry = new MultiRegistry<>();
         final String first = "first";
 
-        registry.register(first, new Integer(1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Short((short) 1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, (short) 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Short((short) 2));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, (short) 2);
+        assertEquals(1, registry.get("first"));
     }
 
     @Test
@@ -62,20 +62,20 @@ public class MultiRegistryTest {
         final String first = "first";
         final String second = "second";
 
-        registry.register(first, new Integer(1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Character('1'));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, '1');
+        assertEquals(1, registry.get("first"));
 
-        registry.register(second, new Character('2'));
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        registry.register(second, '2');
+        assertEquals('2', registry.get("second"));
 
-        registry.register(second, new Integer(2));
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        registry.register(second, 2);
+        assertEquals('2', registry.get("second"));
 
         registry.register(second, new Object());
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        assertEquals('2', registry.get("second"));
     }
 
 }
index 9ca024200599435df0a1397c3e95c1bae0820ee2..53fd99da8edb31b9dc24ecc8d570acf2e410307a 100644 (file)
@@ -156,7 +156,7 @@ public class PCEPRequestParameterObjectParser extends AbstractObjectWithTlvsPars
         flags.set(E_FLAG_OFFSET, rpObj.isEroCompression());
         final byte[] res = flags.array();
         if (rpObj.getPriority() != null) {
-            final byte p = UnsignedBytes.checkedCast(rpObj.getPriority().shortValue());
+            final byte p = UnsignedBytes.checkedCast(rpObj.getPriority());
             res[res.length -1] = (byte) (res[res.length -1] | p);
         }
         body.writeBytes(res);
index 889898f35d9b8b619b474cb76ae867b5c8011ab8..b82e87082af3de461cb738d3ca033f9a4224ad47 100755 (executable)
@@ -50,7 +50,7 @@ public final class PCEPProtocolSessionPromise<S extends PCEPSession> extends Def
         final PCEPProtocolSessionPromise<?> lock = this;
 
         try {
-            LOG.debug("Promise {} attempting connect for {}ms", lock, Integer.valueOf(this.connectTimeout));
+            LOG.debug("Promise {} attempting connect for {}ms", lock, this.connectTimeout);
             if (this.address.isUnresolved()) {
                 this.address = new InetSocketAddress(this.address.getHostName(), this.address.getPort());
             }
index 121904533e96577b21bf9e10a5888289641238fe..b177a11f505fdee7316022447b7e2199b617da0c 100755 (executable)
@@ -85,7 +85,7 @@ public final class Main {
             } else if (args[argIdx].equals("--password")) {
                 password = args[++argIdx];
             } else if (args[argIdx].equals("--reconnect")) {
-                reconnectTime = Integer.valueOf(args[++argIdx]).intValue();
+                reconnectTime = Integer.valueOf(args[++argIdx]);
             } else if (args[argIdx].equals("--redelegation-timeout")) {
                 redelegationTimeout = Integer.valueOf(args[++argIdx]);
             } else if (args[argIdx].equals("--state-timeout")) {
index 3ca2ec8abbd91f3d55f15049ef41f8ac04ef0b2c..15ec2f51a070f00288730d97cf388dec0dd125c5 100644 (file)
@@ -191,9 +191,9 @@ public abstract class PCCMockCommon {
             for (final Reports report : pcrt) {
                 final Lsp lsp = report.getLsp();
                 if (lsp.getPlspId().getValue() == 0) {
-                    assertEquals(false, lsp.isSync().booleanValue());
+                    assertEquals(false, lsp.isSync());
                 } else {
-                    assertEquals(true, lsp.isSync().booleanValue());
+                    assertEquals(true, lsp.isSync());
                 }
                 final BigInteger actuaLspDBVersion = lsp.getTlvs().getAugmentation(org.opendaylight.yang.gen
                     .v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class)
index d5ffe2ed3d64b236612ad16ad35b34ee2a060b47..1769c26cb7f1489d12719cdabafe339edae12f7f 100644 (file)
@@ -21,7 +21,7 @@ public final class PSTUtil {
      * @return  true if setup is via RSVP-TE signaling protocol
      */
     public static boolean isDefaultPST(final PathSetupType pst) {
-        if (pst != null && pst.getPst() != null && pst.getPst().shortValue() != 0) {
+        if (pst != null && pst.getPst() != null && pst.getPst() != 0) {
             return false;
         }
         return true;