refactoring

raydac · raydac · commit 253b9b457385 · 2025-07-12T12:26:12.000+03:00
diff --git a/jcp/pom.xml b/jcp/pom.xml
@@ -575,26 +575,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java18</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-        <executions>
-          <execution>
-            <id>check-java-api</id>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/InfoHelper.java b/jcp/src/main/java/com/igormaznitsa/jcp/InfoHelper.java
@@ -215,9 +215,7 @@ private static String makeColumns(final String name, final String reference,
                                     final int firstColumnWidth) {
     final int spaces = firstColumnWidth - name.length();
     final StringBuilder result = new StringBuilder(name);
-    for (int i = 0; i < spaces; i++) {
-      result.append(' ');
-    }
+    result.append(" ".repeat(Math.max(0, spaces)));
     result.append(reference);
     return result.toString();
   }
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java b/jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java
@@ -21,9 +21,7 @@
 
 package com.igormaznitsa.jcp.context;
 
-import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.Collections.unmodifiableList;
 
 import com.igormaznitsa.jcp.containers.FileInfoContainer;
 import com.igormaznitsa.jcp.containers.TextFileDataContainer;
@@ -68,7 +66,7 @@ public class PreprocessorContext {
       Collections.singletonList("." + File.separatorChar);
   public static final String DEFAULT_DEST_DIRECTORY = ".." + File.separatorChar + "preprocessed";
   public static final List<String> DEFAULT_PROCESSING_EXTENSIONS =
-      unmodifiableList(asList("java", "txt", "htm", "html"));
+      List.of("java", "txt", "htm", "html");
   public static final List<String> DEFAULT_EXCLUDED_EXTENSIONS = singletonList("xml");
   public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
@@ -233,9 +231,7 @@ private static String makeStackView(
     final StringBuilder builder = new StringBuilder();
     int tab = 5;
 
-    for (int s = 0; s < tab; s++) {
-      builder.append(' ');
-    }
+    builder.append(" ".repeat(tab));
 
     builder.append('{');
     if (cloned) {
@@ -251,9 +247,7 @@ private static String makeStackView(
     for (int i = list.size() - 1; i >= 0; i--) {
       final TextFileDataContainer cur = list.get(i);
       builder.append('\n');
-      for (int s = 0; s < tab; s++) {
-        builder.append(' ');
-      }
+      builder.append(" ".repeat(Math.max(0, tab)));
       builder.append("└>");
       builder.append(fileIndex++).append(". ");
       builder.append(cur.getFile().getName()).append(':').append(cur.getLastReadStringIndex() + 1);
@@ -281,8 +275,7 @@ private static Charset decodeCharset(final String charsetName) {
    * @since 7.0.3
    */
   public Set<File> findAllInputFiles() {
-    final Set<File> result = new HashSet<>();
-    result.addAll(this.configFiles);
+    final Set<File> result = new HashSet<>(this.configFiles);
     this.preprocessedResources.forEach(x -> {
       result.addAll(x.getIncludedSources());
       if (x.getSourceFile() != null &&
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/exceptions/PreprocessorException.java b/jcp/src/main/java/com/igormaznitsa/jcp/exceptions/PreprocessorException.java
@@ -53,19 +53,15 @@ private static String makeStackView(final FilePositionInfo[] list, final char fi
     final StringBuilder builder = new StringBuilder();
     int tab = 5;
 
-    for (int s = 0; s < tab; s++) {
-      builder.append(fill);
-    }
+    builder.append(String.valueOf(fill).repeat(tab));
     builder.append("{File chain}");
     tab += 5;
 
     int fileIndex = 1;
     for (int i = list.length - 1; i >= 0; i--) {
       final FilePositionInfo cur = list[i];
       builder.append('\n');
-      for (int s = 0; s < tab; s++) {
-        builder.append(fill);
-      }
+      builder.append(String.valueOf(fill).repeat(Math.max(0, tab)));
       builder.append("└>");
       builder.append(fileIndex++).append(". ");
       builder.append(cur.getFile().getName()).append(':').append(cur.getLineNumber());
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java b/jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java
@@ -21,6 +21,8 @@
 
 package com.igormaznitsa.jcp.expression;
 
+import static java.util.Objects.requireNonNullElseGet;
+
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
@@ -610,11 +612,7 @@ ExpressionItem nextItem(final PushbackReader reader, final PreprocessorContext c
             result = Value.BOOLEAN_FALSE;
           } else {
             final AbstractFunction function = AbstractFunction.findForName(str);
-            if (function == null) {
-              result = new Variable(str);
-            } else {
-              result = function;
-            }
+            result = requireNonNullElseGet(function, () -> new Variable(str));
           }
         }
         break;
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionSTR2GO.java b/jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionSTR2GO.java
@@ -42,9 +42,7 @@ private static String toUnicode(final char c) {
     final StringBuilder result = new StringBuilder(4);
     final String hex = Integer.toHexString(c);
 
-    for (int i = 0; i < 4 - hex.length(); i++) {
-      result.append('0');
-    }
+    result.append("0".repeat(4 - hex.length()));
 
     result.append(hex);
 
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/extension/PreprocessorExtension.java b/jcp/src/main/java/com/igormaznitsa/jcp/extension/PreprocessorExtension.java
@@ -43,21 +43,6 @@ public interface PreprocessorExtension {
    */
   boolean processAction(PreprocessorContext context, Value[] parameters);
 
-  /**
-   * Call to process a user function (the function starts with $)
-   *
-   * @param functionName the name of the function (without $ and in low case),
-   *                     must not be null
-   * @param arguments    the function arguments as an array, must not be null
-   * @return a calculated value, it must not be null
-   * @see #processUserFunction(PreprocessorContext, String, Value[])
-   * @deprecated since 7.1.2
-   */
-  @Deprecated
-  default Value processUserFunction(String functionName, Value[] arguments) {
-    throw new UnsupportedOperationException("Use version with PreprocessorContext for call");
-  }
-
   /**
    * Call to process a user function (such functions start with $)
    *
@@ -66,13 +51,10 @@ default Value processUserFunction(String functionName, Value[] arguments) {
    *                     must not be null
    * @param arguments    the function arguments as an array, must not be null
    * @return a calculated value, it must not be null
-   * @see #processUserFunction(String, Value[])
    * @since 7.1.2
    */
-  default Value processUserFunction(PreprocessorContext context, String functionName,
-                                    Value[] arguments) {
-    return this.processUserFunction(functionName, arguments);
-  }
+  Value processUserFunction(PreprocessorContext context, String functionName,
+                            Value[] arguments);
 
   /**
    * When a preprocessor meets a user defined function (the function starts with
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/utils/AntPathMatcher.java b/jcp/src/main/java/com/igormaznitsa/jcp/utils/AntPathMatcher.java
@@ -48,7 +48,7 @@ public static String[] tokenizeToStringArray(
       if (trimTokens) {
         token = token.trim();
       }
-      if (!ignoreEmptyTokens || token.length() > 0) {
+      if (!ignoreEmptyTokens || !token.isEmpty()) {
         tokens.add(token);
       }
     }
@@ -204,7 +204,7 @@ private boolean isPotentialMatch(String path, String[] pattDirs) {
         pos += skipped;
         skipped = skipSegment(path, pos, pattDir);
         if (skipped < pattDir.length()) {
-          return (skipped > 0 || (pattDir.length() > 0 && isWildcardChar(pattDir.charAt(0))));
+          return (skipped > 0 || (!pattDir.isEmpty() && isWildcardChar(pattDir.charAt(0))));
         }
         pos += skipped;
       }
diff --git a/jcp/src/main/java/com/igormaznitsa/jcp/utils/PreprocessorUtils.java b/jcp/src/main/java/com/igormaznitsa/jcp/utils/PreprocessorUtils.java
@@ -237,9 +237,8 @@ public static String replacePartByChar(final String text, final char chr, final
     final StringBuilder result = new StringBuilder(text.length());
 
     result.append(text.subSequence(0, Math.min(text.length(), startPosition)));
-    for (int i = startPosition; i < Math.min(text.length(), startPosition + length); i++) {
-      result.append(chr);
-    }
+    result.append(String.valueOf(chr)
+        .repeat(Math.max(0, Math.min(text.length(), startPosition + length) - startPosition)));
     result.append(text.subSequence(Math.min(startPosition + length, text.length()), text.length()));
 
     return result.toString();
@@ -248,9 +247,7 @@ public static String replacePartByChar(final String text, final char chr, final
 
   public static String generateStringForChar(final char chr, final int length) {
     final StringBuilder buffer = new StringBuilder(Math.max(length, 1));
-    for (int i = 0; i < length; i++) {
-      buffer.append(chr);
-    }
+    buffer.append(String.valueOf(chr).repeat(Math.max(0, length)));
     return buffer.toString();
   }
 
diff --git a/jcp/src/test/java/com/igormaznitsa/jcp/context/PreprocessorContextTest.java b/jcp/src/test/java/com/igormaznitsa/jcp/context/PreprocessorContextTest.java
@@ -254,19 +254,20 @@ public void warning(String message) {
           @Override
           public boolean processAction(PreprocessorContext context, Value[] parameters) {
             throw new UnsupportedOperationException(
-                "Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+                "Not supported yet.");
           }
 
           @Override
-          public Value processUserFunction(String functionName, Value[] arguments) {
+          public Value processUserFunction(PreprocessorContext context, String functionName,
+                                           Value[] arguments) {
             throw new UnsupportedOperationException(
-                "Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+                "Not supported yet.");
           }
 
           @Override
           public int getUserFunctionArity(String functionName) {
             throw new UnsupportedOperationException(
-                "Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+                "Not supported yet.");
           }
         };
 
diff --git a/jcp/src/test/java/com/igormaznitsa/jcp/maven/PreprocessMojoTest.java b/jcp/src/test/java/com/igormaznitsa/jcp/maven/PreprocessMojoTest.java
@@ -21,7 +21,6 @@
 
 package com.igormaznitsa.jcp.maven;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertArrayEquals;
 
 import com.igormaznitsa.jcp.context.CommentRemoverType;
@@ -85,7 +84,7 @@ public void testConfiguration() throws Exception {
     final String[] sources = context.getSources()
         .stream()
         .map(PreprocessorContext.SourceFolder::getAsString)
-        .collect(toList()).toArray(new String[0]);
+        .toArray(String[]::new);
 
     assertArrayEqualsWithoutOrders(new String[] {"/", "/some", "/another/some"}, sources);
     assertEquals("destination_dir", context.getTarget().getName());

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static String[] tokenizeToStringArray(`
`48`	`48`	`if (trimTokens) {`
`49`	`49`	`token = token.trim();`
`50`	`50`	`}`
`51`		`- if (!ignoreEmptyTokens \|\| token.length() > 0) {`
	`51`	`+ if (!ignoreEmptyTokens \|\| !token.isEmpty()) {`
`52`	`52`	`tokens.add(token);`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -204,7 +204,7 @@ private boolean isPotentialMatch(String path, String[] pattDirs) {`
`204`	`204`	`pos += skipped;`
`205`	`205`	`skipped = skipSegment(path, pos, pattDir);`
`206`	`206`	`if (skipped < pattDir.length()) {`
`207`		`- return (skipped > 0 \|\| (pattDir.length() > 0 && isWildcardChar(pattDir.charAt(0))));`
	`207`	`+ return (skipped > 0 \|\| (!pattDir.isEmpty() && isWildcardChar(pattDir.charAt(0))));`
`208`	`208`	`}`
`209`	`209`	`pos += skipped;`
`210`	`210`	`}`