[CAMEL-21862] camel-spring-boot - Remove deprecated camel.springboot. config prefix

core/camel-spring-boot/src/main/docs/spring-boot.adoc

@@ -311,11 +311,11 @@ keeping the application alive by preventing JVM termination.
 It means that after you start a Camel application with Spring Boot, your
 application waits for a `Ctrl+C` signal and does not exit immediately.
 
-The controller thread can be activated using the `camel.springboot.main-run-controller` to `true`.
+The controller thread can be activated using the `camel.main.run-controller` to `true`.
 
 [source,properties]
 ----
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 ----
 
 Applications using web modules (e.g. importing the `org.springframework.boot:spring-boot-web-starter` module),

core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java

@@ -107,7 +107,7 @@ CamelContext camelContext(ApplicationContext applicationContext, CamelConfigurat
         Clock clock = new ResetableClock();
         CamelSpringBootApplicationController controller = new CamelSpringBootApplicationController(applicationContext);
         CamelContext camelContext = new SpringBootCamelContext(applicationContext,
-                config.getSpringboot().isWarnOnEarlyShutdown(), controller);
+                config.getMain().isWarnOnEarlyShutdown(), controller);
         camelContext.getClock().add(ContextEvents.BOOT, clock);
         controller.setCamelContext(camelContext);
         // bean post processor is created before CamelContext
@@ -292,7 +292,7 @@ static void configureStartupRecorder(CamelContext camelContext, CamelConfigurati
     @ConditionalOnMissingBean(RoutesCollector.class)
     @ConditionalOnMissingClass("org.apache.camel.spring.boot.endpointdsl.EndpointDslRouteCollector")
     RoutesCollector routesCollector(ApplicationContext applicationContext, CamelConfigurationProperties config) {
-        return new CamelSpringBootRoutesCollector(applicationContext, config.getSpringboot().isIncludeNonSingletons());
+        return new CamelSpringBootRoutesCollector(applicationContext, config.getMain().isIncludeNonSingletons());
     }
 
     @Bean

core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java

@@ -110,7 +110,7 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
                     camelContextConfiguration.beforeApplicationStart(camelContext);
                 }
 
-                if (configurationProperties.getSpringboot().isMainRunController()) {
+                if (configurationProperties.getMain().isMainRunController()) {
                     CamelMainRunController controller = new CamelMainRunController(applicationContext, camelContext);
 
                     if (configurationProperties.getMain().getDurationMaxMessages() > 0

core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootCamelContext.java

@@ -79,7 +79,7 @@ protected synchronized void doStop() throws Exception {
             if (!junit && !starterWeb) {
                 LOG.warn(
                         "CamelContext has only been running for less than a second. If you intend to run Camel for a longer time "
-                                + "then you can set the property camel.springboot.main-run-controller=true in application.properties"
+                                + "then you can set the property camel.main.run-controller=true in application.properties"
                                 + " or add spring-boot-starter-web JAR to the classpath.");
             }
         }

core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java

@@ -30,7 +30,7 @@
 import org.springframework.core.convert.support.DefaultConversionService;
 
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(value = "camel.springboot.type-conversion", matchIfMissing = true)
+@ConditionalOnProperty(value = "camel.main.type-conversion", matchIfMissing = true)
 public class TypeConversionConfiguration {
 
     // We explicitly declare the destroyMethod to be "" as the Spring @Bean

core/camel-spring-boot/src/main/velocity/config.vm

@@ -52,29 +52,15 @@ public class CamelConfigurationProperties  {
     // the need to generate this whole file using a velocity template.
     //
 
-    @NestedConfigurationProperty
-    private final Springboot springboot = new Springboot();
-
     @NestedConfigurationProperty
     private final Main main = new Main();
 
-    public Springboot getSpringboot() {
-        return springboot;
-    }
-
     public Main getMain() {
         return main;
     }
 
     public class Main extends InnerCamelConfigurationProperties {
 
-    }
-
-    @SuppressWarnings("unused")
-    public class Springboot extends InnerDeprecatedCamelConfigurationProperties {
-        // Spring Boot only Properties
-        // ---------------------------
-
         /**
          * Whether to use the main run controller to ensure the Spring-Boot application
          * keeps running until being stopped or the JVM terminated.

core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java

@@ -39,7 +39,7 @@
 @EnableAutoConfiguration
 @SpringBootTest(classes = { CamelAutoConfiguration.class,
         SupervisingRouteControllerRestartTest.TestConfiguration.class }, properties = {
-                "camel.springboot.main-run-controller = true", "camel.routecontroller.enabled = true",
+                "camel.main.run-controller = true", "camel.routecontroller.enabled = true",
                 "camel.routecontroller.initialDelay = 500", "camel.routecontroller.backoffDelay = 1000",
                 "camel.routecontroller.backoffMaxAttempts = 5", })
 public class SupervisingRouteControllerRestartTest {

core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java

@@ -39,7 +39,7 @@
 @EnableAutoConfiguration
 @SpringBootTest(classes = { CamelAutoConfiguration.class,
         SupervisingRouteControllerTest.TestConfiguration.class }, properties = {
-                "camel.springboot.routes-include-pattern = false", "camel.springboot.main-run-controller = true",
+                "camel.main.routes-include-pattern = false", "camel.main.run-controller = true",
                 "camel.routecontroller.enabled = true", "camel.routecontroller.initialDelay = 500",
                 "camel.routecontroller.backoffDelay = 1000", "camel.routecontroller.backoffMaxAttempts = 5", })
 public class SupervisingRouteControllerTest {

docs/spring-boot/modules/ROOT/pages/index.adoc

@@ -70,12 +70,12 @@ with a Camel component.
 
 == Making sure Camel context is running in standalone Spring Boot
 
-To ensure the Spring Boot application keeps running until being stopped or the JVM terminated, typically only need when running Spring Boot standalone, i.e. not with `spring-boot-starter-web` when the web container keeps the JVM running, set the `camel.springboot.main-run-controller=true` property in your configuration. For example in `application.properties`.
+To ensure the Spring Boot application keeps running until being stopped or the JVM terminated, typically only need when running Spring Boot standalone, i.e. not with `spring-boot-starter-web` when the web container keeps the JVM running, set the `camel.main.run-controller=true` property in your configuration. For example in `application.properties`.
 
 [source]
 ----
 # to keep the JVM running
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 ----
 
 == Spring Boot configuration support

dsl-starter/camel-endpointdsl-starter/src/main/java/org/apache/camel/spring/boot/endpointdsl/EndpointDslAutoConfiguration.java

@@ -34,7 +34,7 @@ public class EndpointDslAutoConfiguration {
     @Bean
     RoutesCollector endpointDslRoutesCollector(ApplicationContext applicationContext,
             CamelConfigurationProperties config) {
-        return new EndpointDslRouteCollector(applicationContext, config.getSpringboot().isIncludeNonSingletons());
+        return new EndpointDslRouteCollector(applicationContext, config.getMain().isIncludeNonSingletons());
     }
 
 }