Refactor getValueBetween

jhipster · May 9, 2022 · b2eb298 · b2eb298
1 parent cfecbde
commit b2eb298
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/tech/jhipster/lite/common/domain/FileUtils.java b/src/main/java/tech/jhipster/lite/common/domain/FileUtils.java
@@ -20,8 +20,10 @@
 import java.util.Optional;
 import java.util.Scanner;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.swing.text.html.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tech.jhipster.lite.error.domain.Assert;
@@ -93,14 +95,15 @@ public static void write(String filename, String text, String eol) throws IOExce
 
   public static Optional<String> getValueBetween(String filename, String prefix, String suffix) {
     Assert.notBlank(FILENAME, filename);
+    Optional<String> matchingLine = readLine(filename, prefix);
+    return matchingLine.map(line -> getValueFromLine(prefix, suffix, line)).orElse(Optional.empty());
+  }
 
-    Optional<String> line = readLine(filename, prefix);
+  public static Optional<String> getValueFromLine(String prefix, String suffix, String line) {
     Pattern pattern = Pattern.compile(prefix + REGEXP_DOT_PLUS_MIN + suffix, Pattern.DOTALL);
-    if (line.isPresent()) {
-      Matcher matcher = pattern.matcher(line.get());
-      if (matcher.find()) {
-        return Optional.of(matcher.group(1));
-      }
+    Matcher matcher = pattern.matcher(line);
+    if (matcher.find()) {
+      return Optional.of(matcher.group(1));
     }
     return Optional.empty();
   }