F!! refactoring + firstOrDefault on QUeryable

Author: LarsEckart

approvaltests-util/src/main/java/com/spun/util/tests/TestUtils.java

@@ -9,6 +9,7 @@
 import com.spun.util.io.StackElementLevelSelector;
 import com.spun.util.io.StackElementSelector;
 import org.lambda.functions.Function2;
+import org.lambda.query.Queryable;
 
 import javax.mail.Message;
 import javax.swing.JFileChooser;
@@ -223,14 +224,11 @@ private static String handleInnerClasses(String className)
   }
   public static String unrollLambda(String methodName)
   {
-    Matcher javaMatcher = unrollJavaLambdaPattern.matcher(methodName);
-    if (javaMatcher.matches())
-    { return javaMatcher.group(1); }
-    Matcher kotlinMatcher = unrollKotlinLambdaPattern.matcher(methodName);
-    if (kotlinMatcher.matches())
-    { return kotlinMatcher.group(1); }
-    return methodName;
+    return lambdaPatterns.select(p -> p.matcher(methodName)).where(Matcher::matches).select(m -> m.group(1))
+        .firstOrDefault(methodName);
   }
-  private static final Pattern unrollJavaLambdaPattern   = Pattern.compile("lambda\\$(.*)\\$\\d+");
-  private static final Pattern unrollKotlinLambdaPattern = Pattern.compile("(.*?)(\\$lambda-\\d+)+");
+  private static final Pattern            unrollJavaLambdaPattern   = Pattern.compile("lambda\\$(.*)\\$\\d+");
+  private static final Pattern            unrollKotlinLambdaPattern = Pattern.compile("(.*?)(\\$lambda-\\d+)+");
+  private static final Queryable<Pattern> lambdaPatterns            = Queryable.as(unrollJavaLambdaPattern,
+      unrollKotlinLambdaPattern);
 }

approvaltests-util/src/main/java/org/lambda/query/Queryable.java

@@ -49,12 +49,16 @@ public Queryable<In> where(Function1<In, Boolean> funct)
   }
   public In first()
   {
-    return this.isEmpty() ? null : this.get(0);
+    return firstOrDefault(null);
   }
   public In first(Function1<In, Boolean> filter)
   {
     return Query.first(this, filter);
   }
+  public In firstOrDefault(In defaultValue)
+  {
+    return this.isEmpty() ? defaultValue : this.get(0);
+  }
   public boolean all(Function1<In, Boolean> filter)
   {
     return Query.all(this, filter);