Use union stringValue()

getValue() is going away, use stringValue(), which is its replacement.

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

diff --git a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnNlriParser.java b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnNlriParser.java
index bb1125fae5495448398681cc20e475e4464d0053..a0ec5f5a0865393d7b8bc5dd5b259c590eea930a 100644 (file)
--- a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnNlriParser.java
+++ b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnNlriParser.java
@@ -39,7 +39,7 @@ public abstract class AbstractFlowspecL3vpnNlriParser extends AbstractFlowspecNl
         final StringBuilder buffer = new StringBuilder();
         final RouteDistinguisher rd = extractRouteDistinguisher(flowspec, RD_NID);
         if (rd != null) {
-            buffer.append("[l3vpn with route-distinguisher ").append(rd.getValue()).append("] ");
+            buffer.append("[l3vpn with route-distinguisher ").append(rd.stringValue()).append("] ");
         }
         buffer.append(super.stringNlri(flowspec));
         return buffer.toString();

diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java
index 1009df91dec5bd4baa50b9c5a68e8bcf8eb587c8..0d3f75f820c6e2a20883ad0df7f0d52cc2854d9e 100644 (file)
--- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java
+++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java
@@ -245,7 +245,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         final FlowspecType sps
     ) {
         assertEquals(6, flows.size());
-        assertEquals(ROUTE_DISTINGUISHER, new String(rd.getValue()));
+        assertEquals(ROUTE_DISTINGUISHER, rd.stringValue());
         assertEquals(destinationPrefix, flows.get(0).getFlowspecType());
         assertEquals(sourcePrefix, flows.get(1).getFlowspecType());
         assertEquals(prots, flows.get(2).getFlowspecType());

diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
index 4273ca4e368f1412ab52ed15048b2f2e711433dd..773140e70638349bdff7d19659d8d743f7f7183e 100644 (file)
--- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
+++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
@@ -156,7 +156,7 @@ public class FlowspecL3vpnIpv6NlriParserTest {
         final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher();
 
         assertEquals(3, flows.size());
-        assertEquals(ROUTE_DISTINGUISHER, new String(rd.getValue()));
+        assertEquals(ROUTE_DISTINGUISHER, rd.stringValue());
         assertEquals(destinationPrefix, flows.get(0).getFlowspecType());
         assertEquals(sourcePrefix, flows.get(1).getFlowspecType());
         assertEquals(headersCase, flows.get(2).getFlowspecType());
@@ -210,7 +210,7 @@ public class FlowspecL3vpnIpv6NlriParserTest {
         final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher();
 
         assertEquals(3, flows.size());
-        assertEquals(ROUTE_DISTINGUISHER, new String(rd.getValue()));
+        assertEquals(ROUTE_DISTINGUISHER, rd.stringValue());
         assertEquals(destinationPrefix, flows.get(0).getFlowspecType());
         assertEquals(sourcePrefix, flows.get(1).getFlowspecType());
         assertEquals(headersCase, flows.get(2).getFlowspecType());
@@ -260,7 +260,7 @@ public class FlowspecL3vpnIpv6NlriParserTest {
         final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher();
 
         assertEquals(2, flows.size());
-        assertEquals(ROUTE_DISTINGUISHER, new String(rd.getValue()));
+        assertEquals(ROUTE_DISTINGUISHER, rd.stringValue());
         assertEquals(fragment, flows.get(0).getFlowspecType());
         assertEquals(label, flows.get(1).getFlowspecType());
 
@@ -321,7 +321,7 @@ public class FlowspecL3vpnIpv6NlriParserTest {
         final RouteDistinguisher rd = flowspecDst.getRouteDistinguisher();
 
         assertEquals(2, flows.size());
-        assertEquals(ROUTE_DISTINGUISHER, new String(rd.getValue()));
+        assertEquals(ROUTE_DISTINGUISHER, rd.stringValue());
         assertEquals(fragment, flows.get(0).getFlowspecType());
         assertEquals(label, flows.get(1).getFlowspecType());
 

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
index 2416e5cd34180357f30c9a8847864e09aa781e61..fa6ddb763346a806b482c48fd9028c64a9390b7f 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
@@ -112,7 +112,7 @@ public abstract class AbstractRIBSupportTest<C extends Routes & DataObject & Cho
 
         doAnswer(invocation -> {
             final Object[] args = invocation.getArguments();
-            AbstractRIBSupportTest.this.deletedRoutes.add((InstanceIdentifier<R>)
+            AbstractRIBSupportTest.this.deletedRoutes.add((InstanceIdentifier)
                     this.mappingService.fromYangInstanceIdentifier((YangInstanceIdentifier) args[1]));
             return args[1];
         }).when(this.tx).delete(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class));