Merge branch 'release-5.4.0'

Author: itsshivaverma

CHANGELOG.md

@@ -25,8 +25,8 @@ subprojects {
     }
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version:'4.13'
-        testCompile group: 'xmlunit', name: 'xmlunit', version:'1.6'
+        testImplementation group: 'junit', name: 'junit', version:'4.13'
+        testImplementation group: 'xmlunit', name: 'xmlunit', version:'1.6'
         compileOnly group: 'org.apache.commons', name: 'commons-lang3', version:'3.10'
         compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5.12'
     }
@@ -37,6 +37,6 @@ subprojects {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.2'
+task gradleWrapper(type: Wrapper) {
+    gradleVersion = '6.7'
 }

NOTICE.txt

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=5.3.2
-releaseVersion=5.3.2
+version=5.4.0
+releaseVersion=5.4.0
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle.properties

@@ -1,38 +1,41 @@
-test {
-  testLogging{
-    events 'started','passed', 'skipped'
-  }
-  /* For use in testing TestDatabaseClientKerberosFromFile */
-  systemProperty "keytabFile", System.getProperty("keytabFile")
-  systemProperty "principal", System.getProperty("principal")
-  
-  exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
-  exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.class'
-  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.class'
-  exclude 'com/marklogic/client/functionaltest/TestSandBox.class'
-}
-
-/* The minimal number of tests that run in a sandbox environment */
-
-task testSandbox(type:Test) {
-  include 'com/marklogic/client/functionaltest/TestSandBox.class'
-}
-
-/* The code repositories to consult for dependencies */
-
-repositories {
-  maven {url "http://distro.marklogic.com/nexus/repository/maven-snapshots" }
-  maven { url "http://developer.marklogic.com/maven2" }
-}
-
-dependencies {  
-  compile project (':marklogic-client-api')
-  compile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
-  compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
-  compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
-  testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
-  compile group: 'commons-io', name: 'commons-io', version: '2.6'
-}
+test {
+  testLogging{
+    events 'started','passed', 'skipped'
+  }
+  /* For use in testing TestDatabaseClientKerberosFromFile */
+  systemProperty "keytabFile", System.getProperty("keytabFile")
+  systemProperty "principal", System.getProperty("principal")
+  
+  exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
+  exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
+  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
+  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.class'
+  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.class'
+  exclude 'com/marklogic/client/functionaltest/TestSandBox.class'
+}
+
+/* The minimal number of tests that run in a sandbox environment */
+
+task testSandbox(type:Test) {
+  include 'com/marklogic/client/functionaltest/TestSandBox.class'
+}
+
+/* The code repositories to consult for dependencies */
+
+repositories {
+  maven {url "http://distro.marklogic.com/nexus/repository/maven-snapshots" }
+  maven { url "http://developer.marklogic.com/maven2" }
+}
+
+dependencies {
+  implementation project (':marklogic-client-api')
+  implementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  implementation group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
+  testImplementation group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
+  implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+  implementation group: 'com.squareup.okhttp3', name: 'okhttp', version:'4.7.2'
+  implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:'2.11.1'
+  implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.11.1'
+}

gradle/wrapper/gradle-wrapper.jar

@@ -183,18 +183,17 @@ public void tearDown() throws Exception {
 
   @Test
   public void massDeleteSingleThread() throws Exception {
-    Set<String> uriSet = new HashSet<>();
+    HashSet<String> urisList = new HashSet<>();
 
-    Assert.assertTrue(uriSet.isEmpty());
+    Assert.assertTrue(urisList.isEmpty());
     Assert.assertTrue(dbClient.newServerEval().xquery(query1).eval().next().getNumber().intValue() == 2000);
 
     QueryBatcher queryBatcher = dmManager.newQueryBatcher(new StructuredQueryBuilder().collection("DeleteListener"))
-        .withBatchSize(11)
-        .withThreadCount(1)
+        .withBatchSize(11, 1)
+        //.withThreadCount(1)
         .onUrisReady(batch -> {
-          for (String s : batch.getItems()) {
-            uriSet.add(s);
-
+          synchronized (this) {
+            urisList.addAll(Arrays.asList(batch.getItems()));
           }
         })
         .onQueryFailure(throwable -> {
@@ -208,13 +207,13 @@ public void massDeleteSingleThread() throws Exception {
     dmManager.stopJob(ticket);
 
     Thread.currentThread().sleep(2000L);
-    Assert.assertTrue(uriSet.size() == 2000);
+    Assert.assertTrue(urisList.size() == 2000);
 
     AtomicInteger successDocs = new AtomicInteger();
     HashSet<String> uris2 = new HashSet<>();
     StringBuffer failures2 = new StringBuffer();
 
-    QueryBatcher deleteBatcher = dmManager.newQueryBatcher(uriSet.iterator())
+    QueryBatcher deleteBatcher = dmManager.newQueryBatcher(urisList.iterator())
         .withBatchSize(23)
         .withThreadCount(1)
         .onUrisReady(new DeleteListener())
@@ -365,7 +364,7 @@ public void run() {
     Thread t1;
     t1 = new Thread(new MyRunnable());
 
-    HashSet<String> urisList = new HashSet<>();
+    Set<String> urisList = Collections.synchronizedSet(new HashSet<>());
 
     QueryBatcher queryBatcher = dmManager.newQueryBatcher(
         new StructuredQueryBuilder().collection("DeleteListener"))
@@ -392,7 +391,7 @@ public void run() {
 
     System.out.println("URI's size " + urisList.size());
     AtomicInteger successDocs = new AtomicInteger();
-    HashSet<String> uris2 = new HashSet<>();
+    Set<String> uris2 = Collections.synchronizedSet(new HashSet<>());
     StringBuffer failures2 = new StringBuffer();
 
     QueryBatcher deleteBatcher = dmManager.newQueryBatcher(urisList.iterator())
@@ -645,7 +644,7 @@ public void deleteOnDiskUris() throws Exception {
 
   public ArrayList<String> getUris() {
 
-    Set<String> uris = new HashSet<>();
+    Set<String> uris = Collections.synchronizedSet(new HashSet<>());
 
     QueryBatcher getUris = dmManager.newQueryBatcher(new StructuredQueryBuilder().collection("DeleteListener"))
         .withBatchSize(5000)
@@ -658,7 +657,7 @@ public ArrayList<String> getUris() {
   }
 
   public ArrayList<String> writeUrisToDisk() throws IOException {
-    Set<String> uris = new HashSet<>();
+    Set<String> uris = Collections.synchronizedSet(new HashSet<>());
 
     FileWriter writer = new FileWriter("uriCache.txt");
     QueryBatcher getUris = dmManager.newQueryBatcher(new StructuredQueryBuilder().collection("DeleteListener"))