You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tk...@apache.org on 2016/02/23 01:14:38 UTC
nifi git commit: NIFI-1545: Adjust integration tests ITDeleteS3Object,
ITFetchS3Object,
and ITPutS3Object to account for AWS new proxy properties. Correct typo in
AbstractS3Processor.createClient() log message.
Repository: nifi
Updated Branches:
refs/heads/support/nifi-0.5.x 3a341ff26 -> f56e1551e
NIFI-1545: Adjust integration tests ITDeleteS3Object, ITFetchS3Object, and ITPutS3Object to account for AWS new proxy properties. Correct typo in AbstractS3Processor.createClient() log message.
Reviewed by Tony Kurc (tkurc@apache.org).
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f56e1551
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f56e1551
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f56e1551
Branch: refs/heads/support/nifi-0.5.x
Commit: f56e1551ebc20495d9bf7cf70814c0e4afba768a
Parents: 3a341ff
Author: Joe Skora <js...@gmail.com>
Authored: Mon Feb 22 08:22:58 2016 -0500
Committer: Tony Kurc <tr...@gmail.com>
Committed: Mon Feb 22 19:15:14 2016 -0500
----------------------------------------------------------------------
.../org/apache/nifi/processors/aws/s3/AbstractS3Processor.java | 2 +-
.../java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java | 2 +-
.../java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java | 2 +-
.../test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f56e1551/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index 0257112..aee9c39 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -134,7 +134,7 @@ public abstract class AbstractS3Processor extends AbstractAWSCredentialsProvider
*/
@Override
protected AmazonS3Client createClient(final ProcessContext context, final AWSCredentials credentials, final ClientConfiguration config) {
- getLogger().info("Creating client with awd credentials");
+ getLogger().info("Creating client with AWS credentials");
final AmazonS3Client s3 = new AmazonS3Client(credentials, config);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f56e1551/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java
index 8ae9224..ad83700 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITDeleteS3Object.java
@@ -146,7 +146,7 @@ public class ITDeleteS3Object extends AbstractS3IT {
public void testGetPropertyDescriptors() throws Exception {
DeleteS3Object processor = new DeleteS3Object();
List<PropertyDescriptor> pd = processor.getSupportedPropertyDescriptors();
- assertEquals("size should be eq", 17, pd.size());
+ assertEquals("size should be eq", 19, pd.size());
assertTrue(pd.contains(processor.ACCESS_KEY));
assertTrue(pd.contains(processor.AWS_CREDENTIALS_PROVIDER_SERVICE));
assertTrue(pd.contains(processor.BUCKET));
http://git-wip-us.apache.org/repos/asf/nifi/blob/f56e1551/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java
index c9334f7..8e5eb28 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITFetchS3Object.java
@@ -136,7 +136,7 @@ public class ITFetchS3Object extends AbstractS3IT {
public void testGetPropertyDescriptors() throws Exception {
FetchS3Object processor = new FetchS3Object();
List<PropertyDescriptor> pd = processor.getSupportedPropertyDescriptors();
- assertEquals("size should be eq", 11, pd.size());
+ assertEquals("size should be eq", 13, pd.size());
assertTrue(pd.contains(FetchS3Object.ACCESS_KEY));
assertTrue(pd.contains(FetchS3Object.AWS_CREDENTIALS_PROVIDER_SERVICE));
assertTrue(pd.contains(FetchS3Object.BUCKET));
http://git-wip-us.apache.org/repos/asf/nifi/blob/f56e1551/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 41d504f..bc5e7a2 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
@@ -227,7 +227,7 @@ public class ITPutS3Object extends AbstractS3IT {
public void testGetPropertyDescriptors() throws Exception {
PutS3Object processor = new PutS3Object();
List<PropertyDescriptor> pd = processor.getSupportedPropertyDescriptors();
- assertEquals("size should be eq", 22, pd.size());
+ assertEquals("size should be eq", 24, pd.size());
assertTrue(pd.contains(PutS3Object.ACCESS_KEY));
assertTrue(pd.contains(PutS3Object.AWS_CREDENTIALS_PROVIDER_SERVICE));
assertTrue(pd.contains(PutS3Object.BUCKET));