Skip to content

Commit 7aa40fe

Browse files
rjrudinrjrudin
authored
Merge pull request #1691 from marklogic/feature/deprecated-stuff
Removed deprecated authentication code
2 parents 769c30d + 9f6c865 commit 7aa40fe

File tree

51 files changed

+379
-1924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+379
-1924
lines changed

‎examples/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ dependencies {
3030
api 'com.opencsv:opencsv:4.6'
3131
api 'org.springframework:spring-jdbc:5.3.29'
3232
api 'org.apache.commons:commons-lang3:3.12.0'
33-
api 'org.apache.httpcomponents:httpclient:4.5.14'
3433
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ public static void main(String[] args) throws IOException {
3434
public static void run(ExampleProperties props) {
3535
System.out.println("example: "+ClientCreator.class.getName());
3636

37-
// create the client
38-
DatabaseClient client = DatabaseClientFactory.newClient(
39-
props.host, props.port, props.writerUser, props.writerPassword,
40-
props.authType);
37+
DatabaseClient client = Util.newClient(props);
4138

4239
// make use of the client connection
4340
TextDocumentManager docMgr = client.newTextDocumentManager();

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ public static void run(ExampleProperties props) throws IOException {
3838

3939
String filename = "flipper.xml";
4040

41-
// create the client
42-
DatabaseClient client = DatabaseClientFactory.newClient(
43-
props.host, props.port, props.writerUser, props.writerPassword,
44-
props.authType);
41+
DatabaseClient client = Util.newClient(props);
4542

4643
// create a manager for XML documents
4744
XMLDocumentManager docMgr = client.newXMLDocumentManager();

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
2218
import com.marklogic.client.DatabaseClient;
23-
import com.marklogic.client.DatabaseClientFactory;
2419
import com.marklogic.client.document.GenericDocumentManager;
2520
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
2621
import com.marklogic.client.io.BytesHandle;
2722
import com.marklogic.client.io.InputStreamHandle;
2823

24+
import java.io.File;
25+
import java.io.IOException;
26+
import java.io.InputStream;
27+
2928
/**
3029
* DocumentFormats illustrates working with documents in multiple or unknown formats.
3130
*/
@@ -45,10 +44,7 @@ public static void run(ExampleProperties props) throws IOException {
4544
{"flipper.xml", "XML"}
4645
};
4746

48-
// create the client
49-
DatabaseClient client = DatabaseClientFactory.newClient(
50-
props.host, props.port, props.writerUser, props.writerPassword,
51-
props.authType);
47+
DatabaseClient client = Util.newClient(props);
5248

5349
// iterate over the files
5450
for (String[] fileEntry: fileEntries) {

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
22-
import org.w3c.dom.Document;
23-
2418
import com.marklogic.client.DatabaseClient;
25-
import com.marklogic.client.DatabaseClientFactory;
2619
import com.marklogic.client.document.XMLDocumentManager;
2720
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
2821
import com.marklogic.client.io.DOMHandle;
@@ -31,6 +24,11 @@
3124
import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
3225
import com.marklogic.client.io.DocumentMetadataHandle.DocumentMetadataValues;
3326
import com.marklogic.client.io.InputStreamHandle;
27+
import org.w3c.dom.Document;
28+
29+
import java.io.File;
30+
import java.io.IOException;
31+
import java.io.InputStream;
3432

3533
/**
3634
* 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 {
4644

4745
String filename = "flipper.xml";
4846

49-
// create the client
50-
DatabaseClient client = DatabaseClientFactory.newClient(
51-
props.host, props.port, props.writerUser, props.writerPassword,
52-
props.authType);
47+
DatabaseClient client = Util.newClient(props);
5348

5449
// create a manager for XML documents
5550
XMLDocumentManager docMgr = client.newXMLDocumentManager();

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
2218
import com.marklogic.client.DatabaseClient;
23-
import com.marklogic.client.DatabaseClientFactory;
2419
import com.marklogic.client.document.XMLDocumentManager;
2520
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
2621
import com.marklogic.client.io.DocumentMetadataHandle;
2722
import com.marklogic.client.io.DocumentMetadataHandle.Capability;
2823
import com.marklogic.client.io.InputStreamHandle;
2924

25+
import java.io.File;
26+
import java.io.IOException;
27+
import java.io.InputStream;
28+
3029
/**
31-
* DocumentMetadataWriter illustrates how to write metadata and content to a database document
30+
* DocumentMetadataWriter illustrates how to write metadata and content to a database document
3231
* in a single request.
3332
*/
3433
public class DocumentMetadataWrite {
@@ -41,10 +40,7 @@ public static void run(ExampleProperties props) throws IOException {
4140

4241
String filename = "flipper.xml";
4342

44-
// create the client
45-
DatabaseClient client = DatabaseClientFactory.newClient(
46-
props.host, props.port, props.writerUser, props.writerPassword,
47-
props.authType);
43+
DatabaseClient client = Util.newClient(props);
4844

4945
// acquire the content
5046
InputStream docStream = Util.openStream("data"+File.separator+filename);

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
import java.io.OutputStream;
22-
2318
import com.marklogic.client.DatabaseClient;
24-
import com.marklogic.client.DatabaseClientFactory;
2519
import com.marklogic.client.document.XMLDocumentManager;
2620
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
2721
import com.marklogic.client.io.OutputStreamHandle;
2822
import com.marklogic.client.io.OutputStreamSender;
2923

24+
import java.io.File;
25+
import java.io.IOException;
26+
import java.io.InputStream;
27+
import java.io.OutputStream;
28+
3029
/**
3130
* DocumentOutputStream illustrates how to write content to a document
3231
* using an OutputStream. You provide the content during execution of
@@ -43,10 +42,7 @@ public static void run(ExampleProperties props) throws IOException {
4342
final int MAX_BUF = 8192;
4443
final String FILENAME = "flipper.xml";
4544

46-
// create the client
47-
DatabaseClient client = DatabaseClientFactory.newClient(
48-
props.host, props.port, props.writerUser, props.writerPassword,
49-
props.authType);
45+
DatabaseClient client = Util.newClient(props);
5046

5147
// create a manager for XML documents
5248
XMLDocumentManager docMgr = client.newXMLDocumentManager();

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
22-
import javax.xml.xpath.XPathExpressionException;
23-
24-
import org.w3c.dom.Document;
25-
2618
import com.marklogic.client.DatabaseClient;
27-
import com.marklogic.client.DatabaseClientFactory;
2819
import com.marklogic.client.document.XMLDocumentManager;
2920
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
3021
import com.marklogic.client.io.DOMHandle;
3122
import com.marklogic.client.io.InputStreamHandle;
23+
import org.w3c.dom.Document;
24+
25+
import javax.xml.xpath.XPathExpressionException;
26+
import java.io.File;
27+
import java.io.IOException;
28+
import java.io.InputStream;
3229

3330
/**
3431
* DocumentReader illustrates how to read the content of a database document.
@@ -41,10 +38,7 @@ public static void main(String[] args) throws IOException, XPathExpressionExcept
4138
public static void run(ExampleProperties props) throws IOException, XPathExpressionException {
4239
System.out.println("example: "+DocumentRead.class.getName());
4340

44-
// create the client
45-
DatabaseClient client = DatabaseClientFactory.newClient(
46-
props.host, props.port, props.writerUser, props.writerPassword,
47-
props.authType);
41+
DatabaseClient client = Util.newClient(props);
4842

4943
setUpExample(client);
5044

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

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
22-
import com.marklogic.client.DatabaseClient;
23-
import com.marklogic.client.DatabaseClientFactory;
24-
import com.marklogic.client.DatabaseClientFactory.Authentication;
25-
import com.marklogic.client.FailedRequestException;
26-
import com.marklogic.client.ForbiddenUserException;
27-
import com.marklogic.client.ResourceNotFoundException;
28-
import com.marklogic.client.ResourceNotResendableException;
18+
import com.marklogic.client.*;
2919
import com.marklogic.client.admin.ExtensionMetadata;
3020
import com.marklogic.client.admin.TransformExtensionsManager;
3121
import com.marklogic.client.document.ServerTransform;
@@ -35,6 +25,10 @@
3525
import com.marklogic.client.io.InputStreamHandle;
3626
import com.marklogic.client.io.StringHandle;
3727

28+
import java.io.File;
29+
import java.io.IOException;
30+
import java.io.InputStream;
31+
3832
/**
3933
* DocumentReadTransform installs a server transform for converting XML documents
4034
* with a known vocabulary to HTML documents for presentation.
@@ -54,22 +48,15 @@ public static void run(ExampleProperties props)
5448
{
5549
System.out.println("example: "+DocumentReadTransform.class.getName());
5650

57-
installTransform(props.host, props.port,
58-
props.adminUser, props.adminPassword, props.authType);
59-
60-
readDocument(props.host, props.port,
61-
props.writerUser, props.writerPassword, props.authType);
62-
63-
tearDownExample(props.host, props.port,
64-
props.adminUser, props.adminPassword, props.authType);
51+
installTransform(props);
52+
readDocument(props);
53+
tearDownExample(props);
6554
}
6655

67-
public static void installTransform(String host, int port, String user, String password, Authentication authType)
56+
public static void installTransform(ExampleProperties props)
6857
throws IOException, ResourceNotFoundException, ResourceNotResendableException, ForbiddenUserException, FailedRequestException
6958
{
70-
// create the client
71-
DatabaseClient client = DatabaseClientFactory.newClient(
72-
host, port, user, password, authType);
59+
DatabaseClient client = Util.newAdminClient(props);
7360

7461
// create a manager for transform extensions
7562
TransformExtensionsManager transMgr = client.newServerConfigManager().newTransformExtensionsManager();
@@ -100,14 +87,12 @@ public static void installTransform(String host, int port, String user, String p
10087
client.release();
10188
}
10289

103-
public static void readDocument(String host, int port, String user, String password, Authentication authType)
90+
public static void readDocument(ExampleProperties props)
10491
throws IOException, ResourceNotFoundException, ForbiddenUserException, FailedRequestException
10592
{
10693
String filename = "flipper.xml";
10794

108-
// create the client
109-
DatabaseClient client = DatabaseClientFactory.newClient(
110-
host, port, user, password, authType);
95+
DatabaseClient client = Util.newClient(props);
11196

11297
// create an identifier for the document
11398
String docId = "/example/"+filename;
@@ -153,12 +138,10 @@ public static void setUpExample(DatabaseClient client, String docId, String file
153138
}
154139

155140
// clean up by deleting the read document and the example transform
156-
public static void tearDownExample(
157-
String host, int port, String user, String password, Authentication authType)
141+
public static void tearDownExample(ExampleProperties props)
158142
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException
159143
{
160-
DatabaseClient client = DatabaseClientFactory.newClient(
161-
host, port, user, password, authType);
144+
DatabaseClient client = Util.newAdminClient(props);
162145

163146
XMLDocumentManager docMgr = client.newXMLDocumentManager();
164147

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
*/
1616
package com.marklogic.client.example.cookbook;
1717

18-
import java.io.File;
19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
2218
import com.marklogic.client.DatabaseClient;
23-
import com.marklogic.client.DatabaseClientFactory;
2419
import com.marklogic.client.document.XMLDocumentManager;
2520
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
2621
import com.marklogic.client.io.InputStreamHandle;
2722

23+
import java.io.File;
24+
import java.io.IOException;
25+
import java.io.InputStream;
26+
2827
/**
2928
* DocumentWriter illustrates how to write content to a database document.
3029
*/
@@ -36,10 +35,7 @@ public static void main(String[] args) throws IOException {
3635
public static void run(ExampleProperties props) throws IOException {
3736
System.out.println("example: "+DocumentWrite.class.getName());
3837

39-
// create the client
40-
DatabaseClient client = DatabaseClientFactory.newClient(
41-
props.host, props.port, props.writerUser, props.writerPassword,
42-
props.authType);
38+
DatabaseClient client = Util.newClient(props);
4339

4440
// use either shortcut or strong typed IO
4541
runShortcut(client);

0 commit comments

Comments
 (0)