#103 deps polished

yegor256 · Jul 11, 2022 · 98fcf6a · 98fcf6a
1 parent 8f89ccd
commit 98fcf6a
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 51 deletions.
diff --git a/pom.xml b/pom.xml
@@ -93,6 +93,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <artifactId>lombok</artifactId>
       <version>1.18.24</version>
     </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.9.2</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/src/main/java/org/xembly/Directives.java b/src/main/java/org/xembly/Directives.java
@@ -234,8 +234,8 @@ public Directives append(final Iterable<Directive> dirs) {
      * Appends the {@link Node node}.
      * @param node The node to append
      * @return This object
-     * @see #append(java.lang.Iterable)
-     * @see Directives#copyOf(org.w3c.dom.Node)
+     * @see #append(Iterable)
+     * @see Directives#copyOf(Node)
      * @since 0.23
      */
     public Directives append(final Node node) {

diff --git a/src/main/java/org/xembly/ParsingException.java b/src/main/java/org/xembly/ParsingException.java
@@ -41,14 +41,6 @@ final class ParsingException extends RuntimeException {
      */
     private static final long serialVersionUID = 0x6547f999eaf6efb9L;
 
-    /**
-     * Public ctor.
-     * @param cause Cause of it
-     */
-    ParsingException(final String cause) {
-        super(cause);
-    }
-
     /**
      * Public ctor.
      * @param cause Cause of it

diff --git a/src/main/java/org/xembly/RemoveDirective.java b/src/main/java/org/xembly/RemoveDirective.java
@@ -69,7 +69,7 @@ public Directive.Cursor exec(final Node dom,
     @SuppressWarnings("aibolit.P13")
     private static Node parent(final Node node) {
         final Node parent;
-        if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
+        if ((int) node.getNodeType() == (int) Node.ATTRIBUTE_NODE) {
             final Attr attr = Attr.class.cast(node);
             parent = attr.getOwnerElement();
             Element.class.cast(parent).removeAttributeNode(attr);

diff --git a/src/main/java/org/xembly/Xembler.java b/src/main/java/org/xembly/Xembler.java
@@ -76,7 +76,7 @@
  * a necessity to catch checked exceptions.
  * Use {@code *Quietly()} methods for that:
  * {@link #xmlQuietly()}, {@link #domQuietly()},
- * and {@link #applyQuietly(org.w3c.dom.Node)}.
+ * and {@link #applyQuietly(Node)}.
  *
  * @since 0.1
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)

diff --git a/src/main/java/org/xembly/XmlContentException.java b/src/main/java/org/xembly/XmlContentException.java
@@ -49,13 +49,4 @@ final class XmlContentException extends Exception {
         super(cause);
     }
 
-    /**
-     * Public ctor.
-     * @param cause Cause of it
-     * @param thr Original throwable
-     */
-    XmlContentException(final String cause, final Throwable thr) {
-        super(cause, thr);
-    }
-
 }
diff --git a/src/main/java/org/xembly/XpathDirective.java b/src/main/java/org/xembly/XpathDirective.java
@@ -58,12 +58,7 @@ final class XpathDirective implements Directive {
      * XPath factory.
      */
     private static final ThreadLocal<XPathFactory> FACTORY =
-        new ThreadLocal<XPathFactory>() {
-            @Override
-            protected XPathFactory initialValue() {
-                return XPathFactory.newInstance();
-            }
-        };
+        ThreadLocal.withInitial(XPathFactory::newInstance);
 
     /**
      * Pattern to match root-only XPath queries.

diff --git a/src/test/java/org/xembly/AddIfDirectiveTest.java b/src/test/java/org/xembly/AddIfDirectiveTest.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link AddIfDirective}.
@@ -83,7 +82,7 @@ public void addsDomNodesDirectly() throws Exception {
         root.appendChild(dom.createProcessingInstruction("a12", "22"));
         dom.appendChild(root);
         new AddIfDirective("b").exec(
-            dom, new DomCursor(Collections.<Node>singleton(root)),
+            dom, new DomCursor(Collections.singleton(root)),
             new DomStack()
         );
         MatcherAssert.assertThat(

diff --git a/src/test/java/org/xembly/AttrDirectiveTest.java b/src/test/java/org/xembly/AttrDirectiveTest.java
@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link AddDirective}.
@@ -88,7 +87,7 @@ public void addsDomAttributesDirectly() throws Exception {
         root.appendChild(second);
         dom.appendChild(root);
         new AttrDirective("x", "y").exec(
-            dom, new DomCursor(Collections.<Node>singletonList(second)),
+            dom, new DomCursor(Collections.singletonList(second)),
             new DomStack()
         );
         MatcherAssert.assertThat(
@@ -109,7 +108,7 @@ public void addsCaseSensitiveAttributesDirectly() throws Exception {
         final Element root = dom.createElement("f");
         dom.appendChild(root);
         new AttrDirective("Price", "\u20ac50").exec(
-            dom, new DomCursor(Collections.<Node>singletonList(root)),
+            dom, new DomCursor(Collections.singletonList(root)),
             new DomStack()
         );
         MatcherAssert.assertThat(

diff --git a/src/test/java/org/xembly/PiDirectiveTest.java b/src/test/java/org/xembly/PiDirectiveTest.java
@@ -38,7 +38,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link PiDirective}.
@@ -84,7 +83,7 @@ public void addsProcessingInstructionsDirectlyToDom() throws Exception {
         final Element root = dom.createElement("xxx");
         dom.appendChild(root);
         new PiDirective("x", "y").exec(
-            dom, new DomCursor(Collections.<Node>emptyList()),
+            dom, new DomCursor(Collections.emptyList()),
             new DomStack()
         );
         MatcherAssert.assertThat(

diff --git a/src/test/java/org/xembly/RemoveDirectiveTest.java b/src/test/java/org/xembly/RemoveDirectiveTest.java
@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link RemoveDirective}.
@@ -88,7 +87,7 @@ public void removesDomNodesDirectly() throws Exception {
         root.appendChild(second);
         dom.appendChild(root);
         new RemoveDirective().exec(
-            dom, new DomCursor(Collections.<Node>singletonList(first)),
+            dom, new DomCursor(Collections.singletonList(first)),
             new DomStack()
         );
         MatcherAssert.assertThat(

diff --git a/src/test/java/org/xembly/SetDirectiveTest.java b/src/test/java/org/xembly/SetDirectiveTest.java
@@ -38,7 +38,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link SetDirective}.
@@ -99,7 +98,7 @@ public void setsTextDirectlyIntoDomNodes() throws Exception {
         root.appendChild(second);
         dom.appendChild(root);
         new SetDirective("alpha").exec(
-            dom, new DomCursor(Arrays.<Node>asList(first, second)),
+            dom, new DomCursor(Arrays.asList(first, second)),
             new DomStack()
         );
         MatcherAssert.assertThat(

diff --git a/src/test/java/org/xembly/XemblerTest.java b/src/test/java/org/xembly/XemblerTest.java
@@ -274,14 +274,8 @@ public void concurrentInvocationWithNoExceptions() throws Exception {
      * @param document DOM object
      * @return Callable object
      */
-    private static Callable<Node> callable(
-        final Xembler xembler, final Node document
-    ) {
-        return new Callable<Node>() {
-            @Override
-            public Node call() throws Exception {
-                return xembler.apply(document);
-            }
-        };
+    private static Callable<Node> callable(final Xembler xembler,
+        final Node document) {
+        return () -> xembler.apply(document);
     }
 }
diff --git a/src/test/java/org/xembly/XpathDirectiveTest.java b/src/test/java/org/xembly/XpathDirectiveTest.java
@@ -110,7 +110,7 @@ public void findsNodesByXpathDirectly() throws Exception {
         MatcherAssert.assertThat(
             new XpathDirective("/*").exec(
                 dom,
-                new DomCursor(Collections.<Node>singletonList(first)),
+                new DomCursor(Collections.singletonList(first)),
                 new DomStack()
             ),
             Matchers.hasItem(root)
@@ -128,7 +128,7 @@ public void findsNodesInEmptyDom() throws Exception {
         MatcherAssert.assertThat(
             new XpathDirective("/some-root").exec(
                 dom,
-                new DomCursor(Collections.<Node>emptyList()),
+                new DomCursor(Collections.emptyList()),
                 new DomStack()
             ),
             Matchers.emptyIterable()

diff --git a/src/test/java/org/xembly/XsetDirectiveTest.java b/src/test/java/org/xembly/XsetDirectiveTest.java
@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Test case for {@link XsetDirective}.
@@ -92,7 +91,7 @@ public void setsTextDirectlyIntoDomNodes() throws Exception {
         root.appendChild(second);
         dom.appendChild(root);
         new XsetDirective("sum(/xxx/*/text()) + 5").exec(
-            dom, new DomCursor(Collections.<Node>singletonList(first)),
+            dom, new DomCursor(Collections.singletonList(first)),
             new DomStack()
         );
         MatcherAssert.assertThat(