You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/10/14 10:34:48 UTC
[camel] 01/01: CAMEL-18611: camel-main - Move the Configurer in main package
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-18611/prevent-split-packages
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2cf2fe0b759466cb01a553fbebb4d3b5fdb2a727
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Oct 14 12:34:17 2022 +0200
CAMEL-18611: camel-main - Move the Configurer in main package
---
core/camel-main/pom.xml | 9 +-
.../AwsVaultConfigurationConfigurer.java | 2 +-
.../AzureVaultConfigurationConfigurer.java | 2 +-
.../HashicorpVaultConfigurationConfigurer.java | 2 +-
.../vault/GcpVaultConfigurationConfigurer.java | 109 ---------------------
.../org.apache.camel.vault.AwsVaultConfiguration | 2 +-
.../org.apache.camel.vault.AzureVaultConfiguration | 2 +-
....apache.camel.vault.HashicorpVaultConfiguration | 2 +-
8 files changed, 14 insertions(+), 116 deletions(-)
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index ad34a7f687a..ab8b535838b 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -151,7 +151,14 @@
<goal>generate-configurer</goal>
</goals>
<configuration>
- <classes>org.apache.camel.vault.AwsVaultConfiguration,org.apache.camel.vault.AzureVaultConfiguration,org.apache.camel.vault.GcpVaultConfiguration,org.apache.camel.vault.HashicorpVaultConfiguration</classes>
+ <classes>
+ <!-- we want to have configurer for AwsVaultConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.AwsVaultConfiguration=org.apache.camel.main.AwsVaultConfiguration</class>
+ <!-- we want to have configurer for RestConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.AzureVaultConfiguration=org.apache.camel.main.AzureVaultConfiguration</class>
+ <!-- we want to have configurer for RestConfiguration in the package main to prevent a split packages issue -->
+ <class>org.apache.camel.vault.HashicorpVaultConfiguration=org.apache.camel.main.HashicorpVaultConfiguration</class>
+ </classes>
</configuration>
</execution>
<execution>
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
index e8e9fb22325..e9bba9ad2dd 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/AwsVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AwsVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
index de815ca031d..9560719e584 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/AzureVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/AzureVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
similarity index 99%
rename from core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java
rename to core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
index 9931b3683a3..72cf78d2605 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/HashicorpVaultConfigurationConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HashicorpVaultConfigurationConfigurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
+package org.apache.camel.main;
import java.util.Map;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java
deleted file mode 100644
index e7e11775ec1..00000000000
--- a/core/camel-main/src/generated/java/org/apache/camel/vault/GcpVaultConfigurationConfigurer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.vault;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.vault.GcpVaultConfiguration;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class GcpVaultConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
- @Override
- public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- org.apache.camel.vault.GcpVaultConfiguration target = (org.apache.camel.vault.GcpVaultConfiguration) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "awsvaultconfiguration":
- case "AwsVaultConfiguration": target.setAwsVaultConfiguration(property(camelContext, org.apache.camel.vault.AwsVaultConfiguration.class, value)); return true;
- case "azurevaultconfiguration":
- case "AzureVaultConfiguration": target.setAzureVaultConfiguration(property(camelContext, org.apache.camel.vault.AzureVaultConfiguration.class, value)); return true;
- case "gcpvaultconfiguration":
- case "GcpVaultConfiguration": target.setGcpVaultConfiguration(property(camelContext, org.apache.camel.vault.GcpVaultConfiguration.class, value)); return true;
- case "hashicorpvaultconfiguration":
- case "HashicorpVaultConfiguration": target.setHashicorpVaultConfiguration(property(camelContext, org.apache.camel.vault.HashicorpVaultConfiguration.class, value)); return true;
- case "projectid":
- case "ProjectId": target.setProjectId(property(camelContext, java.lang.String.class, value)); return true;
- case "refreshenabled":
- case "RefreshEnabled": target.setRefreshEnabled(property(camelContext, boolean.class, value)); return true;
- case "refreshperiod":
- case "RefreshPeriod": target.setRefreshPeriod(property(camelContext, long.class, value)); return true;
- case "secrets":
- case "Secrets": target.setSecrets(property(camelContext, java.lang.String.class, value)); return true;
- case "serviceaccountkey":
- case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
- case "subscriptionname":
- case "SubscriptionName": target.setSubscriptionName(property(camelContext, java.lang.String.class, value)); return true;
- case "usedefaultinstance":
- case "UseDefaultInstance": target.setUseDefaultInstance(property(camelContext, boolean.class, value)); return true;
- default: return false;
- }
- }
-
- @Override
- public Class<?> getOptionType(String name, boolean ignoreCase) {
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "awsvaultconfiguration":
- case "AwsVaultConfiguration": return org.apache.camel.vault.AwsVaultConfiguration.class;
- case "azurevaultconfiguration":
- case "AzureVaultConfiguration": return org.apache.camel.vault.AzureVaultConfiguration.class;
- case "gcpvaultconfiguration":
- case "GcpVaultConfiguration": return org.apache.camel.vault.GcpVaultConfiguration.class;
- case "hashicorpvaultconfiguration":
- case "HashicorpVaultConfiguration": return org.apache.camel.vault.HashicorpVaultConfiguration.class;
- case "projectid":
- case "ProjectId": return java.lang.String.class;
- case "refreshenabled":
- case "RefreshEnabled": return boolean.class;
- case "refreshperiod":
- case "RefreshPeriod": return long.class;
- case "secrets":
- case "Secrets": return java.lang.String.class;
- case "serviceaccountkey":
- case "ServiceAccountKey": return java.lang.String.class;
- case "subscriptionname":
- case "SubscriptionName": return java.lang.String.class;
- case "usedefaultinstance":
- case "UseDefaultInstance": return boolean.class;
- default: return null;
- }
- }
-
- @Override
- public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- org.apache.camel.vault.GcpVaultConfiguration target = (org.apache.camel.vault.GcpVaultConfiguration) obj;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "awsvaultconfiguration":
- case "AwsVaultConfiguration": return target.getAwsVaultConfiguration();
- case "azurevaultconfiguration":
- case "AzureVaultConfiguration": return target.getAzureVaultConfiguration();
- case "gcpvaultconfiguration":
- case "GcpVaultConfiguration": return target.getGcpVaultConfiguration();
- case "hashicorpvaultconfiguration":
- case "HashicorpVaultConfiguration": return target.getHashicorpVaultConfiguration();
- case "projectid":
- case "ProjectId": return target.getProjectId();
- case "refreshenabled":
- case "RefreshEnabled": return target.isRefreshEnabled();
- case "refreshperiod":
- case "RefreshPeriod": return target.getRefreshPeriod();
- case "secrets":
- case "Secrets": return target.getSecrets();
- case "serviceaccountkey":
- case "ServiceAccountKey": return target.getServiceAccountKey();
- case "subscriptionname":
- case "SubscriptionName": return target.getSubscriptionName();
- case "usedefaultinstance":
- case "UseDefaultInstance": return target.isUseDefaultInstance();
- default: return null;
- }
- }
-}
-
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
index 7a503509765..91f1f3e5da8 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AwsVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.AwsVaultConfigurationConfigurer
+class=org.apache.camel.main.AwsVaultConfigurationConfigurer
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
index 0cd24e89184..a24e47a3724 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.AzureVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.AzureVaultConfigurationConfigurer
+class=org.apache.camel.main.AzureVaultConfigurationConfigurer
diff --git a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
index d8af04e4df3..0dd6674cfc1 100644
--- a/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
+++ b/core/camel-main/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.vault.HashicorpVaultConfiguration
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.vault.HashicorpVaultConfigurationConfigurer
+class=org.apache.camel.main.HashicorpVaultConfigurationConfigurer