#98 toCollection()

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

@@ -34,7 +34,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
 import lombok.EqualsAndHashCode;
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
@@ -102,14 +101,13 @@ public final class Directives implements Iterable<Directive> {
     /**
      * List of directives.
      */
-    private final transient Collection<Directive> all =
-        new CopyOnWriteArrayList<Directive>();
+    private final transient Collection<Directive> all;
 
     /**
      * Public ctor.
      */
     public Directives() {
-        this(Collections.<Directive>emptyList());
+        this(Collections.emptyList());
     }
 
     /**
@@ -125,8 +123,9 @@ public Directives(final String text) throws SyntaxException {
      * Public ctor.
      * @param dirs Directives
      */
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public Directives(final Iterable<Directive> dirs) {
-        this.append(dirs);
+        this.all = Directives.toCollection(dirs);
     }
 
     @Override
@@ -244,11 +243,9 @@ public static Iterable<Directive> copyOf(final Node node) {
      * @since 0.11
      */
     public Directives append(final Iterable<Directive> dirs) {
-        final Collection<Directive> list = new LinkedList<Directive>();
-        for (final Directive dir : dirs) {
-            list.add(dir);
+        synchronized (this.all) {
+            this.all.addAll(Directives.toCollection(dirs));
         }
-        this.all.addAll(list);
         return this;
     }
 
@@ -575,11 +572,23 @@ private static Collection<Directive> parse(final String script)
         final XemblyParser parser = new XemblyParser(tokens);
         try {
             return parser.directives();
-        } catch (final RecognitionException ex) {
-            throw new SyntaxException(script, ex);
-        } catch (final ParsingException ex) {
+        } catch (final RecognitionException | ParsingException ex) {
             throw new SyntaxException(script, ex);
         }
     }
 
+    /**
+     * Iterable to collection.
+     * @param itr Iterable
+     * @param <T> The type
+     * @return Collection
+     */
+    private static <T> Collection<T> toCollection(final Iterable<T> itr) {
+        final Collection<T> col = new LinkedList<>();
+        for (final T item : itr) {
+            col.add(item);
+        }
+        return col;
+    }
+
 }

src/test/java/org/xembly/DirectivesTest.java

@@ -192,21 +192,19 @@ public void performsFullScaleModifications() throws Exception {
     public void copiesExistingNode() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
-        new Xembler(
-            new Directives().add("dudes").append(
-                Directives.copyOf(
-                    new XMLDocument(
-                        StringUtils.join(
-                            "<jeff name='Jeffrey'><first/><second/>",
-                            "<?some-pi test?>",
-                            "<file a='x'><f><name>\u20ac</name></f></file>",
-                            "<!-- some comment -->",
-                            "<x><![CDATA[hey you]]></x>  </jeff>"
-                        )
-                    ).node()
+        final Iterable<Directive> copy = Directives.copyOf(
+            new XMLDocument(
+                StringUtils.join(
+                    "<jeff name='Jeffrey'><first/><second/>",
+                    "<?some-pi test?>",
+                    "<file a='x'><f><name>\u20ac</name></f></file>",
+                    "<!-- some comment -->",
+                    "<x><![CDATA[hey you]]></x>  </jeff>"
                 )
-            )
-        ).apply(dom);
+            ).node()
+        );
+        MatcherAssert.assertThat(copy, Matchers.iterableWithSize(19));
+        new Xembler(new Directives().add("dudes").append(copy)).apply(dom);
         MatcherAssert.assertThat(
             XhtmlMatchers.xhtml(dom),
             XhtmlMatchers.hasXPaths(
@@ -339,4 +337,18 @@ public void addsComments() throws Exception {
         );
     }
 
+    /**
+     * Directives can append.
+     * @throws Exception If some problem inside
+     */
+    @Test
+    public void appendsDirs() throws Exception {
+        MatcherAssert.assertThat(
+            new Directives().add("0").append(
+                new Directives().add("1")
+            ).add("2").toString(),
+            Matchers.equalTo("ADD \"0\";ADD \"1\";ADD \"2\";")
+        );
+    }
+
 }