Use enhanced for loop 15/102515/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 30 Sep 2022 12:56:54 +0000 (14:56 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 30 Sep 2022 12:56:54 +0000 (14:56 +0200)
We are using simple iteration, hence we can hide the original iterator.

Change-Id: I4eb7300023581132a424d7bca99ac6541085011e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java

index 38f42ad8296421953bcbb8a509826e0e9332f9d8..243c8fd1e797e6027fbd1608ec49e5eca3ccad11 100644 (file)
@@ -340,19 +340,18 @@ final class InferredStatementContext<A, D extends DeclaredStatement<A>, E extend
     }
 
     private static boolean sameSubstatements(final Collection<?> original, final EffectiveStatement<?, ?> effective) {
-        final Collection<?> copied = effective.effectiveSubstatements();
+        final var copied = effective.effectiveSubstatements();
         if (copied != effective.effectiveSubstatements() || original.size() != copied.size()) {
             // Do not bother if result is treating substatements as transient
             return false;
         }
 
-        final Iterator<?> oit = original.iterator();
-        final Iterator<?> cit = copied.iterator();
-        while (oit.hasNext()) {
+        final var cit = copied.iterator();
+        for (var origChild : original) {
             verify(cit.hasNext());
             // Identity comparison on purpose to side-step whatever equality there might be. We want to reuse instances
             // after all.
-            if (oit.next() != cit.next()) {
+            if (origChild != cit.next()) {
                 return false;
             }
         }