This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 3f9d5e7 CAMEL-14864: Generte ExtendedCamelContextConfigurer in impl package so its not in root package which should be exposed only by camel-api; otherwise we have OSGi problems. 3f9d5e7 is described below commit 3f9d5e7f416241879f3a1cb7440b41c1d8da6470 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Apr 10 09:47:20 2020 +0200 CAMEL-14864: Generte ExtendedCamelContextConfigurer in impl package so its not in root package which should be exposed only by camel-api; otherwise we have OSGi problems. --- core/camel-core-engine/pom.xml | 2 +- .../{ => impl}/ExtendedCamelContextConfigurer.java | 2 +- ...ToleranceConfigurationDefinitionConfigurer.java | 110 ------------ .../HystrixConfigurationDefinitionConfigurer.java | 200 --------------------- ...ilience4jConfigurationDefinitionConfigurer.java | 140 --------------- .../apache/camel/configurer/ExtendedCamelContext | 2 +- .../FaultToleranceConfigurationDefinition | 2 - .../configurer/HystrixConfigurationDefinition | 2 - .../configurer/Resilience4jConfigurationDefinition | 2 - .../maven/packaging/GenerateConfigurerMojo.java | 28 +-- 10 files changed, 21 insertions(+), 469 deletions(-) diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml index dc2e7fe..62ce4f6 100644 --- a/core/camel-core-engine/pom.xml +++ b/core/camel-core-engine/pom.xml @@ -131,7 +131,7 @@ <configuration> <discoverClasses>false</discoverClasses> <!-- we want to have configurer for ExtendedCamelContext in camel-core-engine --> - <classes>org.apache.camel.ExtendedCamelContext</classes> + <classes>org.apache.camel.ExtendedCamelContext=org.apache.camel.impl.ExtendedCamelContext</classes> </configuration> </execution> </executions> diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java similarity index 99% rename from core/camel-core-engine/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java rename to core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java index 6858b66..2ba64b3 100644 --- a/core/camel-core-engine/src/generated/java/org/apache/camel/ExtendedCamelContextConfigurer.java +++ b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java @@ -1,5 +1,5 @@ /* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel; +package org.apache.camel.impl; import java.util.Map; diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java deleted file mode 100644 index 9d2c49d..0000000 --- a/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,110 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.FaultToleranceConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class FaultToleranceConfigurationDefinitionConfigurer 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.model.FaultToleranceConfigurationDefinition target = (org.apache.camel.model.FaultToleranceConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "bulkheadenabled": - case "BulkheadEnabled": target.setBulkheadEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadexecutorserviceref": - case "BulkheadExecutorServiceRef": target.setBulkheadExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": target.setBulkheadMaxConcurrentCalls(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadwaitingtaskqueue": - case "BulkheadWaitingTaskQueue": target.setBulkheadWaitingTaskQueue(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerref": - case "CircuitBreakerRef": target.setCircuitBreakerRef(property(camelContext, java.lang.String.class, value)); return true; - case "delay": - case "Delay": target.setDelay(property(camelContext, java.lang.String.class, value)); return true; - case "failureratio": - case "FailureRatio": target.setFailureRatio(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "requestvolumethreshold": - case "RequestVolumeThreshold": target.setRequestVolumeThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "successthreshold": - case "SuccessThreshold": target.setSuccessThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutduration": - case "TimeoutDuration": target.setTimeoutDuration(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutenabled": - case "TimeoutEnabled": target.setTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutpoolsize": - case "TimeoutPoolSize": target.setTimeoutPoolSize(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutscheduledexecutorserviceref": - case "TimeoutScheduledExecutorServiceRef": target.setTimeoutScheduledExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map<String, Object> getAllOptions(Object target) { - Map<String, Object> answer = new CaseInsensitiveMap(); - answer.put("BulkheadEnabled", java.lang.String.class); - answer.put("BulkheadExecutorServiceRef", java.lang.String.class); - answer.put("BulkheadMaxConcurrentCalls", java.lang.String.class); - answer.put("BulkheadWaitingTaskQueue", java.lang.String.class); - answer.put("CircuitBreakerRef", java.lang.String.class); - answer.put("Delay", java.lang.String.class); - answer.put("FailureRatio", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("RequestVolumeThreshold", java.lang.String.class); - answer.put("SuccessThreshold", java.lang.String.class); - answer.put("TimeoutDuration", java.lang.String.class); - answer.put("TimeoutEnabled", java.lang.String.class); - answer.put("TimeoutPoolSize", java.lang.String.class); - answer.put("TimeoutScheduledExecutorServiceRef", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.FaultToleranceConfigurationDefinition target = (org.apache.camel.model.FaultToleranceConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "bulkheadenabled": - case "BulkheadEnabled": return target.getBulkheadEnabled(); - case "bulkheadexecutorserviceref": - case "BulkheadExecutorServiceRef": return target.getBulkheadExecutorServiceRef(); - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": return target.getBulkheadMaxConcurrentCalls(); - case "bulkheadwaitingtaskqueue": - case "BulkheadWaitingTaskQueue": return target.getBulkheadWaitingTaskQueue(); - case "circuitbreakerref": - case "CircuitBreakerRef": return target.getCircuitBreakerRef(); - case "delay": - case "Delay": return target.getDelay(); - case "failureratio": - case "FailureRatio": return target.getFailureRatio(); - case "id": - case "Id": return target.getId(); - case "requestvolumethreshold": - case "RequestVolumeThreshold": return target.getRequestVolumeThreshold(); - case "successthreshold": - case "SuccessThreshold": return target.getSuccessThreshold(); - case "timeoutduration": - case "TimeoutDuration": return target.getTimeoutDuration(); - case "timeoutenabled": - case "TimeoutEnabled": return target.getTimeoutEnabled(); - case "timeoutpoolsize": - case "TimeoutPoolSize": return target.getTimeoutPoolSize(); - case "timeoutscheduledexecutorserviceref": - case "TimeoutScheduledExecutorServiceRef": return target.getTimeoutScheduledExecutorServiceRef(); - default: return null; - } - } -} - diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java deleted file mode 100644 index c2bc575..0000000 --- a/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,200 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.HystrixConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class HystrixConfigurationDefinitionConfigurer 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.model.HystrixConfigurationDefinition target = (org.apache.camel.model.HystrixConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowmaximumsizetodivergefromcoresize": - case "AllowMaximumSizeToDivergeFromCoreSize": target.setAllowMaximumSizeToDivergeFromCoreSize(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerenabled": - case "CircuitBreakerEnabled": target.setCircuitBreakerEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakererrorthresholdpercentage": - case "CircuitBreakerErrorThresholdPercentage": target.setCircuitBreakerErrorThresholdPercentage(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerforceclosed": - case "CircuitBreakerForceClosed": target.setCircuitBreakerForceClosed(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerforceopen": - case "CircuitBreakerForceOpen": target.setCircuitBreakerForceOpen(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerrequestvolumethreshold": - case "CircuitBreakerRequestVolumeThreshold": target.setCircuitBreakerRequestVolumeThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakersleepwindowinmilliseconds": - case "CircuitBreakerSleepWindowInMilliseconds": target.setCircuitBreakerSleepWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "corepoolsize": - case "CorePoolSize": target.setCorePoolSize(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationsemaphoremaxconcurrentrequests": - case "ExecutionIsolationSemaphoreMaxConcurrentRequests": target.setExecutionIsolationSemaphoreMaxConcurrentRequests(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationstrategy": - case "ExecutionIsolationStrategy": target.setExecutionIsolationStrategy(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationthreadinterruptontimeout": - case "ExecutionIsolationThreadInterruptOnTimeout": target.setExecutionIsolationThreadInterruptOnTimeout(property(camelContext, java.lang.String.class, value)); return true; - case "executiontimeoutenabled": - case "ExecutionTimeoutEnabled": target.setExecutionTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "executiontimeoutinmilliseconds": - case "ExecutionTimeoutInMilliseconds": target.setExecutionTimeoutInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "fallbackenabled": - case "FallbackEnabled": target.setFallbackEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "fallbackisolationsemaphoremaxconcurrentrequests": - case "FallbackIsolationSemaphoreMaxConcurrentRequests": target.setFallbackIsolationSemaphoreMaxConcurrentRequests(property(camelContext, java.lang.String.class, value)); return true; - case "groupkey": - case "GroupKey": target.setGroupKey(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "keepalivetime": - case "KeepAliveTime": target.setKeepAliveTime(property(camelContext, java.lang.String.class, value)); return true; - case "maxqueuesize": - case "MaxQueueSize": target.setMaxQueueSize(property(camelContext, java.lang.String.class, value)); return true; - case "maximumsize": - case "MaximumSize": target.setMaximumSize(property(camelContext, java.lang.String.class, value)); return true; - case "metricshealthsnapshotintervalinmilliseconds": - case "MetricsHealthSnapshotIntervalInMilliseconds": target.setMetricsHealthSnapshotIntervalInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilebucketsize": - case "MetricsRollingPercentileBucketSize": target.setMetricsRollingPercentileBucketSize(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentileenabled": - case "MetricsRollingPercentileEnabled": target.setMetricsRollingPercentileEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilewindowbuckets": - case "MetricsRollingPercentileWindowBuckets": target.setMetricsRollingPercentileWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilewindowinmilliseconds": - case "MetricsRollingPercentileWindowInMilliseconds": target.setMetricsRollingPercentileWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingstatisticalwindowbuckets": - case "MetricsRollingStatisticalWindowBuckets": target.setMetricsRollingStatisticalWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingstatisticalwindowinmilliseconds": - case "MetricsRollingStatisticalWindowInMilliseconds": target.setMetricsRollingStatisticalWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "queuesizerejectionthreshold": - case "QueueSizeRejectionThreshold": target.setQueueSizeRejectionThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "requestlogenabled": - case "RequestLogEnabled": target.setRequestLogEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolkey": - case "ThreadPoolKey": target.setThreadPoolKey(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolrollingnumberstatisticalwindowbuckets": - case "ThreadPoolRollingNumberStatisticalWindowBuckets": target.setThreadPoolRollingNumberStatisticalWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolrollingnumberstatisticalwindowinmilliseconds": - case "ThreadPoolRollingNumberStatisticalWindowInMilliseconds": target.setThreadPoolRollingNumberStatisticalWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map<String, Object> getAllOptions(Object target) { - Map<String, Object> answer = new CaseInsensitiveMap(); - answer.put("AllowMaximumSizeToDivergeFromCoreSize", java.lang.String.class); - answer.put("CircuitBreakerEnabled", java.lang.String.class); - answer.put("CircuitBreakerErrorThresholdPercentage", java.lang.String.class); - answer.put("CircuitBreakerForceClosed", java.lang.String.class); - answer.put("CircuitBreakerForceOpen", java.lang.String.class); - answer.put("CircuitBreakerRequestVolumeThreshold", java.lang.String.class); - answer.put("CircuitBreakerSleepWindowInMilliseconds", java.lang.String.class); - answer.put("CorePoolSize", java.lang.String.class); - answer.put("ExecutionIsolationSemaphoreMaxConcurrentRequests", java.lang.String.class); - answer.put("ExecutionIsolationStrategy", java.lang.String.class); - answer.put("ExecutionIsolationThreadInterruptOnTimeout", java.lang.String.class); - answer.put("ExecutionTimeoutEnabled", java.lang.String.class); - answer.put("ExecutionTimeoutInMilliseconds", java.lang.String.class); - answer.put("FallbackEnabled", java.lang.String.class); - answer.put("FallbackIsolationSemaphoreMaxConcurrentRequests", java.lang.String.class); - answer.put("GroupKey", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("KeepAliveTime", java.lang.String.class); - answer.put("MaxQueueSize", java.lang.String.class); - answer.put("MaximumSize", java.lang.String.class); - answer.put("MetricsHealthSnapshotIntervalInMilliseconds", java.lang.String.class); - answer.put("MetricsRollingPercentileBucketSize", java.lang.String.class); - answer.put("MetricsRollingPercentileEnabled", java.lang.String.class); - answer.put("MetricsRollingPercentileWindowBuckets", java.lang.String.class); - answer.put("MetricsRollingPercentileWindowInMilliseconds", java.lang.String.class); - answer.put("MetricsRollingStatisticalWindowBuckets", java.lang.String.class); - answer.put("MetricsRollingStatisticalWindowInMilliseconds", java.lang.String.class); - answer.put("QueueSizeRejectionThreshold", java.lang.String.class); - answer.put("RequestLogEnabled", java.lang.String.class); - answer.put("ThreadPoolKey", java.lang.String.class); - answer.put("ThreadPoolRollingNumberStatisticalWindowBuckets", java.lang.String.class); - answer.put("ThreadPoolRollingNumberStatisticalWindowInMilliseconds", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.HystrixConfigurationDefinition target = (org.apache.camel.model.HystrixConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowmaximumsizetodivergefromcoresize": - case "AllowMaximumSizeToDivergeFromCoreSize": return target.getAllowMaximumSizeToDivergeFromCoreSize(); - case "circuitbreakerenabled": - case "CircuitBreakerEnabled": return target.getCircuitBreakerEnabled(); - case "circuitbreakererrorthresholdpercentage": - case "CircuitBreakerErrorThresholdPercentage": return target.getCircuitBreakerErrorThresholdPercentage(); - case "circuitbreakerforceclosed": - case "CircuitBreakerForceClosed": return target.getCircuitBreakerForceClosed(); - case "circuitbreakerforceopen": - case "CircuitBreakerForceOpen": return target.getCircuitBreakerForceOpen(); - case "circuitbreakerrequestvolumethreshold": - case "CircuitBreakerRequestVolumeThreshold": return target.getCircuitBreakerRequestVolumeThreshold(); - case "circuitbreakersleepwindowinmilliseconds": - case "CircuitBreakerSleepWindowInMilliseconds": return target.getCircuitBreakerSleepWindowInMilliseconds(); - case "corepoolsize": - case "CorePoolSize": return target.getCorePoolSize(); - case "executionisolationsemaphoremaxconcurrentrequests": - case "ExecutionIsolationSemaphoreMaxConcurrentRequests": return target.getExecutionIsolationSemaphoreMaxConcurrentRequests(); - case "executionisolationstrategy": - case "ExecutionIsolationStrategy": return target.getExecutionIsolationStrategy(); - case "executionisolationthreadinterruptontimeout": - case "ExecutionIsolationThreadInterruptOnTimeout": return target.getExecutionIsolationThreadInterruptOnTimeout(); - case "executiontimeoutenabled": - case "ExecutionTimeoutEnabled": return target.getExecutionTimeoutEnabled(); - case "executiontimeoutinmilliseconds": - case "ExecutionTimeoutInMilliseconds": return target.getExecutionTimeoutInMilliseconds(); - case "fallbackenabled": - case "FallbackEnabled": return target.getFallbackEnabled(); - case "fallbackisolationsemaphoremaxconcurrentrequests": - case "FallbackIsolationSemaphoreMaxConcurrentRequests": return target.getFallbackIsolationSemaphoreMaxConcurrentRequests(); - case "groupkey": - case "GroupKey": return target.getGroupKey(); - case "id": - case "Id": return target.getId(); - case "keepalivetime": - case "KeepAliveTime": return target.getKeepAliveTime(); - case "maxqueuesize": - case "MaxQueueSize": return target.getMaxQueueSize(); - case "maximumsize": - case "MaximumSize": return target.getMaximumSize(); - case "metricshealthsnapshotintervalinmilliseconds": - case "MetricsHealthSnapshotIntervalInMilliseconds": return target.getMetricsHealthSnapshotIntervalInMilliseconds(); - case "metricsrollingpercentilebucketsize": - case "MetricsRollingPercentileBucketSize": return target.getMetricsRollingPercentileBucketSize(); - case "metricsrollingpercentileenabled": - case "MetricsRollingPercentileEnabled": return target.getMetricsRollingPercentileEnabled(); - case "metricsrollingpercentilewindowbuckets": - case "MetricsRollingPercentileWindowBuckets": return target.getMetricsRollingPercentileWindowBuckets(); - case "metricsrollingpercentilewindowinmilliseconds": - case "MetricsRollingPercentileWindowInMilliseconds": return target.getMetricsRollingPercentileWindowInMilliseconds(); - case "metricsrollingstatisticalwindowbuckets": - case "MetricsRollingStatisticalWindowBuckets": return target.getMetricsRollingStatisticalWindowBuckets(); - case "metricsrollingstatisticalwindowinmilliseconds": - case "MetricsRollingStatisticalWindowInMilliseconds": return target.getMetricsRollingStatisticalWindowInMilliseconds(); - case "queuesizerejectionthreshold": - case "QueueSizeRejectionThreshold": return target.getQueueSizeRejectionThreshold(); - case "requestlogenabled": - case "RequestLogEnabled": return target.getRequestLogEnabled(); - case "threadpoolkey": - case "ThreadPoolKey": return target.getThreadPoolKey(); - case "threadpoolrollingnumberstatisticalwindowbuckets": - case "ThreadPoolRollingNumberStatisticalWindowBuckets": return target.getThreadPoolRollingNumberStatisticalWindowBuckets(); - case "threadpoolrollingnumberstatisticalwindowinmilliseconds": - case "ThreadPoolRollingNumberStatisticalWindowInMilliseconds": return target.getThreadPoolRollingNumberStatisticalWindowInMilliseconds(); - default: return null; - } - } -} - diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java deleted file mode 100644 index f397b9c..0000000 --- a/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,140 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.Resilience4jConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class Resilience4jConfigurationDefinitionConfigurer 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.model.Resilience4jConfigurationDefinition target = (org.apache.camel.model.Resilience4jConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "automatictransitionfromopentohalfopenenabled": - case "AutomaticTransitionFromOpenToHalfOpenEnabled": target.setAutomaticTransitionFromOpenToHalfOpenEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadenabled": - case "BulkheadEnabled": target.setBulkheadEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": target.setBulkheadMaxConcurrentCalls(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxwaitduration": - case "BulkheadMaxWaitDuration": target.setBulkheadMaxWaitDuration(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerref": - case "CircuitBreakerRef": target.setCircuitBreakerRef(property(camelContext, java.lang.String.class, value)); return true; - case "configref": - case "ConfigRef": target.setConfigRef(property(camelContext, java.lang.String.class, value)); return true; - case "failureratethreshold": - case "FailureRateThreshold": target.setFailureRateThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "minimumnumberofcalls": - case "MinimumNumberOfCalls": target.setMinimumNumberOfCalls(property(camelContext, java.lang.String.class, value)); return true; - case "permittednumberofcallsinhalfopenstate": - case "PermittedNumberOfCallsInHalfOpenState": target.setPermittedNumberOfCallsInHalfOpenState(property(camelContext, java.lang.String.class, value)); return true; - case "slidingwindowsize": - case "SlidingWindowSize": target.setSlidingWindowSize(property(camelContext, java.lang.String.class, value)); return true; - case "slidingwindowtype": - case "SlidingWindowType": target.setSlidingWindowType(property(camelContext, java.lang.String.class, value)); return true; - case "slowcalldurationthreshold": - case "SlowCallDurationThreshold": target.setSlowCallDurationThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "slowcallratethreshold": - case "SlowCallRateThreshold": target.setSlowCallRateThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutcancelrunningfuture": - case "TimeoutCancelRunningFuture": target.setTimeoutCancelRunningFuture(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutduration": - case "TimeoutDuration": target.setTimeoutDuration(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutenabled": - case "TimeoutEnabled": target.setTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutexecutorserviceref": - case "TimeoutExecutorServiceRef": target.setTimeoutExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - case "waitdurationinopenstate": - case "WaitDurationInOpenState": target.setWaitDurationInOpenState(property(camelContext, java.lang.String.class, value)); return true; - case "writablestacktraceenabled": - case "WritableStackTraceEnabled": target.setWritableStackTraceEnabled(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map<String, Object> getAllOptions(Object target) { - Map<String, Object> answer = new CaseInsensitiveMap(); - answer.put("AutomaticTransitionFromOpenToHalfOpenEnabled", java.lang.String.class); - answer.put("BulkheadEnabled", java.lang.String.class); - answer.put("BulkheadMaxConcurrentCalls", java.lang.String.class); - answer.put("BulkheadMaxWaitDuration", java.lang.String.class); - answer.put("CircuitBreakerRef", java.lang.String.class); - answer.put("ConfigRef", java.lang.String.class); - answer.put("FailureRateThreshold", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("MinimumNumberOfCalls", java.lang.String.class); - answer.put("PermittedNumberOfCallsInHalfOpenState", java.lang.String.class); - answer.put("SlidingWindowSize", java.lang.String.class); - answer.put("SlidingWindowType", java.lang.String.class); - answer.put("SlowCallDurationThreshold", java.lang.String.class); - answer.put("SlowCallRateThreshold", java.lang.String.class); - answer.put("TimeoutCancelRunningFuture", java.lang.String.class); - answer.put("TimeoutDuration", java.lang.String.class); - answer.put("TimeoutEnabled", java.lang.String.class); - answer.put("TimeoutExecutorServiceRef", java.lang.String.class); - answer.put("WaitDurationInOpenState", java.lang.String.class); - answer.put("WritableStackTraceEnabled", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.Resilience4jConfigurationDefinition target = (org.apache.camel.model.Resilience4jConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "automatictransitionfromopentohalfopenenabled": - case "AutomaticTransitionFromOpenToHalfOpenEnabled": return target.getAutomaticTransitionFromOpenToHalfOpenEnabled(); - case "bulkheadenabled": - case "BulkheadEnabled": return target.getBulkheadEnabled(); - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": return target.getBulkheadMaxConcurrentCalls(); - case "bulkheadmaxwaitduration": - case "BulkheadMaxWaitDuration": return target.getBulkheadMaxWaitDuration(); - case "circuitbreakerref": - case "CircuitBreakerRef": return target.getCircuitBreakerRef(); - case "configref": - case "ConfigRef": return target.getConfigRef(); - case "failureratethreshold": - case "FailureRateThreshold": return target.getFailureRateThreshold(); - case "id": - case "Id": return target.getId(); - case "minimumnumberofcalls": - case "MinimumNumberOfCalls": return target.getMinimumNumberOfCalls(); - case "permittednumberofcallsinhalfopenstate": - case "PermittedNumberOfCallsInHalfOpenState": return target.getPermittedNumberOfCallsInHalfOpenState(); - case "slidingwindowsize": - case "SlidingWindowSize": return target.getSlidingWindowSize(); - case "slidingwindowtype": - case "SlidingWindowType": return target.getSlidingWindowType(); - case "slowcalldurationthreshold": - case "SlowCallDurationThreshold": return target.getSlowCallDurationThreshold(); - case "slowcallratethreshold": - case "SlowCallRateThreshold": return target.getSlowCallRateThreshold(); - case "timeoutcancelrunningfuture": - case "TimeoutCancelRunningFuture": return target.getTimeoutCancelRunningFuture(); - case "timeoutduration": - case "TimeoutDuration": return target.getTimeoutDuration(); - case "timeoutenabled": - case "TimeoutEnabled": return target.getTimeoutEnabled(); - case "timeoutexecutorserviceref": - case "TimeoutExecutorServiceRef": return target.getTimeoutExecutorServiceRef(); - case "waitdurationinopenstate": - case "WaitDurationInOpenState": return target.getWaitDurationInOpenState(); - case "writablestacktraceenabled": - case "WritableStackTraceEnabled": return target.getWritableStackTraceEnabled(); - default: return null; - } - } -} - diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext index 4d22c93..2a6d7b3 100644 --- a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext +++ b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext @@ -1,2 +1,2 @@ # Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.ExtendedCamelContextConfigurer +class=org.apache.camel.impl.ExtendedCamelContextConfigurer diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition deleted file mode 100644 index c84d003..0000000 --- a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.FaultToleranceConfigurationDefinitionConfigurer diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition deleted file mode 100644 index 495b0f6..0000000 --- a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.HystrixConfigurationDefinitionConfigurer diff --git a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition b/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition deleted file mode 100644 index b2c684d..0000000 --- a/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.Resilience4jConfigurationDefinitionConfigurer diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java index d5be300..fa38aa1 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java @@ -72,6 +72,8 @@ public class GenerateConfigurerMojo extends AbstractGeneratorMojo { /** * To generate configurer for these classes. + * The syntax is either <tt>fqn</tt> or </tt>fqn=targetFqn</tt>. + * This allows to map source class to target class to generate the source code using a different classname. */ @Parameter protected String[] classes; @@ -147,19 +149,25 @@ public class GenerateConfigurerMojo extends AbstractGeneratorMojo { for (String fqn : set) { try { + String targetFqn = fqn; + int pos = fqn.indexOf('='); + if (pos != -1) { + targetFqn = fqn.substring(pos + 1); + fqn = fqn.substring(0, pos); + } List<Option> options = processClass(fqn); - generateConfigurer(fqn, options); - generateMetaInfConfigurer(fqn); + generateConfigurer(fqn, targetFqn, options); + generateMetaInfConfigurer(targetFqn); } catch (Exception e) { throw new MojoExecutionException("Error processing class: " + fqn, e); } } } - private List<Option> processClass(String name) throws ClassNotFoundException { + private List<Option> processClass(String fqn) throws ClassNotFoundException { List<Option> answer = new ArrayList<>(); - Class clazz = projectClassLoader.loadClass(name); + Class clazz = projectClassLoader.loadClass(fqn); // find all public setters ReflectionUtils.doWithMethods(clazz, m -> { boolean setter = m.getName().length() >= 4 && m.getName().startsWith("set") && Character.isUpperCase(m.getName().charAt(3)); @@ -198,12 +206,12 @@ public class GenerateConfigurerMojo extends AbstractGeneratorMojo { return true; } - private void generateConfigurer(String name, List<Option> options) throws IOException { - int pos = name.lastIndexOf('.'); - String pn = name.substring(0, pos); - String cn = name.substring(pos + 1) + "Configurer"; - String en = name; - String pfqn = name; + private void generateConfigurer(String fqn, String targetFqn, List<Option> options) throws IOException { + int pos = targetFqn.lastIndexOf('.'); + String pn = targetFqn.substring(0, pos); + String cn = targetFqn.substring(pos + 1) + "Configurer"; + String en = fqn; + String pfqn = fqn; String psn = "org.apache.camel.support.component.PropertyConfigurerSupport"; StringWriter sw = new StringWriter();