http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java index acabe08..e47d58c 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java @@ -49,7 +49,11 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.Charset; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -58,7 +62,8 @@ import java.util.regex.Pattern; @SideEffectFree @SupportsBatching @Tags({"Text", "Regular Expression", "Update", "Change", "Replace", "Modify", "Regex"}) -@CapabilityDescription("Updates the content of a FlowFile by evaluating a Regular Expression against it and replacing the section of the content that matches the Regular Expression with some alternate value.") +@CapabilityDescription("Updates the content of a FlowFile by evaluating a Regular Expression against it and replacing the section of " + + "the content that matches the Regular Expression with some alternate value.") public class ReplaceText extends AbstractProcessor { //Constants @@ -77,7 +82,8 @@ public class ReplaceText extends AbstractProcessor { .build(); public static final PropertyDescriptor REPLACEMENT_VALUE = new PropertyDescriptor.Builder() .name("Replacement Value") - .description("The value to replace the regular expression with. Back-references to Regular Expression capturing groups are supported, but back-references that reference capturing groups that do not exist in the regular expression will be treated as literal value.") + .description("The value to replace the regular expression with. Back-references to Regular Expression capturing groups are supported, but " + + "back-references that reference capturing groups that do not exist in the regular expression will be treated as literal value.") .required(true) .defaultValue("$1") .addValidator(Validator.VALID) @@ -92,15 +98,20 @@ public class ReplaceText extends AbstractProcessor { .build(); public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder() .name("Maximum Buffer Size") - .description("Specifies the maximum amount of data to buffer (per file or per line, depending on the Evaluation Mode) in order to apply the regular expressions. If 'Entire Text' (in Evaluation Mode) is selected and the FlowFile is larger than this value, the FlowFile will be routed to 'failure'. " - + "In 'Line-by-Line' Mode, if a single line is larger than this value, the FlowFile will be routed to 'failure'. A default value of 1 MB is provided, primarily for 'Entire Text' mode. In 'Line-by-Line' Mode, a value such as 8 KB or 16 KB is suggested. This value is ignored and the buffer is not used if 'Regular Expression' is set to '.*'") + .description("Specifies the maximum amount of data to buffer (per file or per line, depending on the Evaluation Mode) in order to " + + "apply the regular expressions. If 'Entire Text' (in Evaluation Mode) is selected and the FlowFile is larger than this value, " + + "the FlowFile will be routed to 'failure'. " + + "In 'Line-by-Line' Mode, if a single line is larger than this value, the FlowFile will be routed to 'failure'. A default value " + + "of 1 MB is provided, primarily for 'Entire Text' mode. In 'Line-by-Line' Mode, a value such as 8 KB or 16 KB is suggested. " + + "This value is ignored and the buffer is not used if 'Regular Expression' is set to '.*'") .required(true) .addValidator(StandardValidators.DATA_SIZE_VALIDATOR) .defaultValue("1 MB") .build(); public static final PropertyDescriptor EVALUATION_MODE = new PropertyDescriptor.Builder() .name("Evaluation Mode") - .description("Evaluate the 'Regular Expression' against each line (Line-by-Line) or buffer the entire file into memory (Entire Text) and then evaluate the 'Regular Expression'.") + .description("Evaluate the 'Regular Expression' against each line (Line-by-Line) or buffer the entire file into memory (Entire Text) and " + + "then evaluate the 'Regular Expression'.") .allowableValues(LINE_BY_LINE, ENTIRE_TEXT) .defaultValue(ENTIRE_TEXT) .required(true) @@ -108,7 +119,8 @@ public class ReplaceText extends AbstractProcessor { // Relationships public static final Relationship REL_SUCCESS = new Relationship.Builder() .name("success") - .description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not match the given Regular Expression") + .description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not " + + "match the given Regular Expression") .build(); public static final Relationship REL_FAILURE = new Relationship.Builder() .name("failure") @@ -205,7 +217,7 @@ public class ReplaceText extends AbstractProcessor { final int originalBackRefIndex = Integer.parseInt(backRefNum); int backRefIndex = originalBackRefIndex; - // if we have a replacement value like $123, and we have less than 123 capturing groups, then + // if we have a replacement value like $123, and we have less than 123 capturing groups, then // we want to truncate the 3 and use capturing group 12; if we have less than 12 capturing groups, // then we want to truncate the 2 and use capturing group 1; if we don't have a capturing group then // we want to truncate the 1 and get 0.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java index 5be2b69..04a9c56 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java @@ -68,7 +68,8 @@ import org.apache.commons.lang3.StringUtils; @SideEffectFree @SupportsBatching @Tags({"Text", "Regular Expression", "Update", "Change", "Replace", "Modify", "Regex", "Mapping"}) -@CapabilityDescription("Updates the content of a FlowFile by evaluating a Regular Expression against it and replacing the section of the content that matches the Regular Expression with some alternate value provided in a mapping file.") +@CapabilityDescription("Updates the content of a FlowFile by evaluating a Regular Expression against it and replacing the section of the content that " + + "matches the Regular Expression with some alternate value provided in a mapping file.") public class ReplaceTextWithMapping extends AbstractProcessor { public static final PropertyDescriptor REGEX = new PropertyDescriptor.Builder() @@ -109,7 +110,8 @@ public class ReplaceTextWithMapping extends AbstractProcessor { .build(); public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder() .name("Maximum Buffer Size") - .description("Specifies the maximum amount of data to buffer (per file) in order to apply the regular expressions. If a FlowFile is larger than this value, the FlowFile will be routed to 'failure'") + .description("Specifies the maximum amount of data to buffer (per file) in order to apply the regular expressions. If a FlowFile is larger " + + "than this value, the FlowFile will be routed to 'failure'") .required(true) .addValidator(StandardValidators.DATA_SIZE_VALIDATOR) .defaultValue("1 MB") @@ -270,13 +272,6 @@ public class ReplaceTextWithMapping extends AbstractProcessor { } } - /** - * Loads a file containing mappings. - * - * @param is - * @return - * @throws IOException - */ protected Map<String, String> loadMappingFile(InputStream is) throws IOException { Map<String, String> mapping = new HashMap<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(is)); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java index 8b6a7b4..7cba650 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java @@ -77,7 +77,8 @@ public class RouteOnAttribute extends AbstractProcessor { "A copy of the FlowFile will be routed to each relationship whose corresponding expression evaluates to 'true'"); public static final AllowableValue ROUTE_ALL_MATCH = new AllowableValue(routeAllMatchValue, "Route to 'matched' if all match", "Requires that all user-defined expressions evaluate to 'true' for the FlowFile to be considered a match"); - public static final AllowableValue ROUTE_ANY_MATCHES = new AllowableValue(routeAnyMatches, // keep the word 'match' instead of 'matched' to maintain backward compatibility (there was a typo originally) + // keep the word 'match' instead of 'matched' to maintain backward compatibility (there was a typo originally) + public static final AllowableValue ROUTE_ANY_MATCHES = new AllowableValue(routeAnyMatches, "Route to 'matched' if any matches", "Requires that at least one user-defined expression evaluate to 'true' for hte FlowFile to be considered a match"); @@ -243,8 +244,7 @@ public class RouteOnAttribute extends AbstractProcessor { } //now transfer the original flow file - logger. - info("Routing {} to {}", new Object[]{flowFile, firstRelationship}); + logger.info("Routing {} to {}", new Object[]{flowFile, firstRelationship}); session.getProvenanceReporter().route(flowFile, firstRelationship); flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, firstRelationship.getName()); session.transfer(flowFile, firstRelationship); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java index 46629fe..1f0fc7b 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java @@ -86,7 +86,10 @@ public class ScanAttribute extends AbstractProcessor { .build(); public static final PropertyDescriptor DICTIONARY_FILTER = new PropertyDescriptor.Builder() .name("Dictionary Filter Pattern") - .description("A Regular Expression that will be applied to each line in the dictionary file. If the regular expression does not match the line, the line will not be included in the list of terms to search for. If a Matching Group is specified, only the portion of the term that matches that Matching Group will be used instead of the entire term. If not specified, all terms in the dictionary will be used and each term will consist of the text of the entire line in the file") + .description("A Regular Expression that will be applied to each line in the dictionary file. If the regular expression does not " + + "match the line, the line will not be included in the list of terms to search for. If a Matching Group is specified, only the " + + "portion of the term that matches that Matching Group will be used instead of the entire term. If not specified, all terms in " + + "the dictionary will be used and each term will consist of the text of the entire line in the file") .required(false) .addValidator(StandardValidators.createRegexValidator(0, 1, false)) .defaultValue(null) http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java index cfa0bda..3da1bd5 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java @@ -225,8 +225,7 @@ public class SplitContent extends AbstractProcessor { } bytesRead++; - boolean matched = buffer. - addAndCompare((byte) (nextByte & 0xFF)); + boolean matched = buffer.addAndCompare((byte) (nextByte & 0xFF)); if (matched) { long splitLength; @@ -255,8 +254,7 @@ public class SplitContent extends AbstractProcessor { FlowFile clone = session.clone(flowFile); session.transfer(flowFile, REL_ORIGINAL); session.transfer(clone, REL_SPLITS); - logger. - info("Found no match for {}; transferring original 'original' and transferring clone {} to 'splits'", new Object[]{flowFile, clone}); + logger.info("Found no match for {}; transferring original 'original' and transferring clone {} to 'splits'", new Object[]{flowFile, clone}); return; } @@ -303,8 +301,7 @@ public class SplitContent extends AbstractProcessor { * @param splits splits */ private void finishFragmentAttributes(final ProcessSession session, final FlowFile source, final List<FlowFile> splits) { - final String originalFilename = source. - getAttribute(CoreAttributes.FILENAME.key()); + final String originalFilename = source.getAttribute(CoreAttributes.FILENAME.key()); final String fragmentId = UUID.randomUUID().toString(); final ArrayList<FlowFile> newList = new ArrayList<>(splits); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java index d641274..56bd729 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java @@ -140,15 +140,6 @@ public class SplitText extends AbstractProcessor { return properties; } - /** - * Reads up to the given maximum number of lines, copying them to out - * - * @param in - * @param maxNumLines - * @param out - * @return the number of lines actually copied - * @throws IOException - */ private int readLines(final InputStream in, final int maxNumLines, final OutputStream out, final boolean keepAllNewLines) throws IOException { int numLines = 0; for (int i = 0; i < maxNumLines; i++) { @@ -279,7 +270,7 @@ public class SplitText extends AbstractProcessor { if (linesCopied.get() > 0) { splits.add(splitFile); } else { - // if the number of content lines is a multiple of the SPLIT_LINE_COUNT, + // if the number of content lines is a multiple of the SPLIT_LINE_COUNT, // the last flow file will contain just a header; don't forward that one session.remove(splitFile); } @@ -341,13 +332,6 @@ public class SplitText extends AbstractProcessor { session.transfer(splits, REL_SPLITS); } - /** - * Apply split index, count and other attributes. - * - * @param session - * @param source - * @param unpacked - */ private void finishFragmentAttributes(final ProcessSession session, final FlowFile source, final List<FlowFile> splits) { final String originalFilename = source.getAttribute(CoreAttributes.FILENAME.key()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java index adbfff2..617fcbe 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java @@ -68,7 +68,8 @@ public class SplitXml extends AbstractProcessor { public static final PropertyDescriptor SPLIT_DEPTH = new PropertyDescriptor.Builder() .name("Split Depth") - .description("Indicates the XML-nesting depth to start splitting XML fragments. A depth of 1 means split the root's children, whereas a depth of 2 means split the root's children's children and so forth.") + .description("Indicates the XML-nesting depth to start splitting XML fragments. A depth of 1 means split the root's children, whereas a depth of" + + " 2 means split the root's children's children and so forth.") .required(true) .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .defaultValue("1") http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java index 2abf4a1..fc4730c 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java @@ -132,35 +132,33 @@ public class TransformXml extends AbstractProcessor { final StopWatch stopWatch = new StopWatch(true); try { - FlowFile transformed = session. - write(original, new StreamCallback() { - @Override - public void process(final InputStream rawIn, final OutputStream out) throws IOException { - try (final InputStream in = new BufferedInputStream(rawIn)) { - - File stylesheet = new File(context.getProperty(XSLT_FILE_NAME).getValue()); - StreamSource styleSource = new StreamSource(stylesheet); - TransformerFactory tfactory = new net.sf.saxon.TransformerFactoryImpl(); - Transformer transformer = tfactory.newTransformer(styleSource); - - // pass all dynamic properties to the transformer - for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties(). - entrySet()) { - if (entry.getKey().isDynamic()) { - String value = context.newPropertyValue(entry.getValue()).evaluateAttributeExpressions(original).getValue(); - transformer.setParameter(entry.getKey().getName(), value); - } - } - - // use a StreamSource with Saxon - StreamSource source = new StreamSource(in); - StreamResult result = new StreamResult(out); - transformer.transform(source, result); - } catch (final Exception e) { - throw new IOException(e); + FlowFile transformed = session.write(original, new StreamCallback() { + @Override + public void process(final InputStream rawIn, final OutputStream out) throws IOException { + try (final InputStream in = new BufferedInputStream(rawIn)) { + + File stylesheet = new File(context.getProperty(XSLT_FILE_NAME).getValue()); + StreamSource styleSource = new StreamSource(stylesheet); + TransformerFactory tfactory = new net.sf.saxon.TransformerFactoryImpl(); + Transformer transformer = tfactory.newTransformer(styleSource); + + // pass all dynamic properties to the transformer + for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties().entrySet()) { + if (entry.getKey().isDynamic()) { + String value = context.newPropertyValue(entry.getValue()).evaluateAttributeExpressions(original).getValue(); + transformer.setParameter(entry.getKey().getName(), value); } } - }); + + // use a StreamSource with Saxon + StreamSource source = new StreamSource(in); + StreamResult result = new StreamResult(out); + transformer.transform(source, result); + } catch (final Exception e) { + throw new IOException(e); + } + } + }); session.transfer(transformed, REL_SUCCESS); session.getProvenanceReporter().modifyContent(transformed, stopWatch.getElapsed(TimeUnit.MILLISECONDS)); logger.info("Transformed {}", new Object[]{original}); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java index 6f228b2..ff4d936 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java @@ -68,14 +68,24 @@ import org.apache.nifi.util.ObjectHolder; @SideEffectFree @SupportsBatching @Tags({"Unpack", "un-merge", "tar", "zip", "archive", "flowfile-stream", "flowfile-stream-v3"}) -@CapabilityDescription("Unpacks the content of FlowFiles that have been packaged with one of several different Packaging Formats, emitting one to many FlowFiles for each input FlowFile") -@ReadsAttribute(attribute = "mime.type", description = "If the <Packaging Format> property is set to use mime.type attribute, this attribute is used to determine the FlowFile's MIME Type. In this case, if the attribute is set to application/tar, the TAR Packaging Format will be used. If the attribute is set to application/zip, the ZIP Packaging Format will be used. If the attribute is set to application/flowfile-v3 or application/flowfile-v2 or application/flowfile-v1, the appropriate FlowFile Packaging Format will be used. If this attribute is missing, the FlowFile will be routed to 'failure'. Otherwise, if the attribute's value is not one of those mentioned above, the FlowFile will be routed to 'success' without being unpacked") +@CapabilityDescription("Unpacks the content of FlowFiles that have been packaged with one of several different Packaging Formats, emitting one to many " + + "FlowFiles for each input FlowFile") +@ReadsAttribute(attribute = "mime.type", description = "If the <Packaging Format> property is set to use mime.type attribute, this attribute is used " + + "to determine the FlowFile's MIME Type. In this case, if the attribute is set to application/tar, the TAR Packaging Format will be used. If " + + "the attribute is set to application/zip, the ZIP Packaging Format will be used. If the attribute is set to application/flowfile-v3 or " + + "application/flowfile-v2 or application/flowfile-v1, the appropriate FlowFile Packaging Format will be used. If this attribute is missing, " + + "the FlowFile will be routed to 'failure'. Otherwise, if the attribute's value is not one of those mentioned above, the FlowFile will be " + + "routed to 'success' without being unpacked") @WritesAttributes({ - @WritesAttribute(attribute = "mime.type", description = "If the FlowFile is successfully unpacked, its MIME Type is no longer known, so the mime.type attribute is set to application/octet-stream."), - @WritesAttribute(attribute = "fragment.identifier", description = "All unpacked FlowFiles produced from the same parent FlowFile will have the same randomly generated UUID added for this attribute"), - @WritesAttribute(attribute = "fragment.index", description = "A one-up number that indicates the ordering of the unpacked FlowFiles that were created from a single parent FlowFile"), + @WritesAttribute(attribute = "mime.type", description = "If the FlowFile is successfully unpacked, its MIME Type is no longer known, so the mime.type " + + "attribute is set to application/octet-stream."), + @WritesAttribute(attribute = "fragment.identifier", description = "All unpacked FlowFiles produced from the same parent FlowFile will have the same randomly generated " + + "UUID added for this attribute"), + @WritesAttribute(attribute = "fragment.index", description = "A one-up number that indicates the ordering of the unpacked FlowFiles that were created from a single " + + "parent FlowFile"), @WritesAttribute(attribute = "fragment.count", description = "The number of unpacked FlowFiles generated from the parent FlowFile"), - @WritesAttribute(attribute = "segment.original.filename ", description = "The filename of the parent FlowFile. Extensions of .tar, .zip or .pkg are removed because the MergeContent processor automatically adds those extensions if it is used to rebuild the original FlowFile")}) + @WritesAttribute(attribute = "segment.original.filename ", description = "The filename of the parent FlowFile. Extensions of .tar, .zip or .pkg are removed because " + + "the MergeContent processor automatically adds those extensions if it is used to rebuild the original FlowFile")}) @SeeAlso(MergeContent.class) public class UnpackContent extends AbstractProcessor { @@ -380,8 +390,7 @@ public class UnpackContent extends AbstractProcessor { mapAttributes(attributes, "content-encoding", CoreAttributes.MIME_TYPE.key()); mapAttributes(attributes, "content-type", CoreAttributes.MIME_TYPE.key()); - if (!attributes. - containsKey(CoreAttributes.MIME_TYPE.key())) { + if (!attributes.containsKey(CoreAttributes.MIME_TYPE.key())) { attributes.put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM); } @@ -396,26 +405,12 @@ public class UnpackContent extends AbstractProcessor { } } - /** - * Maps attributes from legacy nifi to the new naming scheme - * - * @param attributes - * @param oldKey - * @param newKey - */ private static void mapAttributes(final Map<String, String> attributes, final String oldKey, final String newKey) { if (!attributes.containsKey(newKey) && attributes.containsKey(oldKey)) { attributes.put(newKey, attributes.get(oldKey)); } } - /** - * If the unpacked flowfiles contain fragment index attributes, then we need to apply fragment count and other attributes for completeness. - * - * @param session - * @param source - * @param unpacked - */ private void finishFragmentAttributes(final ProcessSession session, final FlowFile source, final List<FlowFile> unpacked) { // first pass verifies all FlowFiles have the FRAGMENT_INDEX attribute and gets the total number of fragments int fragmentCount = 0; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java index 3f761d1..d505898 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java @@ -58,21 +58,21 @@ import org.xml.sax.SAXException; @CapabilityDescription("Validates the contents of FlowFiles against a user-specified XML Schema file") public class ValidateXml extends AbstractProcessor { - public static final PropertyDescriptor SCHEMA_FILE = new PropertyDescriptor.Builder(). - name("Schema File"). - description("The path to the Schema file that is to be used for validation"). - required(true). - addValidator(StandardValidators.FILE_EXISTS_VALIDATOR). - build(); - - public static final Relationship REL_VALID = new Relationship.Builder(). - name("valid"). - description("FlowFiles that are successfully validated against the schema are routed to this relationship"). - build(); - public static final Relationship REL_INVALID = new Relationship.Builder(). - name("invalid"). - description("FlowFiles that are not valid according to the specified schema are routed to this relationship"). - build(); + public static final PropertyDescriptor SCHEMA_FILE = new PropertyDescriptor.Builder() + .name("Schema File") + .description("The path to the Schema file that is to be used for validation") + .required(true) + .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) + .build(); + + public static final Relationship REL_VALID = new Relationship.Builder() + .name("valid") + .description("FlowFiles that are successfully validated against the schema are routed to this relationship") + .build(); + public static final Relationship REL_INVALID = new Relationship.Builder() + .name("invalid") + .description("FlowFiles that are not valid according to the specified schema are routed to this relationship") + .build(); private static final String SCHEMA_LANGUAGE = "http://www.w3.org/2001/XMLSchema";; @@ -105,10 +105,8 @@ public class ValidateXml extends AbstractProcessor { @OnScheduled public void parseSchema(final ProcessContext context) throws IOException, SAXException { try { - final File file = new File(context.getProperty(SCHEMA_FILE). - getValue()); - final SchemaFactory schemaFactory = SchemaFactory. - newInstance(SCHEMA_LANGUAGE); + final File file = new File(context.getProperty(SCHEMA_FILE).getValue()); + final SchemaFactory schemaFactory = SchemaFactory.newInstance(SCHEMA_LANGUAGE); final Schema schema = schemaFactory.newSchema(file); this.schemaRef.set(schema); } catch (final SAXException e) { @@ -136,23 +134,18 @@ public class ValidateXml extends AbstractProcessor { validator.validate(new StreamSource(in)); } catch (final IllegalArgumentException | SAXException e) { valid.set(false); - logger. - debug("Failed to validate {} against schema due to {}", new Object[]{flowFile, e}); + logger.debug("Failed to validate {} against schema due to {}", new Object[]{flowFile, e}); } } }); if (valid.get()) { - logger. - info("Successfully validated {} against schema; routing to 'valid'", new Object[]{flowFile}); - session.getProvenanceReporter(). - route(flowFile, REL_VALID); + logger.info("Successfully validated {} against schema; routing to 'valid'", new Object[]{flowFile}); + session.getProvenanceReporter().route(flowFile, REL_VALID); session.transfer(flowFile, REL_VALID); } else { - logger. - info("Failed to validate {} against schema; routing to 'invalid'", new Object[]{flowFile}); - session.getProvenanceReporter(). - route(flowFile, REL_INVALID); + logger.info("Failed to validate {} against schema; routing to 'invalid'", new Object[]{flowFile}); + session.getProvenanceReporter().route(flowFile, REL_INVALID); session.transfer(flowFile, REL_INVALID); } } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java index ab12be2..7dd6797 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java @@ -50,11 +50,6 @@ public class ContentAcknowledgmentServlet extends HttpServlet { private ProcessorLog logger; private ConcurrentMap<String, FlowFileEntryTimeWrapper> flowFileMap; - /** - * - * @param config - * @throws ServletException - */ @SuppressWarnings("unchecked") @Override public void init(final ServletConfig config) throws ServletException { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index 81986ba..6a8f32f 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -94,11 +94,6 @@ public class ListenHTTPServlet extends HttpServlet { private ConcurrentMap<String, FlowFileEntryTimeWrapper> flowFileMap; private StreamThrottler streamThrottler; - /** - * - * @param config - * @throws ServletException - */ @SuppressWarnings("unchecked") @Override public void init(final ServletConfig config) throws ServletException { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java index c9d906d..4ecccf8 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java @@ -41,11 +41,11 @@ public class Bin { /** * Constructs a new bin * - * @param minSizeBytes - * @param maxSizeBytes - * @param minEntries - * @param maxEntries - * @param fileCountAttribute + * @param minSizeBytes min bytes + * @param maxSizeBytes max bytes + * @param minEntries min entries + * @param maxEntries max entries + * @param fileCountAttribute num files * @throws IllegalArgumentException if the min is not less than or equal to the max. */ public Bin(final long minSizeBytes, final long maxSizeBytes, final int minEntries, final int maxEntries, final String fileCountAttribute) { @@ -75,7 +75,7 @@ public class Bin { /** * Indicates enough size exists to meet the minimum requirements * - * @return + * @return true if full enough */ public boolean isFullEnough() { return isFull() || (size >= minimumSizeBytes && (binContents.size() >= minimumEntries)); @@ -84,8 +84,8 @@ public class Bin { /** * Determines if this bin is older than the time specified. * - * @param duration - * @param unit + * @param duration duration + * @param unit unit * @return true if this bin is older than the length of time given; false otherwise */ public boolean isOlderThan(final int duration, final TimeUnit unit) { @@ -96,8 +96,8 @@ public class Bin { /** * Determines if this bin is older than the specified bin * - * @param other - * @return + * @param other other bin + * @return true if this is older than given bin */ public boolean isOlderThan(final Bin other) { return creationMomentEpochNs < other.creationMomentEpochNs; @@ -106,7 +106,7 @@ public class Bin { /** * If this bin has enough room for the size of the given flow file then it is added otherwise it is not * - * @param flowFile + * @param flowFile flowfile to offer * @param session the ProcessSession to which the FlowFile belongs * @return true if added; false otherwise */ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java index 9d0e857..90440a5 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java @@ -152,7 +152,7 @@ public class BinManager { * <p/> * @param relaxFullnessConstraint if false will require bins to be full before considered ready; if true bins only have to meet their minimum size criteria or be 'old' and then they'll be * considered ready - * @return + * @return bins that are considered full */ public Collection<Bin> removeReadyBins(boolean relaxFullnessConstraint) { final Map<String, List<Bin>> newGroupMap = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java index 8520813..4bca491 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java @@ -42,12 +42,6 @@ public class DocumentReaderCallback implements InputStreamCallback { this.isNamespaceAware = isNamespaceAware; } - /** - * Loads the Document from the specified stream. - * - * @param stream - * @throws IOException - */ @Override public void process(final InputStream stream) throws IOException { try { @@ -63,9 +57,7 @@ public class DocumentReaderCallback implements InputStreamCallback { } /** - * Returns the document. - * - * @return + * @return the document */ public Document getDocument() { return document; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java index 21e6b4c..41a42bb 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java @@ -305,8 +305,7 @@ public class FTPTransfer implements FileTransfer { final FTPFile[] files = client.listFiles(path); FTPFile matchingFile = null; for (final FTPFile file : files) { - if (file.getName(). - equalsIgnoreCase(remoteFileName)) { + if (file.getName().equalsIgnoreCase(remoteFileName)) { matchingFile = file; break; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java index 0e6a26f..adaba5c 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java @@ -75,7 +75,7 @@ public class FTPUtils { * value of zero means do not timeout. Users should probably set a value here unless using very reliable communications links or else risk indefinite hangs that require a restart.</li> * </ul> * - * @param conf + * @param conf conf * @param monitor if provided will be used to monitor FTP commands processed but may be null * @return FTPClient connected to FTP server as configured * @throws NullPointerException if either argument is null http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java index ece0e59..f0061b8 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java @@ -136,7 +136,10 @@ public interface FileTransfer extends Closeable { .build(); public static final PropertyDescriptor REMOTE_POLL_BATCH_SIZE = new PropertyDescriptor.Builder() .name("Remote Poll Batch Size") - .description("The value specifies how many file paths to find in a given directory on the remote system when doing a file listing. This value in general should not need to be modified but when polling against a remote system with a tremendous number of files this value can be critical. Setting this value too high can result very poor performance and setting it too low can cause the flow to be slower than normal.") + .description("The value specifies how many file paths to find in a given directory on the remote system when doing a file listing. This value " + + "in general should not need to be modified but when polling against a remote system with a tremendous number of files this value can " + + "be critical. Setting this value too high can result very poor performance and setting it too low can cause the flow to be slower " + + "than normal.") .defaultValue("5000") .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) .required(true) @@ -194,41 +197,53 @@ public interface FileTransfer extends Closeable { .build(); public static final PropertyDescriptor DOT_RENAME = new PropertyDescriptor.Builder() .name("Dot Rename") - .description("If true, then the filename of the sent file is prepended with a \".\" and then renamed back to the original once the file is completely sent. Otherwise, there is no rename. This property is ignored if the Temporary Filename property is set.") + .description("If true, then the filename of the sent file is prepended with a \".\" and then renamed back to the " + + "original once the file is completely sent. Otherwise, there is no rename. This property is ignored if the " + + "Temporary Filename property is set.") .allowableValues("true", "false") .defaultValue("true") .build(); public static final PropertyDescriptor TEMP_FILENAME = new PropertyDescriptor.Builder() .name("Temporary Filename") - .description("If set, the filename of the sent file will be equal to the value specified during the transfer and after successful completion will be renamed to the original filename. If this value is set, the Dot Rename property is ignored.") + .description("If set, the filename of the sent file will be equal to the value specified during the transfer and after successful " + + "completion will be renamed to the original filename. If this value is set, the Dot Rename property is ignored.") .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(true) .required(false) .build(); public static final PropertyDescriptor LAST_MODIFIED_TIME = new PropertyDescriptor.Builder() .name("Last Modified Time") - .description("The lastModifiedTime to assign to the file after transferring it. If not set, the lastModifiedTime will not be changed. Format must be yyyy-MM-dd'T'HH:mm:ssZ. You may also use expression language such as ${file.lastModifiedTime}. If the value is invalid, the processor will not be invalid but will fail to change lastModifiedTime of the file.") + .description("The lastModifiedTime to assign to the file after transferring it. If not set, the lastModifiedTime will not be changed. " + + "Format must be yyyy-MM-dd'T'HH:mm:ssZ. You may also use expression language such as ${file.lastModifiedTime}. If the value " + + "is invalid, the processor will not be invalid but will fail to change lastModifiedTime of the file.") .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(true) .build(); public static final PropertyDescriptor PERMISSIONS = new PropertyDescriptor.Builder() .name("Permissions") - .description("The permissions to assign to the file after transferring it. Format must be either UNIX rwxrwxrwx with a - in place of denied permissions (e.g. rw-r--r--) or an octal number (e.g. 644). If not set, the permissions will not be changed. You may also use expression language such as ${file.permissions}. If the value is invalid, the processor will not be invalid but will fail to change permissions of the file.") + .description("The permissions to assign to the file after transferring it. Format must be either UNIX rwxrwxrwx with a - in place of " + + "denied permissions (e.g. rw-r--r--) or an octal number (e.g. 644). If not set, the permissions will not be changed. You may " + + "also use expression language such as ${file.permissions}. If the value is invalid, the processor will not be invalid but will " + + "fail to change permissions of the file.") .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(true) .build(); public static final PropertyDescriptor REMOTE_OWNER = new PropertyDescriptor.Builder() .name("Remote Owner") - .description("Integer value representing the User ID to set on the file after transferring it. If not set, the owner will not be set. You may also use expression language such as ${file.owner}. If the value is invalid, the processor will not be invalid but will fail to change the owner of the file.") + .description("Integer value representing the User ID to set on the file after transferring it. If not set, the owner will not be set. " + + "You may also use expression language such as ${file.owner}. If the value is invalid, the processor will not be invalid but " + + "will fail to change the owner of the file.") .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(true) .build(); public static final PropertyDescriptor REMOTE_GROUP = new PropertyDescriptor.Builder() .name("Remote Group") - .description("Integer value representing the Group ID to set on the file after transferring it. If not set, the group will not be set. You may also use expression language such as ${file.group}. If the value is invalid, the processor will not be invalid but will fail to change the group of the file.") + .description("Integer value representing the Group ID to set on the file after transferring it. If not set, the group will not be set. " + + "You may also use expression language such as ${file.group}. If the value is invalid, the processor will not be invalid but " + + "will fail to change the group of the file.") .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(true) http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java index 5034b83..19955e7 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java @@ -149,8 +149,7 @@ public class SFTPTransfer implements FileTransfer { return; } - final boolean ignoreDottedFiles = ctx. - getProperty(FileTransfer.IGNORE_DOTTED_FILES).asBoolean(); + final boolean ignoreDottedFiles = ctx.getProperty(FileTransfer.IGNORE_DOTTED_FILES).asBoolean(); final boolean recurse = ctx.getProperty(FileTransfer.RECURSIVE_SEARCH).asBoolean(); final String fileFilterRegex = ctx.getProperty(FileTransfer.FILE_FILTER_REGEX).getValue(); final Pattern pattern = (fileFilterRegex == null) ? null : Pattern.compile(fileFilterRegex); @@ -234,8 +233,7 @@ public class SFTPTransfer implements FileTransfer { try { getListing(newFullForwardPath, depth + 1, maxResults, listing); } catch (final IOException e) { - logger. - error("Unable to get listing from " + newFullForwardPath + "; skipping this subdirectory"); + logger.error("Unable to get listing from " + newFullForwardPath + "; skipping this subdirectory"); } } } @@ -310,8 +308,7 @@ public class SFTPTransfer implements FileTransfer { channel.mkdir(remoteDirectory); } catch (SftpException e) { if (e.id != ChannelSftp.SSH_FX_FAILURE) { - throw new IOException("Could not blindly create remote directory due to " + e. - getMessage(), e); + throw new IOException("Could not blindly create remote directory due to " + e.getMessage(), e); } } return; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java index d053f14..d012ae0 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/XmlSplitterSaxParser.java @@ -71,9 +71,7 @@ public class XmlSplitterSaxParser extends DefaultHandler { @Override public void endElement(final String uri, final String localName, final String qName) throws SAXException { // Add the element end tag. - sb.append("</"). - append(qName). - append(">"); + sb.append("</").append(qName).append(">"); // We have finished processing this element. Decrement the depth. int newDepth = depth.decrementAndGet(); @@ -104,12 +102,7 @@ public class XmlSplitterSaxParser extends DefaultHandler { for (int i = 0; i < attCount; i++) { String attName = atts.getQName(i); String attValue = atts.getValue(i); - sb.append(" "). - append(attName). - append("="). - append("\""). - append(attValue). - append("\""); + sb.append(" ").append(attName).append("=").append("\"").append(attValue).append("\""); } sb.append(">"); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java index ac2efec..1965314 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java @@ -29,8 +29,7 @@ public class TestDistributeLoad { public static void before() { System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info"); System.setProperty("org.slf4j.simpleLogger.showDateTime", "true"); - System. - setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DistributeLoad", "debug"); + System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DistributeLoad", "debug"); } @Test http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6a706458/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java index 6012b04..688b9eb 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java @@ -60,8 +60,8 @@ public class TestHandleHttpRequest { public void run() { try { final int port = ((HandleHttpRequest) runner.getProcessor()).getPort(); - final HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:"; + port + "/my/path?query=true&value1=value1&value2=&value3&value4=apple=orange"). - openConnection(); + final HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:"; + + port + "/my/path?query=true&value1=value1&value2=&value3&value4=apple=orange").openConnection(); connection.setDoOutput(false); connection.setRequestMethod("GET"); connection.setRequestProperty("header1", "value1");
