You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/07/14 19:28:13 UTC
nifi git commit: NIFI-2062 AWS SDK Update:
Repository: nifi
Updated Branches:
refs/heads/master f6136b69e -> a7c5b88a4
NIFI-2062 AWS SDK Update:
* Updated the AWS SDK dependency version to 1.11.8
* Removed GetDynamoDBTest references to JsonObject class dropped from AWS SDK
* Fixed integration test ITPutSNS.testPublish() - exception from not evaluating expressions
* Ignored integration test ITPutS3Object.testS3MultipartAgeoff() - did not work before or after SDK update
This closes #562.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a7c5b88a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a7c5b88a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a7c5b88a
Branch: refs/heads/master
Commit: a7c5b88a470d832e1690faede9a5b2f606196342
Parents: f6136b6
Author: James Wing <jv...@gmail.com>
Authored: Tue Jun 21 13:06:02 2016 -0700
Committer: Aldrin Piri <al...@apache.org>
Committed: Thu Jul 14 15:27:26 2016 -0400
----------------------------------------------------------------------
.../apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java | 6 ++----
.../java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java | 1 +
.../test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java | 1 +
pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/a7c5b88a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
index 5bc3360..5ee15b1 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
@@ -45,8 +45,6 @@ import com.amazonaws.services.dynamodbv2.document.TableKeysAndAttributes;
import com.amazonaws.services.dynamodbv2.model.AttributeValue;
import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult;
import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-import com.amazonaws.util.json.JSONException;
-import com.amazonaws.util.json.JSONObject;
public class GetDynamoDBTest extends AbstractDynamoDBTest {
protected GetDynamoDB getDynamoDB;
@@ -177,7 +175,7 @@ public class GetDynamoDBTest extends AbstractDynamoDBTest {
}
@Test
- public void testStringHashStringRangeGetJsonObjectValid() throws IOException, JSONException {
+ public void testStringHashStringRangeGetJsonObjectValid() throws IOException {
outcome = new BatchGetItemOutcome(result);
KeysAndAttributes kaa = new KeysAndAttributes();
Map<String,AttributeValue> map = new HashMap<>();
@@ -190,7 +188,7 @@ public class GetDynamoDBTest extends AbstractDynamoDBTest {
Map<String,List<Map<String,AttributeValue>>> responses = new HashMap<>();
List<Map<String,AttributeValue>> items = new ArrayList<>();
Map<String,AttributeValue> item = new HashMap<String,AttributeValue>();
- String jsonDocument = new JSONObject().put("name", "john").toString();
+ String jsonDocument = "{\"name\": \"john\"}";
item.put("j1",new AttributeValue(jsonDocument));
item.put("hashS", new AttributeValue("h1"));
item.put("rangeS", new AttributeValue("r1"));
http://git-wip-us.apache.org/repos/asf/nifi/blob/a7c5b88a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
index 2db6c74..525d1ab 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
@@ -796,6 +796,7 @@ public class ITPutS3Object extends AbstractS3IT {
Assert.assertTrue(ff1.getSize() > S3_MAXIMUM_OBJECT_SIZE);
}
+ @Ignore
@Test
public void testS3MultipartAgeoff() throws InterruptedException, IOException {
final PutS3Object processor = new PutS3Object();
http://git-wip-us.apache.org/repos/asf/nifi/blob/a7c5b88a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
index f558446..94fb3d3 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java
@@ -39,6 +39,7 @@ public class ITPutSNS {
@Test
public void testPublish() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new PutSNS());
+ runner.setValidateExpressionUsage(false);
runner.setProperty(PutSNS.CREDENTIALS_FILE, CREDENTIALS_FILE);
runner.setProperty(PutSNS.ARN, "arn:aws:sns:us-west-2:100515378163:test-topic-1");
assertTrue(runner.setProperty("DynamicProperty", "hello!").isValid());
http://git-wip-us.apache.org/repos/asf/nifi/blob/a7c5b88a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a41aa4..ac03bac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1236,7 +1236,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.10.32</version>
+ <version>1.11.8</version>
</dependency>
<!-- Groovy support is primarily as a test dependency -->
<dependency>