This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 45501bfd826f6230160e6aefb12f4f29534fcde0 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Wed Mar 10 13:25:53 2021 +0000 CAMEL-16255: Remove redundant httpclient dependency from camel-slack --- components/camel-slack/pom.xml | 6 ----- .../camel/component/slack/SlackConsumerTest.java | 31 +++++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml index 7393360..9a89f2b 100644 --- a/components/camel-slack/pom.xml +++ b/components/camel-slack/pom.xml @@ -74,12 +74,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> - </dependency> - <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java index eca77ad..25e2d8e 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java @@ -18,15 +18,15 @@ package org.apache.camel.component.slack; import java.io.IOException; +import okhttp3.Call; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClients; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -67,12 +67,19 @@ public class SlackConsumerTest extends CamelTestSupport { } private void sendMessage(String message) throws IOException { - HttpClient client = HttpClients.createDefault(); - HttpPost post = new HttpPost(hook); - post.setHeader("Content-type", "application/json"); - post.setEntity(new StringEntity(String.format("{ 'text': '%s'}", message))); - HttpResponse response = client.execute(post); - assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + RequestBody requestBody + = RequestBody.create(String.format("{ 'text': '%s'}", message), MediaType.parse("application/json")); + + Request request = new Request.Builder() + .url(hook) + .post(requestBody) + .build(); + + OkHttpClient client = new OkHttpClient(); + Call call = client.newCall(request); + Response response = call.execute(); + + assertEquals(200, response.code()); } @Override