@@ -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
0 commit comments