improved registration of input files

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/JcpPreprocessor.java

@@ -228,7 +228,7 @@ public Statistics execute() throws IOException {
 
     final Collection<FileInfoContainer> filesToBePreprocessed =
         collectFilesToPreprocess(srcFolders, this.context.getExcludeFolders());
-    this.context.getPreprocessedResources().addAll(filesToBePreprocessed);
+    this.context.addAllPreprocessedResources(filesToBePreprocessed);
 
     final List<PreprocessingState.ExcludeIfInfo> excludedIf =
         processGlobalDirectives(filesToBePreprocessed);

jcp/src/main/java/com/igormaznitsa/jcp/containers/FileInfoContainer.java

@@ -21,6 +21,9 @@
 
 package com.igormaznitsa.jcp.containers;
 
+import static java.util.Objects.requireNonNull;
+
+
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.directives.AbstractDirectiveHandler;
@@ -35,7 +38,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -67,9 +69,13 @@ public class FileInfoContainer {
    */
   private final boolean copyOnly;
   /**
-   * List of file generated from the file.
+   * Collection of files generated with the file.
    */
   private final Collection<File> generatedResources = new HashSet<>();
+  /**
+   * Collection of files which took part during preprocessing of the file
+   */
+  private final Collection<File> includedSources = new HashSet<>();
   /**
    * The flag shows that the file has been excluded from preprocessing and it will not be preprocessed and copied
    */
@@ -85,8 +91,8 @@ public class FileInfoContainer {
 
   public FileInfoContainer(final File srcFile, final String targetFileName,
                            final boolean copyOnly) {
-    Objects.requireNonNull(srcFile, "Source file is null");
-    Objects.requireNonNull(targetFileName, "Target file name is null");
+    requireNonNull(srcFile, "Source file is null");
+    requireNonNull(targetFileName, "Target file name is null");
 
     this.copyOnly = copyOnly;
     excludedFromPreprocessing = false;
@@ -123,12 +129,12 @@ private static String findTailRemover(final String str, final PreprocessorContex
   }
 
   public void setTargetFolder(final String targetFolder) {
-    this.targetFolder = Objects.requireNonNull(targetFolder, "Target folder must not be null");
+    this.targetFolder = requireNonNull(targetFolder, "Target folder must not be null");
   }
 
   public void setTargetName(final String targetName) {
     this.targetFileName =
-        Objects.requireNonNull(targetFileName, "Target file name must not be null");
+        requireNonNull(targetFileName, "Target file name must not be null");
   }
 
 
@@ -206,7 +212,7 @@ public List<PreprocessingState.ExcludeIfInfo> processGlobalDirectives(
         }
       }
       if (!preprocessingState.isIfStackEmpty()) {
-        final TextFileDataContainer lastIf = Objects.requireNonNull(preprocessingState.peekIf());
+        final TextFileDataContainer lastIf = requireNonNull(preprocessingState.peekIf());
         throw new PreprocessorException(
             "Unclosed " + AbstractDirectiveHandler.DIRECTIVE_PREFIX + "_if instruction detected",
             "", new FilePositionInfo[] {
@@ -336,8 +342,12 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
       context.clearLocalVariables();
     }
 
-    final PreprocessingState preprocessingState =
-        state != null ? state : context.produceNewPreprocessingState(this, 1);
+    final PreprocessingState preprocessingState;
+    if (state == null) {
+      preprocessingState = context.produceNewPreprocessingState(this, 1);
+    } else {
+      preprocessingState = state;
+    }
 
     String leftTrimmedString = null;
 
@@ -402,7 +412,7 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
                     AbstractDirectiveHandler.PREFIX_FOR_KEEPING_LINES_PROCESSED_DIRECTIVES +
                     extractedDirective;
                 final ResetablePrinter thePrinter =
-                    Objects.requireNonNull(preprocessingState.getPrinter());
+                    requireNonNull(preprocessingState.getPrinter());
                 if (doPrintLn) {
                   thePrinter.println(text, context.getEol());
                 } else {
@@ -416,7 +426,7 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
                   AbstractDirectiveHandler.PREFIX_FOR_KEEPING_LINES_PROCESSED_DIRECTIVES +
                   extractedDirective;
               final ResetablePrinter thePrinter =
-                  Objects.requireNonNull(preprocessingState.getPrinter());
+                  requireNonNull(preprocessingState.getPrinter());
               if (doPrintLn) {
                 thePrinter.println(text, context.getEol());
               } else {
@@ -429,7 +439,7 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
           }
         }
 
-        final ResetablePrinter thePrinter = Objects.requireNonNull(preprocessingState.getPrinter());
+        final ResetablePrinter thePrinter = requireNonNull(preprocessingState.getPrinter());
         if (preprocessingState.isDirectiveCanBeProcessed() &&
             !preprocessingState.getPreprocessingFlags()
                 .contains(PreprocessingFlag.TEXT_OUTPUT_DISABLED)) {
@@ -494,22 +504,22 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
 
     if (!preprocessingState.isIfStackEmpty()) {
       final TextFileDataContainer lastIf =
-          Objects.requireNonNull(preprocessingState.peekIf(), "'IF' stack is empty");
+          requireNonNull(preprocessingState.peekIf(), "'IF' stack is empty");
       throw new PreprocessorException(
           "Unclosed " + AbstractDirectiveHandler.DIRECTIVE_PREFIX + "if instruction detected",
           "", new FilePositionInfo[] {
           new FilePositionInfo(lastIf.getFile(), lastIf.getNextStringIndex())}, null);
     }
     if (!preprocessingState.isWhileStackEmpty()) {
       final TextFileDataContainer lastWhile =
-          Objects.requireNonNull(preprocessingState.peekWhile(), "'WHILE' stack is empty");
+          requireNonNull(preprocessingState.peekWhile(), "'WHILE' stack is empty");
       throw new PreprocessorException(
           "Unclosed " + AbstractDirectiveHandler.DIRECTIVE_PREFIX + "while instruction detected",
           "", new FilePositionInfo[] {
           new FilePositionInfo(lastWhile.getFile(), lastWhile.getNextStringIndex())}, null);
     }
 
-    if (!context.isDryRun() && Objects.requireNonNull(lastTextFileDataContainer).isAutoFlush()) {
+    if (!context.isDryRun() && requireNonNull(lastTextFileDataContainer).isAutoFlush()) {
       final File outFile = context.createDestinationFileForPath(makeTargetFilePathAsString());
 
       final boolean wasSaved =

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

@@ -22,6 +22,7 @@
 package com.igormaznitsa.jcp.context;
 
 import static com.igormaznitsa.jcp.utils.IOUtils.closeQuietly;
+import static com.igormaznitsa.jcp.utils.PreprocessorUtils.findFirstActiveFileContainer;
 
 
 import com.igormaznitsa.jcp.containers.FileInfoContainer;
@@ -218,17 +219,14 @@ public TextFileDataContainer openFile(final File file) throws IOException {
     return newContainer;
   }
 
-
   public TextFileDataContainer peekFile() {
     return includeStack.peek();
   }
 
-
-  List<TextFileDataContainer> getCurrentIncludeStack() {
+  public List<TextFileDataContainer> getCurrentIncludeStack() {
     return this.includeStack;
   }
 
-
   public FilePositionInfo[] makeIncludeStack() {
     if (this.fake) {
       return EMPTY_STACK;
@@ -484,8 +482,11 @@ public boolean saveBuffersToFile(final File outFile, final boolean keepComments)
       closeQuietly(writer);
     }
 
-    if (wasSaved && this.context.isKeepAttributes() && outFile.exists()) {
-      PreprocessorUtils.copyFileAttributes(this.getRootFileInfo().getSourceFile(), outFile);
+    if (wasSaved) {
+      findFirstActiveFileContainer(context).ifPresent(t -> t.getGeneratedResources().add(outFile));
+      if (this.context.isKeepAttributes() && outFile.exists()) {
+        PreprocessorUtils.copyFileAttributes(this.getRootFileInfo().getSourceFile(), outFile);
+      }
     }
 
     return wasSaved;

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

@@ -52,7 +52,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
@@ -86,8 +85,12 @@ public class PreprocessorContext {
   private final TextFileDataContainer currentInCloneSource;
   private final List<SourceFolder> sources = new ArrayList<>();
   private final File baseDir;
-  private final Collection<File> activatedConfigFiles = new ArrayList<>();
-  private final Collection<FileInfoContainer> preprocessedResources = new ArrayList<>();
+  private final Collection<File> activatedConfigFiles;
+
+  @Setter(AccessLevel.NONE)
+  @Getter(AccessLevel.NONE)
+  private final Collection<FileInfoContainer> preprocessedResources;
+
   @Setter(AccessLevel.NONE)
   @Getter(AccessLevel.NONE)
   private final AtomicReference<PreprocessingState> preprocessingState = new AtomicReference<>();
@@ -121,6 +124,8 @@ public class PreprocessorContext {
    * @param baseDir the base folder for process, it must not be null
    */
   public PreprocessorContext(final File baseDir) {
+    this.preprocessedResources = new ArrayList<>();
+    this.activatedConfigFiles = new ArrayList<>();
     this.baseDir = Objects.requireNonNull(baseDir, "Base folder must not be null");
     this.preprocessingState
         .set(new PreprocessingState(this, this.sourceEncoding, this.targetEncoding));
@@ -139,8 +144,8 @@ public PreprocessorContext(final File baseDir) {
   public PreprocessorContext(final PreprocessorContext context) {
     Objects.requireNonNull(context, "Source context must not be null");
 
-    this.activatedConfigFiles.addAll(context.activatedConfigFiles);
-    this.preprocessedResources.addAll(context.preprocessedResources);
+    this.activatedConfigFiles = context.activatedConfigFiles;
+    this.preprocessedResources = context.preprocessedResources;
 
     this.baseDir = context.getBaseDir();
     this.verbose = context.isVerbose();
@@ -191,6 +196,22 @@ public PreprocessorContext(final PreprocessorContext context) {
     this.currentInCloneSource = context.getPreprocessingState().peekFile();
   }
 
+  public void addPreprocessedResource(final FileInfoContainer container) {
+    if (container != null) {
+      this.preprocessedResources.add(container);
+    }
+  }
+
+  public void addAllPreprocessedResources(final Collection<FileInfoContainer> containers) {
+    if (containers != null) {
+      this.preprocessedResources.addAll(containers);
+    }
+  }
+
+  public Set<FileInfoContainer> findPreprocessedResources() {
+    return new HashSet<>(this.preprocessedResources);
+  }
+
   private static String makeStackView(
       final TextFileDataContainer cloneSource,
       final boolean cloned,
@@ -241,35 +262,31 @@ private static Charset decodeCharset(final String charsetName) {
     }
   }
 
-  public Collection<File> findAllInputFiles() {
-    return Stream.concat(this.configFiles.stream(),
-        this.preprocessedResources.stream().map(FileInfoContainer::getSourceFile)
-    ).collect(Collectors.toSet());
+  public Set<File> findAllInputFiles() {
+    final Set<File> result = new HashSet<>();
+    result.addAll(this.configFiles);
+    this.preprocessedResources.forEach(x -> {
+      result.addAll(x.getIncludedSources());
+      if (x.getSourceFile() != null &&
+          !(x.getIncludedSources().isEmpty() && x.isExcludedFromPreprocessing())) {
+        result.add(x.getSourceFile());
+      }
+    });
+    return result;
   }
 
-  public Collection<File> findAllGeneratedFiles() {
+  public Set<File> findAllGeneratedFiles() {
     return this.preprocessedResources.stream()
         .flatMap(x -> x.getGeneratedResources().stream())
         .collect(Collectors.toSet());
   }
 
-  public void notifyAboutFileInfoContainer(final FileInfoContainer fileInfoContainer) {
-    if (fileInfoContainer != null) {
-      final FileInfoContainer existing =
-          this.findFileInfoContainer(fileInfoContainer.getSourceFile()).orElse(null);
-      if (existing == null) {
-        this.preprocessedResources.add(fileInfoContainer);
-      } else {
-        existing.getGeneratedResources().addAll(fileInfoContainer.getGeneratedResources());
-      }
-    }
-  }
-
   public Optional<FileInfoContainer> findFileInfoContainer(final File file) {
     if (file == null) {
       return Optional.empty();
     } else {
-      return this.preprocessedResources.stream().filter(x -> file.equals(x.getSourceFile()))
+      return this.preprocessedResources.stream()
+          .filter(x -> file.equals(x.getSourceFile()))
           .findFirst();
     }
   }

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

@@ -21,6 +21,9 @@
 
 package com.igormaznitsa.jcp.directives;
 
+import static com.igormaznitsa.jcp.utils.PreprocessorUtils.findFirstActiveFileContainer;
+
+
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import java.io.File;
@@ -63,6 +66,9 @@ public AfterDirectiveProcessingBehaviour execute(final String string,
               "Content was " + (saved ? "saved" : "not saved") + " into file '" + outFile + "'");
         }
 
+        findFirstActiveFileContainer(context)
+            .ifPresent(f -> f.getGeneratedResources().add(outFile));
+
         state.resetPrinters();
       } catch (IOException ex) {
         throw context.makeException("Can't flush text buffers", ex);

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

@@ -21,6 +21,9 @@
 
 package com.igormaznitsa.jcp.directives;
 
+import static com.igormaznitsa.jcp.utils.PreprocessorUtils.findFirstActiveFileContainer;
+
+
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.expression.Expression;
@@ -63,11 +66,14 @@ public AfterDirectiveProcessingBehaviour execute(final String string,
     final String filePath = includingFilePath.toString();
 
     try {
-      final File theFile = context.findFileInSources(filePath);
+      final File fileToInclude = context.findFileInSources(filePath);
       if (context.isVerbose()) {
-        context.logForVerbose("Including file '" + theFile.getCanonicalPath() + '\'');
+        context.logForVerbose("Including file '" + fileToInclude.getCanonicalPath() + '\'');
       }
-      state.openFile(theFile);
+      state.openFile(fileToInclude);
+
+      findFirstActiveFileContainer(context)
+          .ifPresent(f -> f.getIncludedSources().add(fileToInclude));
     } catch (IOException ex) {
       throw context.makeException("Can't open file '" + filePath + '\'', ex);
     }