R use new ArrayUtils.combine(T, T[])

Author: actions-user

approvaltests-util/src/main/java/com/spun/util/ArrayUtils.java

@@ -284,7 +284,6 @@ public static <T> T[] toArray(List<T> list, Class<T> type)
   {
     return Queryable.as(list, type).asArray();
   }
-
   public static <KEY, VALUES, SPECIFIC_VALUE extends VALUES> SPECIFIC_VALUE getOrElse(Map<KEY, VALUES> fields,
       KEY key, Function0<SPECIFIC_VALUE> defaultIfNotFound)
   {
@@ -297,7 +296,6 @@ public static <KEY, VALUES, SPECIFIC_VALUE extends VALUES> SPECIFIC_VALUE getOrE
       return defaultIfNotFound.call();
     }
   }
-
   public static class IterableWrapper<T> implements Iterable<T>
   {
     private final Iterator<T> iterator;

approvaltests/src/main/java/org/approvaltests/reporters/DiffInfo.java

@@ -61,7 +61,7 @@ public static class One
   {
     public static String of(String pathOne, String... paths)
     {
-      final String[] all = ArrayUtils.combine(new String[]{pathOne}, paths);
+      final String[] all = ArrayUtils.combine(pathOne, paths);
       for (String path : all)
       {
         if (new File(path).exists())

approvaltests/src/main/java/org/approvaltests/reporters/linux/LinuxDiffReporter.java

@@ -9,7 +9,7 @@ public class LinuxDiffReporter extends FirstWorkingReporter
   public LinuxDiffReporter()
   {
     super(
-        // @formatter:off
+    // @formatter:off
         // begin-snippet: linux_diff_reporters
         DiffMergeReporter.INSTANCE,
         MeldMergeReporter.INSTANCE,

approvaltests/src/main/java/org/approvaltests/reporters/macosx/MacDiffReporter.java

@@ -9,7 +9,7 @@ public class MacDiffReporter extends FirstWorkingReporter
   public MacDiffReporter()
   {
     super(
-        // @formatter:off
+    // @formatter:off
         // begin-snippet: mac_diff_reporters
         BeyondCompareMacReporter.INSTANCE,
         DiffMergeReporter.INSTANCE,

approvaltests/src/main/java/org/approvaltests/reporters/windows/WindowsDiffReporter.java

@@ -9,7 +9,7 @@ public class WindowsDiffReporter extends FirstWorkingReporter
   public WindowsDiffReporter()
   {
     super(
-        // @formatter:off
+    // @formatter:off
         // begin-snippet: windows_diff_reporters
         TortoiseDiffReporter.INSTANCE,
         BeyondCompareReporter.INSTANCE,

approvaltests/src/main/java/org/approvaltests/scrubbers/MultiScrubber.java

@@ -9,7 +9,7 @@ public class MultiScrubber implements Scrubber
   private final Scrubber[] scrubbers;
   public MultiScrubber(Scrubber one, Scrubber[] others)
   {
-    this.scrubbers = ArrayUtils.combine(new Scrubber[]{one}, others);
+    this.scrubbers = ArrayUtils.combine(one, others);
   }
   @Override
   public String scrub(String input)