Skip to content

Commit cc05b57

Browse files
committed
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.
1 parent b56710a commit cc05b57

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import javax.xml.parsers.ParserConfigurationException;
1212

1313
import com.marklogic.client.io.Format;
14-
import okhttp3.MediaType;
1514
import org.w3c.dom.Document;
1615
import org.w3c.dom.NodeList;
1716
import org.xml.sax.SAXException;

marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java renamed to marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPKerberosAuthInterceptor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
33
*/
4-
package com.marklogic.client.impl;
4+
package com.marklogic.client.impl.okhttp;
55

66
import java.io.IOException;
77
import java.util.Map;
@@ -20,6 +20,7 @@
2020
import javax.security.auth.login.Configuration;
2121
import javax.security.auth.kerberos.KerberosTicket;
2222

23+
import com.marklogic.client.impl.SSLUtil;
2324
import org.ietf.jgss.GSSContext;
2425
import org.ietf.jgss.GSSCredential;
2526
import org.ietf.jgss.GSSException;

marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java renamed to marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/HTTPSamlAuthInterceptor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
33
*/
44

5-
package com.marklogic.client.impl;
5+
package com.marklogic.client.impl.okhttp;
66

77
import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.AuthorizerCallback;
88
import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.ExpiringSAMLAuth;
99
import com.marklogic.client.DatabaseClientFactory.SAMLAuthContext.RenewerCallback;
10+
import com.marklogic.client.impl.RESTServices;
1011
import okhttp3.Interceptor;
1112
import okhttp3.Request;
1213
import okhttp3.Response;
@@ -55,7 +56,7 @@ public Response intercept(Chain chain) throws IOException {
5556
Request authenticatedRequest = chain.request().newBuilder()
5657
.header(RESTServices.HEADER_AUTHORIZATION, buildSamlHeader())
5758
.build();
58-
59+
5960
return chain.proceed(authenticatedRequest);
6061
}
6162

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
import com.marklogic.client.DatabaseClientFactory;
77
import com.marklogic.client.extra.okhttpclient.OkHttpClientConfigurator;
8-
import com.marklogic.client.impl.HTTPKerberosAuthInterceptor;
9-
import com.marklogic.client.impl.HTTPSamlAuthInterceptor;
10-
import com.marklogic.client.impl.OkHttpServices;
118
import com.marklogic.client.impl.SSLUtil;
129
import okhttp3.*;
1310

@@ -23,7 +20,6 @@
2320
import java.util.ArrayList;
2421
import java.util.List;
2522
import java.util.Map;
26-
import java.util.Objects;
2723
import java.util.concurrent.TimeUnit;
2824

2925
/**

0 commit comments

Comments
 (0)