Update qulice-maven-plugin version and optimize AddDirective class.

Author: yegor256

pom.xml

@@ -449,7 +449,7 @@
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.24.0</version>
+            <version>0.25.1</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>findbugs:.*</exclude>

src/main/java/org/xembly/AddDirective.java

@@ -45,15 +45,14 @@ public String toString() {
     public Directive.Cursor exec(final Node dom,
         final Directive.Cursor cursor, final Directive.Stack stack) {
         final Collection<Node> targets = new ArrayList<>(cursor.size());
-        final String label = this.name.raw();
         final Document doc;
         if (dom.getOwnerDocument() == null) {
             doc = Document.class.cast(dom);
         } else {
             doc = dom.getOwnerDocument();
         }
         for (final Node node : cursor) {
-            final Element element = doc.createElement(label);
+            final Element element = doc.createElement(this.name.raw());
             node.appendChild(element);
             targets.add(element);
         }

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

@@ -45,14 +45,13 @@ public String toString() {
     public Directive.Cursor exec(final Node dom,
         final Directive.Cursor cursor, final Directive.Stack stack) {
         final Collection<Node> targets = new ArrayList<>(cursor.size());
-        final String label = this.name.raw();
         for (final Node node : cursor) {
             final NodeList kids = node.getChildNodes();
             Node target = null;
             final int len = kids.getLength();
             for (int idx = 0; idx < len; ++idx) {
                 if (kids.item(idx).getNodeName()
-                    .compareToIgnoreCase(label) == 0) {
+                    .compareToIgnoreCase(this.name.raw()) == 0) {
                     target = kids.item(idx);
                     break;
                 }

src/main/java/org/xembly/Arg.java

@@ -51,7 +51,7 @@ public String raw() {
      * @return Clean text
      * @throws XmlContentException If fails
      */
-    @SuppressWarnings({ "PMD.AvoidInstantiatingObjectsInLoops", "aibolit.P32" })
+    @SuppressWarnings({"aibolit.P32", "PMD.ProhibitPublicStaticMethods"})
     public static String unescape(final String text)
         throws XmlContentException {
         final char[] chars = text.toCharArray();
@@ -123,8 +123,7 @@ private static String escape(final String text) {
     private static char symbol(final String symbol) throws XmlContentException {
         final char chr;
         if ('#' == symbol.charAt(0)) {
-            final int num = Integer.parseInt(symbol.substring(1));
-            chr = Arg.legal((char) num);
+            chr = Arg.legal((char) Integer.parseInt(symbol.substring(1)));
         } else if ("apos".equalsIgnoreCase(symbol)) {
             chr = '\'';
         } else if ("quot".equalsIgnoreCase(symbol)) {

src/main/java/org/xembly/Callback.java

@@ -9,6 +9,7 @@
  * @param <V> Type of computed result
  * @since 0.31.0
  */
+@FunctionalInterface
 public interface Callback<V> {
     /**
      * Computes a result.

src/main/java/org/xembly/CdataDirective.java

@@ -47,10 +47,8 @@ public Directive.Cursor exec(final Node dom,
         } else {
             doc = dom.getOwnerDocument();
         }
-        final String val = this.value.raw();
         for (final Node node : cursor) {
-            final Node cdata = doc.createCDATASection(val);
-            node.appendChild(cdata);
+            node.appendChild(doc.createCDATASection(this.value.raw()));
         }
         return cursor;
     }

src/main/java/org/xembly/CommentDirective.java

@@ -47,10 +47,8 @@ public Directive.Cursor exec(final Node dom,
         } else {
             doc = dom.getOwnerDocument();
         }
-        final String val = this.value.raw();
         for (final Node node : cursor) {
-            final Node cdata = doc.createComment(val);
-            node.appendChild(cdata);
+            node.appendChild(doc.createComment(this.value.raw()));
         }
         return cursor;
     }

src/main/java/org/xembly/Directive.java

@@ -16,6 +16,7 @@
  *
  * @since 0.1
  */
+@SuppressWarnings("PMD.ImplicitFunctionalInterface")
 public interface Directive {
 
     /**

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

@@ -51,12 +51,7 @@
  * @checkstyle ClassFanOutComplexity (500 lines)
  */
 @EqualsAndHashCode(of = "all")
-@SuppressWarnings({
-    "PMD.TooManyMethods",
-    "PMD.CyclomaticComplexity",
-    "PMD.GodClass",
-    "PMD.StdCyclomaticComplexity"
-})
+@SuppressWarnings("PMD.TooManyMethods")
 public final class Directives implements Iterable<Directive> {
 
     /**
@@ -83,7 +78,6 @@ public Directives(final String text) {
      * Public ctor.
      * @param dirs Directives
      */
-    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public Directives(final Iterable<Directive> dirs) {
         this.all = Collections.synchronizedCollection(Directives.toCollection(dirs));
     }
@@ -126,8 +120,8 @@ public Iterator<Directive> iterator() {
     @SuppressWarnings(
         {
             "PMD.CognitiveComplexity",
-            "PMD.StdCyclomaticComplexity",
             "PMD.InefficientEmptyStringCheck",
+            "PMD.ProhibitPublicStaticMethods",
             "aibolit.P20_5"
         }
     )

src/main/java/org/xembly/DomStack.java

@@ -7,6 +7,8 @@
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import lombok.EqualsAndHashCode;
 
 /**
@@ -25,23 +27,32 @@ final class DomStack implements Directive.Stack {
     private final Deque<Directive.Cursor> cursors =
         new LinkedList<>();
 
+    /**
+     * Lock for thread safety.
+     */
+    private final Lock lock = new ReentrantLock();
+
     @Override
     public void push(final Directive.Cursor cursor) {
-        synchronized (this.cursors) {
+        this.lock.lock();
+        try {
             this.cursors.push(cursor);
+        } finally {
+            this.lock.unlock();
         }
     }
 
     @Override
     public Directive.Cursor pop() throws ImpossibleModificationException {
-        synchronized (this.cursors) {
-            try {
-                return this.cursors.pop();
-            } catch (final NoSuchElementException ex) {
-                throw new ImpossibleModificationException(
-                    "Stack is empty, can't POP", ex
-                );
-            }
+        this.lock.lock();
+        try {
+            return this.cursors.pop();
+        } catch (final NoSuchElementException ex) {
+            throw new ImpossibleModificationException(
+                "Stack is empty, can't POP", ex
+            );
+        } finally {
+            this.lock.unlock();
         }
     }
 }