Add SourceDependency.isSatisfiedBy()

[yangtools.git] / parser / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / repo / RevisionDependencyResolver.java

diff --git a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java
index 8ad4f0298df67e80a7fa2233bb938b82d6f22c4f..c605451c16d9a6458b19d218126c7d4b4d7a6684 100644 (file)
--- a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java
+++ b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.repo;
 
 import java.util.Collection;
 import java.util.Map;
-import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.source.SourceDependency;
 import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.spi.source.SourceInfo;
@@ -30,16 +29,6 @@ final class RevisionDependencyResolver extends DependencyResolver {
         // Quick lookup
         return haystack.contains(new SourceIdentifier(dependency.name(), dependency.revision()))
             // Slow revision-less walk
-            || dependency.revision() == null && findWildcard(haystack, dependency.name()) != null;
-    }
-
-    private static SourceIdentifier findWildcard(final Collection<SourceIdentifier> haystack,
-            final Unqualified needle) {
-        for (var sourceId : haystack) {
-            if (needle.equals(sourceId.name())) {
-                return sourceId;
-            }
-        }
-        return null;
+            || dependency.revision() == null && haystack.stream().anyMatch(dependency::isSatisfiedBy);
     }
 }
\ No newline at end of file