This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new f7bc0058524 CAMEL-19693: camel-main - Base package scan should detect @BindToRegistry beans f7bc0058524 is described below commit f7bc00585246a910a02c1e35399fe05b90cdec2c Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Aug 3 06:50:06 2023 +0200 CAMEL-19693: camel-main - Base package scan should detect @BindToRegistry beans --- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 4 ++-- .../test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index ee60e0c621c..245982c4315 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -268,7 +268,7 @@ public abstract class BaseMainSupport extends BaseService { // auto-detect custom beans via base package scanning String basePackage = camelContext.getCamelContextExtension().getBasePackageScan(); if (basePackage != null) { - PackageScanHelper.registerBeans(getCamelContext(), Set.of(basePackage)); + PackageScanHelper.registerBeans(camelContext, Set.of(basePackage)); } } @@ -406,7 +406,7 @@ public abstract class BaseMainSupport extends BaseService { ContextReloadStrategy reloader = new DefaultContextReloadStrategy(); camelContext.addService(reloader); } - PeriodTaskScheduler scheduler = PluginHelper.getPeriodTaskScheduler(getCamelContext()); + PeriodTaskScheduler scheduler = PluginHelper.getPeriodTaskScheduler(camelContext); scheduler.schedulePeriodTask(r, period); } } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java index 8196c88c21d..5e061d0c5c0 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.main; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated;