Skip to content
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

Jump to bottom

CAMEL-19164: upgrade to http components 5.x #13619

Merged
merged 4 commits into from Mar 29, 2024
Merged

CAMEL-19164: upgrade to http components 5.x #13619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
257877b
CAMEL-19164: upgrade to HttpComponents v5
jono-morris Mar 26, 2024
da1cbf5
CAMEL-19164: changes to generated components
jono-morris Mar 26, 2024
dada296
Merge branch 'main' into CAMEL-20019_add_platform-http-vertx_cookie_h…
jono-morris Mar 26, 2024
ec44818
CAMEL-19164: generated changes
jono-morris Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions components/camel-as2/camel-as2-api/pom.xml
View file
Open in desktop
Expand Up @@ -69,14 +69,9 @@
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore4-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpclient4-version}</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${httpclient-version}</version>
</dependency>

<dependency>
Expand Down
89 changes: 32 additions & 57 deletions ...l-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2AsynchronousMDNManager.java
View file
Open in desktop
Expand Up @@ -19,31 +19,33 @@
import java.io.IOException;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.PrivateKey;
import java.security.cert.Certificate;

import org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
import org.apache.camel.component.as2.api.protocol.RequestAsynchronousMDN;
import org.apache.camel.component.as2.api.util.EntityUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.impl.DefaultBHttpClientConnection;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.protocol.HttpCoreContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpProcessorBuilder;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.RequestConnControl;
import org.apache.http.protocol.RequestContent;
import org.apache.http.protocol.RequestDate;
import org.apache.http.protocol.RequestExpectContinue;
import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent;
import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
import org.apache.hc.core5.http.protocol.RequestConnControl;
import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestDate;
import org.apache.hc.core5.http.protocol.RequestExpectContinue;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.http.protocol.RequestUserAgent;

public class AS2AsynchronousMDNManager {

Expand Down Expand Up @@ -99,7 +101,7 @@ public AS2AsynchronousMDNManager(String as2Version,
// Build Processor
httpProcessor = HttpProcessorBuilder.create().add(new RequestAsynchronousMDN(as2Version, senderFQDN))
.add(new RequestTargetHost()).add(new RequestUserAgent(userAgent)).add(new RequestDate())
.add(new RequestContent(true)).add(new RequestConnControl()).add(new RequestExpectContinue(true))
.add(new RequestContent(true)).add(new RequestConnControl()).add(new RequestExpectContinue())
.build();
}

Expand All @@ -110,33 +112,21 @@ public HttpCoreContext send(
ObjectHelper.notNull(mdn, "mdn");
ObjectHelper.notNull(recipientDeliveryAddress, "recipientDeliveryAddress");

URI uri = null;
try {
URIBuilder uriBuilder = new URIBuilder(recipientDeliveryAddress);
uri = uriBuilder.build();

} catch (URISyntaxException e) {
throw new HttpException("Invalid recipient delivery address URL", e);
}

String requestUri = buildRequestURI(uri);
URI uri = URI.create(recipientDeliveryAddress);

int buffSize = 8 * 1024;

try (DefaultBHttpClientConnection httpConnection = new DefaultBHttpClientConnection(buffSize)) {

HttpHost targetHost = new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme());
Http1Config h1Config = Http1Config.custom().setBufferSize(buffSize).build();
HttpConnectionFactory<ManagedHttpClientConnection> connFactory
= ManagedHttpClientConnectionFactory.builder().http1Config(h1Config).build();

// Create socket and bind to connection;
Socket socket = new Socket(targetHost.getHostName(), targetHost.getPort());
httpConnection.bind(socket);
try (HttpClientConnection httpConnection = connFactory.createConnection(new Socket(uri.getHost(), uri.getPort()))) {

// Add Context attributes
HttpCoreContext httpContext = HttpCoreContext.create();
httpContext.setTargetHost(targetHost);
httpContext.setAttribute(RECIPIENT_ADDRESS, recipientDeliveryAddress);

BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", requestUri);
ClassicHttpRequest request = new BasicClassicHttpRequest("POST", uri);
request.setHeader(AS2Header.CONTENT_TYPE, mdn.getMainMessageContentType());
httpContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
mdn.setMainBody(true);
Expand All @@ -157,31 +147,16 @@ public HttpCoreContext send(
}
}

private HttpResponse send(DefaultBHttpClientConnection httpConnection, HttpRequest request, HttpCoreContext httpContext)
private HttpResponse send(HttpClientConnection httpConnection, ClassicHttpRequest request, HttpCoreContext httpContext)
throws HttpException, IOException {

// Execute Request
HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
httpexecutor.preProcess(request, httpProcessor, httpContext);
HttpResponse response = httpexecutor.execute(request, httpConnection, httpContext);
httpexecutor.postProcess(response, httpProcessor, httpContext);
HttpRequestExecutor httpExecutor = new HttpRequestExecutor();
httpExecutor.preProcess(request, httpProcessor, httpContext);
ClassicHttpResponse response = httpExecutor.execute(request, httpConnection, httpContext);
httpExecutor.postProcess(response, httpProcessor, httpContext);

return response;
}

private String buildRequestURI(URI uri) {
StringBuilder sb = new StringBuilder();
if (uri.getPath() != null) {
sb.append(uri.getPath());
}
if (uri.getQuery() != null) {
sb.append('?');
sb.append(uri.getQuery());
}
if (uri.getFragment() != null) {
sb.append('#');
sb.append(uri.getFragment());
}
return sb.toString();
}
}