You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jf...@apache.org on 2020/09/17 03:40:08 UTC
[nifi] branch main updated: NIFI-7768 Added support for monogdb+srv
connection strings.
This is an automated email from the ASF dual-hosted git repository.
jfrazee pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f4ee9fe NIFI-7768 Added support for monogdb+srv connection strings.
f4ee9fe is described below
commit f4ee9fefa9b1e14f4f0449f92fba9dcf0d4ea0f9
Author: Mike Thomsen <mt...@apache.org>
AuthorDate: Mon Sep 7 20:08:46 2020 -0400
NIFI-7768 Added support for monogdb+srv connection strings.
This closes #4514.
Signed-off-by: Joey Frazee <jf...@apache.org>
---
.../apache/nifi/processors/mongodb/GetMongoIT.java | 9 +++++----
.../processors/mongodb/RunMongoAggregationIT.java | 9 +++++++--
nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 23 +---------------------
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
index ddea9a8..7ec724c 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
@@ -311,11 +311,12 @@ public class GetMongoIT {
* Test original behavior; Manually set query of {}, no input
*/
final String attr = "query.attr";
- runner.setProperty(GetMongo.QUERY, "{}");
+ final String queryValue = "{}";
+ runner.setProperty(GetMongo.QUERY, queryValue);
runner.setProperty(GetMongo.QUERY_ATTRIBUTE, attr);
runner.run();
runner.assertTransferCount(GetMongo.REL_SUCCESS, 3);
- testQueryAttribute(attr, "{ }");
+ testQueryAttribute(attr, queryValue);
runner.clearTransferState();
@@ -325,7 +326,7 @@ public class GetMongoIT {
runner.removeProperty(GetMongo.QUERY);
runner.setIncomingConnection(false);
runner.run();
- testQueryAttribute(attr, "{ }");
+ testQueryAttribute(attr, queryValue);
runner.clearTransferState();
@@ -336,7 +337,7 @@ public class GetMongoIT {
runner.setIncomingConnection(true);
runner.enqueue("{}");
runner.run();
- testQueryAttribute(attr, "{ }");
+ testQueryAttribute(attr, queryValue);
/*
* Input flowfile with invalid query
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
index 2aadc5f..24c130f 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
@@ -37,6 +37,7 @@ import org.junit.Test;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -239,12 +240,16 @@ public class RunMongoAggregationIT {
@Test
public void testExtendedJsonSupport() throws Exception {
- String pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS";
+ String pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+ //Let's put this a week from now to make sure that we're not getting too close to
+ //the creation date
+ Date nowish = new Date(now.getTime().getTime() + (7 * 24 * 60 * 60 * 1000));
+
final String queryInput = "[\n" +
" {\n" +
" \"$match\": {\n" +
- " \"date\": { \"$gte\": { \"$date\": \"2019-01-01T00:00:00Z\" }, \"$lte\": { \"$date\": \"" + simpleDateFormat.format(now.getTime()) + "\" } }\n" +
+ " \"date\": { \"$gte\": { \"$date\": \"2019-01-01T00:00:00Z\" }, \"$lte\": { \"$date\": \"" + simpleDateFormat.format(nowish) + "\" } }\n" +
" }\n" +
" },\n" +
" {\n" +
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
index 7d78a04..a0298a8 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
@@ -35,30 +35,9 @@
</modules>
<properties>
- <mongo.driver.version>3.2.2</mongo.driver.version>
+ <mongo.driver.version>3.12.7</mongo.driver.version>
</properties>
- <profiles>
- <profile>
- <id>3.4</id>
- <properties>
- <mongo.driver.version>3.4.3</mongo.driver.version>
- </properties>
- </profile>
- <profile>
- <id>3.6</id>
- <properties>
- <mongo.driver.version>3.6.4</mongo.driver.version>
- </properties>
- </profile>
- <profile>
- <id>3.8</id>
- <properties>
- <mongo.driver.version>3.8.0</mongo.driver.version>
- </properties>
- </profile>
- </profiles>
-
<dependencyManagement>
<dependencies>
<dependency>