This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3d8cbc318ea8d62caf51adf3d5a81b8f674fbde Author: Claus Ibsen <[email protected]> AuthorDate: Sat Dec 25 13:00:56 2021 +0100 CAMEL-17380: camel-yaml-dsl - Do not depend on endpointdsl --- .../component/ComponentsBuilderFactory.java | 14 - .../dsl/KameletReifyComponentBuilderFactory.java | 145 --------- .../src/generated/resources/metadata.json | 22 -- dsl/camel-dsl-support/pom.xml | 6 +- .../pom.xml | 12 +- .../support/EndpointRouteBuilderLoaderSupport.java | 6 +- .../builder/endpoint/EndpointBuilderFactory.java | 1 - .../camel/builder/endpoint/EndpointBuilders.java | 1 - .../builder/endpoint/StaticEndpointBuilders.java | 45 --- .../dsl/KameletReifyEndpointBuilderFactory.java | 326 --------------------- dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml | 10 +- .../dsl/groovy/GroovyRoutesBuilderLoader.java | 2 +- dsl/camel-java-joor-dsl/pom.xml | 8 - dsl/camel-js-dsl/pom.xml | 10 +- .../dsl/js/JavaScriptRoutesBuilderLoader.java | 2 +- dsl/camel-kotlin-dsl/pom.xml | 10 +- .../camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt | 4 +- dsl/camel-xml-io-dsl/pom.xml | 8 - dsl/camel-xml-jaxb-dsl/pom.xml | 8 - dsl/pom.xml | 1 + parent/pom.xml | 5 + 21 files changed, 22 insertions(+), 624 deletions(-) diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java index 451b939..2684f42 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java @@ -2614,20 +2614,6 @@ public interface ComponentsBuilderFactory { return org.apache.camel.builder.component.dsl.KameletComponentBuilderFactory.kamelet(); } /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * @return the dsl builder - */ - @Deprecated - static org.apache.camel.builder.component.dsl.KameletReifyComponentBuilderFactory.KameletReifyComponentBuilder kameletReify() { - return org.apache.camel.builder.component.dsl.KameletReifyComponentBuilderFactory.kameletReify(); - } - /** * Kubernetes ConfigMap (camel-kubernetes) * Perform operations on Kubernetes ConfigMaps and get notified on * ConfigMaps changes. diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletReifyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletReifyComponentBuilderFactory.java deleted file mode 100644 index f41efd3..0000000 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletReifyComponentBuilderFactory.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.builder.component.dsl; - -import javax.annotation.Generated; -import org.apache.camel.Component; -import org.apache.camel.builder.component.AbstractComponentBuilder; -import org.apache.camel.builder.component.ComponentBuilder; -import org.apache.camel.component.kameletreify.KameletReifyComponent; - -/** - * To call Kamelets (indirectly) - * - * Generated by camel-package-maven-plugin - do not edit this file! - */ -@Generated("org.apache.camel.maven.packaging.ComponentDslMojo") -public interface KameletReifyComponentBuilderFactory { - - /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * @return the dsl builder - */ - @Deprecated - static KameletReifyComponentBuilder kameletReify() { - return new KameletReifyComponentBuilderImpl(); - } - - /** - * Builder for the Kamelet Reify component. - */ - interface KameletReifyComponentBuilder - extends - ComponentBuilder<KameletReifyComponent> { - /** - * Allows for bridging the consumer to the Camel routing Error Handler, - * which mean any exceptions occurred while the consumer is trying to - * pickup incoming messages, or the likes, will now be processed as a - * message and handled by the routing Error Handler. By default the - * consumer will use the org.apache.camel.spi.ExceptionHandler to deal - * with exceptions, that will be logged at WARN or ERROR level and - * ignored. - * - * The option is a: <code>boolean</code> type. - * - * Default: false - * Group: consumer - * - * @param bridgeErrorHandler the value to set - * @return the dsl builder - */ - default KameletReifyComponentBuilder bridgeErrorHandler( - boolean bridgeErrorHandler) { - doSetProperty("bridgeErrorHandler", bridgeErrorHandler); - return this; - } - /** - * Whether the producer should be started lazy (on the first message). - * By starting lazy you can use this to allow CamelContext and routes to - * startup in situations where a producer may otherwise fail during - * starting and cause the route to fail being started. By deferring this - * startup to be lazy then the startup failure can be handled during - * routing messages via Camel's routing error handlers. Beware that when - * the first message is processed then creating and starting the - * producer may take a little time and prolong the total processing time - * of the processing. - * - * The option is a: <code>boolean</code> type. - * - * Default: false - * Group: producer - * - * @param lazyStartProducer the value to set - * @return the dsl builder - */ - default KameletReifyComponentBuilder lazyStartProducer( - boolean lazyStartProducer) { - doSetProperty("lazyStartProducer", lazyStartProducer); - return this; - } - /** - * Whether autowiring is enabled. This is used for automatic autowiring - * options (the option must be marked as autowired) by looking up in the - * registry to find if there is a single instance of matching type, - * which then gets configured on the component. This can be used for - * automatic configuring JDBC data sources, JMS connection factories, - * AWS Clients, etc. - * - * The option is a: <code>boolean</code> type. - * - * Default: true - * Group: advanced - * - * @param autowiredEnabled the value to set - * @return the dsl builder - */ - default KameletReifyComponentBuilder autowiredEnabled( - boolean autowiredEnabled) { - doSetProperty("autowiredEnabled", autowiredEnabled); - return this; - } - } - - class KameletReifyComponentBuilderImpl - extends - AbstractComponentBuilder<KameletReifyComponent> - implements - KameletReifyComponentBuilder { - @Override - protected KameletReifyComponent buildConcreteComponent() { - return new KameletReifyComponent(); - } - @Override - protected boolean setPropertyOnComponent( - Component component, - String name, - Object value) { - switch (name) { - case "bridgeErrorHandler": ((KameletReifyComponent) component).setBridgeErrorHandler((boolean) value); return true; - case "lazyStartProducer": ((KameletReifyComponent) component).setLazyStartProducer((boolean) value); return true; - case "autowiredEnabled": ((KameletReifyComponent) component).setAutowiredEnabled((boolean) value); return true; - default: return false; - } - } - } -} \ No newline at end of file diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json index 90e3c56..57e87e4 100644 --- a/dsl/camel-componentdsl/src/generated/resources/metadata.json +++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json @@ -4302,28 +4302,6 @@ "producerOnly": false, "lenientProperties": true }, - "KameletReifyComponentBuilderFactory": { - "kind": "component", - "name": "kamelet-reify", - "title": "Kamelet Reify", - "description": "To call Kamelets (indirectly)", - "deprecated": true, - "firstVersion": "3.6.0", - "label": "core", - "javaType": "org.apache.camel.component.kameletreify.KameletReifyComponent", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-kamelet-reify", - "version": "3.15.0-SNAPSHOT", - "scheme": "kamelet-reify", - "extendsScheme": "", - "syntax": "kamelet-reify:delegateUri", - "async": false, - "api": false, - "consumerOnly": false, - "producerOnly": false, - "lenientProperties": true - }, "KubernetesConfigMapsComponentBuilderFactory": { "kind": "component", "name": "kubernetes-config-maps", diff --git a/dsl/camel-dsl-support/pom.xml b/dsl/camel-dsl-support/pom.xml index f45a7fe..b2d22c6 100644 --- a/dsl/camel-dsl-support/pom.xml +++ b/dsl/camel-dsl-support/pom.xml @@ -31,7 +31,7 @@ <artifactId>camel-dsl-support</artifactId> <packaging>jar</packaging> <name>Camel :: DSL :: Support</name> - <description>Camel DSL (Support))</description> + <description>Camel DSL Support</description> <dependencies> <dependency> @@ -42,10 +42,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-core-model</artifactId> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-endpointdsl</artifactId> - </dependency> </dependencies> <build> diff --git a/dsl/camel-dsl-support/pom.xml b/dsl/camel-endpointdsl-support/pom.xml similarity index 85% copy from dsl/camel-dsl-support/pom.xml copy to dsl/camel-endpointdsl-support/pom.xml index f45a7fe..5d8fd4f 100644 --- a/dsl/camel-dsl-support/pom.xml +++ b/dsl/camel-endpointdsl-support/pom.xml @@ -28,19 +28,15 @@ <version>3.15.0-SNAPSHOT</version> </parent> - <artifactId>camel-dsl-support</artifactId> + <artifactId>camel-endpointdsl-support</artifactId> <packaging>jar</packaging> - <name>Camel :: DSL :: Support</name> - <description>Camel DSL (Support))</description> + <name>Camel :: Endpoint DSL :: Support</name> + <description>Camel Endpoint DSL Support</description> <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> + <artifactId>camel-dsl-support</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/dsl/camel-dsl-support/src/main/java/org/apache/camel/dsl/support/EndpointRouteBuilderLoaderSupport.java b/dsl/camel-endpointdsl-support/src/main/java/org/apache/camel/endpointdsl/support/EndpointRouteBuilderLoaderSupport.java similarity index 89% rename from dsl/camel-dsl-support/src/main/java/org/apache/camel/dsl/support/EndpointRouteBuilderLoaderSupport.java rename to dsl/camel-endpointdsl-support/src/main/java/org/apache/camel/endpointdsl/support/EndpointRouteBuilderLoaderSupport.java index 863e82e..b2033b4 100644 --- a/dsl/camel-dsl-support/src/main/java/org/apache/camel/dsl/support/EndpointRouteBuilderLoaderSupport.java +++ b/dsl/camel-endpointdsl-support/src/main/java/org/apache/camel/endpointdsl/support/EndpointRouteBuilderLoaderSupport.java @@ -14,21 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.dsl.support; +package org.apache.camel.endpointdsl.support; import java.io.Reader; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.builder.endpoint.EndpointRouteBuilder; +import org.apache.camel.dsl.support.RouteBuilderLoaderSupport; import org.apache.camel.spi.Resource; import org.apache.camel.spi.RoutesBuilderLoader; import static org.apache.camel.builder.endpoint.EndpointRouteBuilder.loadEndpointRoutesBuilder; /** - * Base class for {@link RoutesBuilderLoader} implementations. + * Base class for {@link RoutesBuilderLoader} implementations with Endpoint DSL. */ public abstract class EndpointRouteBuilderLoaderSupport extends RouteBuilderLoaderSupport { + protected EndpointRouteBuilderLoaderSupport(String extension) { super(extension); } diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java index dd07f1a..580633d 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java @@ -202,7 +202,6 @@ public interface EndpointBuilderFactory org.apache.camel.builder.endpoint.dsl.KMS2EndpointBuilderFactory.KMS2Builders, org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory.KafkaBuilders, org.apache.camel.builder.endpoint.dsl.KameletEndpointBuilderFactory.KameletBuilders, - org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory.KameletReifyBuilders, org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory.KeystoneBuilders, org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory.Kinesis2Builders, org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory.KinesisFirehose2Builders, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java index e819142..61865bc 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java @@ -199,7 +199,6 @@ public interface EndpointBuilders org.apache.camel.builder.endpoint.dsl.KMS2EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.KameletEndpointBuilderFactory, - org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index f16241b..967150e 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -8901,51 +8901,6 @@ public class StaticEndpointBuilders { return org.apache.camel.builder.endpoint.dsl.KameletEndpointBuilderFactory.endpointBuilder(componentName, path); } /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * Syntax: <code>kamelet-reify:delegateUri</code> - * - * Path parameter: delegateUri (required) - * The delegated uri - * - * @param path delegateUri - * @return the dsl builder - */ - @Deprecated - public static org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory.KameletReifyEndpointBuilder kameletReify( - String path) { - return org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory.endpointBuilder("kamelet-reify", path); - } - /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * Syntax: <code>kamelet-reify:delegateUri</code> - * - * Path parameter: delegateUri (required) - * The delegated uri - * - * @param componentName to use a custom component name for the endpoint - * instead of the default name - * @param path delegateUri - * @return the dsl builder - */ - @Deprecated - public static org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory.KameletReifyEndpointBuilder kameletReify( - String componentName, - String path) { - return org.apache.camel.builder.endpoint.dsl.KameletReifyEndpointBuilderFactory.endpointBuilder(componentName, path); - } - /** * Kubernetes ConfigMap (camel-kubernetes) * Perform operations on Kubernetes ConfigMaps and get notified on * ConfigMaps changes. diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletReifyEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletReifyEndpointBuilderFactory.java deleted file mode 100644 index fe0078b..0000000 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletReifyEndpointBuilderFactory.java +++ /dev/null @@ -1,326 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.builder.endpoint.dsl; - -import java.util.*; -import java.util.concurrent.*; -import java.util.function.*; -import java.util.stream.*; -import javax.annotation.Generated; -import org.apache.camel.builder.EndpointConsumerBuilder; -import org.apache.camel.builder.EndpointProducerBuilder; -import org.apache.camel.builder.endpoint.AbstractEndpointBuilder; - -/** - * To call Kamelets (indirectly) - * - * Generated by camel build tools - do NOT edit this file! - */ -@Generated("org.apache.camel.maven.packaging.EndpointDslMojo") -public interface KameletReifyEndpointBuilderFactory { - - - /** - * Builder for endpoint consumers for the Kamelet Reify component. - */ - public interface KameletReifyEndpointConsumerBuilder - extends - EndpointConsumerBuilder { - default AdvancedKameletReifyEndpointConsumerBuilder advanced() { - return (AdvancedKameletReifyEndpointConsumerBuilder) this; - } - /** - * Allows for bridging the consumer to the Camel routing Error Handler, - * which mean any exceptions occurred while the consumer is trying to - * pickup incoming messages, or the likes, will now be processed as a - * message and handled by the routing Error Handler. By default the - * consumer will use the org.apache.camel.spi.ExceptionHandler to deal - * with exceptions, that will be logged at WARN or ERROR level and - * ignored. - * - * The option is a: <code>boolean</code> type. - * - * Default: false - * Group: consumer - * - * @param bridgeErrorHandler the value to set - * @return the dsl builder - */ - default KameletReifyEndpointConsumerBuilder bridgeErrorHandler( - boolean bridgeErrorHandler) { - doSetProperty("bridgeErrorHandler", bridgeErrorHandler); - return this; - } - /** - * Allows for bridging the consumer to the Camel routing Error Handler, - * which mean any exceptions occurred while the consumer is trying to - * pickup incoming messages, or the likes, will now be processed as a - * message and handled by the routing Error Handler. By default the - * consumer will use the org.apache.camel.spi.ExceptionHandler to deal - * with exceptions, that will be logged at WARN or ERROR level and - * ignored. - * - * The option will be converted to a <code>boolean</code> - * type. - * - * Default: false - * Group: consumer - * - * @param bridgeErrorHandler the value to set - * @return the dsl builder - */ - default KameletReifyEndpointConsumerBuilder bridgeErrorHandler( - String bridgeErrorHandler) { - doSetProperty("bridgeErrorHandler", bridgeErrorHandler); - return this; - } - } - - /** - * Advanced builder for endpoint consumers for the Kamelet Reify component. - */ - public interface AdvancedKameletReifyEndpointConsumerBuilder - extends - EndpointConsumerBuilder { - default KameletReifyEndpointConsumerBuilder basic() { - return (KameletReifyEndpointConsumerBuilder) this; - } - /** - * To let the consumer use a custom ExceptionHandler. Notice if the - * option bridgeErrorHandler is enabled then this option is not in use. - * By default the consumer will deal with exceptions, that will be - * logged at WARN or ERROR level and ignored. - * - * The option is a: - * <code>org.apache.camel.spi.ExceptionHandler</code> type. - * - * Group: consumer (advanced) - * - * @param exceptionHandler the value to set - * @return the dsl builder - */ - default AdvancedKameletReifyEndpointConsumerBuilder exceptionHandler( - org.apache.camel.spi.ExceptionHandler exceptionHandler) { - doSetProperty("exceptionHandler", exceptionHandler); - return this; - } - /** - * To let the consumer use a custom ExceptionHandler. Notice if the - * option bridgeErrorHandler is enabled then this option is not in use. - * By default the consumer will deal with exceptions, that will be - * logged at WARN or ERROR level and ignored. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ExceptionHandler</code> type. - * - * Group: consumer (advanced) - * - * @param exceptionHandler the value to set - * @return the dsl builder - */ - default AdvancedKameletReifyEndpointConsumerBuilder exceptionHandler( - String exceptionHandler) { - doSetProperty("exceptionHandler", exceptionHandler); - return this; - } - /** - * Sets the exchange pattern when the consumer creates an exchange. - * - * The option is a: - * <code>org.apache.camel.ExchangePattern</code> type. - * - * Group: consumer (advanced) - * - * @param exchangePattern the value to set - * @return the dsl builder - */ - default AdvancedKameletReifyEndpointConsumerBuilder exchangePattern( - org.apache.camel.ExchangePattern exchangePattern) { - doSetProperty("exchangePattern", exchangePattern); - return this; - } - /** - * Sets the exchange pattern when the consumer creates an exchange. - * - * The option will be converted to a - * <code>org.apache.camel.ExchangePattern</code> type. - * - * Group: consumer (advanced) - * - * @param exchangePattern the value to set - * @return the dsl builder - */ - default AdvancedKameletReifyEndpointConsumerBuilder exchangePattern( - String exchangePattern) { - doSetProperty("exchangePattern", exchangePattern); - return this; - } - } - - /** - * Builder for endpoint producers for the Kamelet Reify component. - */ - public interface KameletReifyEndpointProducerBuilder - extends - EndpointProducerBuilder { - default AdvancedKameletReifyEndpointProducerBuilder advanced() { - return (AdvancedKameletReifyEndpointProducerBuilder) this; - } - /** - * Whether the producer should be started lazy (on the first message). - * By starting lazy you can use this to allow CamelContext and routes to - * startup in situations where a producer may otherwise fail during - * starting and cause the route to fail being started. By deferring this - * startup to be lazy then the startup failure can be handled during - * routing messages via Camel's routing error handlers. Beware that when - * the first message is processed then creating and starting the - * producer may take a little time and prolong the total processing time - * of the processing. - * - * The option is a: <code>boolean</code> type. - * - * Default: false - * Group: producer - * - * @param lazyStartProducer the value to set - * @return the dsl builder - */ - default KameletReifyEndpointProducerBuilder lazyStartProducer( - boolean lazyStartProducer) { - doSetProperty("lazyStartProducer", lazyStartProducer); - return this; - } - /** - * Whether the producer should be started lazy (on the first message). - * By starting lazy you can use this to allow CamelContext and routes to - * startup in situations where a producer may otherwise fail during - * starting and cause the route to fail being started. By deferring this - * startup to be lazy then the startup failure can be handled during - * routing messages via Camel's routing error handlers. Beware that when - * the first message is processed then creating and starting the - * producer may take a little time and prolong the total processing time - * of the processing. - * - * The option will be converted to a <code>boolean</code> - * type. - * - * Default: false - * Group: producer - * - * @param lazyStartProducer the value to set - * @return the dsl builder - */ - default KameletReifyEndpointProducerBuilder lazyStartProducer( - String lazyStartProducer) { - doSetProperty("lazyStartProducer", lazyStartProducer); - return this; - } - } - - /** - * Advanced builder for endpoint producers for the Kamelet Reify component. - */ - public interface AdvancedKameletReifyEndpointProducerBuilder - extends - EndpointProducerBuilder { - default KameletReifyEndpointProducerBuilder basic() { - return (KameletReifyEndpointProducerBuilder) this; - } - } - - /** - * Builder for endpoint for the Kamelet Reify component. - */ - public interface KameletReifyEndpointBuilder - extends - KameletReifyEndpointConsumerBuilder, - KameletReifyEndpointProducerBuilder { - default AdvancedKameletReifyEndpointBuilder advanced() { - return (AdvancedKameletReifyEndpointBuilder) this; - } - } - - /** - * Advanced builder for endpoint for the Kamelet Reify component. - */ - public interface AdvancedKameletReifyEndpointBuilder - extends - AdvancedKameletReifyEndpointConsumerBuilder, - AdvancedKameletReifyEndpointProducerBuilder { - default KameletReifyEndpointBuilder basic() { - return (KameletReifyEndpointBuilder) this; - } - } - - public interface KameletReifyBuilders { - /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * Syntax: <code>kamelet-reify:delegateUri</code> - * - * Path parameter: delegateUri (required) - * The delegated uri - * - * @param path delegateUri - * @return the dsl builder - */ - @Deprecated - default KameletReifyEndpointBuilder kameletReify(String path) { - return KameletReifyEndpointBuilderFactory.endpointBuilder("kamelet-reify", path); - } - /** - * Kamelet Reify (camel-kamelet-reify) - * To call Kamelets (indirectly) - * - * Category: core - * Since: 3.6 - * Maven coordinates: org.apache.camel:camel-kamelet-reify - * - * Syntax: <code>kamelet-reify:delegateUri</code> - * - * Path parameter: delegateUri (required) - * The delegated uri - * - * @param componentName to use a custom component name for the endpoint - * instead of the default name - * @param path delegateUri - * @return the dsl builder - */ - @Deprecated - default KameletReifyEndpointBuilder kameletReify( - String componentName, - String path) { - return KameletReifyEndpointBuilderFactory.endpointBuilder(componentName, path); - } - } - @Deprecated - static KameletReifyEndpointBuilder endpointBuilder( - String componentName, - String path) { - class KameletReifyEndpointBuilderImpl extends AbstractEndpointBuilder implements KameletReifyEndpointBuilder, AdvancedKameletReifyEndpointBuilder { - public KameletReifyEndpointBuilderImpl(String path) { - super(componentName, path); - } - } - return new KameletReifyEndpointBuilderImpl(path); - } -} \ No newline at end of file diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml index 6f1437b..7c7339a 100644 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml +++ b/dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml @@ -46,15 +46,7 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-dsl-support</artifactId> + <artifactId>camel-endpointdsl-support</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/java/org/apache/camel/dsl/groovy/GroovyRoutesBuilderLoader.java b/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/java/org/apache/camel/dsl/groovy/GroovyRoutesBuilderLoader.java index ad98d84..a7f5f23 100644 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/java/org/apache/camel/dsl/groovy/GroovyRoutesBuilderLoader.java +++ b/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/java/org/apache/camel/dsl/groovy/GroovyRoutesBuilderLoader.java @@ -25,7 +25,7 @@ import org.apache.camel.Experimental; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.builder.endpoint.EndpointRouteBuilder; import org.apache.camel.dsl.groovy.common.GroovyDSL; -import org.apache.camel.dsl.support.EndpointRouteBuilderLoaderSupport; +import org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport; import org.apache.camel.spi.annotations.RoutesLoader; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; diff --git a/dsl/camel-java-joor-dsl/pom.xml b/dsl/camel-java-joor-dsl/pom.xml index b897fa5..9192ff5 100644 --- a/dsl/camel-java-joor-dsl/pom.xml +++ b/dsl/camel-java-joor-dsl/pom.xml @@ -46,14 +46,6 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-dsl-support</artifactId> </dependency> diff --git a/dsl/camel-js-dsl/pom.xml b/dsl/camel-js-dsl/pom.xml index 70a1fd9..0516800 100644 --- a/dsl/camel-js-dsl/pom.xml +++ b/dsl/camel-js-dsl/pom.xml @@ -46,15 +46,7 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-dsl-support</artifactId> + <artifactId>camel-endpointdsl-support</artifactId> </dependency> <dependency> diff --git a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java index 938145f..199ad55 100644 --- a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java +++ b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java @@ -21,7 +21,7 @@ import java.io.Reader; import org.apache.camel.CamelContext; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.dsl.support.EndpointRouteBuilderLoaderSupport; +import org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport; import org.apache.camel.spi.annotations.RoutesLoader; import org.apache.camel.support.LifecycleStrategySupport; import org.graalvm.polyglot.Context; diff --git a/dsl/camel-kotlin-dsl/pom.xml b/dsl/camel-kotlin-dsl/pom.xml index 6a4f7e6..a75992f 100644 --- a/dsl/camel-kotlin-dsl/pom.xml +++ b/dsl/camel-kotlin-dsl/pom.xml @@ -46,15 +46,7 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-dsl-support</artifactId> + <artifactId>camel-endpointdsl-support</artifactId> </dependency> <dependency> diff --git a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt index cb659c7..d789d8d 100644 --- a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt +++ b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt @@ -20,7 +20,7 @@ import org.apache.camel.Experimental import org.apache.camel.RuntimeCamelException import org.apache.camel.api.management.ManagedResource import org.apache.camel.builder.endpoint.EndpointRouteBuilder -import org.apache.camel.dsl.support.EndpointRouteBuilderLoaderSupport +import org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport import org.apache.camel.spi.annotations.RoutesLoader import org.slf4j.LoggerFactory import java.io.Reader @@ -32,7 +32,7 @@ import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT @Experimental @ManagedResource(description = "Managed KotlinRoutesBuilderLoader") @RoutesLoader(EXTENSION) -class KotlinRoutesBuilderLoader : EndpointRouteBuilderLoaderSupport(EXTENSION) { +class KotlinRoutesBuilderLoader : org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport(EXTENSION) { @Throws(Exception::class) override fun doLoadEndpointRouteBuilder(reader: Reader, builder: EndpointRouteBuilder) { val host = BasicJvmScriptingHost() diff --git a/dsl/camel-xml-io-dsl/pom.xml b/dsl/camel-xml-io-dsl/pom.xml index 1cfa6cd..ab81ddf 100644 --- a/dsl/camel-xml-io-dsl/pom.xml +++ b/dsl/camel-xml-io-dsl/pom.xml @@ -40,14 +40,6 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-xml-io</artifactId> </dependency> <dependency> diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml index 05eb98b..02e6bc2 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl/pom.xml @@ -40,14 +40,6 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-xml-jaxb</artifactId> </dependency> <dependency> diff --git a/dsl/pom.xml b/dsl/pom.xml index a3841a2..592aa6e 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -37,6 +37,7 @@ <module>camel-endpointdsl</module> <module>camel-componentdsl</module> <module>camel-dsl-support</module> + <module>camel-endpointdsl-support</module> <module>camel-groovy-dsl</module> <module>camel-java-joor-dsl</module> <module>camel-xml-io-dsl</module> diff --git a/parent/pom.xml b/parent/pom.xml index 4930c54..0ae244a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -719,6 +719,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-endpointdsl-support</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-dsl-support</artifactId> <version>${project.version}</version> </dependency>
