refactoring

Author: raydac

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

@@ -54,6 +54,7 @@
 import com.igormaznitsa.jcp.context.CommentTextProcessor;
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import com.igormaznitsa.jcp.context.SpecialVariableProcessor;
 import com.igormaznitsa.jcp.directives.ExcludeIfDirectiveHandler;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
 import com.igormaznitsa.jcp.exceptions.PreprocessorException;
@@ -86,8 +87,6 @@
  */
 public final class JcpPreprocessor {
 
-  private static final String PROPERTY_JCP_BASE_DIR = "jcp.base.dir";
-
   static final CommandLineHandler[] COMMAND_LINE_HANDLERS = new CommandLineHandler[] {
       new HelpHandler(),
       new InCharsetHandler(),
@@ -113,6 +112,7 @@ public final class JcpPreprocessor {
       new AllowMergeBlockLineHandler(),
       new UnknownAsFalseHandler()
   };
+  private static final String PROPERTY_JCP_BASE_DIR = "jcp.base.dir";
   private final PreprocessorContext context;
 
   public JcpPreprocessor(final PreprocessorContext context) {
@@ -224,41 +224,66 @@ public PreprocessorContext getContext() {
 
 
   public Statistics execute() throws IOException {
-    final long timeStart = System.currentTimeMillis();
+    this.context.getCommentTextProcessors().forEach(x -> x.onContextStarted(this.context));
+    this.context.getMapVariableNameToSpecialVarProcessor()
+        .values().forEach(x -> x.onContextStarted(this.context));
 
-    this.context.getActivatedConfigFiles().addAll(processConfigFiles());
+    final long timeStart = System.currentTimeMillis();
+    Throwable throwable = null;
+    Statistics stat = null;
+    try {
+      this.context.getActivatedConfigFiles().addAll(processConfigFiles());
 
-    this.context.logInfo(String
-        .format("File extensions: %s excluded %s", this.context.getExtensions(),
-            this.context.getExcludeExtensions()));
-    final List<PreprocessorContext.SourceFolder> srcFolders = this.context.getSources();
-    this.context.logDebug("Source folders: " + srcFolders);
+      this.context.logInfo(String
+          .format("File extensions: %s excluded %s", this.context.getExtensions(),
+              this.context.getExcludeExtensions()));
+      final List<PreprocessorContext.SourceFolder> srcFolders = this.context.getSources();
+      this.context.logDebug("Source folders: " + srcFolders);
 
-    if (srcFolders.isEmpty()) {
-      this.context.logWarning("Source folder list is empty!");
-    }
+      if (srcFolders.isEmpty()) {
+        this.context.logWarning("Source folder list is empty!");
+      }
 
-    final Collection<FileInfoContainer> filesToBePreprocessed =
-        collectFilesToPreprocess(srcFolders, this.context.getExcludeFolders());
-    this.context.addAllPreprocessedResources(filesToBePreprocessed);
+      final Collection<FileInfoContainer> filesToBePreprocessed =
+          collectFilesToPreprocess(srcFolders, this.context.getExcludeFolders());
+      this.context.addAllPreprocessedResources(filesToBePreprocessed);
 
-    final List<PreprocessingState.ExcludeIfInfo> excludedIf =
-        processGlobalDirectives(filesToBePreprocessed);
+      final List<PreprocessingState.ExcludeIfInfo> excludedIf =
+          processGlobalDirectives(filesToBePreprocessed);
 
-    processFileExclusion(excludedIf);
-    if (!this.context.isDryRun()) {
-      createTargetFolder();
-    } else {
-      this.context.logInfo("Dry run mode is ON");
+      processFileExclusion(excludedIf);
+      if (!this.context.isDryRun()) {
+        createTargetFolder();
+      } else {
+        this.context.logInfo("Dry run mode is ON");
+      }
+      stat = preprocessFiles(filesToBePreprocessed);
+    } catch (Throwable ex) {
+      throwable = ex;
+      if (ex instanceof IOException) {
+        throw (IOException) ex;
+      }
+    } finally {
+      try {
+        for (final CommentTextProcessor p : this.context.getCommentTextProcessors()) {
+          p.onContextStopped(this.context, throwable);
+        }
+      } finally {
+        for (final SpecialVariableProcessor p : this.context.getMapVariableNameToSpecialVarProcessor()
+            .values()) {
+          p.onContextStopped(this.context, throwable);
+        }
+      }
+    }
+    if (stat != null) {
+      final long elapsedTime = System.currentTimeMillis() - timeStart;
+      this.context.logInfo("-----------------------------------------------------------------");
+      this.context.logInfo(String
+          .format("Preprocessed %d files, copied %d files, ignored %d files, elapsed time %d ms",
+              stat.getPreprocessed(), stat.getCopied(), stat.getExcluded(), elapsedTime));
     }
-    final Statistics stat = preprocessFiles(filesToBePreprocessed);
-
-    final long elapsedTime = System.currentTimeMillis() - timeStart;
-    this.context.logInfo("-----------------------------------------------------------------");
-    this.context.logInfo(String
-        .format("Preprocessed %d files, copied %d files, ignored %d files, elapsed time %d ms",
-            stat.getPreprocessed(), stat.getCopied(), stat.getExcluded(), elapsedTime));
     return stat;
+
   }
 
   private void processFileExclusion(final List<PreprocessingState.ExcludeIfInfo> foundExcludeIf) {

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

@@ -415,7 +415,7 @@ private void flushTextBufferForRemovedComments(final StringBuilder textBuffer,
       if (!processors.isEmpty()) {
         processors.forEach(x -> {
           try {
-            final String result = x.processCommentText(origText, this, context, state);
+            final String result = x.onUncommentText(origText, this, context, state);
             textBuffer.append(result);
           } catch (Exception ex) {
             throw new PreprocessorException(

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

@@ -10,8 +10,7 @@
  *
  * @since 7.2.0
  */
-@FunctionalInterface
-public interface CommentTextProcessor {
+public interface CommentTextProcessor extends PreprocessorContextListener {
   /**
    * Process text value.
    *
@@ -22,7 +21,7 @@ public interface CommentTextProcessor {
    * @return must return value as the same text or as the changed one.
    * @throws IOException if any IO error during operation
    */
-  String processCommentText(
+  String onUncommentText(
       String text,
       FileInfoContainer fileInfoContainer,
       PreprocessorContext context,

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

@@ -0,0 +1,27 @@
+package com.igormaznitsa.jcp.context;
+
+/**
+ * Listener for preprocessor context work states.
+ *
+ * @since 7.2.0
+ */
+public interface PreprocessorContextListener {
+  /**
+   * Called when context started.
+   *
+   * @param context the source context, must not be null
+   */
+  default void onContextStarted(PreprocessorContext context) {
+
+  }
+
+  /**
+   * Called when context work ended.
+   *
+   * @param context the source context, must not be null
+   * @param error   the error if it was thrown during context execution.
+   */
+  default void onContextStopped(PreprocessorContext context, Throwable error) {
+
+  }
+}

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

@@ -29,16 +29,14 @@
  *
  * @author Igor Maznitsa (igor.maznitsa@igormaznitsa.com)
  */
-public interface SpecialVariableProcessor {
+public interface SpecialVariableProcessor extends PreprocessorContextListener {
 
   /**
    * Get all variable names allowed by the processor as an array, all names must
    * be in lower case
    *
    * @return allowed variable names as a String array
    */
-
-
   String[] getVariableNames();
 
   /**
@@ -49,7 +47,6 @@ public interface SpecialVariableProcessor {
    * @return the value, it must not return null because it will notified
    * preprocessor that it supports the variable
    */
-
   Value getVariable(String varName, PreprocessorContext context);
 
   /**