BUG-4688: Rework SchemaContext module lookups

[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 3ded08a8bc1a8e9799a1f86b648d2432e82f3234..3c8ff18beedc4a398bf28b7eb7ae536915054aa1 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,6 @@ 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 com.google.common.base.Verify;
-import java.util.Date;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 
@@ -40,9 +38,7 @@ public abstract class NamespaceKeyCriterion<K> {
 
         @Override
         public ModuleIdentifier select(final ModuleIdentifier first, final ModuleIdentifier second) {
-            final Date firstRev = Verify.verifyNotNull(first.getRevision());
-            final Date secondRev = Verify.verifyNotNull(second.getRevision());
-            return firstRev.compareTo(secondRev) >= 0 ? first : second;
+            return ModuleIdentifier.compareRevisions(first.getRevision(), second.getRevision()) >= 0 ? first : second;
         }
 
         @Override