Merge pull request #728 from jamesnetherton/jira-improvements
Improve Jira extension
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 f14c0c9..00abff7 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
@@ -16,12 +16,15 @@
*/
package org.apache.camel.quarkus.component.mongodb.deployment;
-import com.mongodb.MongoClient;
+import java.util.List;
+
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
+import io.quarkus.mongodb.runtime.MongoClientRecorder;
import org.apache.camel.quarkus.component.mongodb.CamelMongoClientRecorder;
import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
@@ -36,10 +39,21 @@
@BuildStep
@Record(ExecutionTime.RUNTIME_INIT)
- CamelRuntimeBeanBuildItem registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem,
+ void registerCamelMongoClientProducer(
+ List<MongoClientBuildItem> mongoClients,
+ BuildProducer<CamelRuntimeBeanBuildItem> runtimeBeans,
CamelMongoClientRecorder recorder) {
- return new CamelRuntimeBeanBuildItem("camelMongoClient", MongoClient.class.getName(),
- recorder.createCamelMongoClient(mongoClientBuildItem.getClient()));
+ for (MongoClientBuildItem mongoClient : mongoClients) {
+ // If there is a default mongo client instance, then bind it to the camel registry
+ // with the default mongo client name used by the camel-mongodb component
+ if (MongoClientRecorder.DEFAULT_MONGOCLIENT_NAME.equals(mongoClient.getName())) {
+ runtimeBeans.produce(
+ new CamelRuntimeBeanBuildItem(
+ "camelMongoClient",
+ "com.mongodb.MongoClient",
+ recorder.createCamelMongoClient(mongoClients.get(0).getClient())));
+ }
+ }
}
}
diff --git a/pom.xml b/pom.xml
index 805dc84..3228e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<camel.version>3.0.1</camel.version>
<guava.version>26.0-jre</guava.version>
<hapi.version>4.1.0</hapi.version>
- <quarkus.version>1.3.0.Alpha1</quarkus.version>
+ <quarkus.version>1.3.0.Alpha2</quarkus.version>
<httpmime.version>4.1.3</httpmime.version>
<jetty.version>9.4.18.v20190429</jetty.version>
<xstream.version>1.4.11</xstream.version>
