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
commit f0eb34f873fe3c1218868eae32497cbf4dfabc07 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Tue May 9 17:56:29 2023 +0200 (chores) cleanup: use the StandardCharsets for decoding URLs instead of String-based names --- .../org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java | 3 ++- .../apache/camel/impl/engine/DefaultPackageScanResourceResolver.java | 3 ++- .../java/org/apache/camel/impl/engine/DefaultResourceResolvers.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java index 431bb919c70..5d32fcf48d8 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java @@ -26,6 +26,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -187,7 +188,7 @@ public class DefaultPackageScanClassResolver extends BasePackageScanResolver url = customResourceLocator(url); String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); + urlPath = URLDecoder.decode(urlPath, StandardCharsets.UTF_8); if (log.isTraceEnabled()) { log.trace("Decoded urlPath: {} with protocol: {}", urlPath, url.getProtocol()); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java index 679bdf72ebb..4e443f6854c 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java @@ -26,6 +26,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; @@ -148,7 +149,7 @@ public class DefaultPackageScanResourceResolver extends BasePackageScanResolver url = customResourceLocator(url); String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); + urlPath = URLDecoder.decode(urlPath, StandardCharsets.UTF_8); if (log.isTraceEnabled()) { log.trace("Decoded urlPath: {} with protocol: {}", urlPath, url.getProtocol()); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java index 207b51d482f..d789261bc85 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceResolvers.java @@ -87,7 +87,7 @@ public final class DefaultResourceResolvers { protected String tryDecodeUri(String uri) { try { // try to decode as the uri may contain %20 for spaces etc - uri = URLDecoder.decode(uri, StandardCharsets.UTF_8.name()); + uri = URLDecoder.decode(uri, StandardCharsets.UTF_8); } catch (Exception e) { getLogger().trace("Error URL decoding uri using UTF-8 encoding: {}. This exception is ignored.", uri); // ignore @@ -183,7 +183,7 @@ public final class DefaultResourceResolvers { protected String tryDecodeUri(String uri) { try { // try to decode as the uri may contain %20 for spaces etc - uri = URLDecoder.decode(uri, StandardCharsets.UTF_8.name()); + uri = URLDecoder.decode(uri, StandardCharsets.UTF_8); } catch (Exception e) { getLogger().trace("Error URL decoding uri using UTF-8 encoding: {}. This exception is ignored.", uri); // ignore