Fix integration tests camel route suppliers service declaration

apache · Sep 26, 2024 · 2e1d23a · 2e1d23a
1 parent 3dd12a4
commit 2e1d23a
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 16 deletions.
diff --git a/...features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java b/...features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
@@ -20,12 +20,13 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-atom-test",
         immediate = true,
-        service = CamelAtomRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelAtomRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java b/...features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
@@ -24,13 +24,14 @@
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.dataformat.avro.AvroDataFormat;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 
 @Component(
         name = "karaf-camel-avro-test",
         immediate = true,
-        service = CamelAvroRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelAvroRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...es/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java b/...es/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
@@ -35,6 +35,7 @@
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.DataFormat;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 import com.google.zxing.BarcodeFormat;
@@ -47,7 +48,7 @@
 @Component(
         name = "karaf-camel-barcode-test",
         immediate = true,
-        service = CamelBarcodeRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelBarcodeRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java b/...-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java
@@ -20,6 +20,7 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 import jakarta.validation.constraints.Min;
@@ -28,7 +29,7 @@
 @Component(
         name = "karaf-camel-bean-validator-test",
         immediate = true,
-        service = CamelBeanValidatorRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelBeanValidatorRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...atures/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java b/...atures/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
@@ -19,12 +19,13 @@
 import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-bindy-test",
         immediate = true,
-        service = CamelBindyRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelBindyRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/.../camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java b/.../camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
@@ -21,12 +21,13 @@
 import org.apache.camel.component.caffeine.CaffeineConstants;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-caffeine-test",
         immediate = true,
-        service = CamelCaffeineRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCaffeineRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java b/...features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
@@ -24,12 +24,13 @@
 import org.apache.camel.component.cbor.CBORDataFormat;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-cbor-test",
         immediate = true,
-        service = CamelCborRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCborRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...el-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java b/...el-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java
@@ -20,6 +20,7 @@
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.language.SimpleExpression;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -28,7 +29,7 @@
 @Component(
         name = "karaf-camel-chatscript-test",
         immediate = true,
-        service = CamelChatscriptRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelChatscriptRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java b/...features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
@@ -22,12 +22,13 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-coap-test",
         immediate = true,
-        service = CamelCoapRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCoapRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...ures/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java b/...ures/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
@@ -26,12 +26,13 @@
 import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-consul-test",
         immediate = true,
-        service = CamelConsulRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelConsulRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...es/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java b/...es/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
@@ -24,12 +24,13 @@
 import org.apache.camel.component.couchdb.CouchDbOperations;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-couchdb-test",
         immediate = true,
-        service = CamelCouchdbRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCouchdbRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...ures/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java b/...ures/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
@@ -26,12 +26,13 @@
 import org.apache.camel.component.crypto.DigitalSignatureConstants;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-crypto-test",
         immediate = true,
-        service = CamelCryptoRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCryptoRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...s/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java b/...s/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
@@ -19,12 +19,13 @@
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.dataformat.CsvDataFormat;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-csv-test",
         immediate = true,
-        service = CamelCsvRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelCsvRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java b/...features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java
@@ -18,12 +18,13 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-exec-test",
         immediate = true,
-        service = CamelExecRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelExecRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/.../camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java b/.../camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
@@ -21,12 +21,13 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-flatpack-test",
         immediate = true,
-        service = CamelFlatpackRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelFlatpackRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
 

diff --git a/...es/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java b/...es/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
@@ -25,12 +25,13 @@
 import org.apache.camel.component.leveldb.serializer.JacksonLevelDBSerializer;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
 import org.osgi.service.component.annotations.Component;
 
 @Component(
         name = "karaf-camel-leveldb-test",
         immediate = true,
-        service = CamelLeveldbRouteSupplier.class
+        service = CamelRouteSupplier.class
 )
 public class CamelLeveldbRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {