You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/08/31 13:29:13 UTC
[camel] branch camel-3.x updated: CAMEL-19814: camel-rest - Should filter out query parameters that are… (#11252)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new e92208094fc CAMEL-19814: camel-rest - Should filter out query parameters that are… (#11252)
e92208094fc is described below
commit e92208094fcc7034981c89197f0e16028fba7dd0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 31 15:29:05 2023 +0200
CAMEL-19814: camel-rest - Should filter out query parameters that are… (#11252)
* CAMEL-19814: camel-rest - Should filter out query parameters that are for the producer endpoint (#11250)
* CAMEL-19814: camel-rest - Should filter out query parameters that are for the producer endpoint
---
.../apache/camel/component/rest/RestComponent.java | 30 +++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
index 8b63431b457..1610f221b97 100644
--- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
+++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java
@@ -20,12 +20,16 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.camel.Endpoint;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.component.extension.ComponentVerifierExtension;
+import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RestConfiguration;
+import org.apache.camel.spi.UriFactoryResolver;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
@@ -84,11 +88,24 @@ public class RestComponent extends DefaultComponent {
// use only what remains and at this point parameters that have been used have been removed
// without overwriting any query parameters set via queryParameters endpoint option
final Map<String, Object> queryParameters = new LinkedHashMap<>(parameters);
+
+ // filter out known options from the producer, as they should not be in the query parameters
+ EndpointUriFactory factory = getEndpointUriFactory(pname);
+ if (factory != null) {
+ for (String key : parameters.keySet()) {
+ if (factory.propertyNames().contains(key)) {
+ queryParameters.remove(key);
+ }
+ }
+ }
+
final Map<String, Object> existingQueryParameters = URISupport.parseQuery(answer.getQueryParameters());
queryParameters.putAll(existingQueryParameters);
final String remainingParameters = URISupport.createQueryString(queryParameters);
- answer.setQueryParameters(remainingParameters);
+ if (ObjectHelper.isNotEmpty(remainingParameters)) {
+ answer.setQueryParameters(remainingParameters);
+ }
}
answer.setParameters(parameters);
@@ -190,6 +207,17 @@ public class RestComponent extends DefaultComponent {
// Helpers
// ****************************************
+ private EndpointUriFactory getEndpointUriFactory(String name) {
+ if (name != null) {
+ UriFactoryResolver resolver
+ = getCamelContext().adapt(ExtendedCamelContext.class).getUriFactoryResolver();
+ if (resolver != null) {
+ return resolver.resolveFactory(name, getCamelContext());
+ }
+ }
+ return null;
+ }
+
public ComponentVerifierExtension getVerifier() {
return (scope, parameters) -> getExtension(ComponentVerifierExtension.class)
.orElseThrow(UnsupportedOperationException::new).verify(scope, parameters);