R extract method to array utils

Author: actions-user

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

@@ -10,8 +10,10 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 
+import org.lambda.functions.Function0;
 import org.lambda.functions.Function1;
 import org.lambda.query.Queryable;
 
@@ -276,6 +278,17 @@ 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)
+  {
+    if (fields.containsKey(key))
+    {
+      return (SPECIFIC_VALUE) fields.get(key);
+    }
+    else
+    {
+      return defaultIfNotFound.call();
+    }
+  }
   public static class IterableWrapper<T> implements Iterable<T>
   {
     private final Iterator<T> iterator;

approvaltests/src/main/java/org/approvaltests/core/Options.java

@@ -8,7 +8,8 @@
 import org.approvaltests.namer.ApprovalNamer;
 import org.approvaltests.namer.NamerWrapper;
 import org.approvaltests.scrubbers.NoOpScrubber;
-import org.lambda.functions.Function0;
+
+import com.spun.util.ArrayUtils;
 
 public class Options
 {
@@ -35,22 +36,7 @@ public Options(Options parent, FileOptions fileOptions)
   }
   public ApprovalFailureReporter getReporter()
   {
-    return getOrElse("reporter", ReporterFactory::get);
-  }
-  private <T> T getOrElse(String key, Function0<T> defaultIfNotFound)
-  {
-    return getOrElse(fields, key, defaultIfNotFound);
-  }
-  public static <T> T getOrElse(Map<String, Object> fields, String key, Function0<T> defaultIfNotFound)
-  {
-    if (fields.containsKey(key))
-    {
-      return (T) fields.get(key);
-    }
-    else
-    {
-      return defaultIfNotFound.call();
-    }
+    return ArrayUtils.getOrElse(fields, "reporter", ReporterFactory::get);
   }
   public Options withReporter(ApprovalFailureReporter reporter)
   {
@@ -66,7 +52,7 @@ public String scrub(String input)
   }
   private Scrubber getScrubber()
   {
-    return getOrElse("scrubber", () -> NoOpScrubber.INSTANCE);
+    return ArrayUtils.getOrElse(fields, "scrubber", () -> NoOpScrubber.INSTANCE);
   }
   public FileOptions forFile()
   {
@@ -89,11 +75,11 @@ public Options withExtension(String fileExtensionWithDot)
     }
     public ApprovalNamer getNamer()
     {
-      return getOrElse(fields, "fileOptions.namer", Approvals::createApprovalNamer);
+      return ArrayUtils.getOrElse(fields, "fileOptions.namer", Approvals::createApprovalNamer);
     }
     public String getFileExtension()
     {
-      return getOrElse(fields, "fileOptions.fileExtension", () -> ".txt");
+      return ArrayUtils.getOrElse(fields, "fileOptions.fileExtension", () -> ".txt");
     }
     public Options withBaseName(String fileBaseName)
     {