refactoring

Author: raydac

jcp-tests/pom.xml

@@ -8,6 +8,7 @@
     <packaging>pom</packaging>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jcp.test.version>7.0.3-SNAPSHOT</jcp.test.version>
         <junit.version>5.4.2</junit.version>
         <maven.compiler.source>1.8</maven.compiler.source>

jcp/src/main/java/com/igormaznitsa/jcp/ant/PreprocessTask.java

@@ -264,7 +264,7 @@ public Value getVariable(final String varName, final PreprocessorContext context
     final Value result = this.antVariables.get(varName);
 
     if (result == null) {
-      throw context.makeException("Request for unsupported Ant property \'" + varName + '\'', null);
+      throw context.makeException("Request for unsupported Ant property '" + varName + '\'', null);
     }
     return result;
   }
@@ -273,7 +273,7 @@ public Value getVariable(final String varName, final PreprocessorContext context
   public void setVariable(final String varName, final Value value,
                           final PreprocessorContext context) {
     throw context.makeException(
-        "Request to change ANT property \'" + varName + "\'. NB! ANT properties are read only!",
+        "Request to change ANT property '" + varName + "'. NB! ANT properties are read only!",
         null);
   }
 

jcp/src/main/java/com/igormaznitsa/jcp/cmdline/ExcludedFileExtensionsHandler.java

@@ -40,8 +40,7 @@ public class ExcludedFileExtensionsHandler implements CommandLineHandler {
   public String getDescription() {
     return
         "comma separated file extensions (case insensetive) to be excluded from preprocess and copy (by default " +
-            PreprocessorContext.DEFAULT_EXCLUDED_EXTENSIONS.stream()
-                .collect(Collectors.joining(",")) + ')';
+            String.join(",", PreprocessorContext.DEFAULT_EXCLUDED_EXTENSIONS) + ')';
   }
 
   @Override

jcp/src/main/java/com/igormaznitsa/jcp/cmdline/FileExtensionsHandler.java

@@ -39,8 +39,7 @@ public class FileExtensionsHandler implements CommandLineHandler {
   @Override
   public String getDescription() {
     return "comma separated list of allowed extensions (case insensitive) (by default " +
-        PreprocessorContext.DEFAULT_PROCESSING_EXTENSIONS.stream()
-            .collect(Collectors.joining(",")) + ')';
+        String.join(",", PreprocessorContext.DEFAULT_PROCESSING_EXTENSIONS) + ')';
   }
 
   @Override

jcp/src/main/java/com/igormaznitsa/jcp/cmdline/GlobalVariableDefiningFileHandler.java

@@ -59,7 +59,7 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
 
         if (context.isVerbose()) {
           context.logForVerbose(
-              "Global parameter file defined through expression \'" + stringRest + '\'');
+              "Global parameter file defined through expression '" + stringRest + '\'');
         }
 
         final Value resultValue = Expression.evalExpression(stringRest, context);
@@ -72,14 +72,14 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
 
       if (context.isVerbose()) {
         context.logForVerbose(
-            "Reading global definition file [" + PreprocessorUtils.getFilePath(file) + "]  \'" +
+            "Reading global definition file [" + PreprocessorUtils.getFilePath(file) + "]  '" +
                 stringRest + '\'');
       }
       if (file.isFile()) {
         context.registerConfigFile(file);
       } else {
         throw context.makeException(
-            "Can't find the global definition file \'" + PreprocessorUtils.getFilePath(file) + '\'',
+            "Can't find the global definition file '" + PreprocessorUtils.getFilePath(file) + '\'',
             null);
       }
 

jcp/src/main/java/com/igormaznitsa/jcp/cmdline/SourceDirectoryHandler.java

@@ -55,8 +55,8 @@ public boolean processCommandLineKey(final String key, final PreprocessorContext
       final String tail = PreprocessorUtils.extractTrimmedTail(ARG_NAME, key);
       if (!tail.isEmpty()) {
         context.setSources(
-            Arrays.asList(extractTail(ARG_NAME, key).split(Pattern.quote(File.pathSeparator)))
-                .stream().map(String::trim).collect(Collectors.toList()));
+            Arrays.stream(extractTail(ARG_NAME, key).split(Pattern.quote(File.pathSeparator)))
+                .map(String::trim).collect(Collectors.toList()));
         result = true;
       }
     }

jcp/src/main/java/com/igormaznitsa/jcp/context/JCPSpecialVariableProcessor.java

@@ -190,7 +190,7 @@ public void setVariable(final String varName, final Value value,
       case VAR_TIME:
       case VAR_TIMESTAMP:
       case VAR_DATE: {
-        final String text = "The variable \'" + varName + "\' can't be set directly";
+        final String text = "The variable '" + varName + "' can't be set directly";
         throw context.makeException(text, null);
       }
       default: {

jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java

@@ -531,7 +531,7 @@ public PreprocessorContext removeLocalVariable(final String name) {
     }
 
     if (isVerbose()) {
-      logForVerbose("Removing local variable '" + normalized + "\'");
+      logForVerbose("Removing local variable '" + normalized + "'");
     }
     localVarTable.remove(normalized);
     return this;
@@ -559,7 +559,7 @@ public PreprocessorContext removeGlobalVariable(final String name) {
     }
 
     if (isVerbose()) {
-      logForVerbose("Removing global variable '" + normalized + "\'");
+      logForVerbose("Removing global variable '" + normalized + "'");
     }
 
     globalVarTable.remove(normalized);
@@ -794,11 +794,11 @@ public File findFileInSources(final String path) throws IOException {
       }
 
       if (result == null) {
-        throw makeException("Can't find file for path \'" + path +
-                "\' in preprocessing source folders, allowed usage only files in preprocessing source folders!",
+        throw makeException("Can't find file for path '" + path +
+                "' in preprocessing source folders, allowed usage only files in preprocessing source folders!",
             null);
       } else if (!result.isFile()) {
-        throw makeException("File \'" + result + "\' is either not found or not a file", null);
+        throw makeException("File '" + result + "' is either not found or not a file", null);
       }
 
     } else if (parentDir != null) {
@@ -807,25 +807,24 @@ public File findFileInSources(final String path) throws IOException {
     } else {
       final List<File> setOfFoundFiles = new ArrayList<>();
       getSources().stream().map((root) -> new File(root.getAsFile(), path))
-          .filter((variant) -> (variant.exists() && variant.isFile())).forEachOrdered((variant) -> {
-        setOfFoundFiles.add(variant);
-      });
+          .filter((variant) -> (variant.exists() && variant.isFile())).forEachOrdered(
+          setOfFoundFiles::add);
 
       if (setOfFoundFiles.size() == 1) {
         result = setOfFoundFiles.get(0);
       } else if (setOfFoundFiles.isEmpty()) {
         result = null;
       } else {
         throw makeException(
-            "Found several variants for path \'" + path + "\' in different source roots", null);
+            "Found several variants for path '" + path + "' in different source roots", null);
       }
 
       if (result == null) {
-        throw makeException("Can't find file for path \'" + path +
-            "\' among source files registered for preprocessing.", null);
+        throw makeException("Can't find file for path '" + path +
+            "' among source files registered for preprocessing.", null);
       } else if (!result.isFile()) {
-        throw makeException("File \'" + PreprocessorUtils.getFilePath(result) +
-            "\' is either not found or not a file", null);
+        throw makeException("File '" + PreprocessorUtils.getFilePath(result) +
+            "' is either not found or not a file", null);
       }
     }
 

jcp/src/main/java/com/igormaznitsa/jcp/directives/DefineDirectiveHandler.java

@@ -60,7 +60,7 @@ public String getReference() {
   protected void process(final PreprocessorContext context, final String varName, final Value value,
                          final boolean exists) {
     if (exists) {
-      context.logWarning("Variable \'" + varName + "\' already defined");
+      context.logWarning("Variable '" + varName + "' already defined");
     }
     context.setGlobalVariable(varName, value);
   }

jcp/src/main/java/com/igormaznitsa/jcp/directives/FlushDirectiveHandler.java

@@ -60,7 +60,7 @@ public AfterDirectiveProcessingBehaviour execute(final String string,
         final boolean saved = state.saveBuffersToFile(outFile, context.isKeepComments());
         if (context.isVerbose()) {
           context.logForVerbose(
-              "Content was " + (saved ? "saved" : "not saved") + " into file '" + outFile + "\'");
+              "Content was " + (saved ? "saved" : "not saved") + " into file '" + outFile + "'");
         }
 
         state.resetPrinters();