You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/07/18 09:07:43 UTC
nifi git commit: NIFI-5305 If EL evaluation creates an empty string
for the database or collection names,
it raises a ProcessException which triggers failure behavior.
Repository: nifi
Updated Branches:
refs/heads/master 72a5e6bfb -> 461eca0d1
NIFI-5305 If EL evaluation creates an empty string for the database or collection names, it raises a ProcessException which triggers failure behavior.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2891.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/461eca0d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/461eca0d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/461eca0d
Branch: refs/heads/master
Commit: 461eca0d147b915fd1c806b17e6dff39d585e3f1
Parents: 72a5e6b
Author: Mike Thomsen <mi...@gmail.com>
Authored: Sat Jul 14 14:18:28 2018 -0400
Committer: Pierre Villard <pi...@gmail.com>
Committed: Wed Jul 18 11:07:31 2018 +0200
----------------------------------------------------------------------
.../mongodb/AbstractMongoProcessor.java | 7 +++
.../nifi/processors/mongodb/DeleteMongo.java | 2 +-
.../nifi/processors/mongodb/GetMongo.java | 3 +-
.../nifi/processors/mongodb/PutMongo.java | 3 +-
.../nifi/processors/mongodb/PutMongoRecord.java | 3 +-
.../processors/mongodb/RunMongoAggregation.java | 2 +-
.../nifi/processors/mongodb/GetMongoIT.java | 61 ++++++++++++++++++++
7 files changed, 73 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
index fa3bc10..cdaaab0 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
@@ -38,6 +38,7 @@ import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.util.SslContextFactory;
import org.apache.nifi.ssl.SSLContextService;
@@ -249,6 +250,9 @@ public abstract class AbstractMongoProcessor extends AbstractProcessor {
protected MongoDatabase getDatabase(final ProcessContext context, final FlowFile flowFile) {
final String databaseName = context.getProperty(DATABASE_NAME).evaluateAttributeExpressions(flowFile).getValue();
+ if (StringUtils.isEmpty(databaseName)) {
+ throw new ProcessException("Database name was empty after expression language evaluation.");
+ }
return mongoClient.getDatabase(databaseName);
}
@@ -258,6 +262,9 @@ public abstract class AbstractMongoProcessor extends AbstractProcessor {
protected MongoCollection<Document> getCollection(final ProcessContext context, final FlowFile flowFile) {
final String collectionName = context.getProperty(COLLECTION_NAME).evaluateAttributeExpressions(flowFile).getValue();
+ if (StringUtils.isEmpty(collectionName)) {
+ throw new ProcessException("Collection name was empty after expression language evaluation.");
+ }
return getDatabase(context, flowFile).getCollection(collectionName);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
index fc9f016..6176a66 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
@@ -128,7 +128,6 @@ public class DeleteMongo extends AbstractMongoProcessor {
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
FlowFile flowFile = session.get();
final WriteConcern writeConcern = getWriteConcern(context);
- final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
final String deleteMode = context.getProperty(DELETE_MODE).getValue();
final String deleteAttr = flowFile.getAttribute("mongodb.delete.mode");
final Boolean failMode = context.getProperty(FAIL_ON_NO_DELETE).asBoolean();
@@ -141,6 +140,7 @@ public class DeleteMongo extends AbstractMongoProcessor {
}
try {
+ final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
session.exportTo(flowFile, bos);
bos.close();
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
index c5201fb..19fe82b 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java
@@ -251,9 +251,8 @@ public class GetMongo extends AbstractMongoProcessor {
configureMapper(jsonTypeSetting);
- final MongoCollection<Document> collection = getCollection(context, input);
-
try {
+ final MongoCollection<Document> collection = getCollection(context, input);
final FindIterable<Document> it = query != null ? collection.find(query) : collection.find();
if (projection != null) {
it.projection(projection);
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
index 620ee7c..d02e22f 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java
@@ -195,9 +195,8 @@ public class PutMongo extends AbstractMongoProcessor {
final String updateMode = context.getProperty(UPDATE_MODE).getValue();
final WriteConcern writeConcern = getWriteConcern(context);
- final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
-
try {
+ final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
// Read the contents of the FlowFile into a byte array
final byte[] content = new byte[(int) flowFile.getSize()];
session.read(flowFile, in -> StreamUtils.fillBuffer(in, content, true));
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java
index 37706bc..cfe19e9 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java
@@ -113,8 +113,6 @@ public class PutMongoRecord extends AbstractMongoProcessor {
final WriteConcern writeConcern = getWriteConcern(context);
- final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
-
List<Document> inserts = new ArrayList<>();
int ceiling = context.getProperty(INSERT_COUNT).asInteger();
int added = 0;
@@ -122,6 +120,7 @@ public class PutMongoRecord extends AbstractMongoProcessor {
try (final InputStream inStream = session.read(flowFile);
final RecordReader reader = recordParserFactory.createRecordReader(flowFile, inStream, getLogger())) {
+ final MongoCollection<Document> collection = getCollection(context, flowFile).withWriteConcern(writeConcern);
RecordSchema schema = reader.getSchema();
Record record;
while ((record = reader.nextRecord()) != null) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java
index 684c5f5..c39b8ee 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java
@@ -156,10 +156,10 @@ public class RunMongoAggregation extends AbstractMongoProcessor {
attrs.put(queryAttr, query);
}
- MongoCollection<Document> collection = getCollection(context, flowFile);
MongoCursor<Document> iter = null;
try {
+ MongoCollection<Document> collection = getCollection(context, flowFile);
List<Bson> aggQuery = buildAggregationQuery(query);
AggregateIterable<Document> it = collection.aggregate(aggQuery);
it.batchSize(batchSize != null ? batchSize : 1);
http://git-wip-us.apache.org/repos/asf/nifi/blob/461eca0d/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
----------------------------------------------------------------------
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 1823edf..3418444 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
@@ -23,9 +23,11 @@ import com.google.common.collect.Lists;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.MockProcessContext;
import org.apache.nifi.util.TestRunner;
@@ -468,4 +470,63 @@ public class GetMongoIT {
/*
* End query read behavior tests
*/
+
+ /*
+ * Verify that behavior described in NIFI-5305 actually works. This test is to ensure that
+ * if a user configures the processor to use EL for the database details (name and collection) that
+ * it can work against a flowfile.
+ */
+ @Test
+ public void testDatabaseEL() {
+ runner.removeVariable("collection");
+ runner.removeVariable("db");
+ runner.setIncomingConnection(true);
+
+ String[] collections = new String[] { "a", "b", "c" };
+ String[] dbs = new String[] { "el_db_1", "el_db_2", "el_db_3" };
+ String query = "{}";
+
+ for (int x = 0; x < collections.length; x++) {
+ MongoDatabase db = mongoClient.getDatabase(dbs[x]);
+ db.getCollection(collections[x])
+ .insertOne(new Document().append("msg", "Hello, World"));
+
+ Map<String, String> attrs = new HashMap<>();
+ attrs.put("db", dbs[x]);
+ attrs.put("collection", collections[x]);
+ runner.enqueue(query, attrs);
+ runner.run();
+
+ db.drop();
+
+ runner.assertTransferCount(GetMongo.REL_SUCCESS, 1);
+ runner.assertTransferCount(GetMongo.REL_ORIGINAL, 1);
+ runner.assertTransferCount(GetMongo.REL_FAILURE, 0);
+ runner.clearTransferState();
+ }
+
+ Map<String, Map<String, String>> vals = new HashMap<String, Map<String, String>>(){{
+ put("Database", new HashMap<String, String>(){{
+ put("db", "");
+ put("collection", "test");
+ }});
+ put("Collection", new HashMap<String, String>(){{
+ put("db", "getmongotest");
+ put("collection", "");
+ }});
+ }};
+
+ for (Map.Entry<String, Map<String, String>> entry : vals.entrySet()) {
+ runner.enqueue("{}", entry.getValue());
+ try {
+ runner.run();
+ } catch (Throwable ex) {
+ Throwable cause = ex.getCause();
+ Assert.assertTrue(cause instanceof ProcessException);
+ Assert.assertTrue(entry.getKey(), cause.getMessage().contains(entry.getKey()));
+ }
+ runner.clearTransferState();
+
+ }
+ }
}