Skip to content

MLE-24405 Refactor: Moved some OkHttp-specific classes #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

MLE-24405 Refactor: Moved some OkHttp-specific classes #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion ...ent/impl/HTTPKerberosAuthInterceptor.java → ...l/okhttp/HTTPKerberosAuthInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions .../client/impl/HTTPSamlAuthInterceptor.java → .../impl/okhttp/HTTPSamlAuthInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
4 changes: 0 additions & 4 deletions marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand All @@ -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;

/**
Expand Down