[camel] branch master updated: Remove deprecated preProcessUri from DefaultComponent

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new e6d293f  Remove deprecated preProcessUri from DefaultComponent
e6d293f is described below

commit e6d293f583a5ab6c6356527398675705057e6f9c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 5 09:19:32 2020 +0100

    Remove deprecated preProcessUri from DefaultComponent
---
 .../java/org/apache/camel/component/irc/IrcComponent.java   |  6 ------
 .../java/org/apache/camel/support/DefaultComponent.java     | 13 ++++---------
 .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc          |  5 +++++
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index 3f50ceb..a644ca5 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -151,12 +151,6 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
     }
 
     @Override
-    @Deprecated
-    protected String preProcessUri(String uri) {
-        return IrcConfiguration.sanitize(uri);
-    }
-
-    @Override
     public boolean isUseGlobalSslContextParameters() {
         return this.useGlobalSslContextParameters;
     }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
index 63320e9..ac0153d 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
@@ -88,16 +88,11 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
         this.camelContext = context;
     }
 
-    @Deprecated
-    protected String preProcessUri(String uri) {
-        return UnsafeUriCharactersEncoder.encode(uri);
-    }
-
     @Override
     public Endpoint createEndpoint(String uri, Map<String, Object> properties) throws Exception {
         ObjectHelper.notNull(getCamelContext(), "camelContext");
-        // check URI string to the unsafe URI characters
-        String encodedUri = preProcessUri(uri);
+        // need to encode before its safe to parse with java.net.Uri
+        String encodedUri = UnsafeUriCharactersEncoder.encode(uri);;
         URI u = new URI(encodedUri);
         String path;
         if (u.getScheme() != null) {
@@ -182,8 +177,8 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
     @Override
     public Endpoint createEndpoint(String uri) throws Exception {
         ObjectHelper.notNull(getCamelContext(), "camelContext");
-        // check URI string to the unsafe URI characters
-        String encodedUri = preProcessUri(uri);
+        // need to encode before its safe to parse with java.net.Uri
+        String encodedUri = UnsafeUriCharactersEncoder.encode(uri);;
         URI u = new URI(encodedUri);
         String path;
         if (u.getScheme() != null) {
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index f8039ee..1b867c5 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -627,3 +627,8 @@ The google-pubnub component has been improved to use a new Java library and beco
 
 Support for Apache Karaf has been removed.
 
+=== API changes
+
+==== DefaultComponent
+
+The deprecated method `preProcessUri` has been removed.