This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20da08acf1cca9b90a9f3c3faeb1f682d2625d77 Author: henka-rl <[email protected]> AuthorDate: Tue Oct 5 10:42:50 2021 +0200 CAMEL-17043 Added rest endpoint parameters to nestedParameters (#6211) --- .../rest/openapi/RestOpenApiEndpoint.java | 63 ++++++++++++---------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java index a344b28..d025796 100644 --- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java +++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java @@ -16,6 +16,15 @@ */ package org.apache.camel.component.rest.openapi; +import static java.util.Optional.ofNullable; +import static org.apache.camel.component.rest.openapi.RestOpenApiHelper.isHostParam; +import static org.apache.camel.component.rest.openapi.RestOpenApiHelper.isMediaRange; +import static org.apache.camel.util.ObjectHelper.isNotEmpty; +import static org.apache.camel.util.ObjectHelper.notNull; +import static org.apache.camel.util.StringHelper.after; +import static org.apache.camel.util.StringHelper.before; +import static org.apache.camel.util.StringHelper.notEmpty; + import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; @@ -35,8 +44,28 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.camel.CamelContext; +import org.apache.camel.Category; +import org.apache.camel.Consumer; +import org.apache.camel.Endpoint; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Processor; +import org.apache.camel.Producer; +import org.apache.camel.spi.Metadata; +import org.apache.camel.spi.RestConfiguration; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; +import org.apache.camel.support.CamelContextHelper; +import org.apache.camel.support.DefaultEndpoint; +import org.apache.camel.support.ResourceHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.StringHelper; +import org.apache.camel.util.UnsafeUriCharactersEncoder; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; + import io.apicurio.datamodels.Library; import io.apicurio.datamodels.core.models.Document; import io.apicurio.datamodels.core.models.common.SecurityRequirement; @@ -57,33 +86,6 @@ import io.apicurio.datamodels.openapi.v3.models.Oas30Parameter; import io.apicurio.datamodels.openapi.v3.models.Oas30Response; import io.apicurio.datamodels.openapi.v3.models.Oas30SecurityScheme; import io.apicurio.datamodels.openapi.v3.models.Oas30Server; -import org.apache.camel.CamelContext; -import org.apache.camel.Category; -import org.apache.camel.Consumer; -import org.apache.camel.Endpoint; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.RestConfiguration; -import org.apache.camel.spi.UriEndpoint; -import org.apache.camel.spi.UriParam; -import org.apache.camel.spi.UriPath; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.support.ResourceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; -import org.apache.camel.util.UnsafeUriCharactersEncoder; - -import static java.util.Optional.ofNullable; -import static org.apache.camel.component.rest.openapi.RestOpenApiHelper.isHostParam; -import static org.apache.camel.component.rest.openapi.RestOpenApiHelper.isMediaRange; -import static org.apache.camel.util.ObjectHelper.isNotEmpty; -import static org.apache.camel.util.ObjectHelper.notNull; -import static org.apache.camel.util.StringHelper.after; -import static org.apache.camel.util.StringHelper.before; -import static org.apache.camel.util.StringHelper.notEmpty; /** * Configure REST producers based on an OpenAPI specification document delegating to a component implementing the @@ -522,10 +524,15 @@ public final class RestOpenApiEndpoint extends DefaultEndpoint { componentParameters.put("sslContextParameters", component.getSslContextParameters()); } + final Map<Object, Object> nestedParameters = new HashMap<>(); if (!componentParameters.isEmpty()) { - final Map<Object, Object> nestedParameters = new HashMap<>(); nestedParameters.put("component", componentParameters); + } + + // Add rest endpoint parameters + nestedParameters.putAll(this.parameters); + if (!nestedParameters.isEmpty()) { // we're trying to set RestEndpoint.parameters['component'] parameters.put("parameters", nestedParameters); }
