[camel-spring-boot] branch main updated: CAMEL-15105: adjust plugin usages of BeanIntrospection

[or...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new a67455b50f1 CAMEL-15105: adjust plugin usages of BeanIntrospection
a67455b50f1 is described below

commit a67455b50f1efef3c0e63d8c8e682b56f1340196
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 10:17:02 2023 +0200

    CAMEL-15105: adjust plugin usages of BeanIntrospection
---
 .../springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java    | 3 ++-
 .../springboot/RestConfigurationDefinitionAutoConfiguration.java     | 3 ++-
 .../component/dns/springboot/cloud/DnsCloudAutoConfiguration.java    | 3 ++-
 .../java/org/apache/camel/component/fhir/FhirConfigurationIT.java    | 3 ++-
 .../cloud/KubernetesServiceDiscoveryAutoConfiguration.java           | 3 ++-
 .../component/resilience/springboot/ResilienceAutoConfiguration.java | 5 +++--
 .../org/apache/camel/spring/boot/util/CamelPropertiesHelper.java     | 3 ++-
 .../camel/springboot/maven/SpringBootAutoConfigurationMojo.java      | 4 +++-
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java
index 275473e388c..613d37fddb1 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.support.PluginHelper;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -77,7 +78,7 @@ public class ConsulServiceDiscoveryAutoConfiguration {
                 // The instance factory
                 ConsulServiceDiscoveryFactory factory = new ConsulServiceDiscoveryFactory();
 
-                BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+                BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
                 try {
                     bi.getProperties(entry.getValue(), parameters, null, false);
                     CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, false);
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
index a54a0d05564..bff6e7a300f 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.support.PluginHelper;
 import org.apache.camel.util.CollectionHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -55,7 +56,7 @@ public class RestConfigurationDefinitionAutoConfiguration {
     public RestConfiguration configureRestConfigurationDefinition()
             throws Exception {
         Map<String, Object> properties = new HashMap<>();
-        camelContext.getCamelContextExtension().getBeanIntrospection().getProperties(config, properties, null, false);
+        PluginHelper.getBeanIntrospection(camelContext).getProperties(config, properties, null, false);
         // These options is configured specially further below, so remove them first
         properties.remove("enableCors");
         properties.remove("apiProperty");
diff --git a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java
index 18e25e57590..0b4df9cfbd5 100644
--- a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java
+++ b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.support.PluginHelper;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -79,7 +80,7 @@ public class DnsCloudAutoConfiguration {
                 // The instance factory
                 DnsServiceDiscoveryFactory factory = new DnsServiceDiscoveryFactory();
 
-                BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+                BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
                 try {
                     bi.getProperties(entry.getValue(), parameters, null, false);
                     CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, false);
diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index 51dc2b89a45..a447b292829 100644
--- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -29,6 +29,7 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection;
 import org.apache.camel.component.fhir.internal.FhirCreateApiMethod;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.CamelContextConfiguration;
+import org.apache.camel.support.PluginHelper;
 import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +104,7 @@ public class FhirConfigurationIT extends AbstractFhirTestSupport {
 
         assertTrue(interceptors.contains(this.mockClientInterceptor), "User defined IClientInterceptor not found");
 
-        long counter = camelContext.getCamelContextExtension().getBeanIntrospection().getInvokedCounter();
+        long counter = PluginHelper.getBeanIntrospection(camelContext).getInvokedCounter();
         assertEquals(0, counter, "Should not use reflection");
     }
 
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java
index 4762c7ad73d..ad372f4ee82 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.support.PluginHelper;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -77,7 +78,7 @@ public class KubernetesServiceDiscoveryAutoConfiguration {
                 // The instance factory
                 KubernetesServiceDiscoveryFactory factory = new KubernetesServiceDiscoveryFactory();
 
-                BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+                BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
                 try {
                     bi.getProperties(entry.getValue(), parameters, null, false);
                     CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, true);
diff --git a/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java b/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
index 1d317c0556a..1f06d0827f5 100644
--- a/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
+++ b/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.camel.model.springboot.Resilience4jConfigurationDefinitionProp
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.support.PluginHelper;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -62,7 +63,7 @@ public class ResilienceAutoConfiguration {
     public Resilience4jConfigurationDefinition defaultResilienceConfigurationDefinition() throws Exception {
         Map<String, Object> properties = new HashMap<>();
 
-        BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+        final BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
         bi.getProperties(config, properties, null, false);
         Resilience4jConfigurationDefinition definition = new Resilience4jConfigurationDefinition();
         CamelPropertiesHelper.setCamelProperties(camelContext, definition, properties, false);
@@ -84,7 +85,7 @@ public class ResilienceAutoConfiguration {
             properties.clear();
 
             // extract properties
-            BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+            final BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
             bi.getProperties(entry.getValue(), properties, null, false);
 
             try {
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
index 6d45e736871..e941e1b5cb0 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
@@ -25,6 +25,7 @@ import org.apache.camel.Component;
 import org.apache.camel.PropertyBindingException;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.PropertyConfigurer;
+import org.apache.camel.support.PluginHelper;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -141,7 +142,7 @@ public final class CamelPropertiesHelper {
     public static Map<String, Object> getNonNullProperties(CamelContext camelContext, Object target) {
         Map<String, Object> properties = new HashMap<>();
 
-        BeanIntrospection bi = camelContext.getCamelContextExtension().getBeanIntrospection();
+        BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
         bi.getProperties(target, properties, null, false);
 
         return properties;
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 90514eac616..05fcabc306b 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -424,6 +424,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.spring.boot.util.CamelPropertiesHelper");
         javaClass.addImport("org.apache.camel.CamelContext");
         javaClass.addImport("org.apache.camel.spi.RestConfiguration");
+        javaClass.addImport("org.apache.camel.support.PluginHelper");
+
 
         javaClass.addField().setName("camelContext").setType(loadClass("org.apache.camel.CamelContext")).setPrivate().addAnnotation(Autowired.class);
         javaClass.addField().setName("config").setType(loadClass(packageName + "." + configType)).setPrivate().addAnnotation(Autowired.class);
@@ -440,7 +442,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         method.addAnnotation(Bean.class).setLiteralValue("name", "\"rest-configuration\"");
         method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
         method.addAnnotation(ConditionalOnMissingBean.class);
-        method.setBody("" + "Map<String, Object> properties = new HashMap<>();\n" + "camelContext.getCamelContextExtension().getBeanIntrospection().getProperties(config, properties, null, false);\n"
+        method.setBody("" + "Map<String, Object> properties = new HashMap<>();\n" + "PluginHelper.getBeanIntrospection(camelContext).getProperties(config, properties, null, false);\n"
                 + "// These options is configured specially further below, so remove them first\n" + "properties.remove(\"enableCors\");\n"
                 + "properties.remove(\"apiProperty\");\n" + "properties.remove(\"componentProperty\");\n" + "properties.remove(\"consumerProperty\");\n"
                 + "properties.remove(\"dataFormatProperty\");\n" + "properties.remove(\"endpointProperty\");\n" + "properties.remove(\"corsHeaders\");\n" + "\n"