Move netconf.util.xml to netconf-client

[netconf.git] / protocol / netconf-client / src / main / java / org / opendaylight / netconf / client / HardcodedNamespaceResolver.java

diff --git a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/HardcodedNamespaceResolver.java
similarity index 57%
rename from protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java
rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/HardcodedNamespaceResolver.java
index ceb50b1920cf09ba49fb30e9ad2441f745bd8387..b7eb4e4b34123a456834864e5d63725e7abe35e9 100644 (file)
--- a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java
+++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/HardcodedNamespaceResolver.java
@@ -5,24 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.util.xml;
+package org.opendaylight.netconf.client;
 
-import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import javax.xml.namespace.NamespaceContext;
 
 // http://www.ibm.com/developerworks/library/x-nmspccontext/
-public class HardcodedNamespaceResolver implements NamespaceContext {
-    private final Map<String/* prefix */, String/* namespace */> prefixesToNamespaces;
+final class HardcodedNamespaceResolver implements NamespaceContext {
+    private final Map<String, String> prefixesToNamespaces;
 
-    public HardcodedNamespaceResolver(final String prefix, final String namespace) {
-        this(ImmutableMap.of(prefix, namespace));
-    }
-
-    public HardcodedNamespaceResolver(final Map<String, String> prefixesToNamespaces) {
-        this.prefixesToNamespaces = Collections.unmodifiableMap(prefixesToNamespaces);
+    HardcodedNamespaceResolver(final String prefix, final String namespace) {
+        prefixesToNamespaces = Map.of(prefix, namespace);
     }
 
     /**
@@ -34,11 +28,11 @@ public class HardcodedNamespaceResolver implements NamespaceContext {
      */
     @Override
     public String getNamespaceURI(final String prefix) {
-        if (prefixesToNamespaces.containsKey(prefix)) {
-            return prefixesToNamespaces.get(prefix);
+        final var namespace = prefixesToNamespaces.get(prefix);
+        if (namespace == null) {
+            throw new IllegalStateException("Prefix mapping not found for " + prefix);
         }
-
-        throw new IllegalStateException("Prefix mapping not found for " + prefix);
+        return namespace;
     }
 
     @Override