From 6edfa634d4664f95a49217a88d764df37232a226 Mon Sep 17 00:00:00 2001 From: Matt Burgess Date: Thu, 7 Jul 2016 12:03:53 -0400 Subject: [PATCH] NIFI-1998: Update Cassandra processor docs to include 3.0.x clusters This closes #616 Signed-off-by: jpercivall --- .../org/apache/nifi/processors/cassandra/PutCassandraQL.java | 2 +- .../org/apache/nifi/processors/cassandra/QueryCassandra.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java index 1e0c973eb1..2f680a6213 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java @@ -69,7 +69,7 @@ import java.util.regex.Pattern; @Tags({"cassandra", "cql", "put", "insert", "update", "set"}) @EventDriven @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) -@CapabilityDescription("Execute provided Cassandra Query Language (CQL) statement on a Cassandra 1.x or 2.x cluster. " +@CapabilityDescription("Execute provided Cassandra Query Language (CQL) statement on a Cassandra 1.x, 2.x, or 3.0.x cluster. " + "The content of an incoming FlowFile is expected to be the CQL command to execute. The CQL command may use " + "the ? to escape parameters. In this case, the parameters to use must exist as FlowFile attributes with the " + "naming convention cql.args.N.type and cql.args.N.value, where N is a positive integer. The cql.args.N.type " diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java index bf0890d964..3182958260 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java @@ -75,7 +75,7 @@ import java.util.concurrent.TimeoutException; @Tags({"cassandra", "cql", "select"}) @EventDriven @InputRequirement(InputRequirement.Requirement.INPUT_ALLOWED) -@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select query on a Cassandra 1.x or 2.x cluster. Query result " +@CapabilityDescription("Execute provided Cassandra Query Language (CQL) select query on a Cassandra 1.x, 2.x, or 3.0.x cluster. Query result " + "may be converted to Avro or JSON format. Streaming is used so arbitrarily large result sets are supported. This processor can be " + "scheduled to run on a timer, or cron expression, using the standard scheduling methods, or it can be triggered by an incoming FlowFile. " + "If it is triggered by an incoming FlowFile, then attributes of that FlowFile will be available when evaluating the "