This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 131e85ed2 #508: Fix integration tests camel route suppliers service
declaration (#509)
131e85ed2 is described below
commit 131e85ed22a0b3d10b50f6cf9f9bd188fa41f786
Author: Stefan Tataru <[email protected]>
AuthorDate: Fri Sep 27 17:49:21 2024 +0200
#508: Fix integration tests camel route suppliers service declaration (#509)
---
.../main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java | 3 ++-
.../org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java | 3 ++-
.../main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java | 3 ++-
.../java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java | 3 ++-
.../src/main/java/test/Camel__featureName__RouteSupplier.java | 3 ++-
17 files changed, 34 insertions(+), 17 deletions(-)
diff --git
a/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
index c146c7d2e..79fad9c3b 100644
---
a/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
+++
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
@@ -20,12 +20,13 @@ import java.util.function.Function;
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/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
index 533e8f5cf..0bb6ceb67 100644
---
a/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
+++
b/tests/features/camel-avro/src/main/java/org/apache/karaf/camel/test/CamelAvroRouteSupplier.java
@@ -24,13 +24,14 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
index a87153e8f..da73263d2 100644
---
a/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
+++
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
@@ -35,6 +35,7 @@ import org.apache.camel.dataformat.barcode.BarcodeImageType;
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 @@ import com.google.zxing.common.HybridBinarizer;
@Component(
name = "karaf-camel-barcode-test",
immediate = true,
- service = CamelBarcodeRouteSupplier.class
+ service = CamelRouteSupplier.class
)
public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
diff --git
a/tests/features/camel-bean-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java
b/tests/features/camel-bean-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java
index ff934da65..e50851c75 100644
---
a/tests/features/camel-bean-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java
+++
b/tests/features/camel-bean-validator/src/main/java/org/apache/karaf/camel/test/CamelBeanValidatorRouteSupplier.java
@@ -20,6 +20,7 @@ import static org.apache.camel.builder.Builder.constant;
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 @@ import jakarta.validation.constraints.NotNull;
@Component(
name = "karaf-camel-bean-validator-test",
immediate = true,
- service = CamelBeanValidatorRouteSupplier.class
+ service = CamelRouteSupplier.class
)
public class CamelBeanValidatorRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
diff --git
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
index 642bfb6ce..89e0c313c 100644
---
a/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
+++
b/tests/features/camel-bindy/src/main/java/org/apache/karaf/camel/test/CamelBindyRouteSupplier.java
@@ -19,12 +19,13 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
b/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
index 22066ce30..cc17294f8 100644
---
a/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
+++
b/tests/features/camel-caffeine/src/main/java/org/apache/karaf/camel/test/CamelCaffeineRouteSupplier.java
@@ -21,12 +21,13 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
b/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
index 5dd7345c8..7db0de64a 100644
---
a/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
+++
b/tests/features/camel-cbor/src/main/java/org/apache/karaf/camel/test/CamelCborRouteSupplier.java
@@ -24,12 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java
b/tests/features/camel-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java
index dd3396184..665eba59a 100644
---
a/tests/features/camel-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java
+++
b/tests/features/camel-chatscript/src/main/java/org/apache/karaf/camel/test/CamelChatscriptRouteSupplier.java
@@ -20,6 +20,7 @@ import
org.apache.camel.component.chatscript.ChatScriptMessage;
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 @@ import com.fasterxml.jackson.databind.ObjectMapper;
@Component(
name = "karaf-camel-chatscript-test",
immediate = true,
- service = CamelChatscriptRouteSupplier.class
+ service = CamelRouteSupplier.class
)
public class CamelChatscriptRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
diff --git
a/tests/features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
b/tests/features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
index 9e0c65ad1..d25fcabef 100644
---
a/tests/features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
+++
b/tests/features/camel-coap/src/main/java/org/apache/karaf/camel/test/CamelCoapRouteSupplier.java
@@ -22,12 +22,13 @@ import java.util.function.Function;
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/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
b/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
index ae658cd61..8433e037f 100644
---
a/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
+++
b/tests/features/camel-consul/src/main/java/org/apache/karaf/camel/test/CamelConsulRouteSupplier.java
@@ -26,12 +26,13 @@ import
org.apache.camel.component.consul.endpoint.ConsulHealthActions;
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/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
b/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
index 1bf5f01ae..5722cad49 100644
---
a/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
+++
b/tests/features/camel-couchdb/src/main/java/org/apache/karaf/camel/test/CamelCouchdbRouteSupplier.java
@@ -24,12 +24,13 @@ import org.apache.camel.component.couchdb.CouchDbConstants;
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/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
b/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
index fadf8a97a..7afd2b70f 100644
---
a/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
+++
b/tests/features/camel-crypto/src/main/java/org/apache/karaf/camel/test/CamelCryptoRouteSupplier.java
@@ -26,12 +26,13 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
b/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
index 62f4de901..dba646c52 100644
---
a/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
+++
b/tests/features/camel-csv/src/main/java/org/apache/karaf/camel/test/CamelCsvRouteSupplier.java
@@ -19,12 +19,13 @@ import org.apache.camel.builder.RouteBuilder;
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/tests/features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java
b/tests/features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java
index 18dc4c058..ea43aacab 100644
---
a/tests/features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java
+++
b/tests/features/camel-exec/src/main/java/org/apache/karaf/camel/test/CamelExecRouteSupplier.java
@@ -18,12 +18,13 @@ package org.apache.karaf.camel.test;
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/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
index 7114bbc86..23705863e 100644
---
a/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
+++
b/tests/features/camel-flatpack/src/main/java/org/apache/karaf/camel/test/CamelFlatpackRouteSupplier.java
@@ -21,12 +21,13 @@ import java.util.function.Function;
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/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
b/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
index 298b5566f..3250fdf54 100644
---
a/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
+++
b/tests/features/camel-leveldb/src/main/java/org/apache/karaf/camel/test/CamelLeveldbRouteSupplier.java
@@ -25,12 +25,13 @@ import
org.apache.camel.component.leveldb.LevelDBAggregationRepository;
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 {
diff --git
a/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
index 5fc71eb1f..69f95dcf5 100644
---
a/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
+++
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java
@@ -22,12 +22,13 @@ import org.apache.camel.CamelContext;
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-${featureNameLower}-test",
immediate = true,
- service = Camel${featureName}RouteSupplier.class
+ service = CamelRouteSupplier.class
)
public class Camel${featureName}RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
