This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new ad4e0b0585 NIFI-10783 Switched to LinkedHashMap for CompareFuzzyHash ad4e0b0585 is described below commit ad4e0b05853895ca6f3404ebd8cb27f3960d29f4 Author: sopan98 <phaltankarso...@gmail.com> AuthorDate: Wed Nov 9 00:18:42 2022 -0600 NIFI-10783 Switched to LinkedHashMap for CompareFuzzyHash This closes #6639 Signed-off-by: David Handermann <exceptionfact...@apache.org> --- .../org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java | 3 ++- .../apache/nifi/processors/cybersecurity/TestCompareFuzzyHash.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java index 091e155db7..0a8ce67c3f 100644 --- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java +++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/java/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash.java @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -206,7 +207,7 @@ public class CompareFuzzyHash extends AbstractFuzzyHashProcessor { double matchThreshold = context.getProperty(MATCH_THRESHOLD).asDouble(); try { - Map<String, Double> matched = new HashMap<>(); + Map<String, Double> matched = new LinkedHashMap<>(); try (BufferedReader reader = fuzzyHashMatcher.getReader(context.getProperty(HASH_LIST_FILE).getValue())) { String line = null; diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/test/java/org/apache/nifi/processors/cybersecurity/TestCompareFuzzyHash.java b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/test/java/org/apache/nifi/processors/cybersecurity/TestCompareFuzzyHash.java index ac05a3666c..35e702a31a 100644 --- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/test/java/org/apache/nifi/processors/cybersecurity/TestCompareFuzzyHash.java +++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/test/java/org/apache/nifi/processors/cybersecurity/TestCompareFuzzyHash.java @@ -98,14 +98,14 @@ public class TestCompareFuzzyHash { outFile.assertAttributeEquals("fuzzyhash.value.0.match", - "\"nifi/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml\"" + "\"nifi/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml\"" ); double similarity = Double.valueOf(outFile.getAttribute("fuzzyhash.value.0.similarity")); assertTrue(similarity >= matchingSimilarity); outFile.assertAttributeEquals("fuzzyhash.value.1.match", - "\"nifi/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml\"" + "\"nifi/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml\"" ); similarity = Double.valueOf(outFile.getAttribute("fuzzyhash.value.1.similarity")); assertTrue(similarity >= matchingSimilarity);