refactoring of service processing

Author: raydac

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

@@ -53,6 +53,7 @@
 import com.igormaznitsa.jcp.containers.FileInfoContainer;
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import com.igormaznitsa.jcp.context.PreprocessorContextAware;
 import com.igormaznitsa.jcp.directives.ExcludeIfDirectiveHandler;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
 import com.igormaznitsa.jcp.exceptions.PreprocessorException;
@@ -319,7 +320,21 @@ private List<PreprocessingState.ExcludeIfInfo> processGlobalDirectives(
   private Statistics preprocessFiles(final Collection<FileInfoContainer> files,
                                      final boolean notifyProcessors) throws IOException {
     if (notifyProcessors) {
-      context.fireNotificationStart();
+      final List<PreprocessorContextAware> successfullyNotified = new ArrayList<>();
+      try {
+        context.fireNotificationStart(successfullyNotified);
+      } catch (final Exception ex) {
+        context.logError("Error during init of context aware processors: " + ex.getMessage());
+        successfullyNotified.forEach(x -> {
+          try {
+            x.onContextStopped(context, ex);
+          } catch (Exception err) {
+            context.logError("Error: " + err.getMessage());
+          }
+        });
+        throw new IllegalStateException("Exception during notification of context aware listeners",
+            ex);
+      }
     }
 
     int preprocessedCounter = 0;

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

@@ -27,6 +27,7 @@
 import com.igormaznitsa.jcp.context.CommentTextProcessor;
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import com.igormaznitsa.jcp.context.PreprocessorContextAware;
 import com.igormaznitsa.jcp.directives.AbstractDirectiveHandler;
 import com.igormaznitsa.jcp.directives.AfterDirectiveProcessingBehaviour;
 import com.igormaznitsa.jcp.directives.DirectiveArgumentType;
@@ -516,7 +517,21 @@ public PreprocessingState preprocessFileWithNotification(final PreprocessingStat
                                                            final boolean notifyProcessors)
       throws IOException {
     if (!context.isCloned() && notifyProcessors) {
-      context.fireNotificationStart();
+      final List<PreprocessorContextAware> successfullyNotified = new ArrayList<>();
+      try {
+        context.fireNotificationStart(successfullyNotified);
+      } catch (final Exception ex) {
+        context.logError("Error during init of context aware processors: " + ex.getMessage());
+        successfullyNotified.forEach(x -> {
+          try {
+            x.onContextStopped(context, ex);
+          } catch (Exception err) {
+            context.logError("Error: " + err.getMessage());
+          }
+        });
+        throw new IllegalStateException("Exception during notification of context aware listeners",
+            ex);
+      }
     }
 
     PreprocessingState theState = null;

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

@@ -13,7 +13,7 @@
  *
  * @since 7.2.0
  */
-public interface CommentTextProcessor extends PreprocessorContextListener, ExecutionAllowable {
+public interface CommentTextProcessor extends PreprocessorContextAware, ExecutionAllowable {
 
   /**
    * Processes uncommented text detected in `//$` or `//$$` sections.

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

@@ -296,13 +296,23 @@ public Set<FileInfoContainer> findPreprocessedResources() {
 
   /**
    * Send notification about context start to all registered listeners.
-   *
+   * @param initedList list accumulating successfully processed listeners, must not be immutable and must not be null
    * @since 7.2.0
    */
-  public void fireNotificationStart() {
-    this.getCommentTextProcessors().forEach(x -> x.onContextStarted(this));
+  public void fireNotificationStart(final List<PreprocessorContextAware> initedList) {
+    this.getCommentTextProcessors().forEach(x -> {
+      x.onContextStarted(this);
+      initedList.add(x);
+    });
     this.getMapVariableNameToSpecialVarProcessor()
-        .values().stream().flatMap(Collection::stream).forEach(x -> x.onContextStarted(this));
+        .values().stream().flatMap(Collection::stream).forEach(x -> {
+          x.onContextStarted(this);
+          initedList.add(x);
+        });
+    this.getPreprocessorExtensions().forEach(x -> {
+      x.onContextStarted(this);
+      initedList.add(x);
+    });
   }
 
   /**
@@ -316,6 +326,7 @@ public void fireNotificationStop(final Throwable error) {
     this.getMapVariableNameToSpecialVarProcessor()
         .values().stream().flatMap(Collection::stream)
         .forEach(x -> x.onContextStopped(this, error));
+    this.getPreprocessorExtensions().forEach(x -> x.onContextStopped(this, error));
   }
 
   /**

jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContextListener.java renamed to jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContextAware.java

@@ -3,9 +3,9 @@
 /**
  * Listener for preprocessor context work states.
  *
- * @since 7.2.0
+ * @since 7.3.0
  */
-public interface PreprocessorContextListener {
+public interface PreprocessorContextAware {
   /**
    * Called when context started.
    *

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

@@ -32,7 +32,7 @@
  *
  * @author Igor Maznitsa ([email protected])
  */
-public interface SpecialVariableProcessor extends PreprocessorContextListener,
+public interface SpecialVariableProcessor extends PreprocessorContextAware,
     ExecutionAllowable {
 
   /**

jcp/src/main/java/com/igormaznitsa/jcp/extension/PreprocessorExtension.java

@@ -25,6 +25,7 @@
 import com.igormaznitsa.jcp.context.ExecutionAllowable;
 import com.igormaznitsa.jcp.context.PreprocessingState;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import com.igormaznitsa.jcp.context.PreprocessorContextAware;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
 import com.igormaznitsa.jcp.expression.Value;
 
@@ -34,7 +35,7 @@
  *
  * @author Igor Maznitsa ([email protected])
  */
-public interface PreprocessorExtension extends ExecutionAllowable {
+public interface PreprocessorExtension extends PreprocessorContextAware, ExecutionAllowable {
 
   /**
    * Undefined arity. In case of functions it means to check only name.