From eb1d6b554cc589d7a62b4bf452bf4ebfbad1f8ff Mon Sep 17 00:00:00 2001 From: Yu ISHIKAWA Date: Fri, 11 Sep 2015 18:05:20 +0900 Subject: [PATCH] Remove `REL_NOT_FOUND` --- .../apache/nifi/processors/aws/s3/DeleteS3Object.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java index c8950c3208..836e0d88ea 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java @@ -18,15 +18,14 @@ package org.apache.nifi.processors.aws.s3; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.concurrent.TimeUnit; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.DeleteObjectRequest; import com.amazonaws.services.s3.model.DeleteVersionRequest; + import org.apache.nifi.annotation.behavior.SupportsBatching; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.SeeAlso; @@ -35,7 +34,6 @@ import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.util.StandardValidators; @@ -46,9 +44,6 @@ import org.apache.nifi.processor.util.StandardValidators; "And the FlowFiles are checked if exists or not before deleting.") public class DeleteS3Object extends AbstractS3Processor { - public static final Relationship REL_NOT_FOUND = new Relationship.Builder().name("not found") - .description("FlowFiles are routed to 'not found' if it doesn't exist on Amazon S3").build(); - public static final PropertyDescriptor VERSION_ID = new PropertyDescriptor.Builder() .name("Version") .description("The Version of the Object to delete") @@ -61,9 +56,6 @@ public class DeleteS3Object extends AbstractS3Processor { Arrays.asList(KEY, BUCKET, ACCESS_KEY, SECRET_KEY, CREDENTAILS_FILE, REGION, TIMEOUT, VERSION_ID, FULL_CONTROL_USER_LIST, READ_USER_LIST, WRITE_USER_LIST, READ_ACL_LIST, WRITE_ACL_LIST, OWNER)); - public static final Set relationships = Collections.unmodifiableSet( - new HashSet<>(Arrays.asList(REL_SUCCESS, REL_FAILURE, REL_NOT_FOUND))); - @Override protected List getSupportedPropertyDescriptors() { return properties;