Repository: camel
Updated Branches:
  refs/heads/master 118214e6d -> c882ce880


Added distinct query support for the camel-mongo3 component.  Unit tests pass 
and code style checked


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c882ce88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c882ce88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c882ce88

Branch: refs/heads/master
Commit: c882ce8809594753f6e274e22d6d4399715ff080
Parents: 118214e
Author: Mark Webb <[email protected]>
Authored: Wed May 24 00:17:34 2017 -0400
Committer: Claus Ibsen <[email protected]>
Committed: Sat May 27 09:37:11 2017 +0200

----------------------------------------------------------------------
 .../component/mongodb3/MongoDbConstants.java    |  1 +
 .../component/mongodb3/MongoDbOperation.java    |  3 +-
 .../component/mongodb3/MongoDbProducer.java     | 31 ++++++++++++++++++
 .../mongodb3/MongoDbFindOperationTest.java      | 34 ++++++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c882ce88/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
----------------------------------------------------------------------
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
index 5731c4f..7196a98 100644
--- 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbConstants.java
@@ -39,6 +39,7 @@ public final class MongoDbConstants {
     public static final String FROM_TAILABLE = "CamelMongoDbTailable";
     public static final String WRITERESULT = "CamelMongoWriteResult";
     public static final String OID = "CamelMongoOid";
+    public static final String DISTINCT_QUERY_FIELD = 
"CamelMongoDbDistinctQueryField";
 
     public static final String MONGO_ID = "_id"; // default id field
 

http://git-wip-us.apache.org/repos/asf/camel/blob/c882ce88/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
----------------------------------------------------------------------
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
index 8c20517..6ddc7d3 100644
--- 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbOperation.java
@@ -24,7 +24,8 @@ public enum MongoDbOperation {
     findAll,
     // group,       // future operation see aggregate
     // mapReduce,   // future operation
-    
+    findDistinct,
+
     // create/update operations
     insert,
     save, 

http://git-wip-us.apache.org/repos/asf/camel/blob/c882ce88/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
index cb33fe4..1253ddd 100644
--- 
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
+++ 
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
@@ -23,7 +23,11 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.DistinctIterable;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
@@ -78,6 +82,7 @@ public class MongoDbProducer extends DefaultProducer {
         bind(MongoDbOperation.aggregate, createDoAggregate());
         bind(MongoDbOperation.command, createDoCommand());
         bind(MongoDbOperation.count, createDoCount());
+        bind(MongoDbOperation.findDistinct, createDoDistinct());
         bind(MongoDbOperation.findAll, createDoFindAll());
         bind(MongoDbOperation.findById, createDoFindById());
         bind(MongoDbOperation.findOneByQuery, createDoFindOneByQuery());
@@ -323,6 +328,32 @@ public class MongoDbProducer extends DefaultProducer {
         };
     }
 
+    private Function<Exchange, Object> createDoDistinct() {
+        return exchange -> {
+            Iterable<String> result = new ArrayList<>();
+            MongoCollection<Document> dbCol = calculateCollection(exchange);
+
+            // get the parameters out of the Exchange Header
+            String distinctFieldName = 
exchange.getIn().getHeader(MongoDbConstants.DISTINCT_QUERY_FIELD, String.class);
+            //BasicDBObject query = 
exchange.getIn().getBody(BasicDBObject.class);
+            Bson query = exchange.getIn().getBody(Bson.class);
+            DistinctIterable<String> ret = null;
+            if (query != null) {
+                ret = dbCol.distinct(distinctFieldName, query, String.class);
+            } else {
+                ret = dbCol.distinct(distinctFieldName, String.class);
+            }
+
+            try {
+                ret.iterator().forEachRemaining(((List<String>) result)::add);
+                exchange.getOut().setHeader(MongoDbConstants.RESULT_PAGE_SIZE, 
((List<String>) result).size());
+            } finally {
+                ret.iterator().close();
+            }
+            return result;
+        };
+    }
+
     private Function<Exchange, Object> createDoFindAll() {
         return exchange1 -> {
             Iterable<Document> result;

http://git-wip-us.apache.org/repos/asf/camel/blob/c882ce88/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
index 7e52386..dc99cdf 100644
--- 
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
+++ 
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbFindOperationTest.java
@@ -189,6 +189,38 @@ public class MongoDbFindOperationTest extends 
AbstractMongoDbTest {
     }
 
     @Test
+    public void testFindDistinctNoQuery() {
+        // Test that the collection has 0 documents in it
+        assertEquals(0, testCollection.count());
+        pumpDataIntoTestCollection();
+
+        Object result = template.requestBodyAndHeader("direct:findDistinct", 
null, MongoDbConstants.DISTINCT_QUERY_FIELD, "scientist");
+        assertTrue("Result is not of type List", result instanceof List);
+
+        @SuppressWarnings("unchecked")
+        List<String> resultList = (List<String>)result;
+        assertEquals(10, resultList.size());
+    }
+
+    @Test
+    public void testFindDistinctWithQuery() {
+        // Test that the collection has 0 documents in it
+        assertEquals(0, testCollection.count());
+        pumpDataIntoTestCollection();
+
+        Bson query = eq("scientist", "Einstein");
+
+        Object result = template.requestBodyAndHeader("direct:findDistinct", 
query, MongoDbConstants.DISTINCT_QUERY_FIELD, "scientist");
+        assertTrue("Result is not of type List", result instanceof List);
+
+        @SuppressWarnings("unchecked")
+        List<String> resultList = (List<String>)result;
+        assertEquals(1, resultList.size());
+
+        assertEquals("Einstein", resultList.get(0));
+    }
+
+    @Test
     public void testFindOneByQuery() throws Exception {
         // Test that the collection has 0 documents in it
         assertEquals(0, testCollection.count());
@@ -257,6 +289,8 @@ public class MongoDbFindOperationTest extends 
AbstractMongoDbTest {
                 
from("direct:findById").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findById&dynamicity=true")
                     .to("mock:resultFindById");
 
+                
from("direct:findDistinct").to("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findDistinct&dynamicity=true")
+                    .to("mock:resultFindDistinct");
             }
         };
     }

Reply via email to