You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/14 18:22:15 UTC
[1/2] incubator-nifi git commit: NIFI-261: Sort processor properties
before fingerprinting for templates
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 5fe4c15cd -> c62aba133
NIFI-261: Sort processor properties before fingerprinting for templates
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/210a21cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/210a21cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/210a21cd
Branch: refs/heads/develop
Commit: 210a21cd8f13fd477a595dc6c83cffce0b6be3e0
Parents: 67dee2e
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 14 12:19:50 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 14 12:19:50 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/fingerprint/FingerprintFactory.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/210a21cd/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
index 7bdf278..8575569 100644
--- a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
+++ b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java
@@ -29,6 +29,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
import java.util.UUID;
import javax.xml.XMLConstants;
@@ -57,7 +59,6 @@ import org.apache.nifi.web.api.dto.RemoteProcessGroupContentsDTO;
import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO;
import org.apache.nifi.web.api.dto.RemoteProcessGroupPortDTO;
import org.apache.nifi.web.api.dto.TemplateDTO;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -510,7 +511,8 @@ public final class FingerprintFactory {
if (config.getProperties() == null) {
builder.append("NO_PROPERTIES");
} else {
- for (final Map.Entry<String, String> entry : config.getProperties().entrySet()) {
+ final SortedMap<String, String> sortedProps = new TreeMap<>(config.getProperties());
+ for (final Map.Entry<String, String> entry : sortedProps.entrySet()) {
final String propName = entry.getKey();
final String propValue = entry.getValue();
if (propValue == null) {
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c62aba13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c62aba13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c62aba13
Branch: refs/heads/develop
Commit: c62aba1336f0a77d9baae8ba261877d959bf97bb
Parents: 210a21c 5fe4c15
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 14 12:22:10 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 14 12:22:10 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-birdseye.js | 4 ++
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 4 ++
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 12 ++++--
.../main/webapp/js/nf/canvas/nf-context-menu.js | 8 ++++
.../webapp/js/nf/canvas/nf-graph-control.js | 40 ++++++++++++++++----
.../src/main/webapp/js/nf/canvas/nf-search.js | 3 ++
.../webapp/js/nf/canvas/nf-toolbar-action.js | 4 ++
7 files changed, 64 insertions(+), 11 deletions(-)
----------------------------------------------------------------------