From: Claudio D. Gasparini Date: Fri, 25 Aug 2017 11:28:57 +0000 (+0200) Subject: remove unnecesary boxing / unboxing X-Git-Tag: release/oxygen~168 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f508b44f76afc2bedf45d38eb9497985890666a8;p=bgpcep.git remove unnecesary boxing / unboxing Change-Id: Ia0600f1684cb122bd41b2b0bb056ac60f50593c6 Signed-off-by: Claudio D. Gasparini --- diff --git a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java index 52e0d60183..e878942bdb 100644 --- a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java @@ -50,7 +50,7 @@ public class PeerDownHandler extends AbstractBmpPerPeerMessageParser 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(); } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java index 1da44f219a..7fce35b47e 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java @@ -267,8 +267,8 @@ public class SimpleFlowspecIpv6NlriParserTest { private static FlowspecType createLabel() { final List 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(); } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java index 06ca1c8208..3016872cd7 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java @@ -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()); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java index 2b2efc609c..f80960ef99 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java @@ -70,7 +70,7 @@ public final class BGPProtocolSessionPromise 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()); } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java index 0245ce3145..ddc1de879e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java @@ -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()); diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java index 0f60733349..2e04675560 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java @@ -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(); diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java index 8afd6c7ed2..020688999d 100644 --- a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java +++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java @@ -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 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")); } } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java index 9ca0242005..53fd99da8e 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java @@ -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); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java index 889898f35d..b82e87082a 100755 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java @@ -50,7 +50,7 @@ public final class PCEPProtocolSessionPromise 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()); } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java index 121904533e..b177a11f50 100755 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java @@ -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")) { diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java index 3ca2ec8abb..15ec2f51a0 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java @@ -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) diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java index d5ffe2ed3d..1769c26cb7 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java @@ -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;