You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/12/11 14:15:36 UTC
(camel-k-runtime) 02/03: chore(api): Camel 4.2.0 adjustments
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit c1d899fb4c962f10db6a13e187ebf312abdca37f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Dec 11 13:05:45 2023 +0100
chore(api): Camel 4.2.0 adjustments
---
.../impl/src/test/java/org/apache/camel/k/cron/CronTest.java | 3 ++-
.../main/java/org/apache/camel/k/quarkus/Application.java | 12 ++++++++++++
.../java/org/apache/camel/k/quarkus/ApplicationRecorder.java | 2 +-
support/pom.xml | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
index e23b63f9..1365e0cf 100644
--- a/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
+++ b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dsl.yaml.YamlRoutesBuilderLoader;
import org.apache.camel.dsl.yaml.deserializers.CustomResolver;
+import org.apache.camel.dsl.yaml.deserializers.BeansDeserializer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.Runtime;
import org.apache.camel.support.LifecycleStrategySupport;
@@ -41,7 +42,7 @@ public class CronTest {
@MethodSource("parameters")
public void testCronTimerActivation(String code, String cronOverride) throws Exception {
final Runtime runtime = Runtime.on(new DefaultCamelContext());
- runtime.getRegistry().bind("__camel_k_resolver", new CustomResolver());
+ runtime.getRegistry().bind("__camel_k_resolver", new CustomResolver(new BeansDeserializer()));
final YamlRoutesBuilderLoader loader = new YamlRoutesBuilderLoader();
loader.setCamelContext(runtime.getCamelContext());
diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
index fe92ec85..99c040d7 100644
--- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
+++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
@@ -138,6 +138,8 @@ public final class Application {
* Since routes are programmatically loaded, create a no-hop collector
*/
public static class NoRoutesCollector implements RoutesCollector {
+ private boolean ignoreLoadingError;
+
@Override
public Collection<RoutesBuilder> collectRoutesFromDirectory(CamelContext camelContext, String excludePattern, String includePattern) {
return Collections.emptyList();
@@ -152,6 +154,16 @@ public final class Application {
public List<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern, String includePattern) {
return Collections.emptyList();
}
+
+ @Override
+ public boolean isIgnoreLoadingError() {
+ return ignoreLoadingError;
+ }
+
+ @Override
+ public void setIgnoreLoadingError(boolean ignoreLoadingError) {
+ this.ignoreLoadingError = ignoreLoadingError;
+ }
}
// *********************************
diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
index 64542bfb..6a8e7f03 100644
--- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
+++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java
@@ -39,7 +39,7 @@ public class ApplicationRecorder {
}
public void publishRuntime(RuntimeValue<CamelMain> main, BeanContainer container) {
- container.instance(ApplicationProducers.class).setRuntime(new Application.Runtime(main.getValue()));
+ container.beanInstance(ApplicationProducers.class).setRuntime(new Application.Runtime(main.getValue()));
}
public RuntimeValue<RoutesCollector> createRoutesCollector() {
diff --git a/support/pom.xml b/support/pom.xml
index 2cc75f2f..767de617 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -32,10 +32,10 @@
<module>camel-k-annotations</module>
<module>camel-k-apt</module>
<module>camel-k-catalog-model</module>
+ <module>camel-k-catalog</module>
<module>camel-k-maven-plugin</module>
<module>camel-k-test</module>
<module>camel-k-itests-support</module>
- <module>camel-k-catalog</module>
<module>camel-k-runtime-bom</module>
<module>camel-k-maven-logging</module>
</modules>