You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/10/03 12:54:07 UTC
[camel-quarkus] branch master updated: chore: rename
CamelRegistryBuildItem to a more meaningful CamelBeanBuildItem
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 03ccfa5 chore: rename CamelRegistryBuildItem to a more meaningful CamelBeanBuildItem
new 4123df5 Merge pull request #222 from lburgazzoli/camel-bean-item
03ccfa5 is described below
commit 03ccfa5482f1bacc7f77ac02512a333adb0f9135
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 3 10:30:00 2019 +0200
chore: rename CamelRegistryBuildItem to a more meaningful CamelBeanBuildItem
---
.../apache/camel/quarkus/core/deployment/BuildProcessor.java | 6 +++---
.../{CamelRegistryBuildItem.java => CamelBeanBuildItem.java} | 12 +++++++++---
.../metrics/deployment/MicroProfileMetricsProcessor.java | 6 +++---
.../quarkus/core/support/deployment/SupportBuildStep.java | 6 +++---
4 files changed, 18 insertions(+), 12 deletions(-)
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 028ac26..93d9ee4 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
@@ -69,7 +69,7 @@ class BuildProcessor {
@BuildStep
CamelRuntimeBuildItem create(
CamelRecorder recorder,
- List<CamelRegistryBuildItem> registryItems,
+ List<CamelBeanBuildItem> camelBeans,
BuildProducer<RuntimeBeanBuildItem> runtimeBeans) {
RuntimeRegistry registry = new RuntimeRegistry();
@@ -80,7 +80,7 @@ class BuildProcessor {
);
services().filter(
- si -> registryItems.stream().noneMatch(
+ si -> camelBeans.stream().noneMatch(
c -> Objects.equals(si.name, c.getName()) && c.getType().isAssignableFrom(si.type)
)
).forEach(
@@ -95,7 +95,7 @@ class BuildProcessor {
}
);
- for (CamelRegistryBuildItem item: registryItems) {
+ for (CamelBeanBuildItem item: camelBeans) {
LOGGER.debug("Binding item with name: {}, type {}", item.getName(), item.getType());
recorder.bind(
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
similarity index 76%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
rename to extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
index 17e556f..6d06153 100644
--- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
+++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
@@ -20,18 +20,24 @@ import java.util.Objects;
import io.quarkus.builder.item.MultiBuildItem;
-public final class CamelRegistryBuildItem extends MultiBuildItem {
+/**
+ * A {@link MultiBuildItem} holding beans to add to {@link org.apache.camel.spi.Registry} during
+ * static initialization phase.
+ * Can be produced only by methods that do not depend on {@linke CamelRuntime} because otherwise
+ * there is a circular dependency.
+ */
+public final class CamelBeanBuildItem extends MultiBuildItem {
private final String name;
private final Class<?> type;
private final Object value;
- public CamelRegistryBuildItem(String name, Object value) {
+ public CamelBeanBuildItem(String name, Object value) {
this.name = Objects.requireNonNull(name);
this.value = Objects.requireNonNull(value);
this.type = Objects.requireNonNull(value).getClass();
}
- public CamelRegistryBuildItem(String name, Class<?> type, Object value) {
+ public CamelBeanBuildItem(String name, Class<?> type, Object value) {
this.name = Objects.requireNonNull(name);
this.type = Objects.requireNonNull(type);
this.value = Objects.requireNonNull(value);
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 53c9d75..1f76a1d 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
@@ -24,7 +24,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
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.CamelRegistryBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.eclipse.microprofile.metrics.MetricRegistry;
import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.METRIC_REGISTRY_NAME;
@@ -39,8 +39,8 @@ class MicroProfileMetricsProcessor {
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
- CamelRegistryBuildItem metricRegistry(CamelMicroProfileMetricsRecorder recorder) {
- return new CamelRegistryBuildItem(
+ CamelBeanBuildItem metricRegistry(CamelMicroProfileMetricsRecorder recorder) {
+ return new CamelBeanBuildItem(
METRIC_REGISTRY_NAME,
MetricRegistry.class,
recorder.createApplicationRegistry()
diff --git a/integration-tests/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java b/integration-tests/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
index 1020b62..21b2b1a 100644
--- a/integration-tests/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
+++ b/integration-tests/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
@@ -20,14 +20,14 @@ 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.CamelRegistryBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
import org.apache.camel.quarkus.core.support.SupportRecorder;
public class SupportBuildStep {
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
- CamelRegistryBuildItem logComponent(SupportRecorder recorder) {
- return new CamelRegistryBuildItem(
+ CamelBeanBuildItem logComponent(SupportRecorder recorder) {
+ return new CamelBeanBuildItem(
"log",
LogComponent.class,
recorder.logComponent()