MLE-23230 Using retry interceptor from the Java Client

Author: rjrudin

ml-app-deployer/build.gradle

@@ -7,6 +7,9 @@ dependencies {
 	// For wrangling JSON.
 	api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 
+	// For compiling JAXB code; marklogic-client-api brings this in at runtime.
+	compileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
+
 	// For resolving XPath expressions against XML documents.
 	implementation 'jaxen:jaxen:2.0.0'
 
@@ -26,6 +29,9 @@ dependencies {
 		exclude module: "jackson-databind"
 	}
 
+	// Need this for compiling tests too.
+	testCompileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
+
 	testImplementation 'commons-io:commons-io:2.19.0'
 	testImplementation 'xmlunit:xmlunit:1.6'
 

ml-app-deployer/src/test/java/com/marklogic/rest/util/RetryInterceptor.java

@@ -3,6 +3,7 @@
  */
 package com.marklogic.rest.util;
 
+import com.marklogic.client.impl.okhttp.RetryIOExceptionInterceptor;
 import com.marklogic.mgmt.DefaultManageConfigFactory;
 import com.marklogic.mgmt.ManageConfig;
 import com.marklogic.mgmt.admin.AdminConfig;
@@ -75,7 +76,7 @@ public ManageConfig manageConfig() {
 		config.setCleanJsonPayloads(true);
 
 		config.setClientConfigurator(builder ->
-			builder.addInterceptor(new com.marklogic.rest.util.RetryInterceptor(3, 1000, 2, 5000)));
+			builder.addInterceptor(new RetryIOExceptionInterceptor(3, 1000, 2, 5000)));
 
 		return config;
 	}

ml-app-deployer/src/test/java/com/marklogic/rest/util/TestConfig.java

@@ -1,5 +1,5 @@
 dependencies {
-	api 'com.marklogic:marklogic-client-api:7.2.0'
+	api 'com.marklogic:marklogic-client-api:8.0-SNAPSHOT'
 	api 'com.marklogic:marklogic-xcc:12.0.0'
 
 	// API dependency as some Spring classes, like Resource, are used throughout this project.
@@ -11,6 +11,9 @@ dependencies {
 	implementation 'org.jdom:jdom2:2.0.6.1'
 	implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 
+	// For compiling JAXB code; marklogic-client-api brings this in at runtime.
+	testCompileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"
+
 	testImplementation 'org.mockito:mockito-core:4.11.0'
 	// Used for testing loading modules from the classpath
 	testImplementation files("lib/modules.jar")