X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fyang-data-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fapi%2Fschema%2FDuplicateFinder.java;fp=data%2Fyang-data-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fapi%2Fschema%2FDuplicateFinder.java;h=c4e867214dea7f317192dbf6f9981f79d6a5e11b;hb=2e257731e354e6cc2fd45a6f6eec79bd01490c07;hp=ffde3bc7af819e4bc2b58b0a65531047b064751e;hpb=0d01df65db50711e7774ae7144c9d62cf28d6cb6;p=yangtools.git diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java index ffde3bc7af..c4e867214d 100644 --- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java +++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java @@ -12,6 +12,7 @@ import java.util.IdentityHashMap; import java.util.Map; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +// FIXME: relocate to yang-data-util, where this can have a proper test suite final class DuplicateFinder { private final Map identities = new IdentityHashMap<>(); private final Map duplicates = new HashMap<>(); @@ -21,11 +22,11 @@ final class DuplicateFinder { } private void findDuplicates(final YangInstanceIdentifier path, final NormalizedNode node) { - final DuplicateEntry i = identities.get(node); + final var i = identities.get(node); if (i == null) { - final DuplicateEntry d = duplicates.get(node); + final var d = duplicates.get(node); if (d == null) { - final DuplicateEntry n = new DuplicateEntry(path); + final var n = new DuplicateEntry(path); identities.put(node, n); duplicates.put(node, n); } else { @@ -33,7 +34,7 @@ final class DuplicateFinder { } if (node instanceof NormalizedNodeContainer container) { - for (NormalizedNode child : container.body()) { + for (var child : container.body()) { findDuplicates(path.node(child.name()), child); } } @@ -43,9 +44,8 @@ final class DuplicateFinder { } /** - * Recursively scan a {@link NormalizedNode} instance and its children and - * produce a collection of {@link DuplicateEntry} objects. Each holds the - * original definition path and a list of hard/softlinks. + * Recursively scan a {@link NormalizedNode} instance and its children and produce a collection of + * {@link DuplicateEntry} objects. Each holds the original definition path and a list of hard/softlinks. * * @param node Root node, may not be null. * @return List of entries