This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 ef7a4ed Added couchdb consumer support in native mode #1022
ef7a4ed is described below
commit ef7a4edffbb498734375a94f569ff74760ea2a09
Author: aldettinger <[email protected]>
AuthorDate: Mon Jun 8 19:17:52 2020 +0200
Added couchdb consumer support in native mode #1022
---
.../couchdb/deployment/CouchdbProcessor.java | 9 +++++
integration-tests/couchdb/pom.xml | 5 +++
.../quarkus/component/couchdb/it/CouchDbRoute.java | 41 ++++++++++++++++++++++
.../component/couchdb/it/CouchdbResource.java | 27 +++++++++++---
.../component/couchdb/it/CouchdbTestDocument.java | 16 +++++++++
.../quarkus/component/couchdb/it/CouchdbTest.java | 29 +++++++++++++++
6 files changed, 122 insertions(+), 5 deletions(-)
diff --git
a/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java
b/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java
index ce41d0a..307355e 100644
---
a/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java
+++
b/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java
@@ -19,8 +19,10 @@ package
org.apache.camel.quarkus.component.couchdb.deployment;
import java.util.ArrayList;
import java.util.List;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
class CouchdbProcessor {
@@ -37,7 +39,14 @@ class CouchdbProcessor {
List<ReflectiveClassBuildItem> items = new
ArrayList<ReflectiveClassBuildItem>();
items.add(new ReflectiveClassBuildItem(false, true,
"org.lightcouch.Response"));
items.add(new ReflectiveClassBuildItem(false, true,
"org.lightcouch.CouchDbInfo"));
+ items.add(new ReflectiveClassBuildItem(false, true,
"org.lightcouch.ChangesResult$Row"));
+ items.add(new ReflectiveClassBuildItem(false, true,
"org.lightcouch.ChangesResult$Row$Rev"));
return items;
}
+ @BuildStep
+ void addDependenciesToIndexer(BuildProducer<IndexDependencyBuildItem>
indexDependencyProducer) {
+ indexDependencyProducer.produce(new
IndexDependencyBuildItem("com.google.code.gson", "gson"));
+ }
+
}
diff --git a/integration-tests/couchdb/pom.xml
b/integration-tests/couchdb/pom.xml
index 528e76f..3a1b3dc 100644
--- a/integration-tests/couchdb/pom.xml
+++ b/integration-tests/couchdb/pom.xml
@@ -64,6 +64,11 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- test dependencies - camel-quarkus -->
<dependency>
diff --git
a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchDbRoute.java
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchDbRoute.java
new file mode 100644
index 0000000..f9290b4
--- /dev/null
+++
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchDbRoute.java
@@ -0,0 +1,41 @@
+/*
+ * 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.component.couchdb.it;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import com.google.gson.JsonObject;
+import org.apache.camel.builder.RouteBuilder;
+
+import static
org.apache.camel.quarkus.component.couchdb.it.CouchdbTestDocument.fromJsonObject;
+
+@ApplicationScoped
+public class CouchDbRoute extends RouteBuilder {
+
+ static final String COUCHDB_ENDPOINT_URI =
"couchdb:http://{{camel.couchdb.test.server.authority}}/database";;
+
+ @Inject
+ CouchdbResource resource;
+
+ @Override
+ public void configure() {
+ from(COUCHDB_ENDPOINT_URI +
"?createDatabase=true&heartbeat=100").process(e -> {
+
resource.logEvent(fromJsonObject(e.getIn().getBody(JsonObject.class)));
+ });
+ }
+}
diff --git
a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java
index c062ce3..56019d2 100644
---
a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java
+++
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.quarkus.component.couchdb.it;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
@@ -33,13 +36,16 @@ import org.apache.camel.component.couchdb.CouchDbOperations;
import org.jboss.logging.Logger;
import org.lightcouch.NoDocumentException;
+import static
org.apache.camel.quarkus.component.couchdb.it.CouchDbRoute.COUCHDB_ENDPOINT_URI;
+
@Path("/couchdb")
@ApplicationScoped
public class CouchdbResource {
- private static final String baseUri =
"couchdb:http://{{camel.couchdb.test.server.authority}}/database";;
private static final Logger LOG = Logger.getLogger(CouchdbResource.class);
+ private final ConcurrentLinkedQueue<CouchdbTestDocument> loggedEvents =
new ConcurrentLinkedQueue<>();
+
@Inject
ProducerTemplate producerTemplate;
@@ -49,7 +55,7 @@ public class CouchdbResource {
@Produces(MediaType.APPLICATION_JSON)
public CouchdbTestDocument create(CouchdbTestDocument document) {
LOG.info("Invoking create");
- Exchange createExchange = producerTemplate.request(baseUri +
"?createDatabase=true",
+ Exchange createExchange =
producerTemplate.request(COUCHDB_ENDPOINT_URI,
e -> e.getMessage().setBody(document.toJsonObject()));
document.setId(createExchange.getMessage().getHeader(CouchDbConstants.HEADER_DOC_ID,
String.class));
document.setRevision(createExchange.getMessage().getHeader(CouchDbConstants.HEADER_DOC_REV,
String.class));
@@ -62,7 +68,7 @@ public class CouchdbResource {
@Produces(MediaType.APPLICATION_JSON)
public String get(CouchdbTestDocument document) {
LOG.info("Invoking get");
- Exchange getExchange = producerTemplate.request(baseUri, e -> {
+ Exchange getExchange = producerTemplate.request(COUCHDB_ENDPOINT_URI,
e -> {
e.getMessage().setBody(document.toJsonObject());
e.getMessage().setHeader(CouchDbConstants.HEADER_METHOD,
CouchDbOperations.GET);
e.getMessage().setHeader(CouchDbConstants.HEADER_DOC_ID,
document.getId());
@@ -80,7 +86,7 @@ public class CouchdbResource {
@Produces(MediaType.APPLICATION_JSON)
public CouchdbTestDocument update(CouchdbTestDocument document) {
LOG.info("Invoking update");
- Exchange updateExchange = producerTemplate.request(baseUri, e -> {
+ Exchange updateExchange =
producerTemplate.request(COUCHDB_ENDPOINT_URI, e -> {
e.getMessage().setBody(document.toJsonObject());
});
document.setId(updateExchange.getMessage().getHeader(CouchDbConstants.HEADER_DOC_ID,
String.class));
@@ -94,7 +100,7 @@ public class CouchdbResource {
@Produces(MediaType.APPLICATION_JSON)
public CouchdbTestDocument delete(CouchdbTestDocument document) {
LOG.info("Invoking delete");
- Exchange deleteExchange = producerTemplate.request(baseUri, e -> {
+ Exchange deleteExchange =
producerTemplate.request(COUCHDB_ENDPOINT_URI, e -> {
e.getMessage().setBody(document.toJsonObject());
e.getMessage().setHeader(CouchDbConstants.HEADER_METHOD,
CouchDbOperations.DELETE);
});
@@ -102,4 +108,15 @@ public class CouchdbResource {
document.setRevision(deleteExchange.getMessage().getHeader(CouchDbConstants.HEADER_DOC_REV,
String.class));
return document;
}
+
+ void logEvent(CouchdbTestDocument event) {
+ loggedEvents.add(event);
+ }
+
+ @Path("/get-events")
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Collection<CouchdbTestDocument> getEvents() {
+ return loggedEvents;
+ }
}
diff --git
a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java
index 853437b..f384ba8 100644
---
a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java
+++
b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java
@@ -64,4 +64,20 @@ public class CouchdbTestDocument {
}
return jsonObject;
}
+
+ public static CouchdbTestDocument fromJsonObject(JsonObject jsonObject) {
+ CouchdbTestDocument doc = new CouchdbTestDocument();
+ if (jsonObject.has("_id")) {
+ doc.setId(jsonObject.get("_id").getAsString());
+ }
+ if (jsonObject.has("_rev")) {
+ doc.setRevision(jsonObject.get("_rev").getAsString());
+ }
+ if (jsonObject.has("value")) {
+ doc.setValue(jsonObject.get("value").getAsString());
+ } else if (jsonObject.has("_deleted")) {
+ doc.setValue("delete");
+ }
+ return doc;
+ }
}
diff --git
a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
index e847bf4..88d3f7d 100644
---
a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
+++
b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.quarkus.component.couchdb.it;
+import java.util.concurrent.TimeUnit;
+
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -80,6 +83,32 @@ class CouchdbTest {
// Check that consulting the deleted document is no more possible
RestAssured.given().contentType(ContentType.JSON).body(created).get("/couchdb/get").then().statusCode(204);
+
+ // Let the CouchDB consumer route some time to record events generated
by above tests
+ await().atMost(10L, TimeUnit.SECONDS).until(() -> {
+ return
RestAssured.given().get("/couchdb/get-events").path("size()").equals(3);
+ });
+ CouchdbTestDocument[] events =
RestAssured.given().get("/couchdb/get-events").then().statusCode(200).extract()
+ .as(CouchdbTestDocument[].class);
+ assertEquals(3, events.length);
+
+ CouchdbTestDocument firstEvent = events[0];
+ assertNotNull(firstEvent);
+ assertEquals("create", firstEvent.getValue());
+ assertEquals(created.getId(), firstEvent.getId());
+ assertEquals(created.getRevision(), firstEvent.getRevision());
+
+ CouchdbTestDocument secondEvent = events[1];
+ assertNotNull(secondEvent);
+ assertEquals("update", secondEvent.getValue());
+ assertEquals(updated.getId(), secondEvent.getId());
+ assertEquals(updated.getRevision(), secondEvent.getRevision());
+
+ CouchdbTestDocument thirdEvent = events[2];
+ assertNotNull(thirdEvent);
+ assertEquals("delete", thirdEvent.getValue());
+ assertEquals(deleted.getId(), thirdEvent.getId());
+ assertEquals(deleted.getRevision(), thirdEvent.getRevision());
}
}
