refactoring of directive handler list

Author: raydac

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

@@ -80,7 +80,7 @@ public static List<String> makeTextForHelpInfo() {
 
     result.add("Directives");
     result.add(SHORT_DELIMITER);
-    for (final AbstractDirectiveHandler handler : AbstractDirectiveHandler.getAllDirectives()) {
+    for (final AbstractDirectiveHandler handler : AbstractDirectiveHandler.findAllDirectives()) {
       result.add(makeDirectiveReference(handler));
     }
     result.add(DELIMITER);

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

@@ -582,11 +582,10 @@ private boolean checkDirectiveArgumentRoughly(final AbstractDirectiveHandler dir
   protected AfterDirectiveProcessingBehaviour processDirective(final PreprocessingState state,
                                                                final String directiveString,
                                                                final PreprocessorContext context,
-                                                               final boolean firstPass)
-      throws IOException {
+                                                               final boolean firstPass) {
     final boolean executionEnabled = state.isDirectiveCanBeProcessed();
 
-    for (final AbstractDirectiveHandler handler : AbstractDirectiveHandler.getAllDirectives()) {
+    for (final AbstractDirectiveHandler handler : context.getDirectiveHandlers()) {
       final String name = handler.getName();
       if (directiveString.startsWith(name)) {
         if ((firstPass && !handler.isGlobalPhaseAllowed()) ||

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

@@ -28,6 +28,7 @@
 
 import com.igormaznitsa.jcp.containers.FileInfoContainer;
 import com.igormaznitsa.jcp.containers.TextFileDataContainer;
+import com.igormaznitsa.jcp.directives.AbstractDirectiveHandler;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
 import com.igormaznitsa.jcp.exceptions.PreprocessorException;
 import com.igormaznitsa.jcp.expression.Value;
@@ -117,6 +118,7 @@ public class PreprocessorContext {
   @Setter(AccessLevel.NONE)
   private PreprocessorLogger preprocessorLogger = new SystemOutLogger();
   private List<String> excludeFolders = new ArrayList<>();
+  private static final List<AbstractDirectiveHandler> directiveHandlers = AbstractDirectiveHandler.findAllDirectives();
 
   /**
    * Constructor
@@ -196,6 +198,15 @@ public PreprocessorContext(final PreprocessorContext context) {
     this.currentInCloneSource = context.getPreprocessingState().peekFile();
   }
 
+  /**
+   * Get all directive handlers allowed for processing.
+   * @return list of direction handlers for the context
+   * @since 7.0.6
+   */
+  public List<AbstractDirectiveHandler> getDirectiveHandlers() {
+    return directiveHandlers;
+  }
+
   public void addPreprocessedResource(final FileInfoContainer container) {
     if (container != null) {
       this.preprocessedResources.add(container);

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

@@ -22,6 +22,8 @@
 package com.igormaznitsa.jcp.directives;
 
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The class is the abstract parent for all classes process preprocessor
@@ -52,55 +54,46 @@ public abstract class AbstractDirectiveHandler {
    */
   public static final String ONE_LINE_COMMENT = "//";
 
-  /**
-   * The array contains all directives of the preprocessor
-   */
-  private static volatile AbstractDirectiveHandler[] allDirectives;
-
-
-  public static AbstractDirectiveHandler[] getAllDirectives() {
-    if (allDirectives == null) {
-      allDirectives = new AbstractDirectiveHandler[] {
-          new LocalDirectiveHandler(),
-          new IfDefinedDirectiveHandler(),
-          new IfNDefDirectiveHandler(),
-          new IfDefDirectiveHandler(),
-          new IfDirectiveHandler(),
-          new ElseDirectiveHandler(),
-          new EndIfDirectiveHandler(),
-          new WhileDirectiveHandler(),
-          new BreakDirectiveHandler(),
-          new ContinueDirectiveHandler(),
-          new EndDirectiveHandler(),
-          new ExitIfDirectiveHandler(),
-          new ExitDirectiveHandler(),
-          new OutdirDirectiveHandler(),
-          new OutEnabledDirectiveHandler(),
-          new OutNameDirectiveHandler(),
-          new OutDisabledDirectiveHandler(),
-          new CommentNextLineDirectiveHandler(),
-          new DefinelDirectiveHandler(),
-          new DefineDirectiveHandler(),
-          new UndefDirectiveHandler(),
-          new FlushDirectiveHandler(),
-          new IncludeDirectiveHandler(),
-          new ActionDirectiveHandler(),
-          new PostfixDirectiveHandler(),
-          new PrefixDirectiveHandler(),
-          new GlobalDirectiveHandler(),
-          new GlobalElseDirectiveHandler(),
-          new GlobalEndIfDirectiveHandler(),
-          new GlobalIfDirectiveHandler(),
-          new ExcludeIfDirectiveHandler(),
-          new ErrorDirectiveHandler(),
-          new WarningDirectiveHandler(),
-          new EchoDirectiveHandler(),
-          new MsgDirectiveHandler(),
-          new NoAutoFlushHandler(),
-          new AbortDirectiveHandler()
-      };
-    }
-    return allDirectives;
+  public static List<AbstractDirectiveHandler> findAllDirectives() {
+    final List<AbstractDirectiveHandler> result = new ArrayList<>();
+    result.add(new LocalDirectiveHandler());
+    result.add(new IfDefinedDirectiveHandler());
+    result.add(new IfNDefDirectiveHandler());
+    result.add(new IfDefDirectiveHandler());
+    result.add(new IfDirectiveHandler());
+    result.add(new ElseDirectiveHandler());
+    result.add(new EndIfDirectiveHandler());
+    result.add(new WhileDirectiveHandler());
+    result.add(new BreakDirectiveHandler());
+    result.add(new ContinueDirectiveHandler());
+    result.add(new EndDirectiveHandler());
+    result.add(new ExitIfDirectiveHandler());
+    result.add(new ExitDirectiveHandler());
+    result.add(new OutdirDirectiveHandler());
+    result.add(new OutEnabledDirectiveHandler());
+    result.add(new OutNameDirectiveHandler());
+    result.add(new OutDisabledDirectiveHandler());
+    result.add(new CommentNextLineDirectiveHandler());
+    result.add(new DefinelDirectiveHandler());
+    result.add(new DefineDirectiveHandler());
+    result.add(new UndefDirectiveHandler());
+    result.add(new FlushDirectiveHandler());
+    result.add(new IncludeDirectiveHandler());
+    result.add(new ActionDirectiveHandler());
+    result.add(new PostfixDirectiveHandler());
+    result.add(new PrefixDirectiveHandler());
+    result.add(new GlobalDirectiveHandler());
+    result.add(new GlobalElseDirectiveHandler());
+    result.add(new GlobalEndIfDirectiveHandler());
+    result.add(new GlobalIfDirectiveHandler());
+    result.add(new ExcludeIfDirectiveHandler());
+    result.add(new ErrorDirectiveHandler());
+    result.add(new WarningDirectiveHandler());
+    result.add(new EchoDirectiveHandler());
+    result.add(new MsgDirectiveHandler());
+    result.add(new NoAutoFlushHandler());
+    result.add(new AbortDirectiveHandler());
+    return result;
   }
 
   /**

jcp/src/test/java/com/igormaznitsa/jcp/directives/AbstractDirectiveHandlerTest.java

@@ -33,7 +33,7 @@ public class AbstractDirectiveHandlerTest {
   @Test
   public void testPotentialConflictsBetweenDirectives() {
     final List<String> processed = new ArrayList<>();
-    for (final AbstractDirectiveHandler h : AbstractDirectiveHandler.getAllDirectives()) {
+    for (final AbstractDirectiveHandler h : AbstractDirectiveHandler.findAllDirectives()) {
       final String name = h.getName();
       for (final String p : processed) {
         assertFalse(h.getFullName() + " conflicts with " + (AbstractDirectiveHandler.DIRECTIVE_PREFIX + p), name.startsWith(p));