[camel] branch master updated: CAMEL-15403: Fixed CS and fix baseUrl is already with scheme or not.

[davsclaus]

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 d8d1a10  CAMEL-15403: Fixed CS and fix baseUrl is already with scheme 
or not.
d8d1a10 is described below

commit d8d1a1014d803e8138e0d3c91319b366c1f9a58f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Aug 13 17:26:49 2020 +0200

    CAMEL-15403: Fixed CS and fix baseUrl is already with scheme or not.
---
 .../camel/oaipmh/component/OAIPMHEndpoint.java     | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git 
a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
 
b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
index 7947ee0..7c1bd87 100644
--- 
a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
+++ 
b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
@@ -73,22 +73,14 @@ public class OAIPMHEndpoint extends DefaultPollingEndpoint {
 
     private Map<String, Object> queryParameters;
 
-    @Override
-    public boolean isLenientProperties() {
-        return true;
-    }
-
     public OAIPMHEndpoint(String uri, String remaining, OAIPMHComponent 
component) {
         super(uri, component);
         this.baseUrl = remaining;
     }
 
-    public Map<String, Object> getQueryParameters() {
-        return queryParameters;
-    }
-
-    public void setQueryParameters(Map<String, Object> queryParameters) {
-        this.queryParameters = queryParameters;
+    @Override
+    public boolean isLenientProperties() {
+        return true;
     }
 
     @Override
@@ -98,7 +90,11 @@ public class OAIPMHEndpoint extends DefaultPollingEndpoint {
         validateParameters();
 
         // build uri from parameters
-        this.url = URI.create((this.isSsl() ? "https://"; : "http://";) + 
baseUrl);
+        String prefix = "";
+        if (!baseUrl.startsWith("http:") && !baseUrl.startsWith("https:")) {
+            prefix = isSsl() ? "https://"; : "http://";;
+        }
+        this.url = URI.create(prefix + baseUrl);
         // append extra parameters
         if (queryParameters != null && !queryParameters.isEmpty()) {
             Map<String, Object> parameters = URISupport.parseParameters(url);
@@ -129,6 +125,14 @@ public class OAIPMHEndpoint extends DefaultPollingEndpoint 
{
         }
     }
 
+    public Map<String, Object> getQueryParameters() {
+        return queryParameters;
+    }
+
+    public void setQueryParameters(Map<String, Object> queryParameters) {
+        this.queryParameters = queryParameters;
+    }
+
     public boolean isIgnoreSSLWarnings() {
         return ignoreSSLWarnings;
     }