You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/05/12 12:59:31 UTC
[camel-quarkus] branch master updated (de7854f -> efd90b1)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from de7854f Allow formatter to be skipped
new cbf8837 Move core build items to a SPI package
new 07d7692 Move support classes to util package
new efd90b1 Move SPI related classes to the SPI package
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../quarkus/core/deployment/BuildProcessor.java | 26 +++++++++++++++++++++-
.../core/deployment/NativeImageProcessor.java | 4 ++++
.../deployment/{ => spi}/CamelBeanBuildItem.java | 2 +-
.../core/deployment/{ => spi}/CamelBeanInfo.java | 2 +-
.../{ => spi}/CamelContextBuildItem.java | 2 +-
.../{ => spi}/CamelContextCustomizerBuildItem.java | 2 +-
.../CamelFactoryFinderResolverBuildItem.java | 2 +-
.../deployment/{ => spi}/CamelMainBuildItem.java | 2 +-
.../{ => spi}/CamelMainListenerBuildItem.java | 2 +-
.../CamelModelJAXBContextFactoryBuildItem.java | 2 +-
.../{ => spi}/CamelModelToXMLDumperBuildItem.java | 2 +-
.../{ => spi}/CamelReactiveExecutorBuildItem.java | 2 +-
.../{ => spi}/CamelRegistryBuildItem.java | 4 ++--
.../CamelRoutesBuilderClassBuildItem.java | 2 +-
.../{ => spi}/CamelRoutesCollectorBuildItem.java | 2 +-
.../{ => spi}/CamelRoutesLoaderBuildItems.java | 2 +-
.../{ => spi}/CamelRuntimeBeanBuildItem.java | 2 +-
.../{ => spi}/CamelRuntimeRegistryBuildItem.java | 2 +-
.../{ => spi}/CamelServiceBuildItem.java | 10 ++++-----
.../deployment/{ => spi}/CamelServiceFilter.java | 2 +-
.../{ => spi}/CamelServiceFilterBuildItem.java | 2 +-
.../{ => spi}/CamelServicePatternBuildItem.java | 2 +-
.../CamelTypeConverterLoaderBuildItem.java | 2 +-
.../CamelTypeConverterRegistryBuildItem.java | 2 +-
.../{ => spi}/ContainerBeansBuildItem.java | 2 +-
.../{ => spi}/UnbannedReflectiveBuildItem.java | 2 +-
.../{ => spi}/UploadAttacherBuildItem.java | 2 +-
.../core/deployment/{ => util}/CamelSupport.java | 4 ++--
.../deployment/CamelContextCustomizerTest.java | 1 +
.../executor/deployment/BuildProcessor.java | 2 +-
.../xml/io/deployment/XmlIoProcessor.java | 2 +-
.../xml/jaxb/deployment/XmlJaxbProcessor.java | 8 +++----
.../component/avro/deployment/AvroProcessor.java | 2 +-
.../support/policy/deployment/PolicyProcessor.java | 2 +-
.../deployment/AttachmentsProcessor.java | 2 +-
.../deployment/BeanValidatorProcessor.java | 6 ++---
.../component/box/deployment/BoxProcessor.java | 2 +-
.../braintree/deployment/BraintreeProcessor.java | 4 ++--
.../component/cron/deployment/CronProcessor.java | 4 ++--
.../component/dozer/deployment/DozerProcessor.java | 4 ++--
.../component/file/deployment/FileProcessor.java | 2 +-
.../deployment/GoogleCalendarProcessor.java | 2 +-
.../drive/deployment/GoogleDriveProcessor.java | 2 +-
.../mail/deployment/GoogleMailProcessor.java | 2 +-
.../sheets/deployment/GoogleSheetsProcessor.java | 2 +-
.../kubernetes/deployment/KubernetesProcessor.java | 2 +-
.../deployment/MicroProfileHealthProcessor.java | 4 ++--
.../deployment/MicroProfileMetricsProcessor.java | 6 ++---
.../mongodb/deployment/MongoDbProcessor.java | 2 +-
.../olingo4/deployment/Olingo4Processor.java | 2 +-
.../deployment/OpenTracingProcessor.java | 2 +-
.../http/deployment/PlatformHttpProcessor.java | 8 +++----
.../quarkus/component/qute/QuteProcessor.java | 2 +-
.../deployment/ReactiveStreamsProcessor.java | 8 +++----
.../component/rest/deployment/RestProcessor.java | 6 ++---
.../telegram/deployment/TelegramProcessor.java | 2 +-
.../deployment/WebSocketJSR356Processor.java | 6 ++---
.../component/xslt/deployment/XsltProcessor.java | 6 ++---
.../support/deployment/SupportBuildStep.java | 2 +-
.../support/deployment/SupportBuildStep.java | 4 ++--
.../core/support/deployment/SupportBuildStep.java | 2 +-
61 files changed, 117 insertions(+), 90 deletions(-)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelBeanBuildItem.java (98%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelBeanInfo.java (95%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelContextBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelContextCustomizerBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelFactoryFinderResolverBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelMainBuildItem.java (95%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelMainListenerBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelModelJAXBContextFactoryBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelModelToXMLDumperBuildItem.java (95%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelReactiveExecutorBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRegistryBuildItem.java (91%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRoutesBuilderClassBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRoutesCollectorBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRoutesLoaderBuildItems.java (97%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRuntimeBeanBuildItem.java (98%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelRuntimeRegistryBuildItem.java (97%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelServiceBuildItem.java (95%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelServiceFilter.java (97%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelServiceFilterBuildItem.java (95%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelServicePatternBuildItem.java (98%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelTypeConverterLoaderBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/CamelTypeConverterRegistryBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/ContainerBeansBuildItem.java (98%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/UnbannedReflectiveBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => spi}/UploadAttacherBuildItem.java (96%)
rename extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{ => util}/CamelSupport.java (97%)
[camel-quarkus] 02/03: Move support classes to util package
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 07d7692afc82ddb752b911b42f214fd177478234
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue May 12 12:47:18 2020 +0200
Move support classes to util package
---
.../quarkus/core/deployment/util/CamelSupport.java | 121 +++++++++++++++++++++
1 file changed, 121 insertions(+)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java
new file mode 100644
index 0000000..5c2850c
--- /dev/null
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/CamelSupport.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.deployment.util;
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import io.quarkus.deployment.ApplicationArchive;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import org.apache.camel.impl.engine.AbstractCamelContext;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
+import org.jboss.jandex.ClassInfo;
+
+public final class CamelSupport {
+ public static final String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";
+ public static final String CAMEL_ROOT_PACKAGE_DIRECTORY = "org/apache/camel";
+
+ private CamelSupport() {
+ }
+
+ public static boolean isConcrete(ClassInfo ci) {
+ return (ci.flags() & Modifier.ABSTRACT) == 0;
+ }
+
+ public static boolean isPublic(ClassInfo ci) {
+ return (ci.flags() & Modifier.PUBLIC) != 0;
+ }
+
+ public static Stream<Path> safeWalk(Path p) {
+ try {
+ return Files.walk(p);
+ } catch (IOException e) {
+ throw new IOError(e);
+ }
+ }
+
+ public static Stream<CamelServiceBuildItem> services(ApplicationArchivesBuildItem archives, PathFilter pathFilter) {
+ final Set<CamelServiceBuildItem> answer = new HashSet<>();
+ final Predicate<Path> filter = pathFilter.asPathPredicate();
+
+ for (ApplicationArchive archive : archives.getAllApplicationArchives()) {
+ for (Path root : archive.getRootDirs()) {
+ final Path resourcePath = root.resolve(CAMEL_SERVICE_BASE_PATH);
+
+ if (!Files.isDirectory(resourcePath)) {
+ continue;
+ }
+
+ safeWalk(resourcePath).filter(Files::isRegularFile).forEach(file -> {
+ // the root archive may point to a jar file or the absolute path of
+ // a project's build output so we need to relativize to make the
+ // FastFactoryFinder work as expected
+ Path key = root.relativize(file);
+
+ if (filter.test(key)) {
+ String clazz = readProperties(file).getProperty("class");
+ if (clazz != null) {
+ answer.add(new CamelServiceBuildItem(key, clazz));
+ }
+ }
+ });
+ }
+ }
+
+ return answer.stream();
+ }
+
+ private static Properties readProperties(Path path) {
+ try (InputStream in = Files.newInputStream(path)) {
+ final Properties result = new Properties();
+ result.load(in);
+ return result;
+ } catch (IOException e) {
+ throw new RuntimeException("Could not read " + path, e);
+ }
+ }
+
+ @SafeVarargs
+ public static <T> Set<T> setOf(T... items) {
+ return Stream.of(items).collect(Collectors.toCollection(HashSet::new));
+ }
+
+ public static String getCamelVersion() {
+ String version = null;
+
+ Package aPackage = AbstractCamelContext.class.getPackage();
+ if (aPackage != null) {
+ version = aPackage.getImplementationVersion();
+ if (version == null) {
+ version = aPackage.getSpecificationVersion();
+ }
+ }
+
+ return Objects.requireNonNull(version, "Could not determine Camel version");
+ }
+}
[camel-quarkus] 01/03: Move core build items to a SPI package
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit cbf8837d90e646960d1055bb0200788f1fb2faea
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue May 12 12:37:07 2020 +0200
Move core build items to a SPI package
---
.../quarkus/core/deployment/BuildProcessor.java | 24 +++++++++++++++++++++-
.../core/deployment/CamelServiceFilter.java | 2 ++
.../quarkus/core/deployment/CamelSupport.java | 1 +
.../core/deployment/NativeImageProcessor.java | 3 +++
.../deployment/{ => spi}/CamelBeanBuildItem.java | 3 ++-
.../{ => spi}/CamelContextBuildItem.java | 2 +-
.../{ => spi}/CamelContextCustomizerBuildItem.java | 2 +-
.../CamelFactoryFinderResolverBuildItem.java | 2 +-
.../deployment/{ => spi}/CamelMainBuildItem.java | 2 +-
.../{ => spi}/CamelMainListenerBuildItem.java | 2 +-
.../CamelModelJAXBContextFactoryBuildItem.java | 2 +-
.../{ => spi}/CamelModelToXMLDumperBuildItem.java | 2 +-
.../{ => spi}/CamelReactiveExecutorBuildItem.java | 2 +-
.../{ => spi}/CamelRegistryBuildItem.java | 4 ++--
.../CamelRoutesBuilderClassBuildItem.java | 2 +-
.../{ => spi}/CamelRoutesCollectorBuildItem.java | 2 +-
.../{ => spi}/CamelRoutesLoaderBuildItems.java | 2 +-
.../{ => spi}/CamelRuntimeBeanBuildItem.java | 3 ++-
.../{ => spi}/CamelRuntimeRegistryBuildItem.java | 2 +-
.../{ => spi}/CamelServiceBuildItem.java | 11 +++++-----
.../{ => spi}/CamelServiceFilterBuildItem.java | 3 ++-
.../{ => spi}/CamelServicePatternBuildItem.java | 2 +-
.../CamelTypeConverterLoaderBuildItem.java | 2 +-
.../CamelTypeConverterRegistryBuildItem.java | 2 +-
.../{ => spi}/ContainerBeansBuildItem.java | 3 ++-
.../{ => spi}/UnbannedReflectiveBuildItem.java | 2 +-
.../{ => spi}/UploadAttacherBuildItem.java | 2 +-
.../deployment/CamelContextCustomizerTest.java | 1 +
.../executor/deployment/BuildProcessor.java | 2 +-
.../xml/io/deployment/XmlIoProcessor.java | 2 +-
.../xml/jaxb/deployment/XmlJaxbProcessor.java | 6 +++---
.../component/avro/deployment/AvroProcessor.java | 2 +-
.../support/policy/deployment/PolicyProcessor.java | 2 +-
.../deployment/AttachmentsProcessor.java | 2 +-
.../deployment/BeanValidatorProcessor.java | 4 ++--
.../component/box/deployment/BoxProcessor.java | 2 +-
.../braintree/deployment/BraintreeProcessor.java | 4 ++--
.../component/cron/deployment/CronProcessor.java | 4 ++--
.../component/dozer/deployment/DozerProcessor.java | 4 ++--
.../component/file/deployment/FileProcessor.java | 2 +-
.../deployment/GoogleCalendarProcessor.java | 2 +-
.../drive/deployment/GoogleDriveProcessor.java | 2 +-
.../mail/deployment/GoogleMailProcessor.java | 2 +-
.../sheets/deployment/GoogleSheetsProcessor.java | 2 +-
.../kubernetes/deployment/KubernetesProcessor.java | 2 +-
.../deployment/MicroProfileHealthProcessor.java | 2 +-
.../deployment/MicroProfileMetricsProcessor.java | 6 +++---
.../mongodb/deployment/MongoDbProcessor.java | 2 +-
.../olingo4/deployment/Olingo4Processor.java | 2 +-
.../deployment/OpenTracingProcessor.java | 2 +-
.../http/deployment/PlatformHttpProcessor.java | 6 +++---
.../quarkus/component/qute/QuteProcessor.java | 2 +-
.../deployment/ReactiveStreamsProcessor.java | 6 +++---
.../component/rest/deployment/RestProcessor.java | 4 ++--
.../telegram/deployment/TelegramProcessor.java | 2 +-
.../deployment/WebSocketJSR356Processor.java | 4 ++--
.../component/xslt/deployment/XsltProcessor.java | 4 ++--
.../support/deployment/SupportBuildStep.java | 2 +-
.../support/deployment/SupportBuildStep.java | 4 ++--
.../core/support/deployment/SupportBuildStep.java | 2 +-
60 files changed, 110 insertions(+), 78 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 2f1c592..de8efcf 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -57,7 +57,29 @@ import org.apache.camel.quarkus.core.CoreAttachmentsRecorder;
import org.apache.camel.quarkus.core.FastFactoryFinderResolver.Builder;
import org.apache.camel.quarkus.core.Flags;
import org.apache.camel.quarkus.core.UploadAttacher;
-import org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem.CamelServiceDestination;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelFactoryFinderResolverBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelMainBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelMainListenerBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactoryBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelReactiveExecutorBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRegistryBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesCollectorBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeRegistryBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem.CamelServiceDestination;
+import org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterLoaderBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterRegistryBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.ContainerBeansBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UploadAttacherBuildItem;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
import org.apache.camel.spi.FactoryFinder;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
index 9e9c508..61115ee 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
@@ -18,6 +18,8 @@ package org.apache.camel.quarkus.core.deployment;
import java.util.function.Predicate;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
+
@FunctionalInterface
public interface CamelServiceFilter extends Predicate<CamelServiceBuildItem> {
String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
index 108e82f..348f384 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
@@ -33,6 +33,7 @@ import java.util.stream.Stream;
import io.quarkus.deployment.ApplicationArchive;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
import org.apache.camel.impl.engine.AbstractCamelContext;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.jboss.jandex.ClassInfo;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index a219a11..6d0f19c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -47,6 +47,9 @@ import org.apache.camel.quarkus.core.CamelConfig;
import org.apache.camel.quarkus.core.CamelConfig.ReflectionConfig;
import org.apache.camel.quarkus.core.CamelConfig.ResourcesConfig;
import org.apache.camel.quarkus.core.Flags;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ExchangeFormatter;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
index a0728cd..b62dd99 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.Objects;
import java.util.Optional;
@@ -22,6 +22,7 @@ import java.util.Optional;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.runtime.RuntimeValue;
+import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding beans to add to {@link org.apache.camel.spi.Registry} during
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextBuildItem.java
index 0ec1306..a04cd30 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextCustomizerBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextCustomizerBuildItem.java
index 513edd5..369253c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextCustomizerBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelFactoryFinderResolverBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelFactoryFinderResolverBuildItem.java
index d4dd35a..f7122c4 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelFactoryFinderResolverBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainBuildItem.java
similarity index 95%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainBuildItem.java
index ccaae59..375f146 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainListenerBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainListenerBuildItem.java
index 0a09ccb..12ddb66 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelMainListenerBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelJAXBContextFactoryBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelJAXBContextFactoryBuildItem.java
index 6fa6c68..0abb793 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelJAXBContextFactoryBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelToXMLDumperBuildItem.java
similarity index 95%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelToXMLDumperBuildItem.java
index 0bab4db..fa69175 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelModelToXMLDumperBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelReactiveExecutorBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelReactiveExecutorBuildItem.java
index f7832ae..bfdd946 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelReactiveExecutorBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRegistryBuildItem.java
similarity index 91%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRegistryBuildItem.java
index 53770a5..e906cd8 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRegistryBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Registry;
*
* They both refer to the same instance of {@link Registry} but in a different phase of the application bootstrap:
* {@link CamelRuntimeBeanBuildItem} is bound to {@link ExecutionTime#RUNTIME_INIT} phase while
- * {@link org.apache.camel.quarkus.core.deployment.CamelRegistryBuildItem} is bound to {@link ExecutionTime#STATIC_INIT}
+ * {@link CamelRegistryBuildItem} is bound to {@link ExecutionTime#STATIC_INIT}
* phase.
*
*/
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesBuilderClassBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesBuilderClassBuildItem.java
index b58eab9..2edd228 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesBuilderClassBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
import org.apache.camel.RoutesBuilder;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesCollectorBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesCollectorBuildItem.java
index 349c06a..6a6b719 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesCollectorBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
similarity index 97%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
index 5638bbc..898fe1e 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
index b35e840..2386573 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.Objects;
import java.util.Optional;
@@ -22,6 +22,7 @@ import java.util.Optional;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.runtime.RuntimeValue;
+import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding beans to add to {@link org.apache.camel.spi.Registry} during
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeRegistryBuildItem.java
similarity index 97%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeRegistryBuildItem.java
index b0f18fd..1239245 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeRegistryBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
similarity index 93%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
index b460bf0..f3b1358 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.nio.file.Path;
import java.util.Objects;
import io.quarkus.builder.item.MultiBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding information about a service defined in a property file somewhere under
@@ -27,11 +28,9 @@ import io.quarkus.builder.item.MultiBuildItem;
*/
public final class CamelServiceBuildItem extends MultiBuildItem implements CamelBeanInfo {
- final Path path;
-
- final String name;
-
- final String type;
+ public final Path path;
+ public final String name;
+ public final String type;
public CamelServiceBuildItem(Path path, String type) {
this(path, path.getFileName().toString(), type);
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
similarity index 90%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
index 066b7ac..78953d1 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
public final class CamelServiceFilterBuildItem extends MultiBuildItem {
private final CamelServiceFilter predicate;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServicePatternBuildItem.java
similarity index 98%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServicePatternBuildItem.java
index 906b21e..e2accad 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServicePatternBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterLoaderBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterLoaderBuildItem.java
index 1b5626b..f9c4c4d 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterLoaderBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterRegistryBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterRegistryBuildItem.java
index 8cb245c..b606dba 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelTypeConverterRegistryBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
index 2e2549d..fc934fb 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.Collection;
import java.util.Objects;
@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
import io.quarkus.arc.processor.BeanInfo;
import io.quarkus.builder.item.SimpleBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UnbannedReflectiveBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UnbannedReflectiveBuildItem.java
index 9ed5097..fdb3529 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UnbannedReflectiveBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.Arrays;
import java.util.Collection;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UploadAttacherBuildItem.java
similarity index 96%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UploadAttacherBuildItem.java
index bed0dfb..a7eaa35 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/UploadAttacherBuildItem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index bb82a1b..9b88090 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -29,6 +29,7 @@ import io.quarkus.runtime.RuntimeValue;
import io.quarkus.test.QuarkusUnitTest;
import org.apache.camel.CamelContext;
import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
diff --git a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
index 77020e9..70dd8cd 100644
--- a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
+++ b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
@@ -21,7 +21,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.vertx.deployment.VertxBuildItem;
import org.apache.camel.quarkus.core.Flags;
-import org.apache.camel.quarkus.core.deployment.CamelReactiveExecutorBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelReactiveExecutorBuildItem;
import org.apache.camel.quarkus.reactive.executor.ReactiveExecutorRecorder;
public class BuildProcessor {
diff --git a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
index 77cca52..6c63686 100644
--- a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
+++ b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
@@ -22,7 +22,7 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.xml.io.XmlIoRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelRoutesLoaderBuildItems;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlIoProcessor {
diff --git a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
index 1c1c1d5..bf290c3 100644
--- a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
+++ b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
@@ -26,10 +26,10 @@ import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.jaxb.XmlJaxbRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelModelToXMLDumperBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.CamelSupport;
+import org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactoryBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlJaxbProcessor {
diff --git a/extensions-jvm/avro-rpc/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java b/extensions-jvm/avro-rpc/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java
index ec58a38..ecd525b 100644
--- a/extensions-jvm/avro-rpc/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java
+++ b/extensions-jvm/avro-rpc/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.pkg.steps.NativeBuild;
import org.apache.camel.component.avro.AvroComponent;
import org.apache.camel.quarkus.component.avro.AvroRecorder;
import org.apache.camel.quarkus.core.JvmOnlyRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
import org.jboss.logging.Logger;
class AvroProcessor {
diff --git a/extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java b/extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
index 9a2ce53..55fe82f 100644
--- a/extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
+++ b/extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
@@ -27,7 +27,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationTarget.Kind;
import org.jboss.jandex.DotName;
diff --git a/extensions/attachments/deployment/src/main/java/org/apache/camel/quarkus/component/attachments/deployment/AttachmentsProcessor.java b/extensions/attachments/deployment/src/main/java/org/apache/camel/quarkus/component/attachments/deployment/AttachmentsProcessor.java
index cb736ed..79a36d3 100644
--- a/extensions/attachments/deployment/src/main/java/org/apache/camel/quarkus/component/attachments/deployment/AttachmentsProcessor.java
+++ b/extensions/attachments/deployment/src/main/java/org/apache/camel/quarkus/component/attachments/deployment/AttachmentsProcessor.java
@@ -22,7 +22,7 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.attachments.AttachmentsRecorder;
import org.apache.camel.quarkus.core.UploadAttacher;
-import org.apache.camel.quarkus.core.deployment.UploadAttacherBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UploadAttacherBuildItem;
class AttachmentsProcessor {
diff --git a/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java b/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
index 2a8f131..e10f1ef 100644
--- a/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
+++ b/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
@@ -22,9 +22,9 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.bean.validator.BeanValidatorComponent;
import org.apache.camel.quarkus.component.bean.validator.BeanValidatorRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
class BeanValidatorProcessor {
diff --git a/extensions/box/deployment/src/main/java/org/apache/camel/quarkus/component/box/deployment/BoxProcessor.java b/extensions/box/deployment/src/main/java/org/apache/camel/quarkus/component/box/deployment/BoxProcessor.java
index 3384950..dc7c3b1 100644
--- a/extensions/box/deployment/src/main/java/org/apache/camel/quarkus/component/box/deployment/BoxProcessor.java
+++ b/extensions/box/deployment/src/main/java/org/apache/camel/quarkus/component/box/deployment/BoxProcessor.java
@@ -36,7 +36,7 @@ import org.apache.camel.component.box.BoxGroupsManagerEndpointConfiguration;
import org.apache.camel.component.box.BoxSearchManagerEndpointConfiguration;
import org.apache.camel.component.box.BoxTasksManagerEndpointConfiguration;
import org.apache.camel.component.box.BoxUsersManagerEndpointConfiguration;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
class BoxProcessor {
diff --git a/extensions/braintree/deployment/src/main/java/org/apache/camel/quarkus/component/braintree/deployment/BraintreeProcessor.java b/extensions/braintree/deployment/src/main/java/org/apache/camel/quarkus/component/braintree/deployment/BraintreeProcessor.java
index fae2cf2..bf4573f 100644
--- a/extensions/braintree/deployment/src/main/java/org/apache/camel/quarkus/component/braintree/deployment/BraintreeProcessor.java
+++ b/extensions/braintree/deployment/src/main/java/org/apache/camel/quarkus/component/braintree/deployment/BraintreeProcessor.java
@@ -29,8 +29,8 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.braintree.BraintreeComponent;
import org.apache.camel.quarkus.component.braintree.graal.BraintreeRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.DotName;
diff --git a/extensions/cron/deployment/src/main/java/org/apache/camel/quarkus/component/cron/deployment/CronProcessor.java b/extensions/cron/deployment/src/main/java/org/apache/camel/quarkus/component/cron/deployment/CronProcessor.java
index 85501d3..2e5670b 100644
--- a/extensions/cron/deployment/src/main/java/org/apache/camel/quarkus/component/cron/deployment/CronProcessor.java
+++ b/extensions/cron/deployment/src/main/java/org/apache/camel/quarkus/component/cron/deployment/CronProcessor.java
@@ -20,8 +20,8 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.cron.api.CamelCronConfiguration;
-import org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
class CronProcessor {
diff --git a/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java b/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
index 938699b..c149820 100644
--- a/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
+++ b/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
@@ -44,8 +44,8 @@ import org.apache.camel.converter.dozer.DozerBeanMapperConfiguration;
import org.apache.camel.converter.dozer.DozerThreadContextClassLoader;
import org.apache.camel.quarkus.component.dozer.CamelDozerConfig;
import org.apache.camel.quarkus.component.dozer.CamelDozerRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
class DozerProcessor {
diff --git a/extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/deployment/FileProcessor.java b/extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/deployment/FileProcessor.java
index 2aac6c8..6541646 100644
--- a/extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/deployment/FileProcessor.java
+++ b/extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/deployment/FileProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.strategy.FileProcessStrategyFactory;
import org.apache.camel.component.file.strategy.GenericFileProcessStrategyFactory;
-import org.apache.camel.quarkus.core.deployment.CamelServiceBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class FileProcessor {
diff --git a/extensions/google-calendar/deployment/src/main/java/org/apache/camel/quarkus/component/google/calendar/deployment/GoogleCalendarProcessor.java b/extensions/google-calendar/deployment/src/main/java/org/apache/camel/quarkus/component/google/calendar/deployment/GoogleCalendarProcessor.java
index 54a5c3c..13bc4ef 100644
--- a/extensions/google-calendar/deployment/src/main/java/org/apache/camel/quarkus/component/google/calendar/deployment/GoogleCalendarProcessor.java
+++ b/extensions/google-calendar/deployment/src/main/java/org/apache/camel/quarkus/component/google/calendar/deployment/GoogleCalendarProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildIt
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.DotName;
diff --git a/extensions/google-drive/deployment/src/main/java/org/apache/camel/quarkus/component/google/drive/deployment/GoogleDriveProcessor.java b/extensions/google-drive/deployment/src/main/java/org/apache/camel/quarkus/component/google/drive/deployment/GoogleDriveProcessor.java
index 3ed0f0f..a93542c 100644
--- a/extensions/google-drive/deployment/src/main/java/org/apache/camel/quarkus/component/google/drive/deployment/GoogleDriveProcessor.java
+++ b/extensions/google-drive/deployment/src/main/java/org/apache/camel/quarkus/component/google/drive/deployment/GoogleDriveProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildIt
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.DotName;
diff --git a/extensions/google-mail/deployment/src/main/java/org/apache/camel/quarkus/component/google/mail/deployment/GoogleMailProcessor.java b/extensions/google-mail/deployment/src/main/java/org/apache/camel/quarkus/component/google/mail/deployment/GoogleMailProcessor.java
index 5046dcf..3ed4562 100644
--- a/extensions/google-mail/deployment/src/main/java/org/apache/camel/quarkus/component/google/mail/deployment/GoogleMailProcessor.java
+++ b/extensions/google-mail/deployment/src/main/java/org/apache/camel/quarkus/component/google/mail/deployment/GoogleMailProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildIt
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.DotName;
diff --git a/extensions/google-sheets/deployment/src/main/java/org/apache/camel/quarkus/component/google/sheets/deployment/GoogleSheetsProcessor.java b/extensions/google-sheets/deployment/src/main/java/org/apache/camel/quarkus/component/google/sheets/deployment/GoogleSheetsProcessor.java
index 3846b02..f8104b8 100644
--- a/extensions/google-sheets/deployment/src/main/java/org/apache/camel/quarkus/component/google/sheets/deployment/GoogleSheetsProcessor.java
+++ b/extensions/google-sheets/deployment/src/main/java/org/apache/camel/quarkus/component/google/sheets/deployment/GoogleSheetsProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildIt
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.DotName;
diff --git a/extensions/kubernetes/deployment/src/main/java/org/apache/camel/quarkus/component/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/deployment/src/main/java/org/apache/camel/quarkus/component/kubernetes/deployment/KubernetesProcessor.java
index dcf49a5..a122e09 100644
--- a/extensions/kubernetes/deployment/src/main/java/org/apache/camel/quarkus/component/kubernetes/deployment/KubernetesProcessor.java
+++ b/extensions/kubernetes/deployment/src/main/java/org/apache/camel/quarkus/component/kubernetes/deployment/KubernetesProcessor.java
@@ -23,7 +23,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.kubernetes.CamelKubernetesRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
class KubernetesProcessor {
private static final String FEATURE = "camel-kubernetes";
diff --git a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
index 8b04405..9a07d84 100644
--- a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
+++ b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
@@ -32,8 +32,8 @@ import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.microprofile.health.AbstractCamelMicroProfileHealthCheck;
import org.apache.camel.quarkus.component.microprofile.health.runtime.CamelMicroProfileHealthConfig;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelSupport;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
import org.eclipse.microprofile.health.Liveness;
import org.eclipse.microprofile.health.Readiness;
import org.jboss.jandex.AnnotationInstance;
diff --git a/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java b/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
index 4c26c42..e82c505 100644
--- a/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
+++ b/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
@@ -23,9 +23,9 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants;
import org.apache.camel.quarkus.component.microprofile.metrics.runtime.CamelMicroProfileMetricsConfig;
import org.apache.camel.quarkus.component.microprofile.metrics.runtime.CamelMicroProfileMetricsRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelContextBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelMainListenerBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelMainListenerBuildItem;
import org.eclipse.microprofile.metrics.MetricRegistry;
class MicroProfileMetricsProcessor {
diff --git a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index 55051fb..a4a3e0a 100644
--- a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++ b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
import io.quarkus.mongodb.runtime.MongoClientRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
class MongoDbProcessor {
diff --git a/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java b/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
index 9c6c2a2..7b1ed71 100644
--- a/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
+++ b/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.olingo4.Olingo4AppEndpointConfiguration;
-import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UnbannedReflectiveBuildItem;
import org.apache.olingo.server.core.ODataImpl;
class Olingo4Processor {
diff --git a/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java b/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
index 02afd6b..257dcf8 100644
--- a/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
+++ b/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.opentracing.CamelOpenTracingConfig;
import org.apache.camel.quarkus.component.opentracing.CamelOpenTracingRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
class OpenTracingProcessor {
diff --git a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
index 99a0327..13e1734 100644
--- a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
+++ b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
@@ -28,10 +28,10 @@ import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.component.platform.http.PlatformHttpConstants;
import org.apache.camel.quarkus.component.platform.http.runtime.PlatformHttpRecorder;
import org.apache.camel.quarkus.component.platform.http.runtime.QuarkusPlatformHttpEngine;
-import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
-import org.apache.camel.quarkus.core.deployment.UploadAttacherBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.UploadAttacherBuildItem;
class PlatformHttpProcessor {
private static final String FEATURE = "camel-platform-http";
diff --git a/extensions/qute/deployment/src/main/java/org/apache/camel/quarkus/component/qute/QuteProcessor.java b/extensions/qute/deployment/src/main/java/org/apache/camel/quarkus/component/qute/QuteProcessor.java
index 0abb01a..dc34b22 100644
--- a/extensions/qute/deployment/src/main/java/org/apache/camel/quarkus/component/qute/QuteProcessor.java
+++ b/extensions/qute/deployment/src/main/java/org/apache/camel/quarkus/component/qute/QuteProcessor.java
@@ -23,7 +23,7 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.qute.QuteComponent;
import org.apache.camel.quarkus.component.qute.CamelQuteRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
class QuteProcessor {
diff --git a/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java b/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
index e5de2a4..d3cc0fa 100644
--- a/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
+++ b/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
@@ -27,10 +27,10 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.reactive.streams.ReactiveStreamsProducers;
import org.apache.camel.quarkus.component.reactive.streams.ReactiveStreamsRecorder;
import org.apache.camel.quarkus.core.Flags;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelContextBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
class ReactiveStreamsProcessor {
private static final String SCHEME = "reactive-streams";
diff --git a/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
index ffed329..5040588 100644
--- a/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
+++ b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
@@ -25,9 +25,9 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.rest.RestComponent;
import org.apache.camel.quarkus.component.rest.RestRecorder;
import org.apache.camel.quarkus.component.rest.graal.NoJAXBContext;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class RestProcessor {
diff --git a/extensions/telegram/deployment/src/main/java/org/apache/camel/quarkus/component/telegram/deployment/TelegramProcessor.java b/extensions/telegram/deployment/src/main/java/org/apache/camel/quarkus/component/telegram/deployment/TelegramProcessor.java
index ba82fae..52f1628 100644
--- a/extensions/telegram/deployment/src/main/java/org/apache/camel/quarkus/component/telegram/deployment/TelegramProcessor.java
+++ b/extensions/telegram/deployment/src/main/java/org/apache/camel/quarkus/component/telegram/deployment/TelegramProcessor.java
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.quarkus.component.telegram.TelegramRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
import org.jboss.jandex.DotName;
class TelegramProcessor {
diff --git a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
index 46c4bd3..9711a57 100644
--- a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
+++ b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
@@ -27,9 +27,9 @@ import io.quarkus.undertow.deployment.ServletDeploymentManagerBuildItem;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Config;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Recorder;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.websocket.jsr356.JSR356WebSocketComponent;
class WebSocketJSR356Processor {
diff --git a/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java b/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
index aeb9d7a..e5cd015 100644
--- a/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
+++ b/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
@@ -41,9 +41,9 @@ import org.apache.camel.quarkus.component.xslt.CamelXsltErrorListener;
import org.apache.camel.quarkus.component.xslt.CamelXsltRecorder;
import org.apache.camel.quarkus.component.xslt.RuntimeUriResolver.Builder;
import org.apache.camel.quarkus.component.xslt.deployment.BuildTimeUriResolver.ResolutionResult;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.support.xalan.XalanTransformerFactory;
import org.apache.commons.lang3.StringUtils;
diff --git a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java b/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
index b6f5dfe..4b606e8 100644
--- a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
+++ b/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
@@ -19,7 +19,7 @@ package org.apache.camel.quarkus.core.runtime.support.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.quarkus.core.deployment.CamelRoutesCollectorBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesCollectorBuildItem;
import org.apache.camel.quarkus.core.runtime.support.SupportRecorder;
public class SupportBuildStep {
diff --git a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java b/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
index 64a1260..8d431d6 100644
--- a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
+++ b/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
@@ -19,8 +19,8 @@ package org.apache.camel.quarkus.core.runtime.support.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.quarkus.core.deployment.CamelMainListenerBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelTypeConverterLoaderBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelMainListenerBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterLoaderBuildItem;
import org.apache.camel.quarkus.core.runtime.support.SupportRecorder;
public class SupportBuildStep {
diff --git a/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java b/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
index 5eb898b..16e9c78 100644
--- a/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
+++ b/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
@@ -20,7 +20,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.support.SupportRecorder;
public class SupportBuildStep {
[camel-quarkus] 03/03: Move SPI related classes to the SPI package
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit efd90b11cabcb9c0920b591ce0b06c335e6ad57f
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue May 12 12:50:09 2020 +0200
Move SPI related classes to the SPI package
---
.../quarkus/core/deployment/BuildProcessor.java | 2 +
.../quarkus/core/deployment/CamelSupport.java | 122 ---------------------
.../core/deployment/NativeImageProcessor.java | 1 +
.../core/deployment/spi/CamelBeanBuildItem.java | 1 -
.../core/deployment/{ => spi}/CamelBeanInfo.java | 2 +-
.../deployment/spi/CamelRuntimeBeanBuildItem.java | 1 -
.../core/deployment/spi/CamelServiceBuildItem.java | 1 -
.../deployment/{ => spi}/CamelServiceFilter.java | 4 +-
.../spi/CamelServiceFilterBuildItem.java | 1 -
.../deployment/spi/ContainerBeansBuildItem.java | 1 -
.../xml/jaxb/deployment/XmlJaxbProcessor.java | 2 +-
.../deployment/BeanValidatorProcessor.java | 2 +-
.../deployment/MicroProfileHealthProcessor.java | 2 +-
.../http/deployment/PlatformHttpProcessor.java | 2 +-
.../deployment/ReactiveStreamsProcessor.java | 2 +-
.../component/rest/deployment/RestProcessor.java | 2 +-
.../deployment/WebSocketJSR356Processor.java | 2 +-
.../component/xslt/deployment/XsltProcessor.java | 2 +-
18 files changed, 13 insertions(+), 139 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index de8efcf..c69666c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -73,6 +73,7 @@ import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeRegistryBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem.CamelServiceDestination;
@@ -80,6 +81,7 @@ import org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterLoaderBuil
import org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterRegistryBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.ContainerBeansBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.UploadAttacherBuildItem;
+import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
import org.apache.camel.spi.FactoryFinder;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
deleted file mode 100644
index 348f384..0000000
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.core.deployment;
-
-import java.io.IOError;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Modifier;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import io.quarkus.deployment.ApplicationArchive;
-import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
-import org.apache.camel.impl.engine.AbstractCamelContext;
-import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
-import org.apache.camel.quarkus.core.deployment.util.PathFilter;
-import org.jboss.jandex.ClassInfo;
-
-public final class CamelSupport {
- public static final String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";
- public static final String CAMEL_ROOT_PACKAGE_DIRECTORY = "org/apache/camel";
-
- private CamelSupport() {
- }
-
- public static boolean isConcrete(ClassInfo ci) {
- return (ci.flags() & Modifier.ABSTRACT) == 0;
- }
-
- public static boolean isPublic(ClassInfo ci) {
- return (ci.flags() & Modifier.PUBLIC) != 0;
- }
-
- public static Stream<Path> safeWalk(Path p) {
- try {
- return Files.walk(p);
- } catch (IOException e) {
- throw new IOError(e);
- }
- }
-
- public static Stream<CamelServiceBuildItem> services(ApplicationArchivesBuildItem archives, PathFilter pathFilter) {
- final Set<CamelServiceBuildItem> answer = new HashSet<>();
- final Predicate<Path> filter = pathFilter.asPathPredicate();
-
- for (ApplicationArchive archive : archives.getAllApplicationArchives()) {
- for (Path root : archive.getRootDirs()) {
- final Path resourcePath = root.resolve(CAMEL_SERVICE_BASE_PATH);
-
- if (!Files.isDirectory(resourcePath)) {
- continue;
- }
-
- safeWalk(resourcePath).filter(Files::isRegularFile).forEach(file -> {
- // the root archive may point to a jar file or the absolute path of
- // a project's build output so we need to relativize to make the
- // FastFactoryFinder work as expected
- Path key = root.relativize(file);
-
- if (filter.test(key)) {
- String clazz = readProperties(file).getProperty("class");
- if (clazz != null) {
- answer.add(new CamelServiceBuildItem(key, clazz));
- }
- }
- });
- }
- }
-
- return answer.stream();
- }
-
- private static Properties readProperties(Path path) {
- try (InputStream in = Files.newInputStream(path)) {
- final Properties result = new Properties();
- result.load(in);
- return result;
- } catch (IOException e) {
- throw new RuntimeException("Could not read " + path, e);
- }
- }
-
- @SafeVarargs
- public static <T> Set<T> setOf(T... items) {
- return Stream.of(items).collect(Collectors.toCollection(HashSet::new));
- }
-
- public static String getCamelVersion() {
- String version = null;
-
- Package aPackage = AbstractCamelContext.class.getPackage();
- if (aPackage != null) {
- version = aPackage.getImplementationVersion();
- if (version == null) {
- version = aPackage.getSpecificationVersion();
- }
- }
-
- return Objects.requireNonNull(version, "Could not determine Camel version");
- }
-}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index 6d0f19c..38cb424 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -50,6 +50,7 @@ import org.apache.camel.quarkus.core.Flags;
import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem;
+import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ExchangeFormatter;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
index b62dd99..5e99e96 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanBuildItem.java
@@ -22,7 +22,6 @@ import java.util.Optional;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding beans to add to {@link org.apache.camel.spi.Registry} during
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanInfo.java
similarity index 95%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanInfo.java
index a0d999d..39207e5 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelBeanInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
/**
* Describes a camel bean.
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
index 2386573..881ad88 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRuntimeBeanBuildItem.java
@@ -22,7 +22,6 @@ import java.util.Optional;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding beans to add to {@link org.apache.camel.spi.Registry} during
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
index f3b1358..38262af 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceBuildItem.java
@@ -20,7 +20,6 @@ import java.nio.file.Path;
import java.util.Objects;
import io.quarkus.builder.item.MultiBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
/**
* A {@link MultiBuildItem} holding information about a service defined in a property file somewhere under
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilter.java
similarity index 94%
rename from extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilter.java
index 61115ee..fac45a3 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilter.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.spi;
import java.util.function.Predicate;
-import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
-
@FunctionalInterface
public interface CamelServiceFilter extends Predicate<CamelServiceBuildItem> {
String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
index 78953d1..6104d4e 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelServiceFilterBuildItem.java
@@ -17,7 +17,6 @@
package org.apache.camel.quarkus.core.deployment.spi;
import io.quarkus.builder.item.MultiBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
public final class CamelServiceFilterBuildItem extends MultiBuildItem {
private final CamelServiceFilter predicate;
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
index fc934fb..3571f16 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/ContainerBeansBuildItem.java
@@ -23,7 +23,6 @@ import java.util.stream.Collectors;
import io.quarkus.arc.processor.BeanInfo;
import io.quarkus.builder.item.SimpleBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelBeanInfo;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
diff --git a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
index bf290c3..9aa2ff4 100644
--- a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
+++ b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
@@ -26,10 +26,10 @@ import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.jaxb.XmlJaxbRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelSupport;
import org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactoryBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
+import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlJaxbProcessor {
diff --git a/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java b/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
index e10f1ef..7547b1c 100644
--- a/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
+++ b/extensions/bean-validator/deployment/src/main/java/org/apache/camel/quarkus/component/bean/validator/deployment/BeanValidatorProcessor.java
@@ -22,8 +22,8 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.bean.validator.BeanValidatorComponent;
import org.apache.camel.quarkus.component.bean.validator.BeanValidatorRecorder;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
class BeanValidatorProcessor {
diff --git a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
index 9a07d84..5845a3c 100644
--- a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
+++ b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java
@@ -32,8 +32,8 @@ import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.microprofile.health.AbstractCamelMicroProfileHealthCheck;
import org.apache.camel.quarkus.component.microprofile.health.runtime.CamelMicroProfileHealthConfig;
-import org.apache.camel.quarkus.core.deployment.CamelSupport;
import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
import org.eclipse.microprofile.health.Liveness;
import org.eclipse.microprofile.health.Readiness;
import org.jboss.jandex.AnnotationInstance;
diff --git a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
index 13e1734..83deb21 100644
--- a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
+++ b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java
@@ -28,8 +28,8 @@ import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.component.platform.http.PlatformHttpConstants;
import org.apache.camel.quarkus.component.platform.http.runtime.PlatformHttpRecorder;
import org.apache.camel.quarkus.component.platform.http.runtime.QuarkusPlatformHttpEngine;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.UploadAttacherBuildItem;
diff --git a/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java b/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
index d3cc0fa..927c706 100644
--- a/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
+++ b/extensions/reactive-streams/deployment/src/main/java/org/apache/camel/quarkus/component/reactive/streams/deployment/ReactiveStreamsProcessor.java
@@ -27,9 +27,9 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.quarkus.component.reactive.streams.ReactiveStreamsProducers;
import org.apache.camel.quarkus.component.reactive.streams.ReactiveStreamsRecorder;
import org.apache.camel.quarkus.core.Flags;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
class ReactiveStreamsProcessor {
diff --git a/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
index 5040588..0d4ae38 100644
--- a/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
+++ b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
@@ -25,8 +25,8 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import org.apache.camel.component.rest.RestComponent;
import org.apache.camel.quarkus.component.rest.RestRecorder;
import org.apache.camel.quarkus.component.rest.graal.NoJAXBContext;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
diff --git a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
index 9711a57..dc5b051 100644
--- a/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
+++ b/extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
@@ -27,8 +27,8 @@ import io.quarkus.undertow.deployment.ServletDeploymentManagerBuildItem;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Config;
import org.apache.camel.quarkus.component.websocket.jsr356.CamelWebSocketJSR356Recorder;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.websocket.jsr356.JSR356WebSocketComponent;
diff --git a/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java b/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
index e5cd015..ffd9319 100644
--- a/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
+++ b/extensions/xslt/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/deployment/XsltProcessor.java
@@ -41,8 +41,8 @@ import org.apache.camel.quarkus.component.xslt.CamelXsltErrorListener;
import org.apache.camel.quarkus.component.xslt.CamelXsltRecorder;
import org.apache.camel.quarkus.component.xslt.RuntimeUriResolver.Builder;
import org.apache.camel.quarkus.component.xslt.deployment.BuildTimeUriResolver.ResolutionResult;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.support.xalan.XalanTransformerFactory;
import org.apache.commons.lang3.StringUtils;