Intern constant QNames

We really want to reuse global constants here, make sure that happens.

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

diff --git a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java
index 929ede3fb089a2efdcd8a5f7c048e127d772bd24..53049a8508460c39f99b54fa2851fe93cafe1f1f 100644 (file)
--- a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java
+++ b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java
@@ -106,10 +106,10 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
     static final NodeIdentifier FLOWSPEC_NID = new NodeIdentifier(Flowspec.QNAME);
     @VisibleForTesting
     static final NodeIdentifier FLOWSPEC_TYPE_NID = new NodeIdentifier(FlowspecType.QNAME);
-    public static final NodeIdentifier DEST_PREFIX_NID
-            = new NodeIdentifier(QName.create(DestinationPrefixCase.QNAME, "destination-prefix").intern());
-    public static final NodeIdentifier SOURCE_PREFIX_NID
-            = new NodeIdentifier(QName.create(SourcePrefixCase.QNAME, "source-prefix").intern());
+    public static final NodeIdentifier DEST_PREFIX_NID =
+        new NodeIdentifier(QName.create(DestinationPrefixCase.QNAME, "destination-prefix").intern());
+    public static final NodeIdentifier SOURCE_PREFIX_NID =
+        new NodeIdentifier(QName.create(SourcePrefixCase.QNAME, "source-prefix").intern());
     @VisibleForTesting
     static final NodeIdentifier PORTS_NID = new NodeIdentifier(Ports.QNAME);
     @VisibleForTesting
@@ -129,11 +129,9 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
     @VisibleForTesting
     static final NodeIdentifier FRAGMENT_NID = new NodeIdentifier(Fragments.QNAME);
     @VisibleForTesting
-    public static final NodeIdentifier OP_NID
-            = new NodeIdentifier(QName.create(Flowspec.QNAME.getModule(), "op"));
+    public static final NodeIdentifier OP_NID = new NodeIdentifier(QName.create(Flowspec.QNAME, "op").intern());
     @VisibleForTesting
-    public static final NodeIdentifier VALUE_NID
-            = new NodeIdentifier(QName.create(Flowspec.QNAME.getModule(), "value"));
+    public static final NodeIdentifier VALUE_NID = new NodeIdentifier(QName.create(Flowspec.QNAME, "value").intern());
 
     protected final FlowspecTypeRegistry flowspecTypeRegistry;
 
@@ -215,7 +213,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
     protected final void serializeNlri(final List<Flowspec> flowspecList, final @NonNull ByteBuf buffer) {
         if (flowspecList != null) {
             for (final Flowspec flow : flowspecList) {
-                this.flowspecTypeRegistry.serializeFlowspecType(flow.getFlowspecType(), buffer);
+                flowspecTypeRegistry.serializeFlowspecType(flow.getFlowspecType(), buffer);
             }
         }
     }
@@ -580,7 +578,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
             while (nlriLength > 0) {
                 final int readableLength = nlri.readableBytes();
                 final FlowspecBuilder builder = new FlowspecBuilder();
-                builder.setFlowspecType(this.flowspecTypeRegistry.parseFlowspecType(nlri));
+                builder.setFlowspecType(flowspecTypeRegistry.parseFlowspecType(nlri));
                 fss.add(builder.build());
                 final int flowspecTypeLength = readableLength - nlri.readableBytes();
                 nlriLength -= flowspecTypeLength;

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 7e19398e1a74f4c2cb838c91d08562d640e63c23..c033d793a066ad4681a93bdfbaa2ea82489d5f14 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
@@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractFlowspecL3vpnNlriParser extends AbstractFlowspecNlriParser {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractFlowspecL3vpnNlriParser.class);
-    public static final NodeIdentifier RD_NID = new NodeIdentifier(QName.create(Flowspec.QNAME.getModule(),
-            "route-distinguisher"));
+    public static final NodeIdentifier RD_NID =
+        new NodeIdentifier(QName.create(Flowspec.QNAME, "route-distinguisher").intern());
 
     protected AbstractFlowspecL3vpnNlriParser(final FlowspecTypeRegistry flowspecTypeRegistry) {
         super(flowspecTypeRegistry);
@@ -79,7 +79,7 @@ public abstract class AbstractFlowspecL3vpnNlriParser extends AbstractFlowspecNl
 
         while (nlri.isReadable()) {
             final FlowspecBuilder builder = new FlowspecBuilder();
-            builder.setFlowspecType(this.flowspecTypeRegistry.parseFlowspecType(nlri));
+            builder.setFlowspecType(flowspecTypeRegistry.parseFlowspecType(nlri));
             fss.add(builder.build());
         }