Use NodeIdentifier.create()

For pre-computed constants it is beneficial to have them shared across
the system, such that when they meet we end up sharing them.

Change-Id: Ic81a350c94010450540868a9281d2994f4e08f2a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java
index 4ad5647097cdf50444d5b118156e4f8fd64a6239..fd7d784669d9ee83dc7a484b827f889a056755d7 100644 (file)
--- a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java
+++ b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java
@@ -39,7 +39,7 @@ public class ConnectionNotificationTopicRegistration extends NotificationTopicRe
 
     public static final SchemaPath EVENT_SOURCE_STATUS_PATH = SchemaPath
         .create(true, QName.create(EventSourceStatusNotification.QNAME, "event-source-status"));
-    private static final NodeIdentifier EVENT_SOURCE_STATUS_ARG = new NodeIdentifier(
+    private static final NodeIdentifier EVENT_SOURCE_STATUS_ARG = NodeIdentifier.create(
         EventSourceStatusNotification.QNAME);
     private static final String XMLNS_ATTRIBUTE_KEY = "xmlns";
     private static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";

diff --git a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java
index 30ed9be743fa17e39f8cd270095018eccf47099f..756f1523a0ff5b33ec588e7b43901d651e304c45 100644 (file)
--- a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java
+++ b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java
@@ -77,12 +77,12 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener
 
     private static final Logger LOG = LoggerFactory.getLogger(NetconfEventSource.class);
 
-    private static final NodeIdentifier TOPIC_NOTIFICATION_ARG = new NodeIdentifier(TopicNotification.QNAME);
-    private static final NodeIdentifier EVENT_SOURCE_ARG = new NodeIdentifier(
+    private static final NodeIdentifier TOPIC_NOTIFICATION_ARG = NodeIdentifier.create(TopicNotification.QNAME);
+    private static final NodeIdentifier EVENT_SOURCE_ARG = NodeIdentifier.create(
         QName.create(TopicNotification.QNAME, "node-id"));
-    private static final NodeIdentifier TOPIC_ID_ARG = new NodeIdentifier(
+    private static final NodeIdentifier TOPIC_ID_ARG = NodeIdentifier.create(
         QName.create(TopicNotification.QNAME, "topic-id"));
-    private static final NodeIdentifier PAYLOAD_ARG = new NodeIdentifier(
+    private static final NodeIdentifier PAYLOAD_ARG = NodeIdentifier.create(
         QName.create(TopicNotification.QNAME, "payload"));
     private static final String ConnectionNotificationSourceName = "ConnectionNotificationSource";
 

diff --git a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java
index 16bd9d37f13763491046c62cd844b4637231298d..7031d7bee5f804f0e3013cace1565cbbede2ea73 100644 (file)
--- a/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java
+++ b/opendaylight/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java
@@ -35,12 +35,14 @@ import org.slf4j.LoggerFactory;
 public class StreamNotificationTopicRegistration extends NotificationTopicRegistration {
 
     private static final Logger LOG = LoggerFactory.getLogger(StreamNotificationTopicRegistration.class);
-    private static final NodeIdentifier STREAM_QNAME = new NodeIdentifier(
+    private static final NodeIdentifier STREAM_QNAME = NodeIdentifier.create(
         QName.create(CreateSubscriptionInput.QNAME, "stream"));
     private static final SchemaPath CREATE_SUBSCRIPTION = SchemaPath
         .create(true, QName.create(CreateSubscriptionInput.QNAME, "create-subscription"));
-    private static final NodeIdentifier START_TIME_SUBSCRIPTION = new NodeIdentifier(
+    private static final NodeIdentifier START_TIME_SUBSCRIPTION = NodeIdentifier.create(
         QName.create(CreateSubscriptionInput.QNAME, "startTime"));
+    private static final NodeIdentifier CREATE_SUBSCRIPTION_INPUT = NodeIdentifier.create(
+        CreateSubscriptionInput.QNAME);
 
     final private DOMMountPoint domMountPoint;
     final private String nodeId;
@@ -68,7 +70,7 @@ public class StreamNotificationTopicRegistration extends NotificationTopicRegist
         if (isActive() == false) {
             LOG.info("Stream {} is not active on node {}. Will subscribe.", this.getStreamName(), this.nodeId);
             final ContainerNode input = Builders.containerBuilder()
-                .withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME))
+                .withNodeIdentifier(CREATE_SUBSCRIPTION_INPUT)
                 .withChild(ImmutableNodes.leafNode(STREAM_QNAME, this.getStreamName())).build();
             CheckedFuture<DOMRpcResult, DOMRpcException> csFuture = domMountPoint.getService(DOMRpcService.class).get()
                 .invokeRpc(CREATE_SUBSCRIPTION, input);
@@ -89,7 +91,7 @@ public class StreamNotificationTopicRegistration extends NotificationTopicRegist
         if (isActive()) {
             LOG.info("Stream {} is reactivating on node {}.", this.getStreamName(), this.nodeId);
             DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> inputBuilder = Builders.containerBuilder()
-                .withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME))
+                .withNodeIdentifier(CREATE_SUBSCRIPTION_INPUT)
                 .withChild(ImmutableNodes.leafNode(STREAM_QNAME, this.getStreamName()));
             if (isReplaySupported() && this.getLastEventTime() != null) {
                 inputBuilder.withChild(ImmutableNodes.leafNode(START_TIME_SUBSCRIPTION, this.getLastEventTime()));