Further deprecation removal

This makes another pass at warnings, eliminating unneeded conversions
in a few places.

Change-Id: I9b19289e104be890afbe0f0525b6efaba2bf4e55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
index 4d33a6e5c3d7950d68033d43ebc7aa06e0b1ed38..52d72488a830cc3ad0b7a6a0db361c29af0023eb 100644 (file)
--- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
+++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
@@ -9,9 +9,7 @@
 package org.opendaylight.protocol.bgp.state;
 
 import com.google.common.primitives.UnsignedInteger;
-import com.google.common.primitives.UnsignedLong;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -81,7 +79,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.open
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.Sent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.SentBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 /**
  * Util for create OpenConfig Neighbor with corresponding openConfig state.
@@ -238,7 +238,7 @@ public final class NeighborUtil {
         final NeighborGracefulRestartStateAugmentation gracefulRestartState =
                 new NeighborGracefulRestartStateAugmentationBuilder()
                         .setLocalRestarting(neighbor.isLocalRestarting())
-                        .setPeerRestartTime(neighbor.getPeerRestartTime())
+                        .setPeerRestartTime(Uint16.valueOf(neighbor.getPeerRestartTime()))
                         .setMode(neighbor.getMode())
                         .setPeerRestarting(neighbor.isPeerRestarting()).build();
 
@@ -299,19 +299,15 @@ public final class NeighborUtil {
 
     private static Received buildMessagesReceived(final @NonNull BGPPeerMessagesState neighbor) {
         return new ReceivedBuilder()
-                .setUPDATE(toBigInteger(neighbor.getUpdateMessagesReceivedCount()))
-                .setNOTIFICATION(toBigInteger(neighbor.getNotificationMessagesReceivedCount()))
+                .setUPDATE(Uint64.valueOf(neighbor.getUpdateMessagesReceivedCount()))
+                .setNOTIFICATION(Uint64.valueOf(neighbor.getNotificationMessagesReceivedCount()))
                 .build();
     }
 
-    public static BigInteger toBigInteger(final long updateReceivedCounter) {
-        return UnsignedLong.valueOf(updateReceivedCounter).bigIntegerValue();
-    }
-
     private static Sent buildMessagesSent(final @NonNull BGPPeerMessagesState neighbor) {
         return new SentBuilder()
-                .setUPDATE(toBigInteger(neighbor.getUpdateMessagesSentCount()))
-                .setNOTIFICATION(toBigInteger(neighbor.getNotificationMessagesSentCount()))
+                .setUPDATE(Uint64.valueOf(neighbor.getUpdateMessagesSentCount()))
+                .setNOTIFICATION(Uint64.valueOf(neighbor.getNotificationMessagesSentCount()))
                 .build();
     }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
index 447ab30d99b4201711d5167ebb45d29cb4d944a2..9544149cbab6fde2c16791d58638e4fe9f4c4ee9 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
@@ -109,8 +109,8 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
 
             final BGPSessionPreferences preferences = this.registry.getPeerPreferences(remoteIp);
             final Uint16 as = openASNumber(preferences.getMyAs().getValue().longValue());
-            sendMessage(new OpenBuilder().setMyAsNumber(as).setHoldTimer(preferences.getHoldTime()).setBgpIdentifier(
-                    preferences.getBgpId()).setBgpParameters(preferences.getParams()).build());
+            sendMessage(new OpenBuilder().setMyAsNumber(as).setHoldTimer(Uint16.valueOf(preferences.getHoldTime()))
+                .setBgpIdentifier(preferences.getBgpId()).setBgpParameters(preferences.getParams()).build());
             if (this.state != State.FINISHED) {
                 this.state = State.OPEN_SENT;
                 this.pending = this.channel.eventLoop().schedule(() -> {

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
index a8e34c89033a87759d03f2084a90ae8ab6bba4e1..6ddb1c6ed1ba8e97bb3bed745db5d8a650545023 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
@@ -378,7 +378,7 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
         attBuilder.setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(localPreference)).build());
         attBuilder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build());
         attBuilder.setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build());
-        attBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        attBuilder.setUnrecognizedAttributes(Collections.emptyMap());
         return new UpdateBuilder()
                 .setWithdrawnRoutes(Collections.singletonList(new WithdrawnRoutesBuilder().setPrefix(prefix).build()))
                 .build();

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
index 51546155c16256108ef6fdbb3504f8b9cb051191..6b6b58e8732376da37c93547f50d6d8840cb37c5 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
@@ -64,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 final class PeerUtil {
@@ -173,7 +174,7 @@ final class PeerUtil {
                     .addAugmentation(new CParameters1Builder()
                         .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
                             .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
-                            .setRestartTime(restartTime)
+                            .setRestartTime(Uint16.valueOf(restartTime))
                             .setTables(gracefulTables.keySet().stream()
                                 .map(key -> new TablesBuilder()
                                     .setAfi(key.getAfi())

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
index 7b4205eb2c47cefcbcf03361a353b38a741e4217..6cd42d04dd7716ef832b05f2f6243bba6766e25b 100644 (file)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
@@ -146,7 +146,7 @@ public abstract class AbstractPCEPSessionTest<T extends TopologySessionListenerF
         doReturn(this.statsRegistry).when(this.topologyDependencies).getStateRegistry();
 
         @SuppressWarnings("unchecked") final T listenerFactory = (T) ((Class) ((ParameterizedType) this.getClass()
-                .getGenericSuperclass()).getActualTypeArguments()[0]).newInstance();
+                .getGenericSuperclass()).getActualTypeArguments()[0]).getDeclaredConstructor().newInstance();
         doReturn(new IpAddressNoZone(new Ipv4AddressNoZone(this.testAddress))).when(this.sessionConfig)
             .getListenAddress();
         doReturn(new PortNumber(Uint16.valueOf(4189))).when(this.sessionConfig).getListenPort();

diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
index 2b1996568c7087cabb8ec724661c7f00399b2e4a..b190167623bf119af017b7cf766e31a973c8a2ee 100644 (file)
--- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
+++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.bgpcep.programming.impl;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doReturn;