Merge branch 'release-4.1.2' into 4.0-master

Author: itsshivaverma

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 4.1.2
+#### New Functionality
+- [#995](https://github.com/marklogic/java-client-api/issues/995) - Support for Kerberos keytab file to authenticate 
+
+#### Improvements and Bug Fixes
+- [#1020](https://github.com/marklogic/java-client-api/issues/1020) - Provide missing DatabaseClientFactory Bean configuration
+- [#1046](https://github.com/marklogic/java-client-api/issues/1046) - Jackson library upgrade to version 2.9.8
+
 ## 4.1.1
 #### New Functionality
 - [#1006](https://github.com/marklogic/java-client-api/issues/1006) - Data Services First - MarkLogic's support for microservices

LEGALNOTICES.TXT

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

gradle.properties

@@ -2,10 +2,14 @@ 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'
 }

marklogic-client-api-functionaltests/build.gradle

@@ -22,7 +22,15 @@
 
 import java.io.File;
 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -37,7 +45,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.admin.TransformExtensionsManager;
 import com.marklogic.client.datamovement.ApplyTransformListener;
@@ -68,7 +75,6 @@ public class ApplyTransformTest extends BasicJavaClientREST {
 	private static final String TEST_DIR_PREFIX = "/WriteHostBatcher-testdata/";
 
 	private static DatabaseClient dbClient;
-	private static String host = null;
 	private static String user = "admin";
 	private static int port = 8000;
 	private static String password = "admin";
@@ -103,7 +109,6 @@ public static void setUpBeforeClass() throws Exception {
 		server = getRestAppServerName();
         port = getRestAppServerPort();
 
-		host = getRestAppServerHostName();
 		hostNames = getHosts();
 		createDB(dbName);
 		Thread.currentThread().sleep(500L);
@@ -251,7 +256,7 @@ public void xQueryMasstransformReplace() throws Exception {
 		ApplyTransformListener listener = new ApplyTransformListener().withTransform(transform)
 				.withApplyResult(ApplyResult.REPLACE).onSuccess(batch -> {
 					success.addAndGet(batch.getItems().length);
-				}).onBatchFailure((batch, throwable) -> {
+				}).onFailure((batch, throwable) -> {
 					throwable.printStackTrace();
 				}).onSkipped(batch -> {
 					skipped.addAndGet(batch.getItems().length);
@@ -303,7 +308,7 @@ public void nonExistentDocsTransform() throws Exception {
 		ApplyTransformListener listener = new ApplyTransformListener().withTransform(transform)
 				.withApplyResult(ApplyResult.REPLACE).onSuccess(batch -> {
 					success.addAndGet(batch.getItems().length);
-				}).onBatchFailure((batch, throwable) -> {
+				}).onFailure((batch, throwable) -> {
 					failure.addAndGet(batch.getItems().length);
 					throwable.printStackTrace();
 				}).onSkipped(batch -> {
@@ -511,12 +516,13 @@ public void failedTransformTest() throws Exception {
 				.withApplyResult(ApplyResult.REPLACE).onSuccess(batch -> {
 					List<String> batchList = Arrays.asList(batch.getItems());
 					successBatch.addAll(batchList);
-				}).onBatchFailure((batch, throwable) -> {
+				}).onFailure((batch, throwable) -> {
 					failCount.addAndGet(1);
 					List<String> batchList = Arrays.asList(batch.getItems());
 					failedBatch.addAll(batchList);
 					throwable.printStackTrace();
 					System.out.println("Failure batch " + batch.getItems().length);
+					// String set to null on purpose, to get an Exception.
 					String s = null;
 					s.charAt(0);
 				}).onSkipped(batch -> {
@@ -610,7 +616,7 @@ public void jsMasstransformReplaceDelete() throws Exception {
 					String s = null;
 					s.charAt(0);
 
-				}).onBatchFailure((batch, throwable) -> {
+				}).onFailure((batch, throwable) -> {
 					isFailureCalled.set(true);
 					throwable.printStackTrace();
 
@@ -720,7 +726,7 @@ public void stopTransformJobTest() throws Exception {
 					skippedBatch.addAll(Arrays.asList(batch.getItems()));
 					System.out.println("stopTransformJobTest : Skipped: " + batch.getItems()[0]);
 
-				}).onBatchFailure((batch, throwable) -> {
+				}).onFailure((batch, throwable) -> {
 					throwable.printStackTrace();
 					System.out.println("stopTransformJobTest: Failed: " + batch.getItems()[0]);
 

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ApplyTransformTest.java

@@ -33,18 +33,15 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.datamovement.DataMovementManager;
 import com.marklogic.client.datamovement.DeleteListener;
 import com.marklogic.client.datamovement.JobTicket;
 import com.marklogic.client.datamovement.QueryBatcher;
 import com.marklogic.client.datamovement.UrisToWriterListener;
 import com.marklogic.client.datamovement.WriteBatcher;
-import com.marklogic.client.functionaltest.BasicJavaClientREST;
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.document.DocumentRecord;
-import com.marklogic.client.impl.DatabaseClientImpl;
+import com.marklogic.client.functionaltest.BasicJavaClientREST;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.FileHandle;
 import com.marklogic.client.io.Format;
@@ -87,7 +84,7 @@ public static void setUpBeforeClass() throws Exception {
     hostNames = getHosts();
     createDB(dbName);
     Thread.currentThread().sleep(500L);
-  //Ensure db has atleast one forest
+  //Ensure DB has at-least one forest
 	createForestonHost(dbName + "-" + forestCount, dbName, hostNames[0]);
 	forestCount++;
 	for (String forestHost : hostNames) {
@@ -106,7 +103,6 @@ public static void setUpBeforeClass() throws Exception {
 	}
 
     dbClient = getDatabaseClient(user, password, getConnType());
-    DatabaseClient adminClient = DatabaseClientFactory.newClient(host, 8000, user, password, Authentication.DIGEST);
     dmManager = dbClient.newDataMovementManager();
 
     // JacksonHandle
@@ -402,7 +398,7 @@ public void run() {
     if (failures2.length() > 0)
       fail(failures2.toString());
 
-    assertEquals("There should be 0 documents in t++he db",
+    assertEquals("There should be 0 documents in the db",
         0, dbClient.newServerEval().xquery(query1).eval().next().getNumber().intValue());
 
     DocumentPage page = dbClient.newDocumentManager().read("/local/json-1998");

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/DeleteListenerTest.java

@@ -32,16 +32,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.datamovement.DataMovementManager;
 import com.marklogic.client.datamovement.DeleteListener;
 import com.marklogic.client.datamovement.ExportListener;
 import com.marklogic.client.datamovement.QueryBatcher;
 import com.marklogic.client.datamovement.WriteBatcher;
-import com.marklogic.client.functionaltest.BasicJavaClientREST;
 import com.marklogic.client.document.DocumentManager;
-import com.marklogic.client.impl.DatabaseClientImpl;
+import com.marklogic.client.functionaltest.BasicJavaClientREST;
 import com.marklogic.client.io.JacksonHandle;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.QueryManager;
@@ -52,12 +49,10 @@ public class ExportListenerTest extends BasicJavaClientREST {
   private static String dbName = "ExportListener";
   private static DataMovementManager dmManager = null;
   private static DatabaseClient dbClient;
-  private static String host = null;
   private static String user = "admin";
   private static int port = 8000;
   private static String password = "admin";
   private static String server = "App-Services";
-  private static JsonNode clusterInfo;
 
   private static final String query1 = "fn:count(fn:doc())";
   private static String[] hostNames;
@@ -68,7 +63,6 @@ public static void setUpBeforeClass() throws Exception {
     server = getRestAppServerName();
     port = getRestAppServerPort();
 
-    host = getRestAppServerHostName();
     hostNames = getHosts();
     createDB(dbName);
     Thread.currentThread().sleep(500L);
@@ -85,12 +79,8 @@ public static void setUpBeforeClass() throws Exception {
 		enableSecurityOnRESTServer(server, dbName);
 	}
 
-    dbClient = getDatabaseClient(user, password, Authentication.DIGEST);
-    DatabaseClient adminClient = DatabaseClientFactory.newClient(host, 8000, user, password, Authentication.DIGEST);
+    dbClient = getDatabaseClient(user, password, getConnType());
     dmManager = dbClient.newDataMovementManager();
-
-    clusterInfo = ((DatabaseClientImpl) adminClient).getServices()
-            .getResource(null, "internal/forestinfo", null, null, new JacksonHandle()).get();
   }
 
   @AfterClass
@@ -343,12 +333,10 @@ public void testServerTimestampNoSnapshots() throws Exception {
     Thread.currentThread().sleep(5000L);
 
     List<String> docExporterList = new ArrayList<String>();
-    List<String> batcherList = new ArrayList<String>();
 
     QueryManager queryMgr = dbClient.newQueryManager();
     StringQueryDefinition querydef = queryMgr.newStringDefinition();
     querydef.setCriteria("John AND Bob");
-    StringBuffer batchResults = new StringBuffer();
 
     try {
       // Listener is setup with no withConsistentSnapshot()
@@ -612,7 +600,7 @@ public void testOnBatchFailure() throws Exception {
                     docExporterList.add(uriOfDoc);
                   }
                   )
-                  .onBatchFailure((batch, throwable) -> {
+                  .onFailure((batch, throwable) -> {
                     onBatchFailureStr.append("From onBatchFailure QA Exception");
                     System.out.println("From onBatchFailure " + throwable.getMessage());
                     System.out.println("From onBatchFailure QA Exception");

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java

@@ -41,17 +41,15 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.datamovement.DataMovementManager;
 import com.marklogic.client.datamovement.DeleteListener;
 import com.marklogic.client.datamovement.ExportToWriterListener;
 import com.marklogic.client.datamovement.QueryBatcher;
 import com.marklogic.client.datamovement.WriteBatcher;
 import com.marklogic.client.document.DocumentManager;
 import com.marklogic.client.functionaltest.Artifact;
+import com.marklogic.client.functionaltest.BasicJavaClientREST;
 import com.marklogic.client.functionaltest.Company;
-import com.marklogic.client.impl.DatabaseClientImpl;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.DocumentMetadataHandle.DocumentMetadataValues;
 import com.marklogic.client.io.FileHandle;
@@ -64,7 +62,6 @@
 import com.marklogic.client.query.StringQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
-import com.marklogic.client.functionaltest.BasicJavaClientREST;
 
 public class ExportToWriterListenerTest extends BasicJavaClientREST {
 
@@ -73,12 +70,10 @@ public class ExportToWriterListenerTest extends BasicJavaClientREST {
   private static final String TEST_DIR_PREFIX = "/WriteHostBatcher-testdata/";
 
   private static DatabaseClient dbClient;
-  private static String host = null;
   private static String user = "admin";
   private static int port = 8000;
   private static String password = "admin";
   private static String server = "App-Services";
-  private static JsonNode clusterInfo;
 
   private static JacksonHandle jacksonHandle;
   private static StringHandle stringHandle;
@@ -103,7 +98,6 @@ public static void setUpBeforeClass() throws Exception {
     port = getRestAppServerPort();
 
     dataConfigDirPath = getDataConfigDirPath();
-    host = getRestAppServerHostName();
     hostNames = getHosts();
     createDB(dbName);
     Thread.currentThread().sleep(500L);
@@ -120,12 +114,9 @@ public static void setUpBeforeClass() throws Exception {
 		enableSecurityOnRESTServer(server, dbName);
 	}
 
-    dbClient = getDatabaseClient(user, password, Authentication.DIGEST);
-    DatabaseClient adminClient = DatabaseClientFactory.newClient(host, 8000, user, password, Authentication.DIGEST);
+    dbClient = getDatabaseClient(user, password, getConnType());
     dmManager = dbClient.newDataMovementManager();
 
-    clusterInfo = ((DatabaseClientImpl) adminClient).getServices()
-            .getResource(null, "internal/forestinfo", null, null, new JacksonHandle()).get();
     // JacksonHandle
     jsonNode = new ObjectMapper().readTree("{\"k1\":\"v1\"}");
     jacksonHandle = new JacksonHandle();
@@ -592,7 +583,7 @@ record -> {
                         return uri + "," + collection + "," + quality + "," + contents;
                       }
                   )
-                  .onBatchFailure((batch, throwable) -> {
+                  .onFailure((batch, throwable) -> {
                     onBatchFailureStr.append("From onBatchFailure QA Exception");
                     System.out.println("From onBatchFailure QA Exception");
                   }))

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportToWriterListenerTest.java

@@ -54,7 +54,6 @@
 import org.w3c.dom.Node;
 
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.admin.TransformExtensionsManager;
 import com.marklogic.client.datamovement.ApplyTransformListener;
@@ -139,9 +138,8 @@ public static void setUpBeforeClass() throws Exception {
 			}
 			hostLists.add("localhost");
 			int index = new Random().nextInt(hostLists.size());
-			dbClient = getDatabaseClientOnDatabase(hostLists.get(index), port, dbName, user, password,
-					Authentication.DIGEST);
-			evalClient = getDatabaseClientOnDatabase(host, port, dbName, user, password, Authentication.DIGEST);
+			dbClient = getDatabaseClientOnDatabase(hostLists.get(index), port, dbName, user, password, getConnType());
+			evalClient = getDatabaseClientOnDatabase(host, port, dbName, user, password, getConnType());
 			dmManager = dbClient.newDataMovementManager();
 			tempMgr = evalClient.newDataMovementManager();
 			Map<String, String> props = new HashMap<>();
@@ -950,8 +948,8 @@ public void massDeleteConsistentSnapShot() throws Exception {
 	 * 
 	 * 
 	 */
-	@Ignore
-	//@Test(timeout = 450000)
+	
+	@Test(timeout = 450000)
 	public void testListenerCloseables() throws Exception {
 		Assume.assumeTrue(hostNames.length > 1);