You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/09/19 08:16:32 UTC
[camel] branch main updated: (chores) camel-jetty: avoid hard-coded charset strings (#11452)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 50231ed8581 (chores) camel-jetty: avoid hard-coded charset strings (#11452)
50231ed8581 is described below
commit 50231ed858196a0ee2236c0a20b0f244640ecf74
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Sep 19 10:16:22 2023 +0200
(chores) camel-jetty: avoid hard-coded charset strings (#11452)
---
.../java/org/apache/camel/component/jetty/CustomFiltersTest.java | 3 ++-
.../apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java | 3 ++-
.../java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java | 3 ++-
.../org/apache/camel/component/jetty/HttpMethodRestrictTest.java | 4 +++-
.../camel/component/jetty/JettyComponentMuteExceptionTest.java | 4 +++-
.../org/apache/camel/component/jetty/JettyMuteExceptionTest.java | 7 +++++--
.../camel/component/jetty/MultiPartFormWithCustomFilterTest.java | 3 ++-
7 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
index 6e57728a886..96a77a9c7b7 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jetty;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -76,7 +77,7 @@ public class CustomFiltersTest extends BaseJettyTest {
CloseableHttpResponse response = client.execute(httppost)) {
assertEquals(200, response.getCode(), "Get a wrong response status");
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals("This is a test response", responseString, "Get a wrong result");
assertEquals("true", response.getFirstHeader("MyTestFilter").getValue(), "Did not use custom multipart filter");
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
index 18362525387..57d178ed450 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jetty;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -60,7 +61,7 @@ public class HttpBridgeMultipartRouteTest extends BaseJettyTest {
try (CloseableHttpClient client = HttpClients.createDefault();
CloseableHttpResponse response = client.execute(method)) {
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals(body, responseString);
String numAttachments = response.getFirstHeader("numAttachments").getValue();
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
index 17787702e0b..44d8bda2be7 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderCaseTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty;
+import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -43,7 +44,7 @@ public class HttpHeaderCaseTest extends BaseJettyTest {
try (CloseableHttpClient client = HttpClients.createDefault();
CloseableHttpResponse response = client.execute(method)) {
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals("Bye World", responseString);
assertEquals("aBc123", response.getFirstHeader("MyCaseHeader").getValue());
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
index bd48d928769..78f847e69d8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jetty;
+import java.nio.charset.StandardCharsets;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -45,7 +47,7 @@ public class HttpMethodRestrictTest extends BaseJettyTest {
CloseableHttpResponse response = client.execute(httpPost)) {
assertEquals(200, response.getCode(), "Get a wrong response status");
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals("This is a test response", responseString, "Get a wrong result");
}
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
index 7b28c201d62..6b67dc032a8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jetty;
+import java.nio.charset.StandardCharsets;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty11.JettyHttpComponent11;
import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -37,7 +39,7 @@ public class JettyComponentMuteExceptionTest extends BaseJettyTest {
try (CloseableHttpClient client = HttpClients.createDefault();
CloseableHttpResponse response = client.execute(get)) {
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals("", responseString);
assertEquals(500, response.getCode());
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
index e92f294f884..0ac79d0b9b1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jetty;
+import java.nio.charset.StandardCharsets;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -25,6 +27,7 @@ import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JettyMuteExceptionTest extends BaseJettyTest {
@@ -35,8 +38,8 @@ public class JettyMuteExceptionTest extends BaseJettyTest {
try (CloseableHttpClient client = HttpClients.createDefault();
CloseableHttpResponse response = client.execute(get)) {
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
- assertEquals("", responseString);
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+ assertTrue(responseString.isEmpty());
assertEquals(500, response.getCode());
}
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
index a021265e272..ae684c73a5d 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import jakarta.activation.DataHandler;
import jakarta.servlet.FilterChain;
@@ -73,7 +74,7 @@ public class MultiPartFormWithCustomFilterTest extends BaseJettyTest {
try (CloseableHttpClient client = HttpClients.createDefault();
CloseableHttpResponse response = client.execute(httppost)) {
assertEquals(200, response.getCode(), "Get a wrong response status");
- String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
assertEquals("A binary file of some kind", responseString, "Get a wrong result");
assertNotNull(response.getFirstHeader("MyMultipartFilter").getValue(), "Did not use custom multipart filter");