From 4db1b1c2f9e17832424220f0b7f8134de25ed6e2 Mon Sep 17 00:00:00 2001
From: Rob Rudin <rudin@progress.com>
Date: Tue, 30 Sep 2025 09:24:50 -0400
Subject: [PATCH] MLE-24405 Refactor: Moved some OkHttp-specific classes

Trying to get as many okhttp3 imports into one package as possible, with the notable exception for now of OkHttpServices.
---
 .../main/java/com/marklogic/client/impl/FailedRequest.java   | 1 -
 .../impl/{ => okhttp}/HTTPKerberosAuthInterceptor.java       | 3 ++-
 .../client/impl/{ => okhttp}/HTTPSamlAuthInterceptor.java    | 5 +++--
 .../java/com/marklogic/client/impl/okhttp/OkHttpUtil.java    | 4 ----
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename marklogic-client-api/src/main/java/com/marklogic/client/impl/{ => okhttp}/HTTPKerberosAuthInterceptor.java (99%)
 rename marklogic-client-api/src/main/java/com/marklogic/client/impl/{ => okhttp}/HTTPSamlAuthInterceptor.java (97%)

diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
index 5b0d2cb5a..00ca7c3be 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
@@ -11,7 +11,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import com.marklogic.client.io.Format;
-import okhttp3.MediaType;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPKerberosAuthInterceptor.java
similarity index 99%
rename from marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java
rename to marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPKerberosAuthInterceptor.java
index 44f4de8f7..15ac1059b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPKerberosAuthInterceptor.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
-package com.marklogic.client.impl;
+package com.marklogic.client.impl.okhttp;
 
 import java.io.IOException;
 import java.util.Map;
@@ -20,6 +20,7 @@
 import javax.security.auth.login.Configuration;
 import javax.security.auth.kerberos.KerberosTicket;
 
+import com.marklogic.client.impl.SSLUtil;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPSamlAuthInterceptor.java
similarity index 97%
rename from marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java
rename to marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPSamlAuthInterceptor.java
index 0a58e9324..9a856306f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPSamlAuthInterceptor.java
@@ -2,11 +2,12 @@
  * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
 
-package com.marklogic.client.impl;
+package com.marklogic.client.impl.okhttp;
 
 import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.AuthorizerCallback;
 import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.ExpiringSAMLAuth;
 import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.RenewerCallback;
+import com.marklogic.client.impl.RESTServices;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -55,7 +56,7 @@ public Response intercept(Chain chain) throws IOException {
 		Request authenticatedRequest = chain.request().newBuilder()
 			.header(RESTServices.HEADER_AUTHORIZATION, buildSamlHeader())
 			.build();
-		
+
 		return chain.proceed(authenticatedRequest);
 	}
 
diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java
index 6a018cad2..9d0f384ae 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java
@@ -5,9 +5,6 @@
 
 import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.extra.okhttpclient.OkHttpClientConfigurator;
-import com.marklogic.client.impl.HTTPKerberosAuthInterceptor;
-import com.marklogic.client.impl.HTTPSamlAuthInterceptor;
-import com.marklogic.client.impl.OkHttpServices;
 import com.marklogic.client.impl.SSLUtil;
 import okhttp3.*;
 
@@ -23,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**