This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7aa02510fae537471c59756854088e649be3fea6 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Aug 24 17:33:01 2021 +0200 Automatically generate configurers using discovery --- components/camel-as2/camel-as2-component/pom.xml | 14 ---------- .../camel-avro-rpc-component/pom.xml | 19 ------------- components/camel-box/camel-box-component/pom.xml | 14 ---------- components/camel-braintree/pom.xml | 14 ---------- components/camel-consul/pom.xml | 24 ----------------- components/camel-dns/pom.xml | 25 ----------------- components/camel-etcd/pom.xml | 24 ----------------- components/camel-fhir/camel-fhir-component/pom.xml | 14 ---------- .../camel-google/camel-google-calendar/pom.xml | 14 ---------- components/camel-google/camel-google-drive/pom.xml | 14 ---------- components/camel-google/camel-google-mail/pom.xml | 14 ---------- .../camel-google/camel-google-sheets/pom.xml | 14 ---------- components/camel-http/pom.xml | 24 ----------------- components/camel-kubernetes/pom.xml | 24 ----------------- components/camel-lra/pom.xml | 25 ----------------- components/camel-netty-http/pom.xml | 26 ------------------ .../netty/http/NettyHttpConfiguration.java | 2 ++ components/camel-netty/pom.xml | 18 ------------- .../camel/component/netty/NettyConfiguration.java | 2 ++ .../camel-olingo2/camel-olingo2-component/pom.xml | 14 ---------- .../camel-olingo4/camel-olingo4-component/pom.xml | 14 ---------- components/camel-quartz/pom.xml | 14 ---------- components/camel-ribbon/pom.xml | 24 ----------------- components/camel-twilio/pom.xml | 14 ---------- components/camel-undertow/pom.xml | 24 ----------------- components/camel-zendesk/pom.xml | 14 ---------- components/camel-zookeeper/pom.xml | 19 ------------- core/camel-cloud/pom.xml | 31 ---------------------- .../impl/cloud/BlacklistServiceFilterFactory.java | 2 ++ .../cloud/CombinedServiceDiscoveryFactory.java | 2 ++ .../impl/cloud/CombinedServiceFilterFactory.java | 2 ++ .../cloud/DefaultServiceLoadBalancerFactory.java | 2 ++ .../impl/cloud/HealthyServiceFilterFactory.java | 2 ++ .../cloud/PassThroughServiceFilterFactory.java | 2 ++ .../impl/cloud/StaticServiceDiscoveryFactory.java | 2 ++ core/camel-support/pom.xml | 19 ------------- .../apache/camel/maven/packaging/GenerateMojo.java | 2 ++ 37 files changed, 20 insertions(+), 508 deletions(-) diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml index 90f63d2..a4659c5 100644 --- a/components/camel-as2/camel-as2-component/pom.xml +++ b/components/camel-as2/camel-as2-component/pom.xml @@ -156,20 +156,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml index 164df24..dda2829 100644 --- a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml +++ b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml @@ -70,25 +70,6 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> <profile> <id>generate-test-protocol</id> diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml index d8f752a..a021d54 100644 --- a/components/camel-box/camel-box-component/pom.xml +++ b/components/camel-box/camel-box-component/pom.xml @@ -593,20 +593,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml index c259877..127a7b0 100644 --- a/components/camel-braintree/pom.xml +++ b/components/camel-braintree/pom.xml @@ -275,20 +275,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml index bc99d44..9750ecc6 100644 --- a/components/camel-consul/pom.xml +++ b/components/camel-consul/pom.xml @@ -172,28 +172,4 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.consul.cloud.ConsulServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml index e85554f..1bfdf2c 100644 --- a/components/camel-dns/pom.xml +++ b/components/camel-dns/pom.xml @@ -72,29 +72,4 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.dns.cloud.DnsServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </project> diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml index a350325..5fef81d 100644 --- a/components/camel-etcd/pom.xml +++ b/components/camel-etcd/pom.xml @@ -99,28 +99,4 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.etcd.cloud.EtcdServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml index d6e071c..1500e6f 100644 --- a/components/camel-fhir/camel-fhir-component/pom.xml +++ b/components/camel-fhir/camel-fhir-component/pom.xml @@ -306,20 +306,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins> diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml index 42a3650..a496faa 100644 --- a/components/camel-google/camel-google-calendar/pom.xml +++ b/components/camel-google/camel-google-calendar/pom.xml @@ -160,20 +160,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml index ff91dd6..d8ab37a 100644 --- a/components/camel-google/camel-google-drive/pom.xml +++ b/components/camel-google/camel-google-drive/pom.xml @@ -190,20 +190,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml index 96d210e..7ca61ad 100644 --- a/components/camel-google/camel-google-mail/pom.xml +++ b/components/camel-google/camel-google-mail/pom.xml @@ -209,20 +209,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml index 5725ca8..0778c86 100644 --- a/components/camel-google/camel-google-sheets/pom.xml +++ b/components/camel-google/camel-google-sheets/pom.xml @@ -259,20 +259,6 @@ </dependencies> </plugin> <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <childDelegation>false</childDelegation> diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index b616401..091d7d0 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -115,28 +115,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.http.cloud.HttpServiceExpressionFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index ab9cb4c..0e18aad 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -132,30 +132,6 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.kubernetes.cloud.KubernetesServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> <profile> <id>jdk9s-build</id> diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml index 4a2f98b..42d4d2d 100644 --- a/components/camel-lra/pom.xml +++ b/components/camel-lra/pom.xml @@ -90,29 +90,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <!-- we need to generate additional configurer classes from camel-lra --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> </project> diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml index b8aa137..10c708d 100644 --- a/components/camel-netty-http/pom.xml +++ b/components/camel-netty-http/pom.xml @@ -165,30 +165,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>true</discoverClasses> - <classes> - <class>org.apache.camel.component.netty.http.NettyHttpConfiguration</class> - <class>org.apache.camel.component.netty.http.cloud.NettyHttpServiceExpressionFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java index 60156d4..a6893bc 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java @@ -22,6 +22,7 @@ import java.util.List; import io.netty.channel.ChannelHandler; import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.netty.NettyConfiguration; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; @@ -31,6 +32,7 @@ import org.apache.camel.spi.UriPath; * Extended configuration for using HTTP with Netty. */ @UriParams +@Configurer public class NettyHttpConfiguration extends NettyConfiguration { @UriPath(enums = "http,https") diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml index 3d2e009..6606821 100644 --- a/components/camel-netty/pom.xml +++ b/components/camel-netty/pom.xml @@ -113,24 +113,6 @@ <build> <plugins> <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>true</discoverClasses> - <classes>org.apache.camel.component.netty.NettyConfiguration</classes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java index a53d56b..86c34b8 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java @@ -33,6 +33,7 @@ import org.apache.camel.Exchange; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.LoggingLevel; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.PropertyConfigurer; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; @@ -46,6 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @UriParams +@Configurer public class NettyConfiguration extends NettyServerBootstrapConfiguration implements Cloneable { private static final Logger LOG = LoggerFactory.getLogger(NettyConfiguration.class); diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 03fc394..e78b56d 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -190,20 +190,6 @@ </dependencies> </plugin> <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml index 06a3439..9df1b4b 100644 --- a/components/camel-olingo4/camel-olingo4-component/pom.xml +++ b/components/camel-olingo4/camel-olingo4-component/pom.xml @@ -144,20 +144,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index fd2f139..eb4a175 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -116,20 +116,6 @@ <build> <plugins> <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml index ebef261..0f7f74f 100644 --- a/components/camel-ribbon/pom.xml +++ b/components/camel-ribbon/pom.xml @@ -110,28 +110,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.ribbon.cloud.RibbonServiceLoadBalancerFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml index f728574..25e067c 100644 --- a/components/camel-twilio/pom.xml +++ b/components/camel-twilio/pom.xml @@ -628,20 +628,6 @@ </execution> </executions> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index 60a285f..e18eb00 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -167,28 +167,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.undertow.cloud.UndertowServiceExpressionFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml index 9a5266f..f138564 100644 --- a/components/camel-zendesk/pom.xml +++ b/components/camel-zendesk/pom.xml @@ -199,20 +199,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins> diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index d76be5a..8c157d8 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -201,25 +201,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.component.zookeeper.cloud.ZooKeeperServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skipTests}</skipTests> diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml index d76d586..eb74820 100644 --- a/core/camel-cloud/pom.xml +++ b/core/camel-cloud/pom.xml @@ -76,35 +76,4 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - <configuration> - <discoverClasses>false</discoverClasses> - <classes> - <class>org.apache.camel.impl.cloud.BlacklistServiceFilterFactory</class> - <class>org.apache.camel.impl.cloud.CombinedServiceDiscoveryFactory</class> - <class>org.apache.camel.impl.cloud.CombinedServiceFilterFactory</class> - <class>org.apache.camel.impl.cloud.DefaultServiceLoadBalancerFactory</class> - <class>org.apache.camel.impl.cloud.HealthyServiceFilterFactory</class> - <class>org.apache.camel.impl.cloud.PassThroughServiceFilterFactory</class> - <class>org.apache.camel.impl.cloud.StaticServiceDiscoveryFactory</class> - </classes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </project> diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java index 87c43cf..dfa5e7c 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java @@ -21,9 +21,11 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceFilter; import org.apache.camel.cloud.ServiceFilterFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; @CloudServiceFactory("blacklist-service-filter") +@Configurer public class BlacklistServiceFilterFactory implements ServiceFilterFactory { private List<String> servers; diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java index 1b527e8..4c17b58 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java @@ -21,10 +21,12 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceDiscovery; import org.apache.camel.cloud.ServiceDiscoveryFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; import org.apache.camel.util.ObjectHelper; @CloudServiceFactory("combined-service-discovery") +@Configurer public class CombinedServiceDiscoveryFactory implements ServiceDiscoveryFactory { private List<ServiceDiscovery> serviceDiscoveryList; diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java index 3f672b0..b855d52 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java @@ -21,10 +21,12 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceFilter; import org.apache.camel.cloud.ServiceFilterFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; import org.apache.camel.util.ObjectHelper; @CloudServiceFactory("combined-service-filter") +@Configurer public class CombinedServiceFilterFactory implements ServiceFilterFactory { private List<ServiceFilter> serviceFilterList; diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java index be5ccfb..c0097d1 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java @@ -19,9 +19,11 @@ package org.apache.camel.impl.cloud; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceLoadBalancer; import org.apache.camel.cloud.ServiceLoadBalancerFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; @CloudServiceFactory("default-service-load-balancer") +@Configurer public class DefaultServiceLoadBalancerFactory implements ServiceLoadBalancerFactory { @Override diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java index ad5e511..0d0dac0 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java @@ -19,9 +19,11 @@ package org.apache.camel.impl.cloud; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceFilter; import org.apache.camel.cloud.ServiceFilterFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; @CloudServiceFactory("healthy-service-filter") +@Configurer public class HealthyServiceFilterFactory implements ServiceFilterFactory { public HealthyServiceFilterFactory() { diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java index 9a077ad..61ce4a2 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java @@ -19,9 +19,11 @@ package org.apache.camel.impl.cloud; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceFilter; import org.apache.camel.cloud.ServiceFilterFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; @CloudServiceFactory("pass-through-service-filter") +@Configurer public class PassThroughServiceFilterFactory implements ServiceFilterFactory { public PassThroughServiceFilterFactory() { diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java index e427c02..ff8e36c 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java @@ -21,9 +21,11 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceDiscovery; import org.apache.camel.cloud.ServiceDiscoveryFactory; +import org.apache.camel.spi.Configurer; import org.apache.camel.spi.annotations.CloudServiceFactory; @CloudServiceFactory("static-service-discovery") +@Configurer public class StaticServiceDiscoveryFactory implements ServiceDiscoveryFactory { private List<String> servers; diff --git a/core/camel-support/pom.xml b/core/camel-support/pom.xml index a43ef25..a56f159 100644 --- a/core/camel-support/pom.xml +++ b/core/camel-support/pom.xml @@ -53,23 +53,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <!-- we need to generate additional configurer classes --> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java index 4c99cb2..f77da4d 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java @@ -46,6 +46,8 @@ public class GenerateMojo extends AbstractGenerateMojo { invoke(EndpointSchemaGeneratorMojo.class); // generate endpoint-uri-factory invoke(GenerateEndpointUriFactoryMojo.class); + // generate configurer + invoke(GenerateConfigurerMojo.class); // generate invoke-on-header invoke(GenerateInvokeOnHeaderMojo.class); // prepare-components