Prohibit for loops which could be foreach with IntelliJ (apache#4653)

* Replace for with foreach * Replace for with for-each in GroupByQueryEngineV2 * Remove io.druid.collections.IntList
akashdw · Aug 9, 2017 · f5d4171 · f5d4171
1 parent f18cc5d
commit f5d4171
Show file tree

Hide file tree

Showing 35 changed files with 150 additions and 418 deletions.
diff --git a/.idea/inspectionProfiles/Druid.xml b/.idea/inspectionProfiles/Druid.xml
diff --git a/api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java b/api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java
@@ -60,8 +60,7 @@ public void testContextualTimestampList() throws Exception
         };
     TimestampSpec spec = new TimestampSpec("TIMEstamp", DATE_FORMAT, null);
 
-    for (int i = 0; i < dates.length; ++i) {
-      String date = dates[i];
+    for (String date : dates) {
       DateTime dateTime = spec.extractTimestamp(ImmutableMap.<String, Object>of("TIMEstamp", date));
       DateTime expectedDateTime = ISODateTimeFormat.dateHourMinuteSecond().parseDateTime(date);
       Assert.assertEquals(expectedDateTime, dateTime);

diff --git a/benchmarks/src/main/java/io/druid/benchmark/TimeParseBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/TimeParseBenchmark.java
@@ -80,8 +80,8 @@ public void setup()
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public void parseNoContext(Blackhole blackhole)
   {
-    for (int i = 0; i < rows.length; ++i) {
-      blackhole.consume(timeFn.apply(rows[i]).getMillis());
+    for (String row : rows) {
+      blackhole.consume(timeFn.apply(row).getMillis());
     }
   }
 
@@ -92,10 +92,10 @@ public void parseWithContext(Blackhole blackhole)
   {
     String lastTimeString = null;
     long lastTime = 0L;
-    for (int i = 0; i < rows.length; ++i) {
-      if (!rows[i].equals(lastTimeString)) {
-        lastTimeString = rows[i];
-        lastTime = timeFn.apply(rows[i]).getMillis();
+    for (String row : rows) {
+      if (!row.equals(lastTimeString)) {
+        lastTimeString = row;
+        lastTime = timeFn.apply(row).getMillis();
       }
       blackhole.consume(lastTime);
     }

diff --git a/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkColumnValueGenerator.java b/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkColumnValueGenerator.java
@@ -163,8 +163,8 @@ private void initDistribution()
           }
         }
         // give them all equal probability, the library will normalize probabilities to sum to 1.0
-        for (int i = 0; i < enumeratedValues.size(); i++) {
-          probabilities.add(new Pair<>(enumeratedValues.get(i), 0.1));
+        for (Object enumeratedValue : enumeratedValues) {
+          probabilities.add(new Pair<>(enumeratedValue, 0.1));
         }
         distribution = new EnumeratedTreeDistribution<>(probabilities);
         break;

diff --git a/common/src/main/java/io/druid/collections/IntList.java b/common/src/main/java/io/druid/collections/IntList.java
diff --git a/common/src/main/java/io/druid/common/utils/SerializerUtils.java b/common/src/main/java/io/druid/common/utils/SerializerUtils.java
@@ -24,7 +24,6 @@
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
-import io.druid.collections.IntList;
 import io.druid.java.util.common.StringUtils;
 
 import java.io.IOException;
@@ -216,15 +215,6 @@ public void writeInts(OutputStream out, int[] ints) throws IOException
     }
   }
 
-  public void writeInts(OutputStream out, IntList ints) throws IOException
-  {
-    writeInt(out, ints.length());
-
-    for (int i = 0; i < ints.length(); i++) {
-      writeInt(out, ints.get(i));
-    }
-  }
-
   public int[] readInts(InputStream in) throws IOException
   {
     int size = readInt(in);

diff --git a/common/src/main/java/io/druid/math/expr/Parser.java b/common/src/main/java/io/druid/math/expr/Parser.java
@@ -115,9 +115,9 @@ public static Expr flatten(Expr expr)
       List<Expr> args = functionExpr.args;
       boolean flattened = false;
       List<Expr> flattening = Lists.newArrayListWithCapacity(args.size());
-      for (int i = 0; i < args.size(); i++) {
-        Expr flatten = flatten(args.get(i));
-        flattened |= flatten != args.get(i);
+      for (Expr arg : args) {
+        Expr flatten = flatten(arg);
+        flattened |= flatten != arg;
         flattening.add(flatten);
       }
       if (Evals.isAllConstants(flattening)) {

diff --git a/common/src/test/java/io/druid/collections/IntListTest.java b/common/src/test/java/io/druid/collections/IntListTest.java