r optimize imports

Author: LarsEckart

approvaltests-hadoop/src/main/java/org/approvaltests/hadoop/WritableUtils.java

@@ -5,11 +5,11 @@
 
 public class WritableUtils
 {
-
-  public static <T> T createWritable(Object value, Class<T> writableType) throws InstantiationException,
-      IllegalAccessException, InvocationTargetException, NoSuchMethodException
+  public static <T> T createWritable(Object value, Class<T> writableType)
+      throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException
   {
-    if (writableType.isInstance(value)) { return (T) value; }
+    if (writableType.isInstance(value))
+    { return (T) value; }
     Object writable = writableType.newInstance();
     try
     {
@@ -31,8 +31,8 @@ public static <T> T createWritable(Object value, Class<T> writableType) throws I
         }
         catch (Exception e)
         {
-          throw new RuntimeException(String.format("Could not convert %s => %s", value.getClass().getName(),
-              writableType.getName()), e);
+          throw new RuntimeException(
+              String.format("Could not convert %s => %s", value.getClass().getName(), writableType.getName()), e);
         }
       }
     }

approvaltests-hadoop/src/main/java/org/approvaltests/hadoop/version1/SmartMapper.java

@@ -5,6 +5,8 @@
 
 public abstract class SmartMapper<KeyIn, ValueIn, KeyOut, ValueOut>
     extends
-      Mapper<KeyIn, ValueIn, KeyOut, ValueOut> implements Transform<KeyIn, ValueIn, KeyOut, ValueOut>
+      Mapper<KeyIn, ValueIn, KeyOut, ValueOut>
+    implements
+      Transform<KeyIn, ValueIn, KeyOut, ValueOut>
 {
 }

approvaltests-hadoop/src/main/java/org/approvaltests/hadoop/version1/SmartReducer.java

@@ -5,6 +5,8 @@
 
 public abstract class SmartReducer<KeyIn, ValueIn, KeyOut, ValueOut>
     extends
-      Reducer<KeyIn, ValueIn, KeyOut, ValueOut> implements Transform<KeyIn, ValueIn, KeyOut, ValueOut>
+      Reducer<KeyIn, ValueIn, KeyOut, ValueOut>
+    implements
+      Transform<KeyIn, ValueIn, KeyOut, ValueOut>
 {
-}
+}

approvaltests-hadoop/src/main/java/org/approvaltests/hadoop/version2/MapperWrapper.java

@@ -16,8 +16,8 @@ public class MapperWrapper<KeyIn, ValueIn, KeyOut, ValueOut>
   private final Class<KeyOut>                            keyOut;
   private final Class<ValueOut>                          valueOut;
   private final Mapper<KeyIn, ValueIn, KeyOut, ValueOut> mapper;
-  public MapperWrapper(Mapper<KeyIn, ValueIn, KeyOut, ValueOut> mapper, Class<KeyIn> keyIn,
-      Class<ValueIn> valueIn, Class<KeyOut> keyOut, Class<ValueOut> valueOut)
+  public MapperWrapper(Mapper<KeyIn, ValueIn, KeyOut, ValueOut> mapper, Class<KeyIn> keyIn, Class<ValueIn> valueIn,
+      Class<KeyOut> keyOut, Class<ValueOut> valueOut)
   {
     this.mapper = mapper;
     this.keyIn = keyIn;

approvaltests-hadoop/src/test/java/org/approvaltests/hadoop/version2/tests/HadoopApprovalsTest.java

@@ -27,22 +27,22 @@ public class HadoopApprovalsTest extends TestCase
 {
   public void testMap() throws Exception
   {
-    SmartMapper<LongWritable, Text, Text, LongWritable> mapper = new MapperWrapper<>(new WordCountMap(), LongWritable.class, Text.class, Text.class,
-        LongWritable.class);
+    SmartMapper<LongWritable, Text, Text, LongWritable> mapper = new MapperWrapper<>(new WordCountMap(),
+        LongWritable.class, Text.class, Text.class, LongWritable.class);
     HadoopApprovals.verifyMapping(mapper, 0, "llew gen  llew");
   }
   public void testReduce() throws Exception
   {
-    SmartReducer<Text, LongWritable, Text, LongWritable> reducer = new ReducerWrapper<>(new WordCountReduce(), Text.class, LongWritable.class, Text.class,
-        LongWritable.class);
+    SmartReducer<Text, LongWritable, Text, LongWritable> reducer = new ReducerWrapper<>(new WordCountReduce(),
+        Text.class, LongWritable.class, Text.class, LongWritable.class);
     HadoopApprovals.verifyReducer(reducer, "life", 7, 35);
   }
   public void testMapReducer() throws Exception
   {
-    SmartMapper<LongWritable, Text, Text, LongWritable> mapper = new MapperWrapper<>(new WordCountMap(), LongWritable.class, Text.class, Text.class,
-        LongWritable.class);
-    SmartReducer<Text, LongWritable, Text, LongWritable> reducer = new ReducerWrapper<>(new WordCountReduce(), Text.class, LongWritable.class, Text.class,
-        LongWritable.class);
+    SmartMapper<LongWritable, Text, Text, LongWritable> mapper = new MapperWrapper<>(new WordCountMap(),
+        LongWritable.class, Text.class, Text.class, LongWritable.class);
+    SmartReducer<Text, LongWritable, Text, LongWritable> reducer = new ReducerWrapper<>(new WordCountReduce(),
+        Text.class, LongWritable.class, Text.class, LongWritable.class);
     HadoopApprovals.verifyMapReduce(mapper, reducer, 0, "one fish two fish red fish blue fish");
   }
   public static class WordCountReduce extends MapReduceBase

approvaltests-tests/src/main/java/org/approvaltests/machine_specific_tests/MachineSpecific.java

@@ -1,10 +1,10 @@
 package org.approvaltests.machine_specific_tests;
 
+import com.spun.util.SystemUtils;
+
 import java.util.Arrays;
 import java.util.List;
 
-import com.spun.util.SystemUtils;
-
 public class MachineSpecific
 {
   public static boolean       FORCE_RUN = false;

approvaltests-tests/src/main/java/org/approvaltests/machine_specific_tests/MachineSpecificTest.java

@@ -1,10 +1,9 @@
 package org.approvaltests.machine_specific_tests;
 
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
+import com.spun.util.SystemUtils;
 import org.junit.jupiter.api.BeforeEach;
 
-import com.spun.util.SystemUtils;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class MachineSpecificTest
 {

approvaltests-tests/src/test/java/org/approvaltests/ApprovalsTest.java

@@ -1,8 +1,5 @@
 package org.approvaltests;
 
-import java.awt.Dimension;
-import java.awt.Rectangle;
-
 import org.approvaltests.core.Options;
 import org.approvaltests.reporters.ClipboardReporter;
 import org.approvaltests.reporters.DiffReporter;
@@ -11,6 +8,8 @@
 import org.junit.jupiter.api.Test;
 
 import javax.swing.JButton;
+import java.awt.Dimension;
+import java.awt.Rectangle;
 
 @UseReporter({DiffReporter.class, ClipboardReporter.class})
 public class ApprovalsTest

approvaltests-tests/src/test/java/org/approvaltests/CheckedExceptionsTest.java

@@ -4,11 +4,7 @@
 import com.spun.util.io.FileUtils;
 import com.spun.util.logger.SimpleLogger;
 import org.approvaltests.core.Options;
-import org.approvaltests.reporters.GenericDiffReporter;
-import org.approvaltests.reporters.JunitReporter;
-import org.approvaltests.reporters.intellij.IntelliJReporter;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.commons.support.ModifierSupport;
 import org.lambda.functions.Functions;
 import org.lambda.query.Query;
 import org.lambda.query.Queryable;

approvaltests-tests/src/test/java/org/approvaltests/DirectoryOutputTest.java

@@ -1,12 +1,11 @@
 package org.approvaltests;
 
-import java.io.File;
-
+import com.spun.util.io.FileUtils;
 import org.approvaltests.reporters.DiffReporter;
 import org.approvaltests.reporters.UseReporter;
 import org.junit.jupiter.api.Test;
 
-import com.spun.util.io.FileUtils;
+import java.io.File;
 
 @UseReporter(DiffReporter.class)
 public class DirectoryOutputTest