Drop StmtContextUtils. qualifier

[yangtools.git] / yang / yang-parser-spi / src / main / java / org / opendaylight / yangtools / yang / parser / spi / meta / NamespaceKeyCriterion.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java
index 3c8ff18beedc4a398bf28b7eb7ae536915054aa1..a3ea67526b19312c47e01ffe975ac9889ded8ece 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java
@@ -12,8 +12,9 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 
 /**
  * Namespace key matching criterion.
@@ -24,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
  */
 @Beta
 public abstract class NamespaceKeyCriterion<K> {
-    private static final class LatestRevisionModule extends NamespaceKeyCriterion<ModuleIdentifier> {
+    private static final class LatestRevisionModule extends NamespaceKeyCriterion<SourceIdentifier> {
         private final String moduleName;
 
         LatestRevisionModule(final String moduleName) {
@@ -32,13 +33,13 @@ public abstract class NamespaceKeyCriterion<K> {
         }
 
         @Override
-        public boolean match(final ModuleIdentifier key) {
+        public boolean match(final SourceIdentifier key) {
             return moduleName.equals(key.getName());
         }
 
         @Override
-        public ModuleIdentifier select(final ModuleIdentifier first, final ModuleIdentifier second) {
-            return ModuleIdentifier.compareRevisions(first.getRevision(), second.getRevision()) >= 0 ? first : second;
+        public SourceIdentifier select(final SourceIdentifier first, final SourceIdentifier second) {
+            return Revision.compare(first.getRevision(), second.getRevision()) >= 0 ? first : second;
         }
 
         @Override
@@ -53,7 +54,7 @@ public abstract class NamespaceKeyCriterion<K> {
      * @param moduleName Module name
      * @return A criterion object.
      */
-    public static NamespaceKeyCriterion<ModuleIdentifier> latestRevisionModule(final String moduleName) {
+    public static NamespaceKeyCriterion<SourceIdentifier> latestRevisionModule(final String moduleName) {
         return new LatestRevisionModule(moduleName);
     }
 
@@ -63,7 +64,7 @@ public abstract class NamespaceKeyCriterion<K> {
      * @param key Key to be matched
      * @return True if the key matches this criterion, false otherwise.
      */
-    public abstract boolean match(@Nonnull K key);
+    public abstract boolean match(@NonNull K key);
 
     /**
      * Select the better match from two candidate keys.
@@ -72,7 +73,7 @@ public abstract class NamespaceKeyCriterion<K> {
      * @param second Second key
      * @return Selected key, must be either first or second key, by identity.
      */
-    public abstract K select(@Nonnull K first, @Nonnull K second);
+    public abstract K select(@NonNull K first, @NonNull K second);
 
     @Override
     public final String toString() {