refactoring

Author: raydac

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

@@ -262,6 +262,14 @@ private static Charset decodeCharset(final String charsetName) {
     }
   }
 
+  /**
+   * Find all files which have been used during preprocess, it includes configs, source files, copied files,
+   * generated files, included files and binary files used by functions. Excluded files are not added if
+   * they are not processed by included files.
+   *
+   * @return set of all input files, must not be null
+   * @since 7.0.3
+   */
   public Set<File> findAllInputFiles() {
     final Set<File> result = new HashSet<>();
     result.addAll(this.configFiles);
@@ -275,7 +283,13 @@ public Set<File> findAllInputFiles() {
     return result;
   }
 
-  public Set<File> findAllGeneratedFiles() {
+  /**
+   * Find all files which have been produced during preprocess, it includes also copied an generated files.
+   *
+   * @return set of all produced files, must not be null
+   * @since 7.0.3
+   */
+  public Set<File> findAllProducedFiles() {
     return this.preprocessedResources.stream()
         .flatMap(x -> x.getGeneratedResources().stream())
         .collect(Collectors.toSet());

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionEVALFILE.java

@@ -110,7 +110,7 @@ public Value executeStr(final PreprocessorContext context, final Value strFilePa
           .ifPresent(f -> {
             f.getIncludedSources().add(fileToEvaluate);
             f.getIncludedSources().addAll(evalContext.findAllInputFiles());
-            f.getGeneratedResources().addAll(evalContext.findAllGeneratedFiles());
+            f.getGeneratedResources().addAll(evalContext.findAllProducedFiles());
           });
 
       final StringWriter strWriter = new StringWriter(1024);

jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpTask.java

@@ -427,7 +427,7 @@ public void warning(final String message) {
     preprocessor.execute();
 
     final Collection<File> foundAllGeneratedFiles =
-        preprocessor.getContext().findAllGeneratedFiles();
+        preprocessor.getContext().findAllProducedFiles();
     final Collection<File> foundAllInputFiles = preprocessor.getContext().findAllInputFiles();
 
     this.outcomingFilesIterator.set(foundAllGeneratedFiles);

jcp/src/main/java/com/igormaznitsa/jcp/utils/PreprocessorUtils.java

@@ -66,6 +66,7 @@ private PreprocessorUtils() {
    * @param context preprocessor context, must not be null
    * @return found FileInfoContainr or empty optional
    * @see FileInfoContainer
+   * @since 7.0.3
    */
   public static Optional<FileInfoContainer> findFirstActiveFileContainer(
       final PreprocessorContext context

jcp/src/test/java/com/igormaznitsa/jcp/usecases/BinFileTest.java

@@ -41,7 +41,7 @@ public void check(final PreprocessorContext context, final JcpPreprocessor.Stati
     assertEquals(1, stat.getPreprocessed());
     assertEquals(0, stat.getCopied());
     assertEquals(2, context.findAllInputFiles().size());
-    assertEquals(1, context.findAllGeneratedFiles().size());
+    assertEquals(1, context.findAllProducedFiles().size());
   }
 
 }

jcp/src/test/java/com/igormaznitsa/jcp/usecases/EvalFileTest.java

@@ -39,7 +39,7 @@ public void check(PreprocessorContext context, JcpPreprocessor.Statistics stat)
     assertEquals(1, stat.getPreprocessed());
     assertEquals(0, stat.getCopied());
     assertEquals(3, context.findAllInputFiles().size());
-    assertEquals(2, context.findAllGeneratedFiles().size());
+    assertEquals(2, context.findAllProducedFiles().size());
   }
 
 }

jcp/src/test/java/com/igormaznitsa/jcp/usecases/ExternalGlobalDefFileTest.java

@@ -40,7 +40,7 @@ public void check(final PreprocessorContext context, final JcpPreprocessor.Stati
     assertEquals(0, stat.getCopied());
     assertEquals(1, stat.getPreprocessed());
     assertEquals(2, context.findAllInputFiles().size());
-    assertEquals(1, context.findAllGeneratedFiles().size());
+    assertEquals(1, context.findAllProducedFiles().size());
   }
 
 }

jcp/src/test/java/com/igormaznitsa/jcp/usecases/GenerationTest.java

@@ -34,7 +34,7 @@ public void check(PreprocessorContext context, JcpPreprocessor.Statistics stat)
     assertEquals(0, stat.getCopied());
     assertEquals(1, stat.getPreprocessed());
     assertEquals(1, context.findAllInputFiles().size());
-    assertEquals(3, context.findAllGeneratedFiles().size());
+    assertEquals(3, context.findAllProducedFiles().size());
   }
 
 }

jcp/src/test/java/com/igormaznitsa/jcp/usecases/IncludeAndExitTest.java

@@ -34,7 +34,7 @@ public void check(final PreprocessorContext context, final JcpPreprocessor.Stati
     assertEquals(0, stat.getCopied());
     assertEquals(1, stat.getPreprocessed());
     assertEquals(3, context.findAllInputFiles().size());
-    assertEquals(1, context.findAllGeneratedFiles().size());
+    assertEquals(1, context.findAllProducedFiles().size());
   }
 
 }

jcp/src/test/java/com/igormaznitsa/jcp/usecases/InsidePreprocessingTest.java

@@ -34,7 +34,7 @@ public void check(PreprocessorContext context, JcpPreprocessor.Statistics stat)
     assertEquals(0, stat.getCopied());
     assertEquals(1, stat.getPreprocessed());
     assertEquals(2, context.findAllInputFiles().size());
-    assertEquals(1, context.findAllGeneratedFiles().size());
+    assertEquals(1, context.findAllProducedFiles().size());
   }
 
 }