Removed deprecated authentication code

examples/build.gradle

@@ -30,5 +30,4 @@ dependencies {
 	api 'com.opencsv:opencsv:4.6'
 	api 'org.springframework:spring-jdbc:5.3.29'
 	api 'org.apache.commons:commons-lang3:3.12.0'
-	api 'org.apache.httpcomponents:httpclient:4.5.14'
 }

examples/src/main/java/com/marklogic/client/example/cookbook/ClientCreator.java

@@ -34,10 +34,7 @@ public static void main(String[] args) throws IOException {
   public static void run(ExampleProperties props) {
     System.out.println("example: "+ClientCreator.class.getName());
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+    DatabaseClient client = Util.newClient(props);
 
     // make use of the client connection
     TextDocumentManager docMgr = client.newTextDocumentManager();

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentDelete.java

@@ -38,10 +38,7 @@ public static void run(ExampleProperties props) throws IOException {
 
     String filename = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // create a manager for XML documents
     XMLDocumentManager docMgr = client.newXMLDocumentManager();

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentFormats.java

@@ -15,17 +15,16 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.GenericDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.BytesHandle;
 import com.marklogic.client.io.InputStreamHandle;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * DocumentFormats illustrates working with documents in multiple or unknown formats.
  */
@@ -45,10 +44,7 @@ public static void run(ExampleProperties props) throws IOException {
       {"flipper.xml",     "XML"}
     };
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // iterate over the files
     for (String[] fileEntry: fileEntries) {

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataRead.java

@@ -15,14 +15,7 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.w3c.dom.Document;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.DOMHandle;
@@ -31,6 +24,11 @@
 import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
 import com.marklogic.client.io.DocumentMetadataHandle.DocumentMetadataValues;
 import com.marklogic.client.io.InputStreamHandle;
+import org.w3c.dom.Document;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * DocumentMetadataReader illustrates how to read the metadata and content of a database document
@@ -46,10 +44,7 @@ public static void run(ExampleProperties props) throws IOException {
 
     String filename = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // create a manager for XML documents
     XMLDocumentManager docMgr = client.newXMLDocumentManager();

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataWrite.java

@@ -15,20 +15,19 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.DocumentMetadataHandle.Capability;
 import com.marklogic.client.io.InputStreamHandle;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
- * DocumentMetadataWriter illustrates how to write metadata and content to a database document 
+ * DocumentMetadataWriter illustrates how to write metadata and content to a database document
  * in a single request.
  */
 public class DocumentMetadataWrite {
@@ -41,10 +40,7 @@ public static void run(ExampleProperties props) throws IOException {
 
     String filename = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // acquire the content
     InputStream docStream = Util.openStream("data"+File.separator+filename);

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentOutputStream.java

@@ -15,18 +15,17 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.OutputStreamHandle;
 import com.marklogic.client.io.OutputStreamSender;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 /**
  * DocumentOutputStream illustrates how to write content to a document
  * using an OutputStream.  You provide the content during execution of
@@ -43,10 +42,7 @@ public static void run(ExampleProperties props) throws IOException {
     final int    MAX_BUF  = 8192;
     final String FILENAME = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // create a manager for XML documents
     XMLDocumentManager docMgr = client.newXMLDocumentManager();

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentRead.java

@@ -15,20 +15,17 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import org.w3c.dom.Document;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.InputStreamHandle;
+import org.w3c.dom.Document;
+
+import javax.xml.xpath.XPathExpressionException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * DocumentReader illustrates how to read the content of a database document.
@@ -41,10 +38,7 @@ public static void main(String[] args) throws IOException, XPathExpressionExcept
   public static void run(ExampleProperties props) throws IOException, XPathExpressionException {
     System.out.println("example: "+DocumentRead.class.getName());
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     setUpExample(client);
 

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentReadTransform.java

@@ -15,17 +15,7 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
-import com.marklogic.client.FailedRequestException;
-import com.marklogic.client.ForbiddenUserException;
-import com.marklogic.client.ResourceNotFoundException;
-import com.marklogic.client.ResourceNotResendableException;
+import com.marklogic.client.*;
 import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.admin.TransformExtensionsManager;
 import com.marklogic.client.document.ServerTransform;
@@ -35,6 +25,10 @@
 import com.marklogic.client.io.InputStreamHandle;
 import com.marklogic.client.io.StringHandle;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * DocumentReadTransform installs a server transform for converting XML documents
  * with a known vocabulary to HTML documents for presentation.
@@ -54,22 +48,15 @@ public static void run(ExampleProperties props)
   {
     System.out.println("example: "+DocumentReadTransform.class.getName());
 
-    installTransform(props.host, props.port,
-      props.adminUser, props.adminPassword, props.authType);
-
-    readDocument(props.host, props.port,
-      props.writerUser, props.writerPassword, props.authType);
-
-    tearDownExample(props.host, props.port,
-      props.adminUser, props.adminPassword, props.authType);
+    installTransform(props);
+    readDocument(props);
+    tearDownExample(props);
   }
 
-  public static void installTransform(String host, int port, String user, String password, Authentication authType)
+  public static void installTransform(ExampleProperties props)
     throws IOException, ResourceNotFoundException, ResourceNotResendableException, ForbiddenUserException, FailedRequestException
   {
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      host, port, user, password, authType);
+	  DatabaseClient client = Util.newAdminClient(props);
 
     // create a manager for transform extensions
     TransformExtensionsManager transMgr = client.newServerConfigManager().newTransformExtensionsManager();
@@ -100,14 +87,12 @@ public static void installTransform(String host, int port, String user, String p
     client.release();
   }
 
-  public static void readDocument(String host, int port, String user, String password, Authentication authType)
+  public static void readDocument(ExampleProperties props)
     throws IOException, ResourceNotFoundException, ForbiddenUserException, FailedRequestException
   {
     String filename = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      host, port, user, password, authType);
+    DatabaseClient client = Util.newClient(props);
 
     // create an identifier for the document
     String docId = "/example/"+filename;
@@ -153,12 +138,10 @@ public static void setUpExample(DatabaseClient client, String docId, String file
   }
 
   // clean up by deleting the read document and the example transform
-  public static void tearDownExample(
-    String host, int port, String user, String password, Authentication authType)
+  public static void tearDownExample(ExampleProperties props)
     throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException
   {
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      host, port, user, password, authType);
+    DatabaseClient client = Util.newAdminClient(props);
 
     XMLDocumentManager docMgr = client.newXMLDocumentManager();
 

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentWrite.java

@@ -15,16 +15,15 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.InputStreamHandle;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * DocumentWriter illustrates how to write content to a database document.
  */
@@ -36,10 +35,7 @@ public static void main(String[] args) throws IOException {
   public static void run(ExampleProperties props) throws IOException {
     System.out.println("example: "+DocumentWrite.class.getName());
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // use either shortcut or strong typed IO
     runShortcut(client);

examples/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteServerURI.java

@@ -15,18 +15,17 @@
  */
 package com.marklogic.client.example.cookbook;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.document.DocumentDescriptor;
 import com.marklogic.client.document.DocumentUriTemplate;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.example.cookbook.Util.ExampleProperties;
 import com.marklogic.client.io.InputStreamHandle;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * DocumentWriterServerURI illustrates how to write content, letting MarkLogic assign a server URI
  */
@@ -40,10 +39,7 @@ public static void run(ExampleProperties props) throws IOException {
 
     String filename = "flipper.xml";
 
-    // create the client
-    DatabaseClient client = DatabaseClientFactory.newClient(
-      props.host, props.port, props.writerUser, props.writerPassword,
-      props.authType);
+	  DatabaseClient client = Util.newClient(props);
 
     // acquire the content
     InputStream docStream = Util.openStream("data"+File.separator+filename);