#272 java version

jcabi · Nov 7, 2024 · d96e331 · d96e331
1 parent 65e46fd
commit d96e331
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 21 deletions.
diff --git a/src/it/utf/pom.xml b/src/it/utf/pom.xml
@@ -33,6 +33,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <groupId>com.jcabi.xml</groupId>
   <artifactId>utf</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <skipITs/>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>@project.groupId@</groupId>

diff --git a/src/main/java/com/jcabi/xml/XMLDocument.java b/src/main/java/com/jcabi/xml/XMLDocument.java
@@ -307,14 +307,16 @@ public int hashCode() {
 
     @Override
     public Node node() {
-        final Node casted = this.cache;
-        final Node answer;
-        if (casted instanceof Document) {
-            answer = casted.cloneNode(true);
-        } else {
-            answer = XMLDocument.createImportedNode(casted);
+        synchronized (XML.class) {
+            final Node casted = this.cache;
+            final Node answer;
+            if (casted instanceof Document) {
+                answer = casted.cloneNode(true);
+            } else {
+                answer = XMLDocument.createImportedNode(casted);
+            }
+            return answer;
         }
-        return answer;
     }
 
     @Override

diff --git a/src/test/java/com/jcabi/xml/StrictXMLTest.java b/src/test/java/com/jcabi/xml/StrictXMLTest.java
@@ -37,6 +37,7 @@
 import java.util.Collections;
 import java.util.Random;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -125,9 +126,6 @@ void rejectsInvalidXmlUsingXsiSchemaLocation() {
 
     @Test
     void validatesMultipleXmlsInThreads() throws Exception {
-        final int timeout = 10;
-        final int numrun = 100;
-        final int loop = 50;
         final XSD xsd = new XSDDocument(
             StringUtils.join(
                 "<xs:schema xmlns:xs ='http://www.w3.org/2001/XMLSchema' >",
@@ -145,9 +143,9 @@ void validatesMultipleXmlsInThreads() throws Exception {
                 Iterables.concat(
                     Collections.singleton("<r>"),
                     Iterables.transform(
-                        Collections.nCopies(timeout, 0),
+                        Collections.nCopies(10, 0),
                         pos -> String.format(
-                            "<x>%d</x>", rnd.nextInt(numrun)
+                            "<x>%d</x>", rnd.nextInt(100)
                         )
                     ),
                     Collections.singleton("<x>101</x></r>")
@@ -156,25 +154,33 @@ void validatesMultipleXmlsInThreads() throws Exception {
             )
         );
         final AtomicInteger done = new AtomicInteger();
+        final int threads = 50;
+        final CountDownLatch latch = new CountDownLatch(threads);
         final Callable<Void> callable = () -> {
             try {
                 new StrictXML(xml, xsd);
             } catch (final IllegalArgumentException ex) {
                 done.incrementAndGet();
+            } finally {
+                latch.countDown();
             }
             return null;
         };
         final ExecutorService service = Executors.newFixedThreadPool(5);
-        for (int count = 0; count < loop; count += 1) {
-            service.submit(callable);
+        try {
+            for (int count = 0; count < threads; count += 1) {
+                service.submit(callable);
+            }
+            latch.await(1L, TimeUnit.SECONDS);
+            MatcherAssert.assertThat(done.get(), Matchers.equalTo(threads));
+        } finally {
+            service.shutdown();
+            MatcherAssert.assertThat(
+                service.awaitTermination(10L, TimeUnit.SECONDS),
+                Matchers.is(true)
+            );
+            service.shutdownNow();
         }
-        service.shutdown();
-        MatcherAssert.assertThat(
-            service.awaitTermination(timeout, TimeUnit.SECONDS),
-            Matchers.is(true)
-        );
-        service.shutdownNow();
-        MatcherAssert.assertThat(done.get(), Matchers.equalTo(loop));
     }
 
     @Test

diff --git a/src/test/java/com/jcabi/xml/XMLDocumentTest.java b/src/test/java/com/jcabi/xml/XMLDocumentTest.java
@@ -29,13 +29,15 @@
  */
 package com.jcabi.xml;
 
+import com.google.common.collect.Iterables;
 import com.jcabi.matchers.XhtmlMatchers;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -342,6 +344,52 @@ void printsInMultipleThreads() throws Exception {
         service.shutdownNow();
     }
 
+    @Test
+    void takesNodeInMultipleThreads() throws Exception {
+        final int threads = 50;
+        final XML xml = new XMLDocument(
+            StringUtils.join(
+                Iterables.concat(
+                    Collections.singleton("<r>"),
+                    Iterables.transform(
+                        Collections.nCopies(100, 0),
+                        pos -> String.format("<x>%d</x>", pos)
+                    ),
+                    Collections.singleton("<x>5555</x></r>")
+                ),
+                " "
+            )
+        );
+        final AtomicInteger done = new AtomicInteger();
+        final CountDownLatch latch = new CountDownLatch(threads);
+        final Runnable runnable = () -> {
+            try {
+                MatcherAssert.assertThat(
+                    new XMLDocument(xml.node()).toString(),
+                    Matchers.containsString(">5555<")
+                );
+                done.incrementAndGet();
+            } finally {
+                latch.countDown();
+            }
+        };
+        final ExecutorService service = Executors.newFixedThreadPool(threads);
+        try {
+            for (int thread = 0; thread < threads; ++thread) {
+                service.submit(runnable);
+            }
+            latch.await(1L, TimeUnit.SECONDS);
+            MatcherAssert.assertThat(done.get(), Matchers.equalTo(threads));
+        } finally {
+            service.shutdown();
+            MatcherAssert.assertThat(
+                service.awaitTermination(10L, TimeUnit.SECONDS),
+                Matchers.is(true)
+            );
+            service.shutdownNow();
+        }
+    }
+
     @Test
     void performsXpathCalculations() {
         final XML xml = new XMLDocument("<x><a/><a/><a/></x>");