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
The following commit(s) were added to refs/heads/master by this push: new 86b5830 Use capabilities instead of feature names 86b5830 is described below commit 86b5830c998d79854cacbe0015925e213b513d55 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Sun Nov 3 14:39:40 2019 +0100 Use capabilities instead of feature names --- .../quarkus/component/xml/deployment/XmlProcessor.java | 3 ++- .../camel/quarkus/core/deployment/BuildProcessor.java | 8 +++++--- .../org/apache/camel/quarkus/core/deployment/Feature.java | 3 ++- .../camel/quarkus/support/common/CamelCapabilities.java} | 14 +++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java index 233c10a..f43af15 100644 --- a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java +++ b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java @@ -26,6 +26,7 @@ import org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuil import org.apache.camel.quarkus.core.deployment.CamelRoutesCollectorBuildItem; import org.apache.camel.quarkus.core.deployment.CamelSupport; import org.apache.camel.quarkus.core.deployment.CamelXmlLoaderBuildItem; +import org.apache.camel.quarkus.support.common.CamelCapabilities; class XmlProcessor { @@ -36,7 +37,7 @@ class XmlProcessor { return new JaxbFileRootBuildItem(CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY); } - @BuildStep + @BuildStep(providesCapabilities = CamelCapabilities.XML) FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java index 2e21fe1..a937ca5 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java +++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; @@ -28,7 +29,6 @@ import io.quarkus.deployment.annotations.Overridable; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.ServiceStartBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.recording.RecorderContext; @@ -44,6 +44,7 @@ import org.apache.camel.quarkus.core.CamelServiceFilter; import org.apache.camel.quarkus.core.CoreAttachmentsRecorder; import org.apache.camel.quarkus.core.Flags; import org.apache.camel.quarkus.core.UploadAttacher; +import org.apache.camel.quarkus.support.common.CamelCapabilities; import org.apache.camel.spi.Registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,8 +138,9 @@ class BuildProcessor { @BuildStep @Record(ExecutionTime.STATIC_INIT) - void disableXmlReifiers(CamelRecorder recorder, List<FeatureBuildItem> features) { - if (features.stream().map(FeatureBuildItem::getInfo).noneMatch("camel-xml"::equals)) { + void disableXmlReifiers(CamelRecorder recorder, Capabilities capabilities) { + if (!capabilities.isCapabilityPresent(CamelCapabilities.XML)) { + LOGGER.debug("Camel XML capability not detected, disable XML reifiers"); recorder.disableXmlReifiers(); } } diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java index 9f0bf2f..49ab988 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java +++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java @@ -18,11 +18,12 @@ package org.apache.camel.quarkus.core.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import org.apache.camel.quarkus.support.common.CamelCapabilities; class Feature { private static final String FEATURE = "camel-core"; - @BuildStep + @BuildStep(providesCapabilities = CamelCapabilities.CORE) FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java similarity index 71% copy from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java copy to extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java index 9f0bf2f..6c4f76b 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java +++ b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java @@ -14,16 +14,12 @@ * 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.support.common; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; +public final class CamelCapabilities { + public static final String CORE = "org.apache.camel"; + public static final String XML = "org.apache.camel.xml"; -class Feature { - private static final String FEATURE = "camel-core"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); + private CamelCapabilities() { } }