Refactor NetconfUtils class

Use NormalizedDataUtil.NETCONF_QNAME public constant. Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
PANTHEONtech · Sep 8, 2023 · 5df4586 · 5df4586
1 parent f7f7cb7
commit 5df4586
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/util/NetconfUtils.java b/...netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/util/NetconfUtils.java
@@ -17,6 +17,7 @@
 import static org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil.NETCONF_TARGET_NODEID;
 import static org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil.NETCONF_UNLOCK_NODEID;
 import static org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil.NETCONF_VALIDATE_NODEID;
+import static org.opendaylight.netconf.common.mdsal.NormalizedDataUtil.NETCONF_QNAME;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
@@ -42,8 +43,6 @@
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode;
@@ -54,12 +53,10 @@
 import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public final class NetconfUtils {
     public static final QName NETCONF_DELETE_CONFIG_QNAME =
-        QName.create(QName.create(QNameModule.create(SchemaContext.NAME.getNamespace(), Revision.of("2011-06-01")),
-            "netconf").intern(), "delete-config").intern();
+        QName.create(NETCONF_QNAME, "delete-config").intern();
     public static final NodeIdentifier NETCONF_DELETE_CONFIG_NODEID =
             NodeIdentifier.create(NETCONF_DELETE_CONFIG_QNAME);
     private static final NodeIdentifier CONFIG_SOURCE_NODEID = NodeIdentifier.create(ConfigSource.QNAME);
@@ -70,6 +67,7 @@ public final class NetconfUtils {
     private static final String TOPOLOGY_NETCONF = "topology-netconf";
 
     private NetconfUtils() {
+        // hidden on purpose
     }
 
     public static InstanceIdentifier<Node> createNetConfNodeMountPointII(final NodeId nodeId) {
@@ -178,5 +176,4 @@ public static ContainerNode getUnLockContent(final QName targetDatastore) {
         return Builders.containerBuilder().withNodeIdentifier(NETCONF_UNLOCK_NODEID)
                 .withChild(getTargetNode(targetDatastore)).build();
     }
-
 }