[camel] 02/02: Use RoutesLoader annotation

[lburgazzoli]

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d6d14e58cc31dcb79f43f186abf31be9aca18f2e
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Feb 22 11:17:45 2021 +0100

    Use RoutesLoader annotation
---
 .../org/apache/camel/language/joor/JoorRoutesBuilderLoader.java  | 5 ++---
 .../java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java     | 5 ++---
 .../org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java    | 9 +++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorRoutesBuilderLoader.java
 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorRoutesBuilderLoader.java
index 6cdcef5..0ebf95f 100644
--- 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorRoutesBuilderLoader.java
+++ 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorRoutesBuilderLoader.java
@@ -26,9 +26,8 @@ import org.apache.camel.StartupStep;
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.spi.Resource;
-import org.apache.camel.spi.RoutesBuilderLoader;
 import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.spi.annotations.RoutesLoader;
 import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.support.RoutesBuilderLoaderSupport;
 import org.apache.camel.util.FileUtil;
@@ -36,7 +35,7 @@ import org.apache.camel.util.IOHelper;
 import org.joor.Reflect;
 
 @ManagedResource(description = "Managed JavaRoutesBuilderLoader")
-@JdkService(RoutesBuilderLoader.FACTORY_GROUP + "/" + 
JoorRoutesBuilderLoader.EXTENSION)
+@RoutesLoader(JoorRoutesBuilderLoader.EXTENSION)
 public class JoorRoutesBuilderLoader extends RoutesBuilderLoaderSupport {
     public static final String EXTENSION = "java";
     public static final Pattern PACKAGE_PATTERN = Pattern.compile(
diff --git 
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java
 
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java
index 9c29478..5c50e1b 100644
--- 
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java
+++ 
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java
@@ -25,13 +25,12 @@ import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Resource;
-import org.apache.camel.spi.RoutesBuilderLoader;
 import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.spi.annotations.RoutesLoader;
 import org.apache.camel.support.RoutesBuilderLoaderSupport;
 
 @ManagedResource(description = "Managed XML RoutesBuilderLoader")
-@JdkService(RoutesBuilderLoader.FACTORY_GROUP + "/" + 
XmlRoutesBuilderLoader.EXTENSION)
+@RoutesLoader(XmlRoutesBuilderLoader.EXTENSION)
 public class XmlRoutesBuilderLoader extends RoutesBuilderLoaderSupport {
 
     public static final String EXTENSION = "xml";
diff --git 
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
 
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
index 566a8e7..69f62c1 100644
--- 
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
+++ 
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
@@ -28,15 +28,16 @@ import org.apache.camel.model.RouteTemplatesDefinition;
 import org.apache.camel.model.RoutesDefinition;
 import org.apache.camel.model.rest.RestsDefinition;
 import org.apache.camel.spi.Resource;
-import org.apache.camel.spi.RoutesBuilderLoader;
 import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.spi.annotations.RoutesLoader;
 import org.apache.camel.support.RoutesBuilderLoaderSupport;
 
-import static org.apache.camel.xml.jaxb.JaxbHelper.*;
+import static org.apache.camel.xml.jaxb.JaxbHelper.loadRestsDefinition;
+import static 
org.apache.camel.xml.jaxb.JaxbHelper.loadRouteTemplatesDefinition;
+import static org.apache.camel.xml.jaxb.JaxbHelper.loadRoutesDefinition;
 
 @ManagedResource(description = "Managed JAXB XML RoutesBuilderLoader")
-@JdkService(RoutesBuilderLoader.FACTORY_GROUP + "/" + 
JaxbXmlRoutesBuilderLoader.EXTENSION)
+@RoutesLoader(JaxbXmlRoutesBuilderLoader.EXTENSION)
 public class JaxbXmlRoutesBuilderLoader extends RoutesBuilderLoaderSupport {
 
     public static final String EXTENSION = "xml";