You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/02/22 12:06:45 UTC
[camel] branch master updated (ba71dce -> d6d14e5)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ba71dce Sync deps
new 5e64774 core(api): introduce RoutesLoader annotation
new d6d14e5 Use RoutesLoader annotation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/language/joor/JoorRoutesBuilderLoader.java | 5 ++---
.../spi/annotations/{ServiceFactory.java => RoutesLoader.java} | 7 ++++---
.../java/org/apache/camel/xml/in/XmlRoutesBuilderLoader.java | 5 ++---
.../org/apache/camel/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 9 +++++----
4 files changed, 13 insertions(+), 13 deletions(-)
copy core/camel-api/src/generated/java/org/apache/camel/spi/annotations/{ServiceFactory.java => RoutesLoader.java} (89%)
[camel] 01/02: core(api): introduce RoutesLoader annotation
Posted by lb...@apache.org.
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 5e64774fd4178a8e3144652db86f5616f801a60a
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Mon Feb 22 11:17:18 2021 +0100
core(api): introduce RoutesLoader annotation
---
.../apache/camel/spi/annotations/RoutesLoader.java | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/RoutesLoader.java b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/RoutesLoader.java
new file mode 100644
index 0000000..646bcf6
--- /dev/null
+++ b/core/camel-api/src/generated/java/org/apache/camel/spi/annotations/RoutesLoader.java
@@ -0,0 +1,35 @@
+/*
+ * 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.spi.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.camel.spi.RoutesBuilderLoader;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ ElementType.TYPE })
+@ServiceFactory(RoutesBuilderLoader.FACTORY_GROUP)
+public @interface RoutesLoader {
+
+ String value();
+
+}
[camel] 02/02: Use RoutesLoader annotation
Posted by lb...@apache.org.
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 <lb...@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";