[camel-spring-boot] 02/03: Camel-Spring-Boot: Fixed build

[ac...@apache.org]

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

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

commit c887354c5a635681c7d89be24e591d084bd996ca
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 19 10:41:31 2020 +0100

    Camel-Spring-Boot: Fixed build
---
 .../rest/springboot/RestConfigurationDefinitionAutoConfiguration.java | 4 ++--
 .../camel/springboot/maven/SpringBootAutoConfigurationMojo.java       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 efaadab..3f91b5f 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
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.CamelContext;
-import org.apache.camel.component.rest.RestComponent;
+import org.apache.camel.model.rest.RestConstants;
 import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.support.IntrospectionSupport;
@@ -53,7 +53,7 @@ public class RestConfigurationDefinitionAutoConfiguration {
     private RestConfigurationDefinitionProperties config;
 
     @Lazy
-    @Bean(name = RestComponent.DEFAULT_REST_CONFIGURATION_ID)
+    @Bean(name = RestConstants.DEFAULT_REST_CONFIGURATION_ID)
     @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean
     public RestConfiguration configureRestConfigurationDefinition()
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 e599773..7b10642 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
@@ -449,7 +449,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.support.IntrospectionSupport");
         javaClass.addImport("org.apache.camel.spring.boot.util.CamelPropertiesHelper");
         javaClass.addImport("org.apache.camel.CamelContext");
-        javaClass.addImport("org.apache.camel.model.rest.RestConstants");
+        javaClass.addImport("org.apache.camel.component.rest.RestComponent");
         javaClass.addImport("org.apache.camel.spi.RestConfiguration");
 
         javaClass.addField().setName("camelContext").setType(loadClass("org.apache.camel.CamelContext")).setPrivate().addAnnotation(Autowired.class);
@@ -464,7 +464,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         method.addThrows(Exception.class);
         method.setReturnType(loadClass("org.apache.camel.spi.RestConfiguration"));
         method.addAnnotation(Lazy.class);
-        method.addAnnotation(Bean.class).setLiteralValue("name", "RestConstants.DEFAULT_REST_CONFIGURATION_ID");
+        method.addAnnotation(Bean.class).setLiteralValue("name", "RestComponent.DEFAULT_REST_CONFIGURATION_ID");
         method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
         method.addAnnotation(ConditionalOnMissingBean.class);
         method.setBody("" + "Map<String, Object> properties = new HashMap<>();\n" + "IntrospectionSupport.getProperties(config, properties, null, false);\n"