#98 aibolit.P25 (private static method) fixed in Directives

src/main/java/org/xembly/AddIfDirective.java

@@ -66,6 +66,7 @@ public String toString() {
     }
 
     @Override
+    @SuppressWarnings("aibolit.P32")
     public Directive.Cursor exec(final Node dom,
         final Directive.Cursor cursor, final Directive.Stack stack) {
         final Collection<Node> targets = new ArrayList<>(cursor.size());

src/main/java/org/xembly/Directives.java

@@ -35,11 +35,6 @@
 import java.util.LinkedList;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.TokenStream;
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -116,7 +111,7 @@ public Directives() {
      * @throws SyntaxException If syntax is broken
      */
     public Directives(final String text) throws SyntaxException {
-        this(Directives.parse(text));
+        this(new Verbs(text).directives());
     }
 
     /**
@@ -562,25 +557,6 @@ public Directives comment(final Object text) {
         return this;
     }
 
-    /**
-     * Parse script.
-     * @param script Script to parse
-     * @return Collection of directives
-     * @throws SyntaxException If can't parse
-     */
-    private static Collection<Directive> parse(final String script)
-        throws SyntaxException {
-        final CharStream input = new ANTLRStringStream(script);
-        final XemblyLexer lexer = new XemblyLexer(input);
-        final TokenStream tokens = new CommonTokenStream(lexer);
-        final XemblyParser parser = new XemblyParser(tokens);
-        try {
-            return parser.directives();
-        } catch (final RecognitionException | ParsingException ex) {
-            throw new SyntaxException(script, ex);
-        }
-    }
-
     /**
      * Iterable to collection.
      * @param itr Iterable

src/main/java/org/xembly/Verbs.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2013-2020, xembly.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met: 1) Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer. 2) Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution. 3) Neither the name of the xembly.org nor
+ * the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.xembly;
+
+import java.util.Collection;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.TokenStream;
+
+/**
+ * Directives in plain text.
+ *
+ * @since 0.24
+ */
+final class Verbs {
+
+    /**
+     * The text.
+     */
+    private final String text;
+
+    /**
+     * Public ctor.
+     * @param txt The script
+     */
+    Verbs(final String txt) {
+        this.text = txt;
+    }
+
+    /**
+     * Parse script.
+     * @return Collection of directives
+     * @throws SyntaxException If can't parse
+     */
+    public Collection<Directive> directives() throws SyntaxException {
+        final CharStream input = new ANTLRStringStream(this.text);
+        final XemblyLexer lexer = new XemblyLexer(input);
+        final TokenStream tokens = new CommonTokenStream(lexer);
+        final XemblyParser parser = new XemblyParser(tokens);
+        try {
+            return parser.directives();
+        } catch (final RecognitionException | ParsingException ex) {
+            throw new SyntaxException(this.text, ex);
+        }
+    }
+
+}