This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 85b6508ced NIFI-15425 Fixed S2S Remote Process Group Open Receive 
Connection over HTTP (#10729)
85b6508ced is described below

commit 85b6508cedef40536e1c173ea93d324773bd8a5e
Author: NissimShiman <[email protected]>
AuthorDate: Thu Jan 8 13:22:39 2026 -0500

    NIFI-15425 Fixed S2S Remote Process Group Open Receive Connection over HTTP 
(#10729)
    
    - Removed Accept header from HTTP request to avoid content negotiation 
failures
    
    Co-authored-by: David Handermann <[email protected]>
    Signed-off-by: David Handermann <[email protected]>
---
 .../java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java    | 1 -
 .../org/apache/nifi/remote/util/SiteToSiteRestApiClientTest.java     | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
 
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
index cccea5b551..640b015096 100644
--- 
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
+++ 
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
@@ -355,7 +355,6 @@ public class SiteToSiteRestApiClient implements Closeable {
         session.setDataTransferUrl(uri.toString());
 
         final HttpRequest.Builder requestBuilder = 
HttpRequest.newBuilder(uri).GET();
-        requestBuilder.setHeader(ACCEPT_HEADER, APPLICATION_JSON);
 
         final HttpResponse<InputStream> response = sendRequest(requestBuilder);
         final int responseCode = response.statusCode();
diff --git 
a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/util/SiteToSiteRestApiClientTest.java
 
b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/util/SiteToSiteRestApiClientTest.java
index 2fbdbdd049..821135eed8 100644
--- 
a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/util/SiteToSiteRestApiClientTest.java
+++ 
b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/util/SiteToSiteRestApiClientTest.java
@@ -61,6 +61,7 @@ import static java.net.HttpURLConnection.HTTP_PROXY_AUTH;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -331,6 +332,10 @@ class SiteToSiteRestApiClientTest {
         assertNotNull(request);
         assertEquals(GET_METHOD, request.getMethod());
         assertProtocolVersionFound(request);
+
+        final Headers requestHeaders = request.getHeaders();
+        final String acceptHeader = requestHeaders.get(ACCEPT_HEADER);
+        assertNull(acceptHeader);
     }
 
     @Test

Reply via email to