You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2026/07/08 05:44:02 UTC
(camel) branch fix/CAMEL-23936-4.18 created (now 210550c14c31)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-23936-4.18
in repository https://gitbox.apache.org/repos/asf/camel.git
at 210550c14c31 CAMEL-23936: Fix logHttpActivity losing Content-Encoding on gzip responses
This branch includes the following new commits:
new 210550c14c31 CAMEL-23936: Fix logHttpActivity losing Content-Encoding on gzip responses
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 01/01: CAMEL-23936: Fix logHttpActivity losing Content-Encoding on gzip responses
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch fix/CAMEL-23936-4.18
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 210550c14c3154158eb4c1471181429d9c382ddb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 8 07:40:54 2026 +0200
CAMEL-23936: Fix logHttpActivity losing Content-Encoding on gzip responses
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
Signed-off-by: Claus Ibsen <cl...@gmail.com>
---
.../http/LoggingHttpActivityListener.java | 2 +-
.../http/HttpLoggingActivityGzipTest.java | 210 +++++++++++++++++++++
2 files changed, 211 insertions(+), 1 deletion(-)
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/LoggingHttpActivityListener.java b/components/camel-http/src/main/java/org/apache/camel/component/http/LoggingHttpActivityListener.java
index 49cb945d92de..1144c100baed 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/LoggingHttpActivityListener.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/LoggingHttpActivityListener.java
@@ -204,7 +204,7 @@ public class LoggingHttpActivityListener extends ServiceSupport implements Camel
byte[] arr = bos.toByteArray();
// ByteArrayEntity close() is a NOOP. Additionally
// the stream must be closed by client (request/response in our case).
- e = new ByteArrayEntity(arr, ct); // NOSONAR
+ e = new ByteArrayEntity(arr, ct, ce != null ? ce.getValue() : null); // NOSONAR
if (request instanceof HttpEntityContainer ec) {
ec.setEntity(e);
} else if (response instanceof HttpEntityContainer ec) {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpLoggingActivityGzipTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpLoggingActivityGzipTest.java
new file mode 100644
index 000000000000..b796fc10e012
--- /dev/null
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpLoggingActivityGzipTest.java
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.interceptor.ResponseBasicUnauthorized;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.EntityDetails;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.io.entity.HttpEntityWrapper;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.http.common.HttpMethods.POST;
+import static org.apache.hc.core5.http.ContentType.TEXT_PLAIN;
+import static org.apache.hc.core5.http.HttpHeaders.CONTENT_ENCODING;
+import static org.apache.hc.core5.http.HttpHeaders.CONTENT_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class HttpLoggingActivityGzipTest extends BaseHttpTest {
+
+ private HttpServer localServer;
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ HttpComponent http = context.getComponent("http", HttpComponent.class);
+ http.setLogHttpActivity(true);
+ return context;
+ }
+
+ @Override
+ public void setupResources() throws Exception {
+ Map<String, String> expectedHeaders = new HashMap<>();
+ expectedHeaders.put(CONTENT_TYPE, TEXT_PLAIN.getMimeType());
+ expectedHeaders.put(CONTENT_ENCODING, "gzip");
+
+ localServer = ServerBootstrap.bootstrap()
+ .setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
+ .setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
+ .setSslContext(getSSLContext())
+ .register("/",
+ new HeaderValidationHandler(POST.name(), null, getBody(), getExpectedContent(), expectedHeaders))
+ .create();
+ localServer.start();
+ }
+
+ @Override
+ public void cleanupResources() throws Exception {
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
+ @Test
+ public void compressedHttpPostWithLogging() {
+ Exchange exchange = template.request(
+ "http://localhost:" + localServer.getLocalPort() + "/", exchange1 -> {
+ exchange1.getIn().setHeader(Exchange.CONTENT_TYPE, "text/plain");
+ exchange1.getIn().setHeader(Exchange.CONTENT_ENCODING, "gzip");
+ exchange1.getIn().setBody(getBody());
+ });
+
+ assertNotNull(exchange);
+ assertNull(exchange.getException());
+
+ Message out = exchange.getMessage();
+ assertNotNull(out);
+ assertEquals(HttpStatus.SC_OK, out.getHeaders().get(Exchange.HTTP_RESPONSE_CODE));
+ assertBody(out.getBody(String.class));
+ }
+
+ @Override
+ protected HttpProcessor getBasicHttpProcessor() {
+ List<HttpRequestInterceptor> requestInterceptors = new ArrayList<>();
+ requestInterceptors.add(new RequestValidateHost());
+ requestInterceptors.add(new RequestDecompressingInterceptor());
+ List<HttpResponseInterceptor> responseInterceptors = new ArrayList<>();
+ responseInterceptors.add(new ResponseCompressingInterceptor());
+ responseInterceptors.add(new ResponseBasicUnauthorized());
+
+ return new DefaultHttpProcessor(requestInterceptors, responseInterceptors);
+ }
+
+ protected String getBody() {
+ return "hl=en&q=camel";
+ }
+
+ static class RequestDecompressingInterceptor implements HttpRequestInterceptor {
+
+ @Override
+ public void process(HttpRequest request, EntityDetails details, HttpContext context) throws HttpException {
+ Header contentEncoding = request.getFirstHeader(CONTENT_ENCODING);
+
+ if (contentEncoding != null
+ && contentEncoding.getValue().equalsIgnoreCase("gzip")) {
+ ClassicHttpRequest classicHttpRequest = (ClassicHttpRequest) request;
+ HttpEntity entity = classicHttpRequest.getEntity();
+ classicHttpRequest.setEntity(new GzipDecompressingEntity(entity));
+ }
+ }
+
+ static class GzipDecompressingEntity extends HttpEntityWrapper {
+
+ GzipDecompressingEntity(final HttpEntity entity) {
+ super(entity);
+ }
+
+ @Override
+ public InputStream getContent()
+ throws IOException,
+ IllegalStateException {
+ return new GZIPInputStream(super.getContent());
+ }
+
+ @Override
+ public long getContentLength() {
+ return -1;
+ }
+
+ @Override
+ public boolean isStreaming() {
+ return false;
+ }
+ }
+ }
+
+ static class ResponseCompressingInterceptor implements HttpResponseInterceptor {
+
+ @Override
+ public void process(HttpResponse response, EntityDetails details, HttpContext context)
+ throws HttpException {
+ response.setHeader(CONTENT_ENCODING, "gzip");
+ ClassicHttpResponse classicHttpResponse = (ClassicHttpResponse) response;
+ HttpEntity entity = classicHttpResponse.getEntity();
+ classicHttpResponse.setEntity(new GzipCompressingEntity(entity));
+ }
+
+ static class GzipCompressingEntity extends HttpEntityWrapper {
+
+ GzipCompressingEntity(final HttpEntity entity) {
+ super(entity);
+ }
+
+ @Override
+ public String getContentEncoding() {
+ return "gzip";
+ }
+
+ @Override
+ public void writeTo(OutputStream outStream) throws IOException {
+ try (GZIPOutputStream gzip = new GZIPOutputStream(outStream)) {
+ super.writeTo(gzip);
+ }
+ }
+
+ @Override
+ public long getContentLength() {
+ return -1;
+ }
+
+ @Override
+ public boolean isStreaming() {
+ return false;
+ }
+ }
+ }
+}