Repository: nifi Updated Branches: refs/heads/NIFI-655 852dbea95 -> e7a5e1822 (forced update)
NIFI-1016: Use centralized priority attribute name in PriorityAttributePrioritizer. closes #98. Signed-off-by: joewitt <joew...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ad73a23a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ad73a23a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ad73a23a Branch: refs/heads/NIFI-655 Commit: ad73a23affe32e77a5295c829a4958da440d24cb Parents: bd47f36 Author: Joe <joe.mesza...@impresstv.com> Authored: Thu Oct 1 14:14:37 2015 +0200 Committer: joewitt <joew...@apache.org> Committed: Sun Oct 18 19:42:46 2015 -0400 ---------------------------------------------------------------------- .../nifi-standard-bundle/nifi-standard-prioritizers/pom.xml | 4 ++++ .../apache/nifi/prioritizer/PriorityAttributePrioritizer.java | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/ad73a23a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml index 598c0db..ede0d13 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml @@ -29,6 +29,10 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> + <artifactId>nifi-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/ad73a23a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java index 75470c8..3d27930 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/PriorityAttributePrioritizer.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.flowfile.FlowFilePrioritizer; +import org.apache.nifi.flowfile.attributes.CoreAttributes; /** * This prioritizer checks each FlowFile for a "priority" attribute and lets @@ -33,8 +34,6 @@ import org.apache.nifi.flowfile.FlowFilePrioritizer; */ public class PriorityAttributePrioritizer implements FlowFilePrioritizer { - public static final String PRIORITY_ATTR = "priority"; - private static final Pattern intPattern = Pattern.compile("-?\\d+"); @Override @@ -47,8 +46,8 @@ public class PriorityAttributePrioritizer implements FlowFilePrioritizer { return 1; } - String o1Priority = o1.getAttribute(PRIORITY_ATTR); - String o2Priority = o2.getAttribute(PRIORITY_ATTR); + String o1Priority = o1.getAttribute(CoreAttributes.PRIORITY.key()); + String o2Priority = o2.getAttribute(CoreAttributes.PRIORITY.key()); if (o1Priority == null && o2Priority == null) { return -1; // this is not 0 to match FirstInFirstOut } else if (o2Priority == null) {