+ * 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 com.example.httpstarter; + +import javax.net.ssl.HostnameVerifier; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Stands in for an application class that happens to have a field of a type HttpComponentConverter registers itself + * for. Deliberately outside the org.apache.camel packages. + */ +@ConfigurationProperties(prefix = "thirdparty.http") +public class ThirdPartyHttpProperties { + + private HostnameVerifier verifier; + + public HostnameVerifier getVerifier() { + return verifier; + } + + public void setVerifier(HostnameVerifier verifier) { + this.verifier = verifier; + } +} diff --git a/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentBeanReferenceBindingTest.java b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentBeanReferenceBindingTest.java new file mode 100644 index 000000000000..e351743589b7 --- /dev/null +++ b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentBeanReferenceBindingTest.java @@ -0,0 +1,126 @@ +/* + * 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.component.http.springboot; + +import com.example.httpstarter.ThirdPartyHttpProperties; +import org.apache.camel.support.jsse.SSLContextParameters; +import org.junit.jupiter.api.Test; +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNull; + +/** + * A complex (object) typed option such as {@code sslContextParameters} is configured with a reference to a bean in the + * Spring application context. A value that cannot be resolved must be reported, not silently turned into null. + */ +class HttpComponentBeanReferenceBindingTest { + + private final ApplicationContextRunner runner = new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(TestConfiguration.class)) + .withUserConfiguration(HttpComponentConverter.class); + + @Test + void testBeanSyntaxIsResolved() { + runner.withPropertyValues("camel.component.http.ssl-context-parameters=#bean:mySslContextParameters") + .run(context -> { + assertThat(context).hasNotFailed(); + assertThat(context.getBean(HttpComponentConfiguration.class).getSslContextParameters()) + .isSameAs(context.getBean("mySslContextParameters")); + }); + } + + @Test + void testHashSyntaxIsResolved() { + runner.withPropertyValues("camel.component.http.ssl-context-parameters=#mySslContextParameters") + .run(context -> { + assertThat(context).hasNotFailed(); + assertThat(context.getBean(HttpComponentConfiguration.class).getSslContextParameters()) + .isSameAs(context.getBean("mySslContextParameters")); + }); + } + + @Test + void testPlainBeanIdIsResolved() { + // a plain bean id used to be silently converted to null + runner.withPropertyValues("camel.component.http.ssl-context-parameters=mySslContextParameters") + .run(context -> { + assertThat(context).hasNotFailed(); + assertThat(context.getBean(HttpComponentConfiguration.class).getSslContextParameters()) + .isSameAs(context.getBean("mySslContextParameters")); + }); + } + + @Test + void testUnresolvableValueIsReported() { + // a typo used to leave the option unset without any error + runner.withPropertyValues("camel.component.http.ssl-context-parameters=#bean:mySslContextParametrs") + .run(context -> { + assertThat(context).hasFailed(); + assertThat(context.getStartupFailure()) + .hasStackTraceContaining("mySslContextParametrs") + .hasStackTraceContaining("camel.component.http"); + }); + } + + @Test + void testThirdPartyPropertiesAreNotIntercepted() { + // HttpComponentConverter is registered with @ConfigurationPropertiesBinding and so takes part in every + // @ConfigurationProperties binding, not only in Camel's own. Adding the starter to the classpath must not + // make an unrelated property of the same type fail to bind. + new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(ThirdPartyConfiguration.class)) + .withUserConfiguration(HttpComponentConverter.class) + .withPropertyValues("thirdparty.http.verifier=someValue") + .run(context -> { + assertThat(context).hasNotFailed(); + assertNull(context.getBean(ThirdPartyHttpProperties.class).getVerifier()); + }); + } + + @Test + void testThirdPartyPropertiesStillResolveHashReferences() { + new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(ThirdPartyConfiguration.class)) + .withUserConfiguration(HttpComponentConverter.class) + .withPropertyValues("thirdparty.http.verifier=#bean:noSuchVerifier") + .run(context -> { + assertThat(context).hasFailed(); + assertThat(context.getStartupFailure()).hasStackTraceContaining("noSuchVerifier"); + }); + } + + @Configuration(proxyBeanMethods = false) + @EnableConfigurationProperties(ThirdPartyHttpProperties.class) + static class ThirdPartyConfiguration { + } + + @Configuration(proxyBeanMethods = false) + @EnableConfigurationProperties(HttpComponentConfiguration.class) + static class TestConfiguration { + + @Bean(name = "mySslContextParameters") + SSLContextParameters mySslContextParameters() { + return new SSLContextParameters(); + } + } + +} diff --git a/components-starter/camel-huaweicloud-dms-starter/src/main/java/org/apache/camel/component/huaweicloud/dms/springboot/DMSComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-dms-starter/src/main/java/org/apache/camel/component/huaweicloud/dms/springboot/DMSComponentAutoConfiguration.java index 5189729966c5..42676d39929f 100644 --- a/components-starter/camel-huaweicloud-dms-starter/src/main/java/org/apache/camel/component/huaweicloud/dms/springboot/DMSComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-dms-starter/src/main/java/org/apache/camel/component/huaweicloud/dms/springboot/DMSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureDMSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-dms", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-frs-starter/src/main/java/org/apache/camel/component/huaweicloud/frs/springboot/FaceRecognitionComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-frs-starter/src/main/java/org/apache/camel/component/huaweicloud/frs/springboot/FaceRecognitionComponentAutoConfiguration.java index ae53c813d9c9..468cab4a72ff 100644 --- a/components-starter/camel-huaweicloud-frs-starter/src/main/java/org/apache/camel/component/huaweicloud/frs/springboot/FaceRecognitionComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-frs-starter/src/main/java/org/apache/camel/component/huaweicloud/frs/springboot/FaceRecognitionComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureFaceRecognitionComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-frs", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-functiongraph-starter/src/main/java/org/apache/camel/springboot/FunctionGraphComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-functiongraph-starter/src/main/java/org/apache/camel/springboot/FunctionGraphComponentAutoConfiguration.java index 67d700e15ec9..9b5266309e08 100644 --- a/components-starter/camel-huaweicloud-functiongraph-starter/src/main/java/org/apache/camel/springboot/FunctionGraphComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-functiongraph-starter/src/main/java/org/apache/camel/springboot/FunctionGraphComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureFunctionGraphComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-functiongraph", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-iam-starter/src/main/java/org/apache/camel/component/huaweicloud/iam/springboot/IAMComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-iam-starter/src/main/java/org/apache/camel/component/huaweicloud/iam/springboot/IAMComponentAutoConfiguration.java index 8b54bc66b357..ee08de90d55f 100644 --- a/components-starter/camel-huaweicloud-iam-starter/src/main/java/org/apache/camel/component/huaweicloud/iam/springboot/IAMComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-iam-starter/src/main/java/org/apache/camel/component/huaweicloud/iam/springboot/IAMComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIAMComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-iam", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-imagerecognition-starter/src/main/java/org/apache/camel/component/huaweicloud/image/springboot/ImageRecognitionComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-imagerecognition-starter/src/main/java/org/apache/camel/component/huaweicloud/image/springboot/ImageRecognitionComponentAutoConfiguration.java index c71b009712a1..964ea56be0f5 100644 --- a/components-starter/camel-huaweicloud-imagerecognition-starter/src/main/java/org/apache/camel/component/huaweicloud/image/springboot/ImageRecognitionComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-imagerecognition-starter/src/main/java/org/apache/camel/component/huaweicloud/image/springboot/ImageRecognitionComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureImageRecognitionComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-imagerecognition", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-obs-starter/src/main/java/org/apache/camel/component/huaweicloud/obs/springboot/OBSComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-obs-starter/src/main/java/org/apache/camel/component/huaweicloud/obs/springboot/OBSComponentAutoConfiguration.java index 29b481ab06bc..a8b504035557 100644 --- a/components-starter/camel-huaweicloud-obs-starter/src/main/java/org/apache/camel/component/huaweicloud/obs/springboot/OBSComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-obs-starter/src/main/java/org/apache/camel/component/huaweicloud/obs/springboot/OBSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOBSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-obs", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huaweicloud-smn-starter/src/main/java/org/apache/camel/component/huaweicloud/smn/springboot/SimpleNotificationComponentAutoConfiguration.java b/components-starter/camel-huaweicloud-smn-starter/src/main/java/org/apache/camel/component/huaweicloud/smn/springboot/SimpleNotificationComponentAutoConfiguration.java index 66b04a66049b..30ea10217276 100644 --- a/components-starter/camel-huaweicloud-smn-starter/src/main/java/org/apache/camel/component/huaweicloud/smn/springboot/SimpleNotificationComponentAutoConfiguration.java +++ b/components-starter/camel-huaweicloud-smn-starter/src/main/java/org/apache/camel/component/huaweicloud/smn/springboot/SimpleNotificationComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSimpleNotificationComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.hwcloud-smn", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentAutoConfiguration.java b/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentAutoConfiguration.java index 29c4e700ed8d..7a9f6eb38315 100644 --- a/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentAutoConfiguration.java +++ b/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureHuggingFaceComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.huggingface", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentConverter.java b/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentConverter.java index 22c166676209..5456b4297ad8 100644 --- a/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentConverter.java +++ b/components-starter/camel-huggingface-starter/src/main/java/org/apache/camel/component/huggingface/springboot/HuggingFaceComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.huggingface.HuggingFaceConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.huggingface.HuggingFaceConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.huggingface"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentAutoConfiguration.java b/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentAutoConfiguration.java index 5ac0103ddcab..e66d9d040f7c 100644 --- a/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIBMCOSComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-cos", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentConverter.java b/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentConverter.java index 77f5c0a57826..5424d30d7c8e 100644 --- a/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentConverter.java +++ b/components-starter/camel-ibm-cos-starter/src/main/java/org/apache/camel/component/ibm/cos/springboot/IBMCOSComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.cos.IBMCOSConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.cos.IBMCOSConfiguration.class); - case "com.ibm.cloud.objectstorage.services.s3.AmazonS3": return applicationContext.getBean(ref, com.ibm.cloud.objectstorage.services.s3.AmazonS3.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-cos"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-secrets-manager-starter/src/main/java/org/apache/camel/component/ibm/secrets/manager/springboot/IBMSecretsManagerComponentAutoConfiguration.java b/components-starter/camel-ibm-secrets-manager-starter/src/main/java/org/apache/camel/component/ibm/secrets/manager/springboot/IBMSecretsManagerComponentAutoConfiguration.java index 7dde420dd1b0..25e21a7c7d59 100644 --- a/components-starter/camel-ibm-secrets-manager-starter/src/main/java/org/apache/camel/component/ibm/secrets/manager/springboot/IBMSecretsManagerComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-secrets-manager-starter/src/main/java/org/apache/camel/component/ibm/secrets/manager/springboot/IBMSecretsManagerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIBMSecretsManagerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-secrets-manager", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentAutoConfiguration.java b/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentAutoConfiguration.java index cbb5cb9b2d0c..4fcddb46b313 100644 --- a/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWatsonDiscoveryComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-watson-discovery", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentConverter.java b/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentConverter.java index be8f10588d49..548e1c50df39 100644 --- a/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentConverter.java +++ b/components-starter/camel-ibm-watson-discovery-starter/src/main/java/org/apache/camel/component/ibm/watson/discovery/springboot/WatsonDiscoveryComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.watson.discovery.WatsonDiscoveryConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.watson.discovery.WatsonDiscoveryConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-watson-discovery"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentAutoConfiguration.java b/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentAutoConfiguration.java index 124f92ac6815..9e405bb03a74 100644 --- a/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWatsonLanguageComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-watson-language", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentConverter.java b/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentConverter.java index 5f97f154758a..290b00d67f66 100644 --- a/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentConverter.java +++ b/components-starter/camel-ibm-watson-language-starter/src/main/java/org/apache/camel/component/ibm/watson/language/springboot/WatsonLanguageComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.watson.language.WatsonLanguageConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.watson.language.WatsonLanguageConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-watson-language"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentAutoConfiguration.java b/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentAutoConfiguration.java index 1f2fe473b5b3..eb15aa7ebabc 100644 --- a/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWatsonSpeechToTextComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-watson-speech-to-text", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentConverter.java b/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentConverter.java index 879972f101d1..408638ef1fab 100644 --- a/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentConverter.java +++ b/components-starter/camel-ibm-watson-speech-to-text-starter/src/main/java/org/apache/camel/component/ibm/watson/stt/springboot/WatsonSpeechToTextComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.watson.stt.WatsonSpeechToTextConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.watson.stt.WatsonSpeechToTextConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-watson-speech-to-text"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentAutoConfiguration.java b/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentAutoConfiguration.java index 6b1f4e525e3f..6dc83b0894f3 100644 --- a/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWatsonTextToSpeechComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-watson-text-to-speech", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentConverter.java b/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentConverter.java index 7d5a2ca7800a..9fc5e951b2cf 100644 --- a/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentConverter.java +++ b/components-starter/camel-ibm-watson-text-to-speech-starter/src/main/java/org/apache/camel/component/ibm/watson/tts/springboot/WatsonTextToSpeechComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.watson.tts.WatsonTextToSpeechConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.watson.tts.WatsonTextToSpeechConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-watson-text-to-speech"); } } \ No newline at end of file diff --git a/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentAutoConfiguration.java b/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentAutoConfiguration.java index 728f04655209..9ac6352fd04d 100644 --- a/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentAutoConfiguration.java +++ b/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWatsonxAiComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ibm-watsonx-ai", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentConverter.java b/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentConverter.java index 6c081dab25c2..6d6ee176c2c7 100644 --- a/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentConverter.java +++ b/components-starter/camel-ibm-watsonx-ai-starter/src/main/java/org/apache/camel/component/ibm/watsonx/ai/springboot/WatsonxAiComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.ibm.watsonx.ai.WatsonxAiConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ibm.watsonx.ai.WatsonxAiConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ibm-watsonx-ai"); } } \ No newline at end of file diff --git a/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java b/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java index 5f2e6573b3f2..c4653b0da2f2 100644 --- a/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java +++ b/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureICalDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.ical", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentAutoConfiguration.java b/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentAutoConfiguration.java index f810c061bcb9..9b6f6e593da9 100644 --- a/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentAutoConfiguration.java +++ b/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIggyComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.iggy", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentConverter.java b/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentConverter.java index c41688415025..f3445d3e45bc 100644 --- a/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentConverter.java +++ b/components-starter/camel-iggy-starter/src/main/java/org/apache/camel/component/iggy/springboot/IggyComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.iggy.IggyConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.iggy.IggyConfiguration.class); - case "org.apache.iggy.message.Partitioning": return applicationContext.getBean(ref, org.apache.iggy.message.Partitioning.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.iggy"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java index 27106605c42a..b5c222c2ddc9 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteCacheComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-cache", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java index e8a02bfe749d..b009bf8a7a18 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-cache"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java index bd20566ad7f5..10f6a46d856b 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteComputeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-compute", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java index 9f67b6801f40..2bbb0151eb0e 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-compute"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java index e8b39f8f23ea..6ad2331a853a 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteEventsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-events", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java index 0d99e5c596fa..f1c88c644f01 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-events"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java index 1dc395a616a1..813f8a1eccad 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteIdGenComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-idgen", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java index d938a9ad5e32..012e6f3ff35e 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-idgen"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java index 090dac6a2fa9..c507b8ad308e 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteMessagingComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-messaging", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java index b269956eebe4..7c1946f7d6a5 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-messaging"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java index a5441f6b469d..6288dec54013 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteQueueComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-queue", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java index 04b5a805a13e..65ceef1cee50 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-queue"); } } \ No newline at end of file diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java index 3d0e8488ce53..b2e575cab2b6 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureIgniteSetComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ignite-set", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java index ae2d26678141..5bc3937ff3d2 100644 --- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java +++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ignite.Ignite": return applicationContext.getBean(ref, org.apache.ignite.Ignite.class); - case "org.apache.ignite.configuration.IgniteConfiguration": return applicationContext.getBean(ref, org.apache.ignite.configuration.IgniteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ignite-set"); } } \ No newline at end of file diff --git a/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentAutoConfiguration.java b/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentAutoConfiguration.java index e4ebafb59e2b..9f648392b9a6 100644 --- a/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentAutoConfiguration.java +++ b/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureInfinispanEmbeddedComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.infinispan-embedded", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentConverter.java b/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentConverter.java index 1ef31865137e..e2877619d9d9 100644 --- a/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentConverter.java +++ b/components-starter/camel-infinispan-embedded-starter/src/main/java/org/apache/camel/component/infinispan/embedded/springboot/InfinispanEmbeddedComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedConfiguration.class); - case "org.apache.camel.component.infinispan.InfinispanQueryBuilder": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.InfinispanQueryBuilder.class); - case "org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedCustomListener": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedCustomListener.class); - case "org.infinispan.manager.EmbeddedCacheManager": return applicationContext.getBean(ref, org.infinispan.manager.EmbeddedCacheManager.class); - case "org.infinispan.configuration.cache.Configuration": return applicationContext.getBean(ref, org.infinispan.configuration.cache.Configuration.class); - case "java.util.function.BiFunction": return applicationContext.getBean(ref, java.util.function.BiFunction.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.infinispan-embedded"); } } \ No newline at end of file diff --git a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentAutoConfiguration.java b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentAutoConfiguration.java index 744229c717af..7c1fd2d58cf9 100644 --- a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentAutoConfiguration.java +++ b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureInfinispanRemoteComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.infinispan", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentConverter.java b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentConverter.java index 6bf5c538c9d8..342f67660830 100644 --- a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentConverter.java +++ b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/InfinispanRemoteComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration.class); - case "org.apache.camel.component.infinispan.InfinispanQueryBuilder": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.InfinispanQueryBuilder.class); - case "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener": return applicationContext.getBean(ref, org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener.class); - case "org.infinispan.client.hotrod.RemoteCacheManager": return applicationContext.getBean(ref, org.infinispan.client.hotrod.RemoteCacheManager.class); - case "org.infinispan.client.hotrod.configuration.Configuration": return applicationContext.getBean(ref, org.infinispan.client.hotrod.configuration.Configuration.class); - case "java.util.function.BiFunction": return applicationContext.getBean(ref, java.util.function.BiFunction.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.infinispan"); } } \ No newline at end of file diff --git a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java index ea225e263488..fbb674c71dc4 100644 --- a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java +++ b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureInfluxDbComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.influxdb", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConverter.java b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConverter.java index f24b8c0856ba..d90bc6bbebf0 100644 --- a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConverter.java +++ b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.influxdb.InfluxDB": return applicationContext.getBean(ref, org.influxdb.InfluxDB.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.influxdb"); } } \ No newline at end of file diff --git a/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentAutoConfiguration.java b/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentAutoConfiguration.java index 7054fac0c37c..3cc4a29d952c 100644 --- a/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentAutoConfiguration.java +++ b/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureInfluxDb2Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.influxdb2", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentConverter.java b/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentConverter.java index 74f81ec63feb..6003f5e7b566 100644 --- a/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentConverter.java +++ b/components-starter/camel-influxdb2-starter/src/main/java/org/apache/camel/component/influxdb2/springboot/InfluxDb2ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.influxdb.client.InfluxDBClient": return applicationContext.getBean(ref, com.influxdb.client.InfluxDBClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.influxdb2"); } } \ No newline at end of file diff --git a/components-starter/camel-iso8583-starter/src/main/java/org/apache/camel/dataformat/iso8583/springboot/Iso8583DataFormatAutoConfiguration.java b/components-starter/camel-iso8583-starter/src/main/java/org/apache/camel/dataformat/iso8583/springboot/Iso8583DataFormatAutoConfiguration.java index 620beba27956..e81a6bf0b1a4 100644 --- a/components-starter/camel-iso8583-starter/src/main/java/org/apache/camel/dataformat/iso8583/springboot/Iso8583DataFormatAutoConfiguration.java +++ b/components-starter/camel-iso8583-starter/src/main/java/org/apache/camel/dataformat/iso8583/springboot/Iso8583DataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureIso8583DataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.iso8583", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java b/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java index d521029e641c..e972791282fb 100644 --- a/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonAvroDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.avro-jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson-protobuf-starter/src/main/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java b/components-starter/camel-jackson-protobuf-starter/src/main/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java index 4bb41ccca015..3f35ea5a4f5f 100644 --- a/components-starter/camel-jackson-protobuf-starter/src/main/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson-protobuf-starter/src/main/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonProtobufDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.protobuf-jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java index 9aff6812216f..e09c30a7545f 100644 --- a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java index 1fe3878d51b8..c91bd96daf31 100644 --- a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java +++ b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.jackson.SchemaResolver": return applicationContext.getBean(ref, org.apache.camel.component.jackson.SchemaResolver.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.jackson"); } } \ No newline at end of file diff --git a/components-starter/camel-jackson3-avro-starter/src/main/java/org/apache/camel/component/jackson3/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java b/components-starter/camel-jackson3-avro-starter/src/main/java/org/apache/camel/component/jackson3/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java index be1976938a6b..3c18f08b642c 100644 --- a/components-starter/camel-jackson3-avro-starter/src/main/java/org/apache/camel/component/jackson3/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson3-avro-starter/src/main/java/org/apache/camel/component/jackson3/avro/springboot/JacksonAvroDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonAvroDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.avro-jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson3-protobuf-starter/src/main/java/org/apache/camel/component/jackson3/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java b/components-starter/camel-jackson3-protobuf-starter/src/main/java/org/apache/camel/component/jackson3/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java index ce38d269076e..b60d3541bf7c 100644 --- a/components-starter/camel-jackson3-protobuf-starter/src/main/java/org/apache/camel/component/jackson3/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson3-protobuf-starter/src/main/java/org/apache/camel/component/jackson3/protobuf/springboot/JacksonProtobufDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonProtobufDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.protobuf-jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java index 4d47ebce875c..df04ddd5a71e 100644 --- a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jackson", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java index 4acd12c8ed78..e01965aae3f6 100644 --- a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java +++ b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.jackson3.SchemaResolver": return applicationContext.getBean(ref, org.apache.camel.component.jackson3.SchemaResolver.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.jackson"); } } \ No newline at end of file diff --git a/components-starter/camel-jackson3xml-starter/src/main/java/org/apache/camel/component/jackson3xml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/components-starter/camel-jackson3xml-starter/src/main/java/org/apache/camel/component/jackson3xml/springboot/JacksonXMLDataFormatAutoConfiguration.java index 59ab5b92b8e8..beecd35770ee 100644 --- a/components-starter/camel-jackson3xml-starter/src/main/java/org/apache/camel/component/jackson3xml/springboot/JacksonXMLDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson3xml-starter/src/main/java/org/apache/camel/component/jackson3xml/springboot/JacksonXMLDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonXMLDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jackson-xml", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java index a87e211e3158..d468809a8f7e 100644 --- a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java +++ b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJacksonXMLDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jackson-xml", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jactl-starter/src/main/java/org/apache/camel/language/jactl/springboot/JactlLanguageAutoConfiguration.java b/components-starter/camel-jactl-starter/src/main/java/org/apache/camel/language/jactl/springboot/JactlLanguageAutoConfiguration.java index b33b5f30bb9c..bfbacf163cf4 100644 --- a/components-starter/camel-jactl-starter/src/main/java/org/apache/camel/language/jactl/springboot/JactlLanguageAutoConfiguration.java +++ b/components-starter/camel-jactl-starter/src/main/java/org/apache/camel/language/jactl/springboot/JactlLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJactlLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.jactl", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageAutoConfiguration.java b/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageAutoConfiguration.java index f82d9bc5fab4..edbf76179546 100644 --- a/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageAutoConfiguration.java +++ b/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJavaScriptLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.js", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java index 30d473095d34..a2527c706270 100644 --- a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java +++ b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJaxbDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jaxb", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentAutoConfiguration.java b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentAutoConfiguration.java index 8af147a980e5..ec563bf112df 100644 --- a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentAutoConfiguration.java +++ b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJCacheComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jcache", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConverter.java b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConverter.java index a1a5a8e2fc71..dec605a63cf0 100644 --- a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConverter.java +++ b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.cache.configuration.Configuration": return applicationContext.getBean(ref, javax.cache.configuration.Configuration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jcache"); } } \ No newline at end of file diff --git a/components-starter/camel-jcr-starter/src/main/java/org/apache/camel/component/jcr/springboot/JcrComponentAutoConfiguration.java b/components-starter/camel-jcr-starter/src/main/java/org/apache/camel/component/jcr/springboot/JcrComponentAutoConfiguration.java index d0d4fad97e9a..8f6d5c612079 100644 --- a/components-starter/camel-jcr-starter/src/main/java/org/apache/camel/component/jcr/springboot/JcrComponentAutoConfiguration.java +++ b/components-starter/camel-jcr-starter/src/main/java/org/apache/camel/component/jcr/springboot/JcrComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJcrComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jcr", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java index 0cf73cf2c848..b44d26718fd8 100644 --- a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java +++ b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJdbcComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jdbc", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConverter.java b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConverter.java index 526cac1aac66..78873e20cd49 100644 --- a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConverter.java +++ b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.sql.DataSource": return applicationContext.getBean(ref, javax.sql.DataSource.class); - case "org.apache.camel.component.jdbc.ConnectionStrategy": return applicationContext.getBean(ref, org.apache.camel.component.jdbc.ConnectionStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jdbc"); } } \ No newline at end of file diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java index 73db943f0b6b..ec9f55501058 100644 --- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java +++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentAutoConfiguration12.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJettyHttpComponent12() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jetty", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java index aaa1d3176a78..5f2cf960c4c0 100644 --- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java +++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -55,25 +56,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.eclipse.jetty.util.thread.ThreadPool": return applicationContext.getBean(ref, org.eclipse.jetty.util.thread.ThreadPool.class); - case "org.eclipse.jetty.server.handler.ErrorHandler": return applicationContext.getBean(ref, org.eclipse.jetty.server.handler.ErrorHandler.class); - case "org.apache.camel.http.common.HttpBinding": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpBinding.class); - case "org.apache.camel.http.common.HttpConfiguration": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpConfiguration.class); - case "org.eclipse.jetty.jmx.MBeanContainer": return applicationContext.getBean(ref, org.eclipse.jetty.jmx.MBeanContainer.class); - case "org.eclipse.jetty.server.RequestLog": return applicationContext.getBean(ref, org.eclipse.jetty.server.RequestLog.class); - case "org.eclipse.jetty.server.SecureRequestCustomizer": return applicationContext.getBean(ref, org.eclipse.jetty.server.SecureRequestCustomizer.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jetty"); } } \ No newline at end of file diff --git a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentAutoConfiguration.java b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentAutoConfiguration.java index 4187a95463ac..5bcf015ee0fc 100644 --- a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentAutoConfiguration.java +++ b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJGroupsRaftComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jgroups-raft", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java index a7b2bd84148e..9581b1f99aa8 100644 --- a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java +++ b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/JGroupsRaftComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.jgroups.raft.RaftHandle": return applicationContext.getBean(ref, org.jgroups.raft.RaftHandle.class); - case "org.jgroups.raft.StateMachine": return applicationContext.getBean(ref, org.jgroups.raft.StateMachine.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jgroups-raft"); } } \ No newline at end of file diff --git a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java index 9d27b03883cf..3cafa3968de5 100644 --- a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java +++ b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJGroupsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jgroups", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConverter.java b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConverter.java index c2a75de098d8..abc09c471e1a 100644 --- a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConverter.java +++ b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.jgroups.JChannel": return applicationContext.getBean(ref, org.jgroups.JChannel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jgroups"); } } \ No newline at end of file diff --git a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentAutoConfiguration.java b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentAutoConfiguration.java index 8bc0725ee17f..0f032efb0672 100644 --- a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentAutoConfiguration.java +++ b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJiraComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jira", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConverter.java b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConverter.java index fcc1b7cc4038..35dc642e2061 100644 --- a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConverter.java +++ b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.jira.JiraConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.jira.JiraConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jira"); } } \ No newline at end of file diff --git a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java index 12c0698ef670..3c046fe1967e 100644 --- a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java +++ b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJmsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jms", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConverter.java b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConverter.java index f66074bbf251..4559e4635d55 100644 --- a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConverter.java +++ b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -59,29 +60,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "jakarta.jms.ConnectionFactory": return applicationContext.getBean(ref, jakarta.jms.ConnectionFactory.class); - case "org.springframework.core.task.TaskExecutor": return applicationContext.getBean(ref, org.springframework.core.task.TaskExecutor.class); - case "org.apache.camel.component.jms.JmsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.jms.JmsConfiguration.class); - case "org.springframework.jms.support.destination.DestinationResolver": return applicationContext.getBean(ref, org.springframework.jms.support.destination.DestinationResolver.class); - case "org.springframework.util.ErrorHandler": return applicationContext.getBean(ref, org.springframework.util.ErrorHandler.class); - case "jakarta.jms.ExceptionListener": return applicationContext.getBean(ref, jakarta.jms.ExceptionListener.class); - case "org.springframework.jms.support.converter.MessageConverter": return applicationContext.getBean(ref, org.springframework.jms.support.converter.MessageConverter.class); - case "org.apache.camel.component.jms.MessageCreatedStrategy": return applicationContext.getBean(ref, org.apache.camel.component.jms.MessageCreatedStrategy.class); - case "org.apache.camel.component.jms.MessageListenerContainerFactory": return applicationContext.getBean(ref, org.apache.camel.component.jms.MessageListenerContainerFactory.class); - case "org.apache.camel.component.jms.QueueBrowseStrategy": return applicationContext.getBean(ref, org.apache.camel.component.jms.QueueBrowseStrategy.class); - case "org.apache.camel.component.jms.TemporaryQueueResolver": return applicationContext.getBean(ref, org.apache.camel.component.jms.TemporaryQueueResolver.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.springframework.transaction.PlatformTransactionManager": return applicationContext.getBean(ref, org.springframework.transaction.PlatformTransactionManager.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jms"); } } \ No newline at end of file diff --git a/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentAutoConfiguration.java b/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentAutoConfiguration.java index 5f75ac25f7ba..540e7bd4c749 100644 --- a/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentAutoConfiguration.java +++ b/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJMXComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jmx", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java index e3e28c338a9c..2b0ee73b7ec1 100644 --- a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java +++ b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJoltComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jolt", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConverter.java b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConverter.java index b230814ab309..7b8ee88558be 100644 --- a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConverter.java +++ b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.bazaarvoice.jolt.Transform": return applicationContext.getBean(ref, com.bazaarvoice.jolt.Transform.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jolt"); } } \ No newline at end of file diff --git a/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentAutoConfiguration.java b/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentAutoConfiguration.java index f44bc085b01f..6aac2b7214ff 100644 --- a/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentAutoConfiguration.java +++ b/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJooqComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jooq", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentConverter.java b/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentConverter.java index 7f60f7249d05..f5ad7ccb2431 100644 --- a/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentConverter.java +++ b/components-starter/camel-jooq-starter/src/main/java/org/apache/camel/component/jooq/springboot/JooqComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.jooq.JooqConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.jooq.JooqConfiguration.class); - case "org.jooq.Configuration": return applicationContext.getBean(ref, org.jooq.Configuration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jooq"); } } \ No newline at end of file diff --git a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JavaLanguageAutoConfiguration.java b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JavaLanguageAutoConfiguration.java index 2a3c3f05d654..b89d7cfe2d18 100644 --- a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JavaLanguageAutoConfiguration.java +++ b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JavaLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJavaLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.java", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java index 68db4126a0e9..62b0d036ce41 100644 --- a/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java +++ b/components-starter/camel-joor-starter/src/main/java/org/apache/camel/language/joor/springboot/JoorLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJoorLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.joor", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java index 58fb4bab22bf..0d5210965351 100644 --- a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java +++ b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJpaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jpa", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java index 66a2fc34e1ec..546270c43845 100644 --- a/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java +++ b/components-starter/camel-jpa-starter/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "jakarta.persistence.EntityManagerFactory": return applicationContext.getBean(ref, jakarta.persistence.EntityManagerFactory.class); - case "org.apache.camel.component.jpa.TransactionStrategy": return applicationContext.getBean(ref, org.apache.camel.component.jpa.TransactionStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jpa"); } } \ No newline at end of file diff --git a/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageAutoConfiguration.java b/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageAutoConfiguration.java index c5962a7a3abb..65e600696031 100644 --- a/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageAutoConfiguration.java +++ b/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJqLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.jq", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java b/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java index f7b2602b6278..9bf8ce1051b1 100644 --- a/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java +++ b/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureScpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.scp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentAutoConfiguration.java b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentAutoConfiguration.java index 374d46638537..95c6de2988f2 100644 --- a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentAutoConfiguration.java +++ b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJsltComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jslt", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConverter.java b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConverter.java index 005539e3b8fe..da31a681329b 100644 --- a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConverter.java +++ b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.schibsted.spt.data.jslt.filters.JsonFilter": return applicationContext.getBean(ref, com.schibsted.spt.data.jslt.filters.JsonFilter.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jslt"); } } \ No newline at end of file diff --git a/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentAutoConfiguration.java b/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentAutoConfiguration.java index e7d5d69645cd..ed58dffffe19 100644 --- a/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentAutoConfiguration.java +++ b/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJsonValidatorComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.json-validator", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatAutoConfiguration.java b/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatAutoConfiguration.java index 8b0a0ed7d080..f684096acc26 100644 --- a/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatAutoConfiguration.java +++ b/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJsonApiDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.json-api", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentAutoConfiguration.java b/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentAutoConfiguration.java index b5068f164860..e63a94f2cee6 100644 --- a/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentAutoConfiguration.java +++ b/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJsonataComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jsonata", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentConverter.java b/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentConverter.java index 7c47e81177e2..092e5f77c2dc 100644 --- a/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentConverter.java +++ b/components-starter/camel-jsonata-starter/src/main/java/org/apache/camel/component/jsonata/springboot/JsonataComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.jsonata.JsonataFrameBinding": return applicationContext.getBean(ref, org.apache.camel.component.jsonata.JsonataFrameBinding.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jsonata"); } } \ No newline at end of file diff --git a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java index 622f997eecbe..0b7d0636777a 100644 --- a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java +++ b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureJsonbDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.jsonb", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java index cb52748add84..22eaa580dc0f 100644 --- a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java +++ b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureJsonPathLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.jsonpath", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java b/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java index faf8f5d5a4cf..00bf69896482 100644 --- a/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java +++ b/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJt400Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jt400", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentConverter.java b/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentConverter.java index aec1a6c6ff60..3fe3bcab4155 100644 --- a/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentConverter.java +++ b/components-starter/camel-jt400-starter/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.ibm.as400.access.AS400ConnectionPool": return applicationContext.getBean(ref, com.ibm.as400.access.AS400ConnectionPool.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.jt400"); } } \ No newline at end of file diff --git a/components-starter/camel-jte-starter/src/main/java/org/apache/camel/component/jte/springboot/JteComponentAutoConfiguration.java b/components-starter/camel-jte-starter/src/main/java/org/apache/camel/component/jte/springboot/JteComponentAutoConfiguration.java index da9c8fad22c0..c2feb8586b5e 100644 --- a/components-starter/camel-jte-starter/src/main/java/org/apache/camel/component/jte/springboot/JteComponentAutoConfiguration.java +++ b/components-starter/camel-jte-starter/src/main/java/org/apache/camel/component/jte/springboot/JteComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureJteComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.jte", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java index be97069f6f2c..3cc0b17e2d12 100644 --- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java +++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKafkaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kafka", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConverter.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConverter.java index 9184b75c75ca..713a61a20467 100644 --- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConverter.java +++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -56,26 +57,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.kafka.KafkaConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.kafka.KafkaConfiguration.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer": return applicationContext.getBean(ref, org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer.class); - case "org.apache.camel.spi.StateRepository": return applicationContext.getBean(ref, org.apache.camel.spi.StateRepository.class); - case "org.apache.camel.component.kafka.consumer.KafkaManualCommitFactory": return applicationContext.getBean(ref, org.apache.camel.component.kafka.consumer.KafkaManualCommitFactory.class); - case "org.apache.camel.component.kafka.PollExceptionStrategy": return applicationContext.getBean(ref, org.apache.camel.component.kafka.PollExceptionStrategy.class); - case "org.apache.camel.component.kafka.serde.KafkaHeaderSerializer": return applicationContext.getBean(ref, org.apache.camel.component.kafka.serde.KafkaHeaderSerializer.class); - case "java.util.concurrent.ExecutorService": return applicationContext.getBean(ref, java.util.concurrent.ExecutorService.class); - case "org.apache.camel.component.kafka.KafkaClientFactory": return applicationContext.getBean(ref, org.apache.camel.component.kafka.KafkaClientFactory.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kafka"); } } \ No newline at end of file diff --git a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentAutoConfiguration.java b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentAutoConfiguration.java index 28162916e218..ef0060a082ae 100644 --- a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentAutoConfiguration.java +++ b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKameletComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kamelet", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConverter.java b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConverter.java index 134aa94739c6..37c1bb414765 100644 --- a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConverter.java +++ b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.spi.RouteTemplateLoaderListener": return applicationContext.getBean(ref, org.apache.camel.spi.RouteTemplateLoaderListener.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kamelet"); } } \ No newline at end of file diff --git a/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentAutoConfiguration.java b/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentAutoConfiguration.java index 2211d739cf86..5d426b5e416a 100644 --- a/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentAutoConfiguration.java +++ b/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKeycloakComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.keycloak", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentConverter.java b/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentConverter.java index 548498c4b4d7..91d8b22e2b4b 100644 --- a/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentConverter.java +++ b/components-starter/camel-keycloak-starter/src/main/java/org/apache/camel/component/keycloak/springboot/KeycloakComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.keycloak.KeycloakConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.keycloak.KeycloakConfiguration.class); - case "org.keycloak.admin.client.Keycloak": return applicationContext.getBean(ref, org.keycloak.admin.client.Keycloak.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.keycloak"); } } \ No newline at end of file diff --git a/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentAutoConfiguration.java b/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentAutoConfiguration.java index 8cd72669ee95..61953751deb6 100644 --- a/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentAutoConfiguration.java +++ b/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKnativeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.knative", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentConverter.java b/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentConverter.java index 268570ec1043..d12c00b23332 100644 --- a/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentConverter.java +++ b/components-starter/camel-knative-starter/src/main/java/org/apache/camel/component/knative/springboot/KnativeComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.knative.KnativeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.knative.KnativeConfiguration.class); - case "org.apache.camel.component.knative.spi.KnativeConsumerFactory": return applicationContext.getBean(ref, org.apache.camel.component.knative.spi.KnativeConsumerFactory.class); - case "org.apache.camel.component.knative.spi.KnativeEnvironment": return applicationContext.getBean(ref, org.apache.camel.component.knative.spi.KnativeEnvironment.class); - case "org.apache.camel.component.knative.spi.KnativeProducerFactory": return applicationContext.getBean(ref, org.apache.camel.component.knative.spi.KnativeProducerFactory.class); - case "org.apache.camel.component.knative.spi.KnativeSinkBinding": return applicationContext.getBean(ref, org.apache.camel.component.knative.spi.KnativeSinkBinding.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.knative"); } } \ No newline at end of file diff --git a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java index 6414cf70274d..074083504b1e 100644 --- a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java +++ b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKServeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kserve", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java index 2f3fc74235d1..779dd2e910d6 100644 --- a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java +++ b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.kserve.KServeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.kserve.KServeConfiguration.class); - case "io.grpc.ChannelCredentials": return applicationContext.getBean(ref, io.grpc.ChannelCredentials.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kserve"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentAutoConfiguration.java index dc1378ff73a0..8187124fbf3d 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesConfigMapsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-config-maps", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConverter.java index 62793d49b8f5..33641afc9474 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-config-maps"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentAutoConfiguration.java index 029be59f0cf4..20bcbea9ef15 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesCronJobComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-cronjob", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentConverter.java index 82f08a3ddbed..052f127500ac 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/cronjob/springboot/KubernetesCronJobComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-cronjob"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentAutoConfiguration.java index 297d0cce3043..78fd6c1c6c20 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesCustomResourcesComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-custom-resources", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentConverter.java index 82b0affce4da..28298259a4c6 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/customresources/springboot/KubernetesCustomResourcesComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-custom-resources"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentAutoConfiguration.java index 527096327f34..6ce42656d0c6 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesDeploymentsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-deployments", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentConverter.java index c7194f9b8bed..4de69eff183a 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/deployments/springboot/KubernetesDeploymentsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-deployments"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentAutoConfiguration.java index 6288e6e3c9e5..a0200cded6b2 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesEventsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-events", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentConverter.java index 44cddd876f82..aa22cd715f86 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/events/springboot/KubernetesEventsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-events"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentAutoConfiguration.java index 9b054c11a8ad..593f0effd96a 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesHPAComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-hpa", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentConverter.java index 2f9a9eed0821..afbf44acb763 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/hpa/springboot/KubernetesHPAComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-hpa"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentAutoConfiguration.java index d465ed52aceb..7b8912a6d107 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesJobComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-job", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentConverter.java index 09a4b7967d57..4c0206e0d43d 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-job"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentAutoConfiguration.java index 4303d7c17bb2..2e94e6b8b7af 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesNamespacesComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-namespaces", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentConverter.java index 223e4b0304b2..d0e4e5cd087e 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/namespaces/springboot/KubernetesNamespacesComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-namespaces"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentAutoConfiguration.java index 6f4a8f83893f..005f1dd47b0a 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesNodesComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-nodes", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentConverter.java index b90133113ea4..2ec62916451d 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/nodes/springboot/KubernetesNodesComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-nodes"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentAutoConfiguration.java index 9bd6698c8f37..b2e52922b4b9 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesPersistentVolumesComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-persistent-volumes", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConverter.java index 487bf7959d86..d7cb57768f1f 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-persistent-volumes"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentAutoConfiguration.java index 14c69c0bafe5..4975cb8c3ae1 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesPersistentVolumesClaimsComponent() return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-persistent-volumes-claims", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConverter.java index d9972bc970e3..e2f2e2c2d855 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-persistent-volumes-claims"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentAutoConfiguration.java index 6447d42b6284..c392c0000e6a 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesPodsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-pods", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentConverter.java index b1c7624f07fe..8d8422870f97 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/pods/springboot/KubernetesPodsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-pods"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentAutoConfiguration.java index d5c148f81f73..f4ad0a46bd72 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesReplicationControllersComponent() return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-replication-controllers", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentConverter.java index a1c805a7fc11..a7cafd4a78e7 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/springboot/KubernetesReplicationControllersComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-replication-controllers"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentAutoConfiguration.java index 0392d8f56274..29646b07ce82 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesResourcesQuotaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-resources-quota", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConverter.java index 74ce691102d2..30ebbddb0f28 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-resources-quota"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentAutoConfiguration.java index 5b60452660d3..4f89cacc4b25 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesSecretsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-secrets", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConverter.java index 394e68e8567a..bc15dce52fa4 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-secrets"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentAutoConfiguration.java index b6e7d729e443..913e499751fb 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesServiceAccountsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-service-accounts", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConverter.java index f8c845e6d0c4..a82ca2780b96 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-service-accounts"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentAutoConfiguration.java index 5ea7bf4a3da7..491de785f7c7 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKubernetesServicesComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kubernetes-services", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConverter.java index 34fdd91a858b..30972dcf8889 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kubernetes-services"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java index ea6ac21ca619..6de0441f2faf 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpenshiftBuildConfigsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openshift-build-configs", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConverter.java index 32bc8214f3a2..a6201f2c7a44 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.openshift-build-configs"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java index da6564bf6273..eef32c6f81f9 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpenshiftBuildsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openshift-builds", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConverter.java index ccc7e3f7b865..bb26f865a7a1 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.openshift-builds"); } } \ No newline at end of file diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentAutoConfiguration.java index e16a983a6d0b..a638fdc5f1c9 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentAutoConfiguration.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpenshiftDeploymentConfigsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openshift-deploymentconfigs", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentConverter.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentConverter.java index edc706fe2b0f..08be1275dae8 100644 --- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentConverter.java +++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/springboot/OpenshiftDeploymentConfigsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,17 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.fabric8.kubernetes.client.KubernetesClient": return applicationContext.getBean(ref, io.fabric8.kubernetes.client.KubernetesClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.openshift-deploymentconfigs"); } } \ No newline at end of file diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java index 7f2ffb9c40b0..14ce5ce88c71 100644 --- a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java +++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKuduComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.kudu", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java index 656bdd8e17f6..6dd74b05fca0 100644 --- a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java +++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.kudu.client.KuduClient": return applicationContext.getBean(ref, org.apache.kudu.client.KuduClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.kudu"); } } \ No newline at end of file diff --git a/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentAutoConfiguration.java b/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentAutoConfiguration.java index 370ee78a0190..9b50035dc113 100644 --- a/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentAutoConfiguration.java +++ b/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLangChain4jAgentComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.langchain4j-agent", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentConverter.java b/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentConverter.java index 594dd2cbdf95..26e551b0f653 100644 --- a/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentConverter.java +++ b/components-starter/camel-langchain4j-agent-starter/src/main/java/org/apache/camel/component/langchain4j/agent/springboot/LangChain4jAgentComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.langchain4j.agent.api.Agent": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.agent.api.Agent.class); - case "org.apache.camel.component.langchain4j.agent.api.AgentConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.agent.api.AgentConfiguration.class); - case "org.apache.camel.component.langchain4j.agent.api.AgentFactory": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.agent.api.AgentFactory.class); - case "org.apache.camel.component.langchain4j.agent.LangChain4jAgentConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.agent.LangChain4jAgentConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.langchain4j-agent"); } } \ No newline at end of file diff --git a/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentAutoConfiguration.java b/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentAutoConfiguration.java index 9ddbe4ca6d28..9dadfacf188e 100644 --- a/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentAutoConfiguration.java +++ b/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLangChain4jChatComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.langchain4j-chat", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentConverter.java b/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentConverter.java index 021f0610c0cd..74b54f4fa330 100644 --- a/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentConverter.java +++ b/components-starter/camel-langchain4j-chat-starter/src/main/java/org/apache/camel/component/langchain4j/chat/springboot/LangChain4jChatComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.langchain4j.chat.LangChain4jChatConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.chat.LangChain4jChatConfiguration.class); - case "dev.langchain4j.model.chat.ChatModel": return applicationContext.getBean(ref, dev.langchain4j.model.chat.ChatModel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.langchain4j-chat"); } } \ No newline at end of file diff --git a/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentAutoConfiguration.java b/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentAutoConfiguration.java index 1d2c9b3e7982..aded4791135c 100644 --- a/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentAutoConfiguration.java +++ b/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLangChain4jEmbeddingsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.langchain4j-embeddings", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentConverter.java b/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentConverter.java index c592da14ae61..fc5c9142d3f9 100644 --- a/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentConverter.java +++ b/components-starter/camel-langchain4j-embeddings-starter/src/main/java/org/apache/camel/component/langchain4j/embeddings/springboot/LangChain4jEmbeddingsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,18 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsConfiguration.class); - case "dev.langchain4j.model.embedding.EmbeddingModel": return applicationContext.getBean(ref, dev.langchain4j.model.embedding.EmbeddingModel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.langchain4j-embeddings"); } } \ No newline at end of file diff --git a/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentAutoConfiguration.java b/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentAutoConfiguration.java index a22afdb50cba..f85942238193 100644 --- a/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentAutoConfiguration.java +++ b/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLangChain4jEmbeddingStoreComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.langchain4j-embeddingstore", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentConverter.java b/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentConverter.java index 13bdb693d6a4..51d83a395344 100644 --- a/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentConverter.java +++ b/components-starter/camel-langchain4j-embeddingstore-starter/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/springboot/LangChain4jEmbeddingStoreComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,20 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreConfiguration.class); - case "dev.langchain4j.model.embedding.EmbeddingModel": return applicationContext.getBean(ref, dev.langchain4j.model.embedding.EmbeddingModel.class); - case "dev.langchain4j.store.embedding.EmbeddingStore": return applicationContext.getBean(ref, dev.langchain4j.store.embedding.EmbeddingStore.class); - case "org.apache.camel.component.langchain4j.embeddingstore.EmbeddingStoreFactory": return applicationContext.getBean(ref, org.apache.camel.component.langchain4j.embeddingstore.EmbeddingStoreFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.langchain4j-embeddingstore"); } } \ No newline at end of file diff --git a/components-starter/camel-langchain4j-web-search-starter/src/main/java/org/apache/camel/component/langchain4j/web/search/springboot/LangChain4jWebSearchComponentAutoConfiguration.java b/components-starter/camel-langchain4j-web-search-starter/src/main/java/org/apache/camel/component/langchain4j/web/search/springboot/LangChain4jWebSearchComponentAutoConfiguration.java index c8e87d3b8678..9b15de4ac302 100644 --- a/components-starter/camel-langchain4j-web-search-starter/src/main/java/org/apache/camel/component/langchain4j/web/search/springboot/LangChain4jWebSearchComponentAutoConfiguration.java +++ b/components-starter/camel-langchain4j-web-search-starter/src/main/java/org/apache/camel/component/langchain4j/web/search/springboot/LangChain4jWebSearchComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLangChain4jWebSearchComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.langchain4j-web-search", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java b/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java index 26cf6d9f77c8..591d5c17873b 100644 --- a/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java +++ b/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLanguageComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.language", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentAutoConfiguration.java b/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentAutoConfiguration.java index c57225df69b4..cb9617f1fec2 100644 --- a/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentAutoConfiguration.java +++ b/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLdapComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ldap", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentAutoConfiguration.java b/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentAutoConfiguration.java index bf1fc17a6ef0..52d433f32699 100644 --- a/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentAutoConfiguration.java +++ b/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLdifComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ldif", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java index c92c978680d3..989b1a989030 100644 --- a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java +++ b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLogComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.log", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConverter.java b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConverter.java index 314e17eeae06..d83f66e2a3de 100644 --- a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConverter.java +++ b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.spi.ExchangeFormatter": return applicationContext.getBean(ref, org.apache.camel.spi.ExchangeFormatter.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.log"); } } \ No newline at end of file diff --git a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java index f1912484f39b..a0f538849a42 100644 --- a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java +++ b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLuceneComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.lucene", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConverter.java b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConverter.java index 5d2361feecb2..e2233a7a78e2 100644 --- a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConverter.java +++ b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.lucene.analysis.Analyzer": return applicationContext.getBean(ref, org.apache.lucene.analysis.Analyzer.class); - case "org.apache.camel.component.lucene.LuceneConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.lucene.LuceneConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.lucene"); } } \ No newline at end of file diff --git a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java index 242c7a578e36..7cfa7ab380f0 100644 --- a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java +++ b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureLumberjackComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.lumberjack", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConverter.java b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConverter.java index d992c2aef764..ba43789e8656 100644 --- a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConverter.java +++ b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.lumberjack"); } } \ No newline at end of file diff --git a/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java b/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java index d7a60eb0ff29..e2b074c41338 100644 --- a/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java +++ b/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureLZFDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.lzf", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java index 684fd0fcb46a..9eb77db68210 100644 --- a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java +++ b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMailComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mail", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConverter.java b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConverter.java index f363c32f443d..59e7ee5d5bcb 100644 --- a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConverter.java +++ b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -55,25 +56,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.mail.JavaMailSender": return applicationContext.getBean(ref, org.apache.camel.component.mail.JavaMailSender.class); - case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class); - case "org.apache.camel.component.mail.AttachmentsContentTransferEncodingResolver": return applicationContext.getBean(ref, org.apache.camel.component.mail.AttachmentsContentTransferEncodingResolver.class); - case "org.apache.camel.component.mail.MailAuthenticator": return applicationContext.getBean(ref, org.apache.camel.component.mail.MailAuthenticator.class); - case "org.apache.camel.component.mail.MailConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.mail.MailConfiguration.class); - case "org.apache.camel.component.mail.ContentTypeResolver": return applicationContext.getBean(ref, org.apache.camel.component.mail.ContentTypeResolver.class); - case "jakarta.mail.Session": return applicationContext.getBean(ref, jakarta.mail.Session.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mail"); } } \ No newline at end of file diff --git a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java index 53ef0d8a2559..f6bab48d3be1 100644 --- a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java +++ b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureMimeMultipartDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.mime-multipart", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentAutoConfiguration.java b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentAutoConfiguration.java index d4636c931350..c5e720db9c2d 100644 --- a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentAutoConfiguration.java +++ b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMapstructComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mapstruct", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentConverter.java b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentConverter.java index 17b672220124..8c8fdd27a43f 100644 --- a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentConverter.java +++ b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.mapstruct.MapStructMapperFinder": return applicationContext.getBean(ref, org.apache.camel.component.mapstruct.MapStructMapperFinder.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mapstruct"); } } \ No newline at end of file diff --git a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentAutoConfiguration.java b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentAutoConfiguration.java index fffed76e5ee1..62a5741533bc 100644 --- a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentAutoConfiguration.java +++ b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMasterComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.master", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConverter.java b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConverter.java index 61ea7c6010fb..a01df36b8a7d 100644 --- a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConverter.java +++ b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.cluster.CamelClusterService": return applicationContext.getBean(ref, org.apache.camel.cluster.CamelClusterService.class); - case "org.apache.camel.cluster.CamelClusterService.Selector": return applicationContext.getBean(ref, org.apache.camel.cluster.CamelClusterService.Selector.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.master"); } } \ No newline at end of file diff --git a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java index d1d58c658c8c..faa720058bb3 100644 --- a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java +++ b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMetricsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.metrics", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConverter.java b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConverter.java index 79637a9a6c97..7cb03f03e063 100644 --- a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConverter.java +++ b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.codahale.metrics.MetricRegistry": return applicationContext.getBean(ref, com.codahale.metrics.MetricRegistry.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.metrics"); } } \ No newline at end of file diff --git a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentAutoConfiguration.java b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentAutoConfiguration.java index 0fdd18d953ab..09cfe7169e5b 100644 --- a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentAutoConfiguration.java +++ b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMicrometerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.micrometer", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConverter.java b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConverter.java index d9e7caa77e17..4be61a8abf69 100644 --- a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConverter.java +++ b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.micrometer.core.instrument.MeterRegistry": return applicationContext.getBean(ref, io.micrometer.core.instrument.MeterRegistry.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.micrometer"); } } \ No newline at end of file diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentAutoConfiguration.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentAutoConfiguration.java index e1edbb945fdb..99fadb9c1b75 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentAutoConfiguration.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMiloBrowseComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.milo-browse", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentConverter.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentConverter.java index 95994d812c9e..af82678f77b7 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentConverter.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/browse/springboot/MiloBrowseComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.milo.client.MiloClientConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.milo.client.MiloClientConfiguration.class); - case "org.apache.camel.component.milo.client.MiloClientConnectionManager": return applicationContext.getBean(ref, org.apache.camel.component.milo.client.MiloClientConnectionManager.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.milo-browse"); } } \ No newline at end of file diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentAutoConfiguration.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentAutoConfiguration.java index c33b189890a8..14c532265fca 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentAutoConfiguration.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMiloClientComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.milo-client", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java index 71dc687bff07..92047d9b0431 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.milo.client.MiloClientConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.milo.client.MiloClientConfiguration.class); - case "org.apache.camel.component.milo.client.MiloClientConnectionManager": return applicationContext.getBean(ref, org.apache.camel.component.milo.client.MiloClientConnectionManager.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.milo-client"); } } \ No newline at end of file diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentAutoConfiguration.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentAutoConfiguration.java index f6b12af73e8f..a776b5cedf74 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentAutoConfiguration.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMiloServerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.milo-server", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java index b00ae174760d..7fe700e8bb08 100644 --- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java +++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo": return applicationContext.getBean(ref, org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo.class); - case "java.security.cert.X509Certificate": return applicationContext.getBean(ref, java.security.cert.X509Certificate.class); - case "org.eclipse.milo.opcua.stack.core.security.CertificateManager": return applicationContext.getBean(ref, org.eclipse.milo.opcua.stack.core.security.CertificateManager.class); - case "org.eclipse.milo.opcua.stack.core.security.CertificateValidator": return applicationContext.getBean(ref, org.eclipse.milo.opcua.stack.core.security.CertificateValidator.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.milo-server"); } } \ No newline at end of file diff --git a/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentAutoConfiguration.java b/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentAutoConfiguration.java index 2f5b03e5ca2c..c768bf81ce72 100644 --- a/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentAutoConfiguration.java +++ b/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMilvusComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.milvus", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentConverter.java b/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentConverter.java index 5144081f6988..cc13cfb6f251 100644 --- a/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentConverter.java +++ b/components-starter/camel-milvus-starter/src/main/java/org/apache/camel/component/milvus/springboot/MilvusComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.milvus.MilvusConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.milvus.MilvusConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.milvus"); } } \ No newline at end of file diff --git a/components-starter/camel-mina-sftp-starter/src/main/java/org/apache/camel/component/file/remote/mina/springboot/MinaSftpComponentAutoConfiguration.java b/components-starter/camel-mina-sftp-starter/src/main/java/org/apache/camel/component/file/remote/mina/springboot/MinaSftpComponentAutoConfiguration.java index a70db9893ee3..b5a5a9614068 100644 --- a/components-starter/camel-mina-sftp-starter/src/main/java/org/apache/camel/component/file/remote/mina/springboot/MinaSftpComponentAutoConfiguration.java +++ b/components-starter/camel-mina-sftp-starter/src/main/java/org/apache/camel/component/file/remote/mina/springboot/MinaSftpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMinaSftpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mina-sftp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java index 15da810b8b30..df1f4d9f2cc7 100644 --- a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java +++ b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMinaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mina", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConverter.java b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConverter.java index acae3613bf25..f16484717362 100644 --- a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConverter.java +++ b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.mina.MinaConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.mina.MinaConfiguration.class); - case "org.apache.mina.filter.codec.ProtocolCodecFactory": return applicationContext.getBean(ref, org.apache.mina.filter.codec.ProtocolCodecFactory.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mina"); } } \ No newline at end of file diff --git a/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentAutoConfiguration.java b/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentAutoConfiguration.java index be22d3514528..7cdfa030a789 100644 --- a/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentAutoConfiguration.java +++ b/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMinioComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.minio", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentConverter.java b/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentConverter.java index d7fdf9b1b60d..cbc21e68465d 100644 --- a/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentConverter.java +++ b/components-starter/camel-minio-starter/src/main/java/org/apache/camel/component/minio/springboot/MinioComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.minio.MinioConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.minio.MinioConfiguration.class); - case "io.minio.MinioClient": return applicationContext.getBean(ref, io.minio.MinioClient.class); - case "okhttp3.OkHttpClient": return applicationContext.getBean(ref, okhttp3.OkHttpClient.class); - case "io.minio.ServerSideEncryption": return applicationContext.getBean(ref, io.minio.ServerSideEncryption.class); - case "io.minio.ServerSideEncryption.CustomerKey": return applicationContext.getBean(ref, io.minio.ServerSideEncryption.CustomerKey.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.minio"); } } \ No newline at end of file diff --git a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentAutoConfiguration.java b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentAutoConfiguration.java index 56b430e8a405..6f4f355ab5d9 100644 --- a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentAutoConfiguration.java +++ b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMllpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mllp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java index a28589b6085a..e2e75f7ea73c 100644 --- a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java +++ b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.mllp.MllpConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.mllp.MllpConfiguration.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mllp"); } } \ No newline at end of file diff --git a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java index 80e1c910c945..abd65c9ae6b9 100644 --- a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java +++ b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMockComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mock", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConverter.java b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConverter.java index aba5b44b948f..e07feb904765 100644 --- a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConverter.java +++ b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.spi.ExchangeFormatter": return applicationContext.getBean(ref, org.apache.camel.spi.ExchangeFormatter.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mock"); } } \ No newline at end of file diff --git a/components-starter/camel-mongodb-gridfs-starter/src/main/java/org/apache/camel/component/mongodb/gridfs/springboot/GridFsComponentAutoConfiguration.java b/components-starter/camel-mongodb-gridfs-starter/src/main/java/org/apache/camel/component/mongodb/gridfs/springboot/GridFsComponentAutoConfiguration.java index 635b91e20d1e..5d212e0d939b 100644 --- a/components-starter/camel-mongodb-gridfs-starter/src/main/java/org/apache/camel/component/mongodb/gridfs/springboot/GridFsComponentAutoConfiguration.java +++ b/components-starter/camel-mongodb-gridfs-starter/src/main/java/org/apache/camel/component/mongodb/gridfs/springboot/GridFsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureGridFsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mongodb-gridfs", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentAutoConfiguration.java b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentAutoConfiguration.java index 0d047fb83bce..ce2253cd6782 100644 --- a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentAutoConfiguration.java +++ b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMongoDbComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mongodb", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConverter.java b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConverter.java index 084c01954811..1d750aec0fd9 100644 --- a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConverter.java +++ b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.mongodb.client.MongoClient": return applicationContext.getBean(ref, com.mongodb.client.MongoClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mongodb"); } } \ No newline at end of file diff --git a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java index 7f8e010f3a58..8f8b8ec74d42 100644 --- a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java +++ b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMustacheComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mustache", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConverter.java b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConverter.java index 83dd29e1e0cd..15566866b49c 100644 --- a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConverter.java +++ b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.github.mustachejava.MustacheFactory": return applicationContext.getBean(ref, com.github.mustachejava.MustacheFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mustache"); } } \ No newline at end of file diff --git a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentAutoConfiguration.java b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentAutoConfiguration.java index 71f93265b0d9..bb636667d2f1 100644 --- a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentAutoConfiguration.java +++ b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMvelComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mvel", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java index f4957ac06ffa..14ed84e22d97 100644 --- a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java +++ b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureMvelLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.mvel", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentAutoConfiguration.java b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentAutoConfiguration.java index ad9720e73e3f..573f7f01d350 100644 --- a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentAutoConfiguration.java +++ b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMyBatisBeanComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mybatis-bean", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConverter.java b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConverter.java index 5ff4a9303041..d43bdd0f7e71 100644 --- a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConverter.java +++ b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ibatis.session.SqlSessionFactory": return applicationContext.getBean(ref, org.apache.ibatis.session.SqlSessionFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mybatis-bean"); } } \ No newline at end of file diff --git a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java index de23d31ed7c3..e1bf8f2718fd 100644 --- a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java +++ b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMyBatisComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.mybatis", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentConverter.java b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentConverter.java index 72f90cda475c..47e0a4176a55 100644 --- a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentConverter.java +++ b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.ibatis.session.SqlSessionFactory": return applicationContext.getBean(ref, org.apache.ibatis.session.SqlSessionFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.mybatis"); } } \ No newline at end of file diff --git a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java index e37d4be44cd9..3dc198080fd1 100644 --- a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java +++ b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNatsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.nats", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java index ec8d204b300e..4d52b559a2d3 100644 --- a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java +++ b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.nats.NatsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.nats.NatsConfiguration.class); - case "io.nats.client.api.ConsumerConfiguration": return applicationContext.getBean(ref, io.nats.client.api.ConsumerConfiguration.class); - case "io.nats.client.Connection": return applicationContext.getBean(ref, io.nats.client.Connection.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.nats"); } } \ No newline at end of file diff --git a/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentAutoConfiguration.java b/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentAutoConfiguration.java index 4de12dc5339c..858718ce937d 100644 --- a/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentAutoConfiguration.java +++ b/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNeo4jComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.neo4j", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentConverter.java b/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentConverter.java index 04dd24be2fd9..593307ad74f0 100644 --- a/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentConverter.java +++ b/components-starter/camel-neo4j-starter/src/main/java/org/apache/camel/component/neo4j/springboot/Neo4jComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.neo4j.Neo4jConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.neo4j.Neo4jConfiguration.class); - case "org.neo4j.driver.Driver": return applicationContext.getBean(ref, org.neo4j.driver.Driver.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.neo4j"); } } \ No newline at end of file diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java index 1a4fdaed8a64..48d8206b234f 100644 --- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java +++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNettyHttpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.netty-http", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConverter.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConverter.java index bf87b2de62c2..e91e8877472a 100644 --- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConverter.java +++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -59,29 +60,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.netty.NettyConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyConfiguration.class); - case "io.netty.channel.EventLoopGroup": return applicationContext.getBean(ref, io.netty.channel.EventLoopGroup.class); - case "io.netty.util.concurrent.EventExecutorGroup": return applicationContext.getBean(ref, io.netty.util.concurrent.EventExecutorGroup.class); - case "org.apache.camel.component.netty.NettyServerBootstrapFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyServerBootstrapFactory.class); - case "org.apache.camel.component.netty.ServerInitializerFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.ServerInitializerFactory.class); - case "org.apache.camel.component.netty.ClientInitializerFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.ClientInitializerFactory.class); - case "org.apache.camel.component.netty.NettyCamelStateCorrelationManager": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyCamelStateCorrelationManager.class); - case "io.netty.channel.group.ChannelGroup": return applicationContext.getBean(ref, io.netty.channel.group.ChannelGroup.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.component.netty.http.NettyHttpBinding": return applicationContext.getBean(ref, org.apache.camel.component.netty.http.NettyHttpBinding.class); - case "org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - case "io.netty.handler.ssl.SslHandler": return applicationContext.getBean(ref, io.netty.handler.ssl.SslHandler.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.netty-http"); } } \ No newline at end of file diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java index b7752d4f9e86..0d7f88594871 100644 --- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java +++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNettyComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.netty", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConverter.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConverter.java index 19e7c847189c..2dcdd4e24f31 100644 --- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConverter.java +++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -56,26 +57,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.netty.NettyConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyConfiguration.class); - case "io.netty.channel.EventLoopGroup": return applicationContext.getBean(ref, io.netty.channel.EventLoopGroup.class); - case "io.netty.util.concurrent.EventExecutorGroup": return applicationContext.getBean(ref, io.netty.util.concurrent.EventExecutorGroup.class); - case "org.apache.camel.component.netty.NettyServerBootstrapFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyServerBootstrapFactory.class); - case "org.apache.camel.component.netty.ServerInitializerFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.ServerInitializerFactory.class); - case "org.apache.camel.component.netty.ClientInitializerFactory": return applicationContext.getBean(ref, org.apache.camel.component.netty.ClientInitializerFactory.class); - case "org.apache.camel.component.netty.NettyCamelStateCorrelationManager": return applicationContext.getBean(ref, org.apache.camel.component.netty.NettyCamelStateCorrelationManager.class); - case "io.netty.channel.group.ChannelGroup": return applicationContext.getBean(ref, io.netty.channel.group.ChannelGroup.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - case "io.netty.handler.ssl.SslHandler": return applicationContext.getBean(ref, io.netty.handler.ssl.SslHandler.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.netty"); } } \ No newline at end of file diff --git a/components-starter/camel-oaipmh-starter/src/main/java/org/apache/camel/oaipmh/component/springboot/OAIPMHComponentAutoConfiguration.java b/components-starter/camel-oaipmh-starter/src/main/java/org/apache/camel/oaipmh/component/springboot/OAIPMHComponentAutoConfiguration.java index 844140943366..0531002aec12 100644 --- a/components-starter/camel-oaipmh-starter/src/main/java/org/apache/camel/oaipmh/component/springboot/OAIPMHComponentAutoConfiguration.java +++ b/components-starter/camel-oaipmh-starter/src/main/java/org/apache/camel/oaipmh/component/springboot/OAIPMHComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOAIPMHComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.oaipmh", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ocsf-starter/src/main/java/org/apache/camel/dataformat/ocsf/springboot/OcsfDataFormatAutoConfiguration.java b/components-starter/camel-ocsf-starter/src/main/java/org/apache/camel/dataformat/ocsf/springboot/OcsfDataFormatAutoConfiguration.java index fd6c33f81ad1..c397a283b671 100644 --- a/components-starter/camel-ocsf-starter/src/main/java/org/apache/camel/dataformat/ocsf/springboot/OcsfDataFormatAutoConfiguration.java +++ b/components-starter/camel-ocsf-starter/src/main/java/org/apache/camel/dataformat/ocsf/springboot/OcsfDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureOcsfDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.ocsf", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java b/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java index d4145406012c..8375c7c7767b 100644 --- a/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java +++ b/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureOgnlLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.ognl", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java index d12455683d7e..31d5d40294e1 100644 --- a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java +++ b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOlingo2Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.olingo2", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConverter.java b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConverter.java index cdf465925fc5..3d04f758ced8 100644 --- a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConverter.java +++ b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -53,23 +54,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.olingo2.Olingo2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.olingo2.Olingo2Configuration.class); - case "org.apache.olingo.odata2.api.ep.EntityProviderReadProperties": return applicationContext.getBean(ref, org.apache.olingo.odata2.api.ep.EntityProviderReadProperties.class); - case "org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties": return applicationContext.getBean(ref, org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties.class); - case "org.apache.http.HttpHost": return applicationContext.getBean(ref, org.apache.http.HttpHost.class); - case "org.apache.http.impl.nio.client.HttpAsyncClientBuilder": return applicationContext.getBean(ref, org.apache.http.impl.nio.client.HttpAsyncClientBuilder.class); - case "org.apache.http.impl.client.HttpClientBuilder": return applicationContext.getBean(ref, org.apache.http.impl.client.HttpClientBuilder.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.olingo2"); } } \ No newline at end of file diff --git a/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentAutoConfiguration.java b/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentAutoConfiguration.java index b7eaa5827d41..c826f42c9adf 100644 --- a/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentAutoConfiguration.java +++ b/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOlingo4Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.olingo4", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConverter.java b/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConverter.java index ea8f00ea193f..1074e75b2ca5 100644 --- a/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConverter.java +++ b/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.olingo4.Olingo4Configuration": return applicationContext.getBean(ref, org.apache.camel.component.olingo4.Olingo4Configuration.class); - case "org.apache.http.HttpHost": return applicationContext.getBean(ref, org.apache.http.HttpHost.class); - case "org.apache.http.impl.nio.client.HttpAsyncClientBuilder": return applicationContext.getBean(ref, org.apache.http.impl.nio.client.HttpAsyncClientBuilder.class); - case "org.apache.http.impl.client.HttpClientBuilder": return applicationContext.getBean(ref, org.apache.http.impl.client.HttpClientBuilder.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.olingo4"); } } \ No newline at end of file diff --git a/components-starter/camel-once-starter/src/main/java/org/apache/camel/component/once/springboot/OnceComponentAutoConfiguration.java b/components-starter/camel-once-starter/src/main/java/org/apache/camel/component/once/springboot/OnceComponentAutoConfiguration.java index 8ebc7b9585f0..755af33ebabe 100644 --- a/components-starter/camel-once-starter/src/main/java/org/apache/camel/component/once/springboot/OnceComponentAutoConfiguration.java +++ b/components-starter/camel-once-starter/src/main/java/org/apache/camel/component/once/springboot/OnceComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOnceComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.once", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openai-starter/src/main/java/org/apache/camel/component/openai/springboot/OpenAIComponentAutoConfiguration.java b/components-starter/camel-openai-starter/src/main/java/org/apache/camel/component/openai/springboot/OpenAIComponentAutoConfiguration.java index f43952809c13..80077da2c334 100644 --- a/components-starter/camel-openai-starter/src/main/java/org/apache/camel/component/openai/springboot/OpenAIComponentAutoConfiguration.java +++ b/components-starter/camel-openai-starter/src/main/java/org/apache/camel/component/openai/springboot/OpenAIComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpenAIComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openai", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentAutoConfiguration.java b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentAutoConfiguration.java index 4416933aea5e..8b01165d9003 100644 --- a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentAutoConfiguration.java +++ b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpensearchComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.opensearch", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConverter.java b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConverter.java index 00292ec34372..3671c5dc62c2 100644 --- a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConverter.java +++ b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.opensearch.client.RestClient": return applicationContext.getBean(ref, org.opensearch.client.RestClient.class); - case "org.opensearch.client.opensearch.OpenSearchClient": return applicationContext.getBean(ref, org.opensearch.client.opensearch.OpenSearchClient.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.opensearch"); } } \ No newline at end of file diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentAutoConfiguration.java index 243eb3d2367f..fc555fba7587 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureCinderComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-cinder", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentAutoConfiguration.java index 29305f4424eb..100f36c0562b 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureGlanceComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-glance", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentAutoConfiguration.java index a53c13d31d40..65caaec7be50 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureKeystoneComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-keystone", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentAutoConfiguration.java index 6654f32d64bd..4f9d2423f8dd 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNeutronComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-neutron", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentAutoConfiguration.java index 21ad8510b7fb..af8bb07e6ff8 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNovaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-nova", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentAutoConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentAutoConfiguration.java index b10eac6c55a0..7df3f7cf8062 100644 --- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentAutoConfiguration.java +++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSwiftComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.openstack-swift", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentAutoConfiguration.java b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentAutoConfiguration.java index f8a882db9ca7..de914c7a04dc 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentAutoConfiguration.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOpenTelemetryComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.opentelemetry-metrics", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentConverter.java b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentConverter.java index 8e99d46022ae..5232b006ce64 100644 --- a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentConverter.java +++ b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/OpenTelemetryComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.opentelemetry.api.metrics.Meter": return applicationContext.getBean(ref, io.opentelemetry.api.metrics.Meter.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.opentelemetry-metrics"); } } \ No newline at end of file diff --git a/components-starter/camel-optaplanner-starter/src/main/java/org/apache/camel/component/optaplanner/springboot/OptaPlannerComponentAutoConfiguration.java b/components-starter/camel-optaplanner-starter/src/main/java/org/apache/camel/component/optaplanner/springboot/OptaPlannerComponentAutoConfiguration.java index a444fafe07bf..c49d181d4379 100644 --- a/components-starter/camel-optaplanner-starter/src/main/java/org/apache/camel/component/optaplanner/springboot/OptaPlannerComponentAutoConfiguration.java +++ b/components-starter/camel-optaplanner-starter/src/main/java/org/apache/camel/component/optaplanner/springboot/OptaPlannerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureOptaPlannerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.optaplanner", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentAutoConfiguration.java b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentAutoConfiguration.java index 8f384f0b7d6b..8eee26661fd7 100644 --- a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentAutoConfiguration.java +++ b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePahoMqtt5Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.paho-mqtt5", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConverter.java b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConverter.java index 46012ff4656f..7c3c33b4bec4 100644 --- a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConverter.java +++ b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration": return applicationContext.getBean(ref, org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration.class); - case "org.eclipse.paho.mqttv5.common.packet.MqttProperties": return applicationContext.getBean(ref, org.eclipse.paho.mqttv5.common.packet.MqttProperties.class); - case "org.eclipse.paho.mqttv5.client.MqttClient": return applicationContext.getBean(ref, org.eclipse.paho.mqttv5.client.MqttClient.class); - case "javax.net.SocketFactory": return applicationContext.getBean(ref, javax.net.SocketFactory.class); - case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class); - case "javax.net.ssl.HostnameVerifier": return applicationContext.getBean(ref, javax.net.ssl.HostnameVerifier.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.paho-mqtt5"); } } \ No newline at end of file diff --git a/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java b/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java index 3599cd467801..0383bb6531d5 100644 --- a/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java +++ b/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePahoComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.paho", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentConverter.java b/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentConverter.java index b27cf037986c..0ec58660b147 100644 --- a/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentConverter.java +++ b/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.paho.PahoConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.paho.PahoConfiguration.class); - case "org.eclipse.paho.client.mqttv3.MqttClient": return applicationContext.getBean(ref, org.eclipse.paho.client.mqttv3.MqttClient.class); - case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class); - case "javax.net.SocketFactory": return applicationContext.getBean(ref, javax.net.SocketFactory.class); - case "javax.net.ssl.HostnameVerifier": return applicationContext.getBean(ref, javax.net.ssl.HostnameVerifier.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.paho"); } } \ No newline at end of file diff --git a/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatAutoConfiguration.java b/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatAutoConfiguration.java index 7efddecc70f8..89b96ea4d49f 100644 --- a/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatAutoConfiguration.java +++ b/components-starter/camel-parquet-avro-starter/src/main/java/org/apache/camel/dataformat/parquet/avro/springboot/ParquetAvroDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureParquetAvroDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.parquet-avro", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java b/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java index 9344f9733eb2..a167e137eae2 100644 --- a/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java +++ b/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePdfComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pdf", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentAutoConfiguration.java b/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentAutoConfiguration.java index e79045e1714d..bcbc7f1cb7de 100644 --- a/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentAutoConfiguration.java +++ b/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePgReplicationSlotComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pg-replication-slot", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pgevent-starter/src/main/java/org/apache/camel/component/pgevent/springboot/PgEventComponentAutoConfiguration.java b/components-starter/camel-pgevent-starter/src/main/java/org/apache/camel/component/pgevent/springboot/PgEventComponentAutoConfiguration.java index 6bca7cb54b53..25ea210e0d2a 100644 --- a/components-starter/camel-pgevent-starter/src/main/java/org/apache/camel/component/pgevent/springboot/PgEventComponentAutoConfiguration.java +++ b/components-starter/camel-pgevent-starter/src/main/java/org/apache/camel/component/pgevent/springboot/PgEventComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePgEventComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pgevent", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentAutoConfiguration.java b/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentAutoConfiguration.java index c8244130ef95..461c110b3db9 100644 --- a/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentAutoConfiguration.java +++ b/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePineconeVectorDbComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pinecone", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentConverter.java b/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentConverter.java index 226425737da4..2cad5a2887df 100644 --- a/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentConverter.java +++ b/components-starter/camel-pinecone-starter/src/main/java/org/apache/camel/component/pinecone/springboot/PineconeVectorDbComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.pinecone.PineconeVectorDbConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.pinecone.PineconeVectorDbConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.pinecone"); } } \ No newline at end of file diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentAutoConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentAutoConfiguration.java index 83a324ff73f0..4e980920d0de 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentAutoConfiguration.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePlatformHttpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.platform-http", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java index ca33b19f6985..2554814a8a52 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.platform.http.spi.PlatformHttpEngine": return applicationContext.getBean(ref, org.apache.camel.component.platform.http.spi.PlatformHttpEngine.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.platform-http"); } } \ No newline at end of file diff --git a/components-starter/camel-plc4x-starter/src/main/java/org/apache/camel/component/plc4x/springboot/Plc4XComponentAutoConfiguration.java b/components-starter/camel-plc4x-starter/src/main/java/org/apache/camel/component/plc4x/springboot/Plc4XComponentAutoConfiguration.java index 4324c60720ac..e00e2bc4130e 100644 --- a/components-starter/camel-plc4x-starter/src/main/java/org/apache/camel/component/plc4x/springboot/Plc4XComponentAutoConfiguration.java +++ b/components-starter/camel-plc4x-starter/src/main/java/org/apache/camel/component/plc4x/springboot/Plc4XComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePlc4XComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.plc4x", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatAutoConfiguration.java b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatAutoConfiguration.java index 980e433227a3..033878cf41c3 100644 --- a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatAutoConfiguration.java +++ b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configurePQCDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.pqc", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConverter.java b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConverter.java index d5dbac8dcfcc..36813e2de405 100644 --- a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConverter.java +++ b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "java.security.KeyPair": return applicationContext.getBean(ref, java.security.KeyPair.class); - case "javax.crypto.KeyGenerator": return applicationContext.getBean(ref, javax.crypto.KeyGenerator.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.pqc"); } } \ No newline at end of file diff --git a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentAutoConfiguration.java b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentAutoConfiguration.java index fb8cd6d1827a..e1e0b14fe9ad 100644 --- a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentAutoConfiguration.java +++ b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePQCComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pqc", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentConverter.java b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentConverter.java index 4f0fd753b9bd..a8794dc20ed9 100644 --- a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentConverter.java +++ b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/springboot/PQCComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -53,23 +54,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.pqc.PQCConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.pqc.PQCConfiguration.class); - case "javax.crypto.KeyAgreement": return applicationContext.getBean(ref, javax.crypto.KeyAgreement.class); - case "java.security.KeyPair": return applicationContext.getBean(ref, java.security.KeyPair.class); - case "java.security.Signature": return applicationContext.getBean(ref, java.security.Signature.class); - case "javax.crypto.KeyGenerator": return applicationContext.getBean(ref, javax.crypto.KeyGenerator.class); - case "org.apache.camel.component.pqc.lifecycle.KeyLifecycleManager": return applicationContext.getBean(ref, org.apache.camel.component.pqc.lifecycle.KeyLifecycleManager.class); - case "java.security.KeyStore": return applicationContext.getBean(ref, java.security.KeyStore.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.pqc"); } } \ No newline at end of file diff --git a/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentAutoConfiguration.java b/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentAutoConfiguration.java index 840b60c4ce03..e41d02beab10 100644 --- a/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentAutoConfiguration.java +++ b/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePrinterComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.lpr", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java index d137764bd43e..896793fd7ae6 100644 --- a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java +++ b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureProtobufDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.protobuf", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentAutoConfiguration.java b/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentAutoConfiguration.java index 7f35725daa28..8d471680be42 100644 --- a/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentAutoConfiguration.java +++ b/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePubNubComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pubnub", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentConverter.java b/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentConverter.java index 82ccf739c249..bc51ebdcf8fa 100644 --- a/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentConverter.java +++ b/components-starter/camel-pubnub-starter/src/main/java/org/apache/camel/component/pubnub/springboot/PubNubComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.pubnub.PubNubConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.pubnub.PubNubConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.pubnub"); } } \ No newline at end of file diff --git a/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentAutoConfiguration.java b/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentAutoConfiguration.java index 138d008e9d39..a5b8920cf84f 100644 --- a/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentAutoConfiguration.java +++ b/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configurePulsarComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.pulsar", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConverter.java b/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConverter.java index 8e681d08097e..7196db469d4b 100644 --- a/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConverter.java +++ b/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.pulsar.PulsarConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.pulsar.PulsarConfiguration.class); - case "org.apache.pulsar.client.api.RedeliveryBackoff": return applicationContext.getBean(ref, org.apache.pulsar.client.api.RedeliveryBackoff.class); - case "org.apache.camel.component.pulsar.PulsarMessageReceiptFactory": return applicationContext.getBean(ref, org.apache.camel.component.pulsar.PulsarMessageReceiptFactory.class); - case "org.apache.pulsar.client.api.MessageRouter": return applicationContext.getBean(ref, org.apache.pulsar.client.api.MessageRouter.class); - case "org.apache.camel.component.pulsar.utils.AutoConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.pulsar.utils.AutoConfiguration.class); - case "org.apache.pulsar.client.api.PulsarClient": return applicationContext.getBean(ref, org.apache.pulsar.client.api.PulsarClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.pulsar"); } } \ No newline at end of file diff --git a/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageAutoConfiguration.java b/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageAutoConfiguration.java index fa0ec2bf11ab..55436b86217e 100644 --- a/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageAutoConfiguration.java +++ b/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configurePythonLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.python", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-python3-starter/src/main/java/org/apache/camel/language/python3/springboot/Python3LanguageAutoConfiguration.java b/components-starter/camel-python3-starter/src/main/java/org/apache/camel/language/python3/springboot/Python3LanguageAutoConfiguration.java index 22fd14c8901c..6a30db25c67a 100644 --- a/components-starter/camel-python3-starter/src/main/java/org/apache/camel/language/python3/springboot/Python3LanguageAutoConfiguration.java +++ b/components-starter/camel-python3-starter/src/main/java/org/apache/camel/language/python3/springboot/Python3LanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configurePython3Language() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.python3", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentAutoConfiguration.java b/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentAutoConfiguration.java index e7578f101fac..dc9893fa00fc 100644 --- a/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentAutoConfiguration.java +++ b/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureQdrantComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.qdrant", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentConverter.java b/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentConverter.java index 0d5209a610d6..66721ef5e8b2 100644 --- a/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentConverter.java +++ b/components-starter/camel-qdrant-starter/src/main/java/org/apache/camel/component/qdrant/springboot/QdrantComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.qdrant.QdrantConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.qdrant.QdrantConfiguration.class); - case "io.qdrant.client.grpc.Common.Filter": return applicationContext.getBean(ref, io.qdrant.client.grpc.Common.Filter.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.qdrant"); } } \ No newline at end of file diff --git a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java index dd77892f4633..772407de5c59 100644 --- a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java +++ b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureQuartzComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.quartz", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConverter.java b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConverter.java index 92f433a8bc0d..ae83ad6e59b7 100644 --- a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConverter.java +++ b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.quartz.Scheduler": return applicationContext.getBean(ref, org.quartz.Scheduler.class); - case "org.quartz.SchedulerFactory": return applicationContext.getBean(ref, org.quartz.SchedulerFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.quartz"); } } \ No newline at end of file diff --git a/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java b/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java index d9bb2c673714..36fe9d470bb0 100644 --- a/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java +++ b/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureQuickfixjComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.quickfix", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConverter.java b/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConverter.java index fdcaad556e24..c40b13ec2116 100644 --- a/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConverter.java +++ b/components-starter/camel-quickfix-starter/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "quickfix.LogFactory": return applicationContext.getBean(ref, quickfix.LogFactory.class); - case "quickfix.MessageFactory": return applicationContext.getBean(ref, quickfix.MessageFactory.class); - case "quickfix.MessageStoreFactory": return applicationContext.getBean(ref, quickfix.MessageStoreFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.quickfix"); } } \ No newline at end of file diff --git a/components-starter/camel-quickjs-starter/src/main/java/org/apache/camel/language/quickjs/springboot/QuickjsLanguageAutoConfiguration.java b/components-starter/camel-quickjs-starter/src/main/java/org/apache/camel/language/quickjs/springboot/QuickjsLanguageAutoConfiguration.java index 51f2968ee6cd..81b93fba30df 100644 --- a/components-starter/camel-quickjs-starter/src/main/java/org/apache/camel/language/quickjs/springboot/QuickjsLanguageAutoConfiguration.java +++ b/components-starter/camel-quickjs-starter/src/main/java/org/apache/camel/language/quickjs/springboot/QuickjsLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureQuickjsLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.quickjs", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentAutoConfiguration.java b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentAutoConfiguration.java index 26c7d3912107..6ac5b173e77e 100644 --- a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentAutoConfiguration.java +++ b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureReactiveStreamsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.reactive-streams", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentConverter.java b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentConverter.java index 68ccb9332721..dd762a06d6a2 100644 --- a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentConverter.java +++ b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.reactive.streams.engine.ReactiveStreamsEngineConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.reactive.streams.engine.ReactiveStreamsEngineConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.reactive-streams"); } } \ No newline at end of file diff --git a/components-starter/camel-ref-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java b/components-starter/camel-ref-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java index e85b8ae1e2c8..f4a0ee8665db 100644 --- a/components-starter/camel-ref-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java +++ b/components-starter/camel-ref-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRefComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ref", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentAutoConfiguration.java b/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentAutoConfiguration.java index 6c075dbc9261..6128ed0fc6f3 100644 --- a/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentAutoConfiguration.java +++ b/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRestOpenApiComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rest-openapi", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentConverter.java b/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentConverter.java index ffa32d9113fd..083950790967 100644 --- a/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentConverter.java +++ b/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.rest.openapi.RestOpenapiProcessorStrategy": return applicationContext.getBean(ref, org.apache.camel.component.rest.openapi.RestOpenapiProcessorStrategy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.rest-openapi"); } } \ No newline at end of file diff --git a/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentAutoConfiguration.java b/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentAutoConfiguration.java index f3d23feb3479..1999652e0181 100644 --- a/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentAutoConfiguration.java +++ b/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRestPostmanComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rest-postman", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentConverter.java b/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentConverter.java index 80383e391d8f..cbf86b7ca77f 100644 --- a/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentConverter.java +++ b/components-starter/camel-rest-postman-starter/src/main/java/org/apache/camel/component/rest/postman/springboot/RestPostmanComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.rest.postman.RestPostmanProcessorStrategy": return applicationContext.getBean(ref, org.apache.camel.component.rest.postman.RestPostmanProcessorStrategy.class); - case "org.apache.camel.component.rest.postman.RestPostmanConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.rest.postman.RestPostmanConfiguration.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.rest-postman"); } } \ No newline at end of file diff --git a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java index c9841c905040..a608bedef10a 100644 --- a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java +++ b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRestApiComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rest-api", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java index b1df336e4e68..fadf7d0ed588 100644 --- a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java +++ b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRestComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rest", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConverter.java b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConverter.java index ce8e9c62ef42..09ed2e665cfd 100644 --- a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConverter.java +++ b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.rest"); } } \ No newline at end of file diff --git a/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentAutoConfiguration.java b/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentAutoConfiguration.java index 6419124730ca..e1efce23264c 100644 --- a/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentAutoConfiguration.java +++ b/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRobotFrameworkComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.robotframework", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentConverter.java b/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentConverter.java index 72a52d13af04..225fb4648a4f 100644 --- a/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentConverter.java +++ b/components-starter/camel-robotframework-starter/src/main/java/org/apache/camel/component/robotframework/springboot/RobotFrameworkComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.robotframework.RobotFrameworkCamelConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.robotframework.RobotFrameworkCamelConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.robotframework"); } } \ No newline at end of file diff --git a/components-starter/camel-rocketmq-starter/src/main/java/org/apache/camel/component/rocketmq/springboot/RocketMQComponentAutoConfiguration.java b/components-starter/camel-rocketmq-starter/src/main/java/org/apache/camel/component/rocketmq/springboot/RocketMQComponentAutoConfiguration.java index 5a6dda0cce92..c4dc9cec8736 100644 --- a/components-starter/camel-rocketmq-starter/src/main/java/org/apache/camel/component/rocketmq/springboot/RocketMQComponentAutoConfiguration.java +++ b/components-starter/camel-rocketmq-starter/src/main/java/org/apache/camel/component/rocketmq/springboot/RocketMQComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRocketMQComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rocketmq", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java index acb547121475..baf71d24b3a1 100644 --- a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java +++ b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRssComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.rss", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java index b67ecd368d6b..92ccc467eeb4 100644 --- a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java +++ b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureRssDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.rss", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentAutoConfiguration.java b/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentAutoConfiguration.java index 76dfeb110dbb..91a85ff32f9c 100644 --- a/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentAutoConfiguration.java +++ b/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSagaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.saga", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java index 725ceb483b56..494f1188ebe4 100644 --- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java +++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSalesforceComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.salesforce", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConverter.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConverter.java index accfd9b9d4ff..33436395e8da 100644 --- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConverter.java +++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -54,24 +55,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.salesforce.SalesforceHttpClient": return applicationContext.getBean(ref, org.apache.camel.component.salesforce.SalesforceHttpClient.class); - case "com.fasterxml.jackson.databind.ObjectMapper": return applicationContext.getBean(ref, com.fasterxml.jackson.databind.ObjectMapper.class); - case "org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata": return applicationContext.getBean(ref, org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata.class); - case "org.apache.camel.component.salesforce.SalesforceEndpointConfig": return applicationContext.getBean(ref, org.apache.camel.component.salesforce.SalesforceEndpointConfig.class); - case "java.util.concurrent.ExecutorService": return applicationContext.getBean(ref, java.util.concurrent.ExecutorService.class); - case "org.apache.camel.support.jsse.KeyStoreParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.KeyStoreParameters.class); - case "org.apache.camel.component.salesforce.SalesforceLoginConfig": return applicationContext.getBean(ref, org.apache.camel.component.salesforce.SalesforceLoginConfig.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.salesforce"); } } \ No newline at end of file diff --git a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java index 6718ee175728..18dd49c2b8f6 100644 --- a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java +++ b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureNetWeaverComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.sap-netweaver", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java index 1612945d2a83..03c4e4bf81ff 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXQueryComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xquery", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentConverter.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentConverter.java index d6fed974a6dc..a5f4ed42afd3 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentConverter.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "net.sf.saxon.Configuration": return applicationContext.getBean(ref, net.sf.saxon.Configuration.class); - case "net.sf.saxon.lib.ModuleURIResolver": return applicationContext.getBean(ref, net.sf.saxon.lib.ModuleURIResolver.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xquery"); } } \ No newline at end of file diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java index c3466bf0d504..568a78dcdcac 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureXQueryLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.xquery", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java b/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java index 6135144a9d00..d234bc8e7690 100644 --- a/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java +++ b/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSchedulerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.scheduler", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java index 8ab492b6a010..cc98a3c5985e 100644 --- a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java +++ b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSchematronComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.schematron", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java index d00d34e24b40..365dcfd7cd09 100644 --- a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java +++ b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSedaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.seda", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConverter.java b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConverter.java index e947ce6bd4e0..d67334e27b69 100644 --- a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConverter.java +++ b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.seda.BlockingQueueFactory": return applicationContext.getBean(ref, org.apache.camel.component.seda.BlockingQueueFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.seda"); } } \ No newline at end of file diff --git a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java index 0dad24ad823b..2e85b7833850 100644 --- a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java +++ b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureServiceNowComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.servicenow", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConverter.java b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConverter.java index 1509051d9e33..04b72d010cd5 100644 --- a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConverter.java +++ b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.servicenow.ServiceNowConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.servicenow.ServiceNowConfiguration.class); - case "org.apache.cxf.transports.http.configuration.HTTPClientPolicy": return applicationContext.getBean(ref, org.apache.cxf.transports.http.configuration.HTTPClientPolicy.class); - case "com.fasterxml.jackson.databind.ObjectMapper": return applicationContext.getBean(ref, com.fasterxml.jackson.databind.ObjectMapper.class); - case "org.apache.cxf.configuration.security.ProxyAuthorizationPolicy": return applicationContext.getBean(ref, org.apache.cxf.configuration.security.ProxyAuthorizationPolicy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.servicenow"); } } \ No newline at end of file diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java index 57f8baf1c87c..baf64d4b9fd7 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureServletComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.servlet", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConverter.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConverter.java index 4fe3227e4f30..aa70c522e53f 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConverter.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.http.common.HttpRegistry": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpRegistry.class); - case "org.apache.camel.http.common.HttpBinding": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpBinding.class); - case "org.apache.camel.http.common.HttpConfiguration": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpConfiguration.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.servlet"); } } \ No newline at end of file diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java index b04e87f2240e..3e65a5a63dc8 100644 --- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java +++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSjmsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.sjms", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConverter.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConverter.java index 40b1ab34ac35..a594b77c3a11 100644 --- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConverter.java +++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "jakarta.jms.ConnectionFactory": return applicationContext.getBean(ref, jakarta.jms.ConnectionFactory.class); - case "org.apache.camel.component.sjms.jms.DestinationCreationStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class); - case "jakarta.jms.ExceptionListener": return applicationContext.getBean(ref, jakarta.jms.ExceptionListener.class); - case "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class); - case "org.apache.camel.component.sjms.jms.MessageCreatedStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.sjms"); } } \ No newline at end of file diff --git a/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentAutoConfiguration.java b/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentAutoConfiguration.java index 5e21c76760a5..6cae29a88c2a 100644 --- a/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentAutoConfiguration.java +++ b/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSjms2Component() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.sjms2", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentConverter.java b/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentConverter.java index 6a4c9b3a67b8..2b4ec2a5722a 100644 --- a/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentConverter.java +++ b/components-starter/camel-sjms2-starter/src/main/java/org/apache/camel/component/sjms2/springboot/Sjms2ComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "jakarta.jms.ConnectionFactory": return applicationContext.getBean(ref, jakarta.jms.ConnectionFactory.class); - case "org.apache.camel.component.sjms.jms.DestinationCreationStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.DestinationCreationStrategy.class); - case "jakarta.jms.ExceptionListener": return applicationContext.getBean(ref, jakarta.jms.ExceptionListener.class); - case "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy.class); - case "org.apache.camel.component.sjms.jms.MessageCreatedStrategy": return applicationContext.getBean(ref, org.apache.camel.component.sjms.jms.MessageCreatedStrategy.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.sjms2"); } } \ No newline at end of file diff --git a/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java b/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java index 1a52ef1062d8..30a6e93cd6bb 100644 --- a/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java +++ b/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSlackComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.slack", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-smb-starter/src/main/java/org/apache/camel/component/smb/springboot/SmbComponentAutoConfiguration.java b/components-starter/camel-smb-starter/src/main/java/org/apache/camel/component/smb/springboot/SmbComponentAutoConfiguration.java index 9c96ad9a4bb3..d6cd75ce867f 100644 --- a/components-starter/camel-smb-starter/src/main/java/org/apache/camel/component/smb/springboot/SmbComponentAutoConfiguration.java +++ b/components-starter/camel-smb-starter/src/main/java/org/apache/camel/component/smb/springboot/SmbComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSmbComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.smb", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentAutoConfiguration.java b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentAutoConfiguration.java index a20ab5bd2a97..667b5b378dc3 100644 --- a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentAutoConfiguration.java +++ b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSmooksComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.smooks", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentConverter.java b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentConverter.java index f7076332bd7b..1ed7e059551a 100644 --- a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentConverter.java +++ b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/component/smooks/springboot/SmooksComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.smooks.SmooksFactory": return applicationContext.getBean(ref, org.smooks.SmooksFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.smooks"); } } \ No newline at end of file diff --git a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/dataformat/smooks/springboot/SmooksDataFormatAutoConfiguration.java b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/dataformat/smooks/springboot/SmooksDataFormatAutoConfiguration.java index 9d91804e8639..36018e8c5891 100644 --- a/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/dataformat/smooks/springboot/SmooksDataFormatAutoConfiguration.java +++ b/components-starter/camel-smooks-starter/src/main/java/org/apache/camel/dataformat/smooks/springboot/SmooksDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSmooksDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.smooks", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java index 7e1d55e6dc38..044ddde18bf6 100644 --- a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java +++ b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSmppComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.smpp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConverter.java b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConverter.java index 910806dba622..8f9a8fb72bb6 100644 --- a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConverter.java +++ b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.smpp.SmppConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.smpp.SmppConfiguration.class); - case "org.jsmpp.session.SessionStateListener": return applicationContext.getBean(ref, org.jsmpp.session.SessionStateListener.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.smpp"); } } \ No newline at end of file diff --git a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java index 3ac04e24409f..073f50a09878 100644 --- a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java +++ b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSnakeYAMLDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.snake-yaml", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java b/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java index 4c0b8a69433a..c2014a7bc704 100644 --- a/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java +++ b/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSnmpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.snmp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatAutoConfiguration.java b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatAutoConfiguration.java index 3b26d8950ba2..96a3229e5686 100644 --- a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatAutoConfiguration.java +++ b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSoapDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.soap", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java index 1cdab9aef405..4d78a7765387 100644 --- a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java +++ b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.dataformat.soap.name.ElementNameStrategy": return applicationContext.getBean(ref, org.apache.camel.dataformat.soap.name.ElementNameStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.soap"); } } \ No newline at end of file diff --git a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java index b5a61bbfafbb..4d166d54a347 100644 --- a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java +++ b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSolrComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.solr", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConverter.java b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConverter.java index bc5ace9246d6..6796e6c114eb 100644 --- a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConverter.java +++ b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.solr.client.solrj.SolrClient": return applicationContext.getBean(ref, org.apache.solr.client.solrj.SolrClient.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.solr"); } } \ No newline at end of file diff --git a/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentAutoConfiguration.java b/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentAutoConfiguration.java index 26301dc04443..f56ab1ac59b4 100644 --- a/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentAutoConfiguration.java +++ b/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSplunkHECComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.splunk-hec", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentConverter.java b/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentConverter.java index 0be9c7f202d4..52d4d9cfff39 100644 --- a/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentConverter.java +++ b/components-starter/camel-splunk-hec-starter/src/main/java/org/apache/camel/component/splunkhec/springboot/SplunkHECComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.splunk-hec"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentAutoConfiguration.java b/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentAutoConfiguration.java index 35859d23baac..b37e9df93fba 100644 --- a/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringAiChatComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ai-chat", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentConverter.java b/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentConverter.java index 210ab1207364..da8855861818 100644 --- a/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentConverter.java +++ b/components-starter/camel-spring-ai-chat-starter/src/main/java/org/apache/camel/component/springai/chat/springboot/SpringAiChatComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.springframework.ai.chat.model.ChatModel": return applicationContext.getBean(ref, org.springframework.ai.chat.model.ChatModel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-ai-chat"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentAutoConfiguration.java b/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentAutoConfiguration.java index bbb1b39939c0..8dbad8c11972 100644 --- a/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringAiEmbeddingsComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ai-embeddings", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentConverter.java b/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentConverter.java index 6303586d4a67..0c061fd843c6 100644 --- a/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentConverter.java +++ b/components-starter/camel-spring-ai-embeddings-starter/src/main/java/org/apache/camel/component/springai/embeddings/springboot/SpringAiEmbeddingsComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.springai.embeddings.SpringAiEmbeddingsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.springai.embeddings.SpringAiEmbeddingsConfiguration.class); - case "org.springframework.ai.embedding.EmbeddingModel": return applicationContext.getBean(ref, org.springframework.ai.embedding.EmbeddingModel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-ai-embeddings"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentAutoConfiguration.java b/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentAutoConfiguration.java index 08f19672bdb0..62cf5ebf5c26 100644 --- a/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringAiImageComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ai-image", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentConverter.java b/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentConverter.java index cda1c1321bb2..d65134d86dc1 100644 --- a/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentConverter.java +++ b/components-starter/camel-spring-ai-image-starter/src/main/java/org/apache/camel/component/springai/image/springboot/SpringAiImageComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.springai.image.SpringAiImageConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.springai.image.SpringAiImageConfiguration.class); - case "org.springframework.ai.image.ImageModel": return applicationContext.getBean(ref, org.springframework.ai.image.ImageModel.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-ai-image"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentAutoConfiguration.java b/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentAutoConfiguration.java index d7e626476d4d..b08372cd511c 100644 --- a/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringAiVectorStoreComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ai-vector-store", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentConverter.java b/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentConverter.java index a857a1834702..d01b686c76dc 100644 --- a/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentConverter.java +++ b/components-starter/camel-spring-ai-vector-store-starter/src/main/java/org/apache/camel/component/springai/vectorstore/springboot/SpringAiVectorStoreComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,18 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.springai.vectorstore.SpringAiVectorStoreConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.springai.vectorstore.SpringAiVectorStoreConfiguration.class); - case "org.springframework.ai.vectorstore.VectorStore": return applicationContext.getBean(ref, org.springframework.ai.vectorstore.VectorStore.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-ai-vector-store"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java index b29e65b69426..bfaac7cde70a 100644 --- a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java +++ b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringBatchComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-batch", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConverter.java b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConverter.java index 2450774bb670..75f56d3ebdd0 100644 --- a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConverter.java +++ b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.springframework.batch.core.launch.JobLauncher": return applicationContext.getBean(ref, org.springframework.batch.core.launch.JobLauncher.class); - case "org.springframework.batch.core.configuration.JobRegistry": return applicationContext.getBean(ref, org.springframework.batch.core.configuration.JobRegistry.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-batch"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentAutoConfiguration.java b/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentAutoConfiguration.java index 0aa2cd22cff8..3cf72a494588 100644 --- a/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentAutoConfiguration.java +++ b/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringJdbcComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-jdbc", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentConverter.java b/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentConverter.java index dfcf16feabaa..a01da59d7fca 100644 --- a/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentConverter.java +++ b/components-starter/camel-spring-jdbc-starter/src/main/java/org/apache/camel/component/spring/jdbc/springboot/SpringJdbcComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.sql.DataSource": return applicationContext.getBean(ref, javax.sql.DataSource.class); - case "org.apache.camel.component.jdbc.ConnectionStrategy": return applicationContext.getBean(ref, org.apache.camel.component.jdbc.ConnectionStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-jdbc"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java index ba31d118868e..14d9441b2aed 100644 --- a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringLdapComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ldap", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentAutoConfiguration.java b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentAutoConfiguration.java index 901bbc079b61..b1cfd8fd42b7 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentAutoConfiguration.java +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringRabbitMQComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-rabbitmq", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java index e662f6265a0a..52aed6eb142e 100644 --- a/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java +++ b/components-starter/camel-spring-rabbitmq-starter/src/main/java/org/apache/camel/component/springrabbit/springboot/SpringRabbitMQComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -54,24 +55,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.springframework.amqp.core.AmqpAdmin": return applicationContext.getBean(ref, org.springframework.amqp.core.AmqpAdmin.class); - case "org.springframework.amqp.rabbit.connection.ConnectionFactory": return applicationContext.getBean(ref, org.springframework.amqp.rabbit.connection.ConnectionFactory.class); - case "org.springframework.util.ErrorHandler": return applicationContext.getBean(ref, org.springframework.util.ErrorHandler.class); - case "org.apache.camel.component.springrabbit.ListenerContainerFactory": return applicationContext.getBean(ref, org.apache.camel.component.springrabbit.ListenerContainerFactory.class); - case "org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor": return applicationContext.getBean(ref, org.springframework.amqp.rabbit.config.StatelessRetryOperationsInterceptor.class); - case "org.springframework.amqp.support.converter.MessageConverter": return applicationContext.getBean(ref, org.springframework.amqp.support.converter.MessageConverter.class); - case "org.apache.camel.component.springrabbit.MessagePropertiesConverter": return applicationContext.getBean(ref, org.apache.camel.component.springrabbit.MessagePropertiesConverter.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-rabbitmq"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java index eab3d865c79c..a58b3ceffb94 100644 --- a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java +++ b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureRedisComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-redis", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentConverter.java b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentConverter.java index bc9269d4dea3..b52443a766f4 100644 --- a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentConverter.java +++ b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.springframework.data.redis.core.RedisTemplate": return applicationContext.getBean(ref, org.springframework.data.redis.core.RedisTemplate.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.spring-redis"); } } \ No newline at end of file diff --git a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java index ca680e905fd2..34056787723a 100644 --- a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java +++ b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureEventComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-event", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/language/spel/springboot/SpelLanguageAutoConfiguration.java b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/language/spel/springboot/SpelLanguageAutoConfiguration.java index 12978ffc209b..24804350b4fc 100644 --- a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/language/spel/springboot/SpelLanguageAutoConfiguration.java +++ b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/language/spel/springboot/SpelLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureSpelLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.spel", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java b/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java index fb5258dde0e0..0a54d630e282 100644 --- a/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSpringWebserviceComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.spring-ws", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java index 2cb2ab1f4525..1af7271ad557 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSqlComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.sql", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentConverter.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentConverter.java index 7f125d62490c..07ecebbc1034 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentConverter.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.sql.DataSource": return applicationContext.getBean(ref, javax.sql.DataSource.class); - case "org.apache.camel.component.sql.RowMapperFactory": return applicationContext.getBean(ref, org.apache.camel.component.sql.RowMapperFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.sql"); } } \ No newline at end of file diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java index 4a5f0729459b..7e44fff23c73 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSqlStoredComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.sql-stored", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConverter.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConverter.java index 3b8401849045..9400ec1bea75 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConverter.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.sql.DataSource": return applicationContext.getBean(ref, javax.sql.DataSource.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.sql-stored"); } } \ No newline at end of file diff --git a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java index 5715eb5e6a83..43180d010afe 100644 --- a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java +++ b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureSshComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.ssh", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConverter.java b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConverter.java index 07e18c1fe896..063f5376aec6 100644 --- a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConverter.java +++ b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.sshd.client.ClientBuilder": return applicationContext.getBean(ref, org.apache.sshd.client.ClientBuilder.class); - case "org.apache.camel.component.ssh.SshConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.ssh.SshConfiguration.class); - case "org.apache.sshd.common.keyprovider.KeyPairProvider": return applicationContext.getBean(ref, org.apache.sshd.common.keyprovider.KeyPairProvider.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.ssh"); } } \ No newline at end of file diff --git a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java index e566a3c7db9c..e25b4aaff2be 100644 --- a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java +++ b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStAXComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.stax", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java index d86801ac8b15..0766adae3343 100644 --- a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java +++ b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureXMLTokenizeLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.xtokenize", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentAutoConfiguration.java b/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentAutoConfiguration.java index 38ad051973b1..de81b178e9e6 100644 --- a/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentAutoConfiguration.java +++ b/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStitchComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.stitch", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentConverter.java b/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentConverter.java index 6d038af069ec..62c3d97944d6 100644 --- a/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentConverter.java +++ b/components-starter/camel-stitch-starter/src/main/java/org/apache/camel/component/stitch/springboot/StitchComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -51,21 +52,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.stitch.StitchConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.stitch.StitchConfiguration.class); - case "org.apache.camel.component.stitch.client.models.StitchSchema": return applicationContext.getBean(ref, org.apache.camel.component.stitch.client.models.StitchSchema.class); - case "reactor.netty.resources.ConnectionProvider": return applicationContext.getBean(ref, reactor.netty.resources.ConnectionProvider.class); - case "reactor.netty.http.client.HttpClient": return applicationContext.getBean(ref, reactor.netty.http.client.HttpClient.class); - case "org.apache.camel.component.stitch.client.StitchClient": return applicationContext.getBean(ref, org.apache.camel.component.stitch.client.StitchClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.stitch"); } } \ No newline at end of file diff --git a/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java b/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java index 186ed0d5fc24..7a27676c1903 100644 --- a/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java +++ b/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStreamComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.stream", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java index cdda3bb17b52..4c731d8c1196 100644 --- a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java +++ b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStringTemplateComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.string-template", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stripe-starter/src/main/java/org/apache/camel/component/stripe/springboot/StripeComponentAutoConfiguration.java b/components-starter/camel-stripe-starter/src/main/java/org/apache/camel/component/stripe/springboot/StripeComponentAutoConfiguration.java index 635153952b40..1e56ae960ba3 100644 --- a/components-starter/camel-stripe-starter/src/main/java/org/apache/camel/component/stripe/springboot/StripeComponentAutoConfiguration.java +++ b/components-starter/camel-stripe-starter/src/main/java/org/apache/camel/component/stripe/springboot/StripeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStripeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.stripe", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java index 32547add7dd9..2714cb8436cc 100644 --- a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java +++ b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureStubComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.stub", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConverter.java b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConverter.java index 06ae73b05d5e..94c3d5ca4dd3 100644 --- a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConverter.java +++ b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.seda.BlockingQueueFactory": return applicationContext.getBean(ref, org.apache.camel.component.seda.BlockingQueueFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.stub"); } } \ No newline at end of file diff --git a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mt/springboot/SwiftMtDataFormatAutoConfiguration.java b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mt/springboot/SwiftMtDataFormatAutoConfiguration.java index f3c30eb05e7d..1de569c803d5 100644 --- a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mt/springboot/SwiftMtDataFormatAutoConfiguration.java +++ b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mt/springboot/SwiftMtDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSwiftMtDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.swift-mt", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatAutoConfiguration.java b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatAutoConfiguration.java index e7349915e605..179a1dbeb76c 100644 --- a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatAutoConfiguration.java +++ b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSwiftMxDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.swift-mx", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java index 2d1780ca2c6a..47ceb9da48f2 100644 --- a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java +++ b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "com.prowidesoftware.swift.model.MxId": return applicationContext.getBean(ref, com.prowidesoftware.swift.model.MxId.class); - case "com.prowidesoftware.swift.model.mx.MxReadConfiguration": return applicationContext.getBean(ref, com.prowidesoftware.swift.model.mx.MxReadConfiguration.class); - case "com.prowidesoftware.swift.model.mx.MxWriteConfiguration": return applicationContext.getBean(ref, com.prowidesoftware.swift.model.mx.MxWriteConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.swift-mx"); } } \ No newline at end of file diff --git a/components-starter/camel-syslog-starter/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java b/components-starter/camel-syslog-starter/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java index b0d6fbd1b84d..a1883a73a935 100644 --- a/components-starter/camel-syslog-starter/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java +++ b/components-starter/camel-syslog-starter/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureSyslogDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.syslog", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentAutoConfiguration.java b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentAutoConfiguration.java index 334fbbb46566..2706b78b1d58 100644 --- a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentAutoConfiguration.java +++ b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTahuEdgeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.tahu-edge", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentConverter.java b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentConverter.java index e123208f8674..4454a6d3e494 100644 --- a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentConverter.java +++ b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuEdgeComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.tahu.TahuConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.tahu.TahuConfiguration.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.tahu-edge"); } } \ No newline at end of file diff --git a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentAutoConfiguration.java b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentAutoConfiguration.java index 4c460058921d..1519c98a2604 100644 --- a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentAutoConfiguration.java +++ b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTahuHostComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.tahu-host", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentConverter.java b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentConverter.java index 982f67b98215..761358b60029 100644 --- a/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentConverter.java +++ b/components-starter/camel-tahu-starter/src/main/java/org/apache/camel/component/tahu/springboot/TahuHostComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.tahu.TahuConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.tahu.TahuConfiguration.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.tahu-host"); } } \ No newline at end of file diff --git a/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java b/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java index 4779bc6663e8..f11ed8347394 100644 --- a/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java +++ b/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureTarFileDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.tar-file", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java index 106a629117b2..0c369c1307cb 100644 --- a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java +++ b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTelegramComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.telegram", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentConverter.java b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentConverter.java index f1c0f2777b3d..3ba65eef38e3 100644 --- a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentConverter.java +++ b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "java.net.http.HttpClient": return applicationContext.getBean(ref, java.net.http.HttpClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.telegram"); } } \ No newline at end of file diff --git a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentAutoConfiguration.java b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentAutoConfiguration.java index e68bc9aedc26..ac7dcc1454f7 100644 --- a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentAutoConfiguration.java +++ b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTensorFlowServingComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.tensorflow-serving", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConverter.java b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConverter.java index 210a10cd83db..38c19003c07e 100644 --- a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConverter.java +++ b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration.class); - case "io.grpc.ChannelCredentials": return applicationContext.getBean(ref, io.grpc.ChannelCredentials.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.tensorflow-serving"); } } \ No newline at end of file diff --git a/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/component/thrift/springboot/ThriftComponentAutoConfiguration.java b/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/component/thrift/springboot/ThriftComponentAutoConfiguration.java index abce0484bc28..c5c3b5793836 100644 --- a/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/component/thrift/springboot/ThriftComponentAutoConfiguration.java +++ b/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/component/thrift/springboot/ThriftComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureThriftComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.thrift", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/dataformat/thrift/springboot/ThriftDataFormatAutoConfiguration.java b/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/dataformat/thrift/springboot/ThriftDataFormatAutoConfiguration.java index 9124214aa3a0..f26431a6dcfa 100644 --- a/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/dataformat/thrift/springboot/ThriftDataFormatAutoConfiguration.java +++ b/components-starter/camel-thrift-starter/src/main/java/org/apache/camel/dataformat/thrift/springboot/ThriftDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureThriftDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.thrift", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-thymeleaf-starter/src/main/java/org/apache/camel/component/thymeleaf/springboot/ThymeleafComponentAutoConfiguration.java b/components-starter/camel-thymeleaf-starter/src/main/java/org/apache/camel/component/thymeleaf/springboot/ThymeleafComponentAutoConfiguration.java index 28495773ee6f..b0aed022c6d0 100644 --- a/components-starter/camel-thymeleaf-starter/src/main/java/org/apache/camel/component/thymeleaf/springboot/ThymeleafComponentAutoConfiguration.java +++ b/components-starter/camel-thymeleaf-starter/src/main/java/org/apache/camel/component/thymeleaf/springboot/ThymeleafComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureThymeleafComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.thymeleaf", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-tika-starter/src/main/java/org/apache/camel/component/tika/springboot/TikaComponentAutoConfiguration.java b/components-starter/camel-tika-starter/src/main/java/org/apache/camel/component/tika/springboot/TikaComponentAutoConfiguration.java index fc24233ea401..c0490bd66f9e 100644 --- a/components-starter/camel-tika-starter/src/main/java/org/apache/camel/component/tika/springboot/TikaComponentAutoConfiguration.java +++ b/components-starter/camel-tika-starter/src/main/java/org/apache/camel/component/tika/springboot/TikaComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTikaComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.tika", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-timer-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java b/components-starter/camel-timer-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java index c48a00d8c2c1..478697a27fd7 100644 --- a/components-starter/camel-timer-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java +++ b/components-starter/camel-timer-starter/src/main/java/org/apache/camel/component/timer/springboot/TimerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTimerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.timer", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-toon-starter/src/main/java/org/apache/camel/dataformat/toon/springboot/ToonDataFormatAutoConfiguration.java b/components-starter/camel-toon-starter/src/main/java/org/apache/camel/dataformat/toon/springboot/ToonDataFormatAutoConfiguration.java index f1219e8aeff0..5f3f0eedfea8 100644 --- a/components-starter/camel-toon-starter/src/main/java/org/apache/camel/dataformat/toon/springboot/ToonDataFormatAutoConfiguration.java +++ b/components-starter/camel-toon-starter/src/main/java/org/apache/camel/dataformat/toon/springboot/ToonDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureToonDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.toon", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentAutoConfiguration.java b/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentAutoConfiguration.java index bb094f618745..b3923a374c26 100644 --- a/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentAutoConfiguration.java +++ b/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTwilioComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.twilio", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConverter.java b/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConverter.java index 16c6aa6aae76..faff41b622b9 100644 --- a/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConverter.java +++ b/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.twilio.TwilioConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.twilio.TwilioConfiguration.class); - case "com.twilio.http.TwilioRestClient": return applicationContext.getBean(ref, com.twilio.http.TwilioRestClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.twilio"); } } \ No newline at end of file diff --git a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/directmessage/springboot/TwitterDirectMessageComponentAutoConfiguration.java b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/directmessage/springboot/TwitterDirectMessageComponentAutoConfiguration.java index b9b0b18eaeb9..0d65fd4ba8ae 100644 --- a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/directmessage/springboot/TwitterDirectMessageComponentAutoConfiguration.java +++ b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/directmessage/springboot/TwitterDirectMessageComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTwitterDirectMessageComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.twitter-directmessage", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/search/springboot/TwitterSearchComponentAutoConfiguration.java b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/search/springboot/TwitterSearchComponentAutoConfiguration.java index f095aecf7d0d..a6f6f3906934 100644 --- a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/search/springboot/TwitterSearchComponentAutoConfiguration.java +++ b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/search/springboot/TwitterSearchComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTwitterSearchComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.twitter-search", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/timeline/springboot/TwitterTimelineComponentAutoConfiguration.java b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/timeline/springboot/TwitterTimelineComponentAutoConfiguration.java index 18d13b231145..0fc8cb901c82 100644 --- a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/timeline/springboot/TwitterTimelineComponentAutoConfiguration.java +++ b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/timeline/springboot/TwitterTimelineComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureTwitterTimelineComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.twitter-timeline", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-ubl-starter/src/main/java/org/apache/camel/component/ubl/springboot/UblDataFormatAutoConfiguration.java b/components-starter/camel-ubl-starter/src/main/java/org/apache/camel/component/ubl/springboot/UblDataFormatAutoConfiguration.java index edc72f836a44..225950262e26 100644 --- a/components-starter/camel-ubl-starter/src/main/java/org/apache/camel/component/ubl/springboot/UblDataFormatAutoConfiguration.java +++ b/components-starter/camel-ubl-starter/src/main/java/org/apache/camel/component/ubl/springboot/UblDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureUblDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.ubl", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java index b1332985e9df..e68f4f654c69 100644 --- a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java +++ b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureUndertowComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.undertow", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java index db68cf5f9e75..2426aefe6105 100644 --- a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java +++ b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.undertow.UndertowHostOptions": return applicationContext.getBean(ref, org.apache.camel.component.undertow.UndertowHostOptions.class); - case "org.apache.camel.component.undertow.UndertowHttpBinding": return applicationContext.getBean(ref, org.apache.camel.component.undertow.UndertowHttpBinding.class); - case "org.apache.camel.component.undertow.spi.UndertowSecurityProvider": return applicationContext.getBean(ref, org.apache.camel.component.undertow.spi.UndertowSecurityProvider.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.undertow"); } } \ No newline at end of file diff --git a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java index d3cd2d45a716..d5df497fabb6 100644 --- a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java +++ b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureUniVocityCsvDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.univocity-csv", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedDataFormatAutoConfiguration.java b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedDataFormatAutoConfiguration.java index e0f7cf0ccb90..b61e49f385a2 100644 --- a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedDataFormatAutoConfiguration.java +++ b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureUniVocityFixedDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.univocity-fixed", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java index ac1bdb1ebde5..1e024b91bd9b 100644 --- a/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java +++ b/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureUniVocityTsvDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.univocity-tsv", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java b/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java index d1dfe4d21508..a7c88c1ed56a 100644 --- a/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java +++ b/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureValidatorComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.validator", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentConverter.java b/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentConverter.java index 97a791837f0a..bc3df88e2405 100644 --- a/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentConverter.java +++ b/components-starter/camel-validator-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.validator.ValidatorResourceResolverFactory": return applicationContext.getBean(ref, org.apache.camel.component.validator.ValidatorResourceResolverFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.validator"); } } \ No newline at end of file diff --git a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java index 26e8c71a69fb..57f20ddb9146 100644 --- a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java +++ b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureVelocityComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.velocity", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConverter.java b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConverter.java index 047158f0686f..0f6ffc6e3812 100644 --- a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConverter.java +++ b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.velocity.app.VelocityEngine": return applicationContext.getBean(ref, org.apache.velocity.app.VelocityEngine.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.velocity"); } } \ No newline at end of file diff --git a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentAutoConfiguration.java b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentAutoConfiguration.java index 51ec25f0f29a..0664ee5aa680 100644 --- a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentAutoConfiguration.java +++ b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureVertxHttpComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.vertx-http", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java index 0f5e6e86f965..37511d408907 100644 --- a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java +++ b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.vertx.core.Vertx": return applicationContext.getBean(ref, io.vertx.core.Vertx.class); - case "org.apache.camel.component.vertx.http.VertxHttpBinding": return applicationContext.getBean(ref, org.apache.camel.component.vertx.http.VertxHttpBinding.class); - case "io.vertx.core.VertxOptions": return applicationContext.getBean(ref, io.vertx.core.VertxOptions.class); - case "io.vertx.ext.web.client.WebClientOptions": return applicationContext.getBean(ref, io.vertx.ext.web.client.WebClientOptions.class); - case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class); - case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.vertx-http"); } } \ No newline at end of file diff --git a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java index 043735093168..45ffd3a428b9 100644 --- a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java +++ b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureVertxComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.vertx", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConverter.java b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConverter.java index e077e71cb97b..271cc50a099d 100644 --- a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConverter.java +++ b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.vertx.core.Vertx": return applicationContext.getBean(ref, io.vertx.core.Vertx.class); - case "io.vertx.core.VertxOptions": return applicationContext.getBean(ref, io.vertx.core.VertxOptions.class); - case "io.vertx.core.impl.VertxBuilder": return applicationContext.getBean(ref, io.vertx.core.impl.VertxBuilder.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.vertx"); } } \ No newline at end of file diff --git a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentAutoConfiguration.java b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentAutoConfiguration.java index 93f026fe3c44..c4844f9ea1ce 100644 --- a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentAutoConfiguration.java +++ b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureVertxWebsocketComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.vertx-websocket", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConverter.java b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConverter.java index 441984b8a335..fe7dc0f93d49 100644 --- a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConverter.java +++ b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "io.vertx.ext.web.Router": return applicationContext.getBean(ref, io.vertx.ext.web.Router.class); - case "io.vertx.core.Vertx": return applicationContext.getBean(ref, io.vertx.core.Vertx.class); - case "io.vertx.core.VertxOptions": return applicationContext.getBean(ref, io.vertx.core.VertxOptions.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.vertx-websocket"); } } \ No newline at end of file diff --git a/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/component/wasm/springboot/WasmComponentAutoConfiguration.java b/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/component/wasm/springboot/WasmComponentAutoConfiguration.java index f81a1e7db4f4..e05aa634626d 100644 --- a/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/component/wasm/springboot/WasmComponentAutoConfiguration.java +++ b/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/component/wasm/springboot/WasmComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWasmComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.wasm", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/language/wasm/springboot/WasmLanguageAutoConfiguration.java b/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/language/wasm/springboot/WasmLanguageAutoConfiguration.java index 1afdd92ee3d6..66663726da28 100644 --- a/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/language/wasm/springboot/WasmLanguageAutoConfiguration.java +++ b/components-starter/camel-wasm-starter/src/main/java/org/apache/camel/language/wasm/springboot/WasmLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureWasmLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.wasm", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java index 0aaad41e09cb..6ce07d1577ac 100644 --- a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java +++ b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWeatherComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.weather", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentAutoConfiguration.java b/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentAutoConfiguration.java index 158da45bbf3f..dcf7b1db384b 100644 --- a/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentAutoConfiguration.java +++ b/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWeaviateVectorDbComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.weaviate", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentConverter.java b/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentConverter.java index db4617295690..41c45e339605 100644 --- a/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentConverter.java +++ b/components-starter/camel-weaviate-starter/src/main/java/org/apache/camel/component/weaviate/springboot/WeaviateVectorDbComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.weaviate.WeaviateVectorDbConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.weaviate.WeaviateVectorDbConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.weaviate"); } } \ No newline at end of file diff --git a/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentAutoConfiguration.java b/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentAutoConfiguration.java index 3a7b37fc166e..d19098b1a16a 100644 --- a/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentAutoConfiguration.java +++ b/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWeb3jComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.web3j", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConverter.java b/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConverter.java index b7205acf72c6..a99ec14cdaff 100644 --- a/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConverter.java +++ b/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.web3j.Web3jConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.web3j.Web3jConfiguration.class); - case "java.math.BigInteger": return applicationContext.getBean(ref, java.math.BigInteger.class); - case "org.web3j.protocol.Web3j": return applicationContext.getBean(ref, org.web3j.protocol.Web3j.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.web3j"); } } \ No newline at end of file diff --git a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentAutoConfiguration.java b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentAutoConfiguration.java index c7666a2fb0de..7eea81bb5678 100644 --- a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentAutoConfiguration.java +++ b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWebhookComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.webhook", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConverter.java b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConverter.java index db7541d05a9d..439fde0a6b7e 100644 --- a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConverter.java +++ b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.webhook.WebhookConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.webhook.WebhookConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.webhook"); } } \ No newline at end of file diff --git a/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentAutoConfiguration.java b/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentAutoConfiguration.java index e0db4be49304..edc4c4febd23 100644 --- a/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentAutoConfiguration.java +++ b/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWhatsAppComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.whatsapp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentConverter.java b/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentConverter.java index 4b58d594f233..12e8585d3d5b 100644 --- a/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentConverter.java +++ b/components-starter/camel-whatsapp-starter/src/main/java/org/apache/camel/component/whatsapp/springboot/WhatsAppComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "java.net.http.HttpClient": return applicationContext.getBean(ref, java.net.http.HttpClient.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.whatsapp"); } } \ No newline at end of file diff --git a/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentAutoConfiguration.java b/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentAutoConfiguration.java index ff9eebd03344..41d6610e49c4 100644 --- a/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentAutoConfiguration.java +++ b/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWordpressComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.wordpress", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConverter.java b/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConverter.java index 41b3c9dfb72e..dec39a211924 100644 --- a/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConverter.java +++ b/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.wordpress.WordpressConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.wordpress.WordpressConfiguration.class); - case "org.apache.camel.component.wordpress.api.model.SearchCriteria": return applicationContext.getBean(ref, org.apache.camel.component.wordpress.api.model.SearchCriteria.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.wordpress"); } } \ No newline at end of file diff --git a/components-starter/camel-workday-starter/src/main/java/org/apache/camel/component/workday/springboot/WorkdayComponentAutoConfiguration.java b/components-starter/camel-workday-starter/src/main/java/org/apache/camel/component/workday/springboot/WorkdayComponentAutoConfiguration.java index cca6801b4acb..05a421e05077 100644 --- a/components-starter/camel-workday-starter/src/main/java/org/apache/camel/component/workday/springboot/WorkdayComponentAutoConfiguration.java +++ b/components-starter/camel-workday-starter/src/main/java/org/apache/camel/component/workday/springboot/WorkdayComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureWorkdayComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.workday", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xchange-starter/src/main/java/org/apache/camel/component/xchange/springboot/XChangeComponentAutoConfiguration.java b/components-starter/camel-xchange-starter/src/main/java/org/apache/camel/component/xchange/springboot/XChangeComponentAutoConfiguration.java index 2ae24c43207f..85e8d2bd7a49 100644 --- a/components-starter/camel-xchange-starter/src/main/java/org/apache/camel/component/xchange/springboot/XChangeComponentAutoConfiguration.java +++ b/components-starter/camel-xchange-starter/src/main/java/org/apache/camel/component/xchange/springboot/XChangeComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXChangeComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xchange", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentAutoConfiguration.java b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentAutoConfiguration.java index b202360ba0bb..5a64b753d119 100644 --- a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentAutoConfiguration.java +++ b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXJComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xj", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConverter.java b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConverter.java index 82df4b8e72bf..21af83714c76 100644 --- a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConverter.java +++ b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "net.sf.saxon.Configuration": return applicationContext.getBean(ref, net.sf.saxon.Configuration.class); - case "org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy": return applicationContext.getBean(ref, org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy.class); - case "javax.xml.transform.URIResolver": return applicationContext.getBean(ref, javax.xml.transform.URIResolver.class); - case "org.apache.camel.component.xslt.XsltUriResolverFactory": return applicationContext.getBean(ref, org.apache.camel.component.xslt.XsltUriResolverFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xj"); } } \ No newline at end of file diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentAutoConfiguration.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentAutoConfiguration.java index b13fc716e687..f73b4d97fed7 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentAutoConfiguration.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXmlSignerComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xmlsecurity-sign", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentConverter.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentConverter.java index 4175d6bffc0a..0a12385f5158 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentConverter.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignerComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.xml.crypto.AlgorithmMethod": return applicationContext.getBean(ref, javax.xml.crypto.AlgorithmMethod.class); - case "org.apache.camel.component.xmlsecurity.api.KeyAccessor": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.api.KeyAccessor.class); - case "javax.xml.crypto.dsig.spec.XPathFilterParameterSpec": return applicationContext.getBean(ref, javax.xml.crypto.dsig.spec.XPathFilterParameterSpec.class); - case "org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties.class); - case "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration.class); - case "javax.xml.crypto.URIDereferencer": return applicationContext.getBean(ref, javax.xml.crypto.URIDereferencer.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xmlsecurity-sign"); } } \ No newline at end of file diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentAutoConfiguration.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentAutoConfiguration.java index f3265f6c8888..a671c21f6b07 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentAutoConfiguration.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXmlVerifierComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xmlsecurity-verify", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java index f0655c918647..75e1ab66973f 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -52,22 +53,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "javax.xml.crypto.KeySelector": return applicationContext.getBean(ref, javax.xml.crypto.KeySelector.class); - case "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler.class); - case "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.api.XmlSignature2Message.class); - case "org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker.class); - case "javax.xml.crypto.URIDereferencer": return applicationContext.getBean(ref, javax.xml.crypto.URIDereferencer.class); - case "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xmlsecurity-verify"); } } \ No newline at end of file diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java index 26855ef8c6ff..9fe5f1da663c 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureXMLSecurityDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.xml-security", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java index 92b79bb7c8b5..01c79d1ecd95 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.camel.CamelContext; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.support.jsse.KeyStoreParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.KeyStoreParameters.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.dataformat.xml-security"); } } \ No newline at end of file diff --git a/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java b/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java index 08f6658cbdfd..7260cd6ef892 100644 --- a/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java +++ b/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXmppComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xmpp", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java b/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java index 168450f16f4a..ca34f2ae8180 100644 --- a/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java +++ b/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java @@ -61,7 +61,8 @@ public org.apache.camel.spi.LanguageCustomizer configureXPathLanguage() { @Override public void configure(String name, Language target) { if (target instanceof CamelContextAware cca && cca.getCamelContext() != null) { - CamelPropertiesHelper.copyProperties(cca.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(cca.getCamelContext(), applicationContext, + "camel.language.xpath", configuration, target); } else { org.slf4j.LoggerFactory.getLogger(getClass()).debug("Language {} does not implement CamelContextAware, skipping auto-configuration properties", name); } diff --git a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentAutoConfiguration.java b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentAutoConfiguration.java index 5eae11a250ef..6be05e003953 100644 --- a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentAutoConfiguration.java +++ b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXsltSaxonComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xslt-saxon", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConverter.java b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConverter.java index cbb28d26cd2d..367278a578a6 100644 --- a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConverter.java +++ b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -50,20 +51,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "net.sf.saxon.Configuration": return applicationContext.getBean(ref, net.sf.saxon.Configuration.class); - case "org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy": return applicationContext.getBean(ref, org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy.class); - case "javax.xml.transform.URIResolver": return applicationContext.getBean(ref, javax.xml.transform.URIResolver.class); - case "org.apache.camel.component.xslt.XsltUriResolverFactory": return applicationContext.getBean(ref, org.apache.camel.component.xslt.XsltUriResolverFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xslt-saxon"); } } \ No newline at end of file diff --git a/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java b/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java index df655ecee060..0886e53355f5 100644 --- a/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java +++ b/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureXsltComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.xslt", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConverter.java b/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConverter.java index 4b1d9e6bb575..c2af4dea8f0d 100644 --- a/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConverter.java +++ b/components-starter/camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -49,19 +50,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy": return applicationContext.getBean(ref, org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy.class); - case "javax.xml.transform.URIResolver": return applicationContext.getBean(ref, javax.xml.transform.URIResolver.class); - case "org.apache.camel.component.xslt.XsltUriResolverFactory": return applicationContext.getBean(ref, org.apache.camel.component.xslt.XsltUriResolverFactory.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.xslt"); } } \ No newline at end of file diff --git a/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentAutoConfiguration.java b/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentAutoConfiguration.java index 3550b4ed647b..eb6c54334e8d 100644 --- a/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentAutoConfiguration.java +++ b/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureZendeskComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.zendesk", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConverter.java b/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConverter.java index ca77830d9306..dc9233fd620d 100644 --- a/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConverter.java +++ b/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.zendesk.ZendeskConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.zendesk.ZendeskConfiguration.class); - case "org.zendesk.client.v2.Zendesk": return applicationContext.getBean(ref, org.zendesk.client.v2.Zendesk.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.zendesk"); } } \ No newline at end of file diff --git a/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatAutoConfiguration.java b/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatAutoConfiguration.java index 1daa8a77380d..d36314c363ad 100644 --- a/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatAutoConfiguration.java +++ b/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureGzipDeflaterDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.gzip-deflater", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatAutoConfiguration.java b/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatAutoConfiguration.java index 2d2f5f04aa2c..f292a1c45037 100644 --- a/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatAutoConfiguration.java +++ b/components-starter/camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureZipDeflaterDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.zip-deflater", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java b/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java index 9b39fde48d78..9eca35074d66 100644 --- a/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java +++ b/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java @@ -63,7 +63,8 @@ public DataFormatCustomizer configureZipFileDataFormatFactory() { return new DataFormatCustomizer() { @Override public void configure(String name, DataFormat target) { - CamelPropertiesHelper.copyProperties(camelContextProvider.getObject(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(camelContextProvider.getObject(), applicationContext, + "camel.dataformat.zip-file", configuration, target); } @Override public boolean isEnabled(String name, DataFormat target) { diff --git a/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java b/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java index 4f09a831553d..f9d09894c548 100644 --- a/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java +++ b/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureMasterComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.zookeeper-master", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentConverter.java b/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentConverter.java index fbde79d8353e..c3c2e4c49b0d 100644 --- a/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentConverter.java +++ b/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -48,18 +49,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.zookeepermaster.ContainerIdFactory": return applicationContext.getBean(ref, org.apache.camel.component.zookeepermaster.ContainerIdFactory.class); - case "org.apache.curator.framework.CuratorFramework": return applicationContext.getBean(ref, org.apache.curator.framework.CuratorFramework.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.zookeeper-master"); } } \ No newline at end of file diff --git a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java index fba1830bdf8e..18318b61ad4a 100644 --- a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java +++ b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java @@ -58,7 +58,8 @@ public ComponentCustomizer configureZooKeeperComponent() { return new ComponentCustomizer() { @Override public void configure(String name, Component target) { - CamelPropertiesHelper.copyProperties(target.getCamelContext(), configuration, target); + CamelPropertiesHelper.copyConfigurationProperties(target.getCamelContext(), applicationContext, + "camel.component.zookeeper", configuration, target); } @Override public boolean isEnabled(String name, Component target) { diff --git a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConverter.java b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConverter.java index 244622fd3e79..2c500345a7d0 100644 --- a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConverter.java +++ b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConverter.java @@ -18,6 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; +import org.apache.camel.spring.boot.util.BeanReferenceHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.ApplicationContext; @@ -47,17 +48,6 @@ public Object convert( Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - if (source == null) { - return null; - } - String ref = source.toString(); - if (!ref.startsWith("#")) { - return null; - } - ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); - switch (targetType.getName()) { - case "org.apache.camel.component.zookeeper.ZooKeeperConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.zookeeper.ZooKeeperConfiguration.class); - } - return null; + return BeanReferenceHelper.resolveBeanReference(applicationContext, source, targetType, "camel.component.zookeeper"); } } \ No newline at end of file diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json b/core/camel-spring-boot/src/main/docs/spring-boot.json index 5c360d573e62..8989cb412117 100644 --- a/core/camel-spring-boot/src/main/docs/spring-boot.json +++ b/core/camel-spring-boot/src/main/docs/spring-boot.json @@ -1335,6 +1335,12 @@ "description": "Security policy for plain-text secrets. When set, overrides the global policy for properties that contain sensitive values configured as plain text.", "sourceType": "org.apache.camel.spring.boot.security.CamelSecurityPolicyConfigurationProperties" }, + { + "name": "camel.springboot.lenient-configuration-binding", + "type": "java.lang.Boolean", + "description": "Whether a camel.component, camel.dataformat or camel.language option that cannot be set on the Camel component, data format or language it configures should be tolerated. When false (the default) an option the application configured explicitly and that cannot be set aborts startup, so a configured option can never be silently dropped. When true the option is logged at WARN and ignored.", + "defaultValue": false + }, { "name": "camel.ssl.cert-alias", "type": "java.lang.String", diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/BeanReferenceHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/BeanReferenceHelper.java new file mode 100644 index 000000000000..8c8aa810982d --- /dev/null +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/BeanReferenceHelper.java @@ -0,0 +1,195 @@ +/* + * 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.spring.boot.util; + +import java.lang.reflect.Field; +import org.springframework.beans.BeansException; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.ApplicationContext; +import org.springframework.core.MethodParameter; +import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.core.convert.TypeDescriptor; +import org.springframework.util.ClassUtils; + +/** + * Resolves the bean references that Camel configuration options of a complex (object) type are configured with in + * application.properties, such as + * camel.component.netty-http.ssl-context-parameters = #bean:mySslContextParameters. + *
+ * This is used by the generated *ComponentConverter, *DataFormatConverter and + * *LanguageConverter classes in the Camel Spring Boot starters. The following syntaxes are supported: + *