Migrate users of deprecated QNameModule methods

[yangtools.git] / model / rfc6536-model-api / src / main / java / org / opendaylight / yangtools / rfc6536 / model / api / NACMConstants.java

diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java
index 6f30fd480b64a0a3b20193b6325d17c8675e1120..a3de71023843967538b3c17be01fefb7ed73959d 100644 (file)
--- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java
+++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java
@@ -7,63 +7,45 @@
  */
 package org.opendaylight.yangtools.rfc6536.model.api;
 
-import com.google.common.collect.ImmutableList;
-import java.util.Collection;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 
 /**
  * Constants associated with RFC6536.
- *
- * @author Robert Varga
  */
 @NonNullByDefault
 public final class NACMConstants {
-    private static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf-acm").intern();
-    private static final XMLNamespace MODULE_NAMESPACE =
+    public static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf-acm").intern();
+    public static final XMLNamespace MODULE_NAMESPACE =
         XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-netconf-acm").intern();
-    private static final Revision RFC6536_REVISION = Revision.of("2012-02-22");
-    private static final Revision RFC8341_REVISION = Revision.of("2018-02-14");
-
     /**
-     * Runtime RFC6536 identity.
+     * RFC6536 model revision.
      */
-    public static final QNameModule RFC6536_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6536_REVISION).intern();
-
+    public static final Revision RFC6536_REVISION = Revision.of("2012-02-22");
     /**
-     * Runtime RFC8341 identity.
+     * RFC8341 model revision..
      */
-    public static final QNameModule RFC8341_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8341_REVISION).intern();
+    public static final Revision RFC8341_REVISION = Revision.of("2018-02-14");
 
     /**
-     * RFC6536 model source name.
+     * Runtime RFC6536 identity.
      */
-    public static final SourceIdentifier RFC6536_SOURCE = new SourceIdentifier(MODULE_NAME, RFC6536_REVISION);
+    public static final QNameModule RFC6536_MODULE = QNameModule.of(MODULE_NAMESPACE, RFC6536_REVISION).intern();
 
     /**
-     * RFC8341 model source name.
+     * Runtime RFC8341 identity.
      */
-    public static final SourceIdentifier RFC8341_SOURCE = new SourceIdentifier(MODULE_NAME, RFC8341_REVISION);
+    public static final QNameModule RFC8341_MODULE = QNameModule.of(MODULE_NAMESPACE, RFC8341_REVISION).intern();
 
     /**
-     * Normative prefix to use when importing {@link #RFC6536_SOURCE}.
+     * Normative prefix to use when importing {@link #MODULE_NAME}.
      */
     public static final String MODULE_PREFIX = "nacm";
 
     private NACMConstants() {
         // Hidden on purpose
     }
-
-    /**
-     * Return identifiers of all sources known to define NACM extension.
-     *
-     * @return Collection of identifiers.
-     */
-    public static Collection<SourceIdentifier> knownModelSources() {
-        return ImmutableList.of(RFC6536_SOURCE, RFC8341_SOURCE);
-    }
 }