Skip to content

Commit f99c24e

Browse files
committed
MLE-24523 Removing deprecated items
Also eagerly bumped up the NOTICE file.
1 parent ce27ad8 commit f99c24e

File tree

6 files changed

+16
-94
lines changed

6 files changed

+16
-94
lines changed

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Eclipse Public License 1.0 (EPL-1.0)
2828

2929
Third-Party Components
3030

31-
The following is a list of the third-party components used by the MarkLogic® for Java Client 7.2.0 (last updated July 21, 2025):
31+
The following is a list of the third-party components used by the MarkLogic® for Java Client 8.0.0 (last updated October 29, 2025):
3232

3333
jackson-databind 2.20.0 (Apache-2.0)
3434
https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/
@@ -68,7 +68,7 @@ For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
6868

6969
Common Licenses
7070

71-
The following is a list of the third-party components used by the MarkLogic® for Java Client 7.2.0 (last updated July 21, 2025):
71+
The following is a list of the third-party components used by the MarkLogic® for Java Client 8.0.0 (last updated October 29, 2025):
7272

7373
Apache License 2.0 (Apache-2.0)
7474
https://spdx.org/licenses/Apache-2.0.html

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ To use the client in your [Maven](https://maven.apache.org/) project, include th
3333
<dependency>
3434
<groupId>com.marklogic</groupId>
3535
<artifactId>marklogic-client-api</artifactId>
36-
<version>7.2.0</version>
36+
<version>8.0.0</version>
3737
</dependency>
3838

3939
To use the client in your [Gradle](https://gradle.org/) project, include the following in your `build.gradle` file:
4040

4141
dependencies {
42-
implementation "com.marklogic:marklogic-client-api:7.2.0"
42+
implementation "com.marklogic:marklogic-client-api:8.0.0"
4343
}
4444

4545
Next, read [The Java API in Five Minutes](http://developer.marklogic.com/try/java/index) to get started.

marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -348,70 +348,7 @@ public SecurityContext withSSLContext(SSLContext context, X509TrustManager trust
348348
}
349349

350350
/**
351-
* @since 6.1.0
352-
* @deprecated as of 7.2.0; use {@code ProgressDataCloudAuthContext} instead. Will be removed in 8.0.0.
353-
*/
354-
@Deprecated
355-
public static class MarkLogicCloudAuthContext extends ProgressDataCloudAuthContext {
356-
357-
/**
358-
* @param apiKey user's API key for accessing Progress Data Cloud
359-
*/
360-
public MarkLogicCloudAuthContext(String apiKey) {
361-
super(apiKey);
362-
}
363-
364-
/**
365-
* @param apiKey user's API key for accessing Progress Data Cloud
366-
* @param tokenDuration length in minutes until the generated access token expires
367-
* @since 6.3.0
368-
*/
369-
public MarkLogicCloudAuthContext(String apiKey, Integer tokenDuration) {
370-
super(apiKey, tokenDuration);
371-
}
372-
373-
/**
374-
* Only intended to be used in the scenario that the token endpoint of "/token" and the grant type of "apikey"
375-
* are not the intended values.
376-
*
377-
* @param apiKey user's API key for accessing Progress Data Cloud
378-
* @param tokenEndpoint for overriding the default token endpoint if necessary
379-
* @param grantType for overriding the default grant type if necessary
380-
*/
381-
public MarkLogicCloudAuthContext(String apiKey, String tokenEndpoint, String grantType) {
382-
super(apiKey, tokenEndpoint, grantType);
383-
}
384-
385-
/**
386-
* Only intended to be used in the scenario that the token endpoint of "/token" and the grant type of "apikey"
387-
* are not the intended values.
388-
*
389-
* @param apiKey user's API key for accessing Progress Data Cloud
390-
* @param tokenEndpoint for overriding the default token endpoint if necessary
391-
* @param grantType for overriding the default grant type if necessary
392-
* @param tokenDuration length in minutes until the generated access token expires
393-
* @since 6.3.0
394-
*/
395-
public MarkLogicCloudAuthContext(String apiKey, String tokenEndpoint, String grantType, Integer tokenDuration) {
396-
super(apiKey, tokenEndpoint, grantType, tokenDuration);
397-
}
398-
399-
@Override
400-
public MarkLogicCloudAuthContext withSSLContext(SSLContext context, X509TrustManager trustManager) {
401-
this.sslContext = context;
402-
this.trustManager = trustManager;
403-
return this;
404-
}
405-
406-
@Override
407-
public MarkLogicCloudAuthContext withSSLHostnameVerifier(SSLHostnameVerifier verifier) {
408-
this.sslVerifier = verifier;
409-
return this;
410-
}
411-
}
412-
413-
/**
414-
* @since 7.2.0 Use this instead of the now-deprecated {@code MarkLogicCloudAuthContext}
351+
* @since 7.2.0 Replaced {@code MarkLogicCloudAuthContext} which was removed in 8.0.0
415352
*/
416353
public static class ProgressDataCloudAuthContext extends AuthContext {
417354
private String tokenEndpoint;
@@ -1332,7 +1269,7 @@ static public DatabaseClient newClient(String host, int port, String basePath, S
13321269
// Progress Data Cloud instance, then port 443 will be used. Every path for constructing a DatabaseClient goes through
13331270
// this method, ensuring that this optimization will always be applied, and thus freeing the user from having to
13341271
// worry about what port to configure when using Progress Data Cloud.
1335-
if (securityContext instanceof MarkLogicCloudAuthContext || securityContext instanceof ProgressDataCloudAuthContext) {
1272+
if (securityContext instanceof ProgressDataCloudAuthContext) {
13361273
port = 443;
13371274
}
13381275

marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33
*/
44
package com.marklogic.client.extra.gson;
55

6-
import java.io.ByteArrayInputStream;
7-
import java.io.IOException;
8-
import java.io.InputStream;
9-
import java.io.InputStreamReader;
10-
import java.nio.charset.StandardCharsets;
11-
126
import com.google.gson.JsonElement;
137
import com.google.gson.JsonIOException;
148
import com.google.gson.JsonParser;
159
import com.google.gson.JsonSyntaxException;
1610
import com.marklogic.client.MarkLogicIOException;
1711
import com.marklogic.client.io.BaseHandle;
1812
import com.marklogic.client.io.Format;
19-
import com.marklogic.client.io.marker.ResendableContentHandle;
2013
import com.marklogic.client.io.marker.*;
2114

15+
import java.io.ByteArrayInputStream;
16+
import java.io.IOException;
17+
import java.io.InputStream;
18+
import java.io.InputStreamReader;
19+
import java.nio.charset.StandardCharsets;
20+
2221
/**
2322
* A GSONHandle represents JSON content as a GSON JsonElement for reading or
2423
* writing. You must install the GSON library to use this class.
@@ -83,18 +82,6 @@ public GSONHandle[] newHandleArray(int length) {
8382
return new GSONHandle[length];
8483
}
8584

86-
/**
87-
* Returns the parser used to construct element objects from JSON.
88-
* @return the JSON parser.
89-
* @deprecated Use static methods like JsonParser.parseString() or JsonParser.parseReader() directly instead
90-
*/
91-
@Deprecated
92-
public JsonParser getParser() {
93-
if (parser == null)
94-
parser = new JsonParser();
95-
return parser;
96-
}
97-
9885
/**
9986
* Returns the root node of the JSON tree.
10087
* @return the JSON root element.

marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public static OkHttpClient.Builder newOkHttpClientBuilder(String host, DatabaseC
5151
} else if (securityContext instanceof DatabaseClientFactory.CertificateAuthContext) {
5252
} else if (securityContext instanceof DatabaseClientFactory.SAMLAuthContext) {
5353
configureSAMLAuth((DatabaseClientFactory.SAMLAuthContext) securityContext, clientBuilder);
54-
} else if (securityContext instanceof DatabaseClientFactory.ProgressDataCloudAuthContext ||
55-
// It's fine to refer to this deprecated class as it needs to be supported until Java Client 8.
56-
securityContext instanceof DatabaseClientFactory.MarkLogicCloudAuthContext) {
54+
} else if (securityContext instanceof DatabaseClientFactory.ProgressDataCloudAuthContext) {
5755
authenticationConfigurer = new ProgressDataCloudAuthenticationConfigurer(host);
5856
} else if (securityContext instanceof DatabaseClientFactory.OAuthContext) {
5957
authenticationConfigurer = new OAuthAuthenticationConfigurer();

ml-development-tools/src/test/example-project/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath "com.marklogic:ml-development-tools:7.2.0"
7+
classpath "com.marklogic:ml-development-tools:8.0.0"
88
}
99
}
1010

@@ -23,11 +23,11 @@ repositories {
2323
}
2424

2525
dependencies {
26-
implementation 'com.marklogic:marklogic-client-api:7.2.0'
26+
implementation 'com.marklogic:marklogic-client-api:8.0.0'
2727
}
2828

2929
tasks.register("testFullPath", com.marklogic.client.tools.gradle.EndpointProxiesGenTask) {
30-
serviceDeclarationFile = "/Users/rrudin/workspace/java-client-api/example-project/src/main/ml-modules/root/inventory/service.json"
30+
serviceDeclarationFile = "/Users/rudin/workspace/java-client-api/ml-development-tools/src/test/example-project/src/main/ml-modules/root/inventory/service.json"
3131
}
3232

3333
tasks.register("testProjectPath", com.marklogic.client.tools.gradle.EndpointProxiesGenTask) {

0 commit comments

Comments
 (0)