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 2021/08/03 14:53:32 UTC
[camel] branch main updated (4154405 -> 0c72525)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4154405 Regen
new 49ee546 CAMEL-16840: generate configurer should support @Metadata(skip = true) to skip the option
new 0c72525 CAMEL-16840: skip option in camel-zookeeper that should not be in configurer
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java | 6 ++++--
.../component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java | 2 ++
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 6 ++++++
3 files changed, 12 insertions(+), 2 deletions(-)
[camel] 02/02: CAMEL-16840: skip option in camel-zookeeper that
should not be in configurer
Posted by da...@apache.org.
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 0c7252552c5a859d05133338d4afcf0d70f9a3de
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 3 16:52:59 2021 +0200
CAMEL-16840: skip option in camel-zookeeper that should not be in configurer
---
.../zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java | 6 ++++--
.../component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java
index a06cb94..6202e1d 100644
--- a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java
+++ b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactoryConfigurer.java
@@ -40,7 +40,7 @@ public class ZooKeeperServiceDiscoveryFactoryConfigurer extends org.apache.camel
case "namespace":
case "Namespace": target.setNamespace(property(camelContext, java.lang.String.class, value)); return true;
case "nodes":
- case "Nodes": target.setNodes(property(camelContext, java.lang.String.class, value)); return true;
+ case "Nodes": target.setNodes(property(camelContext, java.util.List.class, value)); return true;
case "reconnectbasesleeptime":
case "ReconnectBaseSleepTime": target.setReconnectBaseSleepTime(property(camelContext, long.class, value)); return true;
case "reconnectbasesleeptimeunit":
@@ -83,7 +83,7 @@ public class ZooKeeperServiceDiscoveryFactoryConfigurer extends org.apache.camel
case "namespace":
case "Namespace": return java.lang.String.class;
case "nodes":
- case "Nodes": return java.lang.String.class;
+ case "Nodes": return java.util.List.class;
case "reconnectbasesleeptime":
case "ReconnectBaseSleepTime": return long.class;
case "reconnectbasesleeptimeunit":
@@ -153,6 +153,8 @@ public class ZooKeeperServiceDiscoveryFactoryConfigurer extends org.apache.camel
switch (ignoreCase ? name.toLowerCase() : name) {
case "authinfolist":
case "AuthInfoList": return org.apache.curator.framework.AuthInfo.class;
+ case "nodes":
+ case "Nodes": return java.lang.String.class;
default: return null;
}
}
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
index 7060b52..7986730 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.cloud.ServiceDiscoveryFactory;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
import org.apache.camel.spi.Configurer;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.CloudServiceFactory;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.AuthInfo;
@@ -67,6 +68,7 @@ public class ZooKeeperServiceDiscoveryFactory implements ServiceDiscoveryFactory
return configuration.getNodes();
}
+ @Metadata(skip = true)
public void setNodes(String nodes) {
configuration.setNodes(nodes);
}
[camel] 01/02: CAMEL-16840: generate configurer should support
@Metadata(skip = true) to skip the option
Posted by da...@apache.org.
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 49ee5465c87b071c6bcca4e3350dd47a4ab86db8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 3 16:52:40 2021 +0200
CAMEL-16840: generate configurer should support @Metadata(skip = true) to skip the option
---
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index fc88b26..77302af 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -37,6 +37,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.tooling.model.BaseOptionModel;
import org.apache.camel.tooling.util.ReflectionHelper;
import org.apache.camel.tooling.util.Strings;
@@ -443,6 +444,11 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo
return setter.getParameterTypes()[0] == String.class;
}
+ Metadata meta = setter.getAnnotation(Metadata.class);
+ if (meta != null && meta.skip()) {
+ return false;
+ }
+
return true;
}