This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new d9dd921 CoreTest.testCamelContextAwareRegistryBeansInitialized failing after RouteBuilder started implementing CamelContextAware #3002 d9dd921 is described below commit d9dd921722496962fc3f3f6a77b3955460ef41ff Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Thu Aug 19 14:10:02 2021 +0200 CoreTest.testCamelContextAwareRegistryBeansInitialized failing after RouteBuilder started implementing CamelContextAware #3002 --- .../camel/quarkus/component/bean/RouteBuilderWithProducer.java | 1 + .../org/apache/camel/quarkus/component/bean/eip/EipRoutes.java | 2 ++ .../camel/quarkus/core/languages/it/CustomDataFormatRoutes.java | 2 ++ .../apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java | 2 ++ .../src/main/java/org/apache/camel/quarkus/core/CoreResource.java | 7 ++++++- .../src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/RouteBuilderWithProducer.java b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/RouteBuilderWithProducer.java index f5785c6..85b5d9d 100644 --- a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/RouteBuilderWithProducer.java +++ b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/RouteBuilderWithProducer.java @@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder; * A {@link RouteBuilder} with a @Produces method that makes it a CDI bean. It would normally get removed from the CDI * container. */ +@ApplicationScoped public class RouteBuilderWithProducer extends RouteBuilder { @Override diff --git a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/eip/EipRoutes.java b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/eip/EipRoutes.java index f115f2e..7896109 100644 --- a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/eip/EipRoutes.java +++ b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/eip/EipRoutes.java @@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.bean.eip; import java.util.ArrayList; import java.util.List; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; import javax.inject.Singleton; @@ -27,6 +28,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.Consume; import org.apache.camel.builder.RouteBuilder; +@ApplicationScoped public class EipRoutes extends RouteBuilder { @Override diff --git a/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/CustomDataFormatRoutes.java b/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/CustomDataFormatRoutes.java index b4ede96..1110c40 100644 --- a/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/CustomDataFormatRoutes.java +++ b/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/CustomDataFormatRoutes.java @@ -21,6 +21,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.charset.StandardCharsets; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; import javax.inject.Singleton; @@ -30,6 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.DataFormat; import org.apache.camel.support.ExchangeHelper; +@ApplicationScoped public class CustomDataFormatRoutes extends RouteBuilder { @Override diff --git a/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java b/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java index 956ce56..540755a 100644 --- a/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java +++ b/integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java @@ -16,6 +16,7 @@ */ package org.apache.camel.quarkus.core.languages.it; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; import javax.inject.Singleton; @@ -25,6 +26,7 @@ import org.apache.camel.Expression; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.ExpressionAdapter; +@ApplicationScoped public class RefLanguageRoutes extends RouteBuilder { @Override diff --git a/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java b/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java index 6811a91..fc8f2d8 100644 --- a/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java +++ b/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java @@ -25,6 +25,7 @@ import java.io.ObjectOutputStream; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Set; import java.util.stream.Collectors; import javax.enterprise.context.ApplicationScoped; @@ -78,7 +79,11 @@ public class CoreResource { @GET @Produces(MediaType.TEXT_PLAIN) public boolean camelContextAwareBeansHaveContextSet() { - return registry.findByType(CamelContextAware.class).stream() + Set<CamelContextAware> contextAwareBeans = registry.findByType(CamelContextAware.class); + if (contextAwareBeans.isEmpty()) { + throw new IllegalStateException("Some CamelContextAware beans expected in Camel registry"); + } + return contextAwareBeans.stream() .filter(camelContextAware -> camelContextAware.getCamelContext() == null) .peek(bean -> LOG.warnf("Found a CamelContextAware bean of type %s with null CamelContext", bean.getClass().getName())) diff --git a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java index 697a279..397bd3a 100644 --- a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java +++ b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java @@ -16,6 +16,7 @@ */ package org.apache.camel.quarkus.eip.it; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; import javax.inject.Singleton; @@ -25,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ClaimCheckOperation; import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer; +@ApplicationScoped public class EipRoutes extends RouteBuilder { public static final int THROTTLE_PERIOD = 500;