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 <lburgazz...@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;