From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 30 May 2019 14:02:44 +0000 (+0200)
Subject: Improve NetconfMessageTransformer.isBaseOrNotificationRpc()
X-Git-Tag: release/sodium~49
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=872434c2d06b84ceb127e3dd62bacd232ae2958b;p=netconf.git

Improve NetconfMessageTransformer.isBaseOrNotificationRpc()

Rather than performing up to three equality comparisons, keep
matching URIs in a constant set and perform Set.contains().

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

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
index 79bc20ad36..10603017c2 100644
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
@@ -21,6 +21,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.Collection;
@@ -76,6 +77,11 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
 
     private static final Logger LOG = LoggerFactory.getLogger(NetconfMessageTransformer.class);
 
+    private static final ImmutableSet<URI> BASE_OR_NOTIFICATION_NS = ImmutableSet.of(
+        NETCONF_URI,
+        IETF_NETCONF_NOTIFICATIONS.getNamespace(),
+        CREATE_SUBSCRIPTION_RPC_QNAME.getNamespace());
+
     private final SchemaContext schemaContext;
     private final BaseSchema baseSchema;
     private final MessageCounter counter;
@@ -258,9 +264,7 @@ public class NetconfMessageTransformer implements MessageTransformer<NetconfMess
     }
 
     private static boolean isBaseOrNotificationRpc(final QName rpc) {
-        return rpc.getNamespace().equals(NETCONF_URI)
-                || rpc.getNamespace().equals(IETF_NETCONF_NOTIFICATIONS.getNamespace())
-                || rpc.getNamespace().equals(CREATE_SUBSCRIPTION_RPC_QNAME.getNamespace());
+        return BASE_OR_NOTIFICATION_NS.contains(rpc.getNamespace());
     }
 
     @Override