NIFI-4436: - Bumping registry version to 0.1.0. - Addressing PR comments.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/20b539aa Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/20b539aa Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/20b539aa Branch: refs/heads/master Commit: 20b539aac3ea4d42d38df2278821c4f0021c0a2f Parents: 0127b02 Author: Matt Gilman <[email protected]> Authored: Tue Jan 2 10:26:52 2018 -0500 Committer: Bryan Bende <[email protected]> Committed: Mon Jan 8 12:44:56 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/web/StandardNiFiServiceFacade.java | 7 +++++++ .../WEB-INF/partials/canvas/save-flow-version-dialog.jsp | 6 +++--- pom.xml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/20b539aa/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java index 1865bff..b7559ec 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java @@ -2449,6 +2449,13 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { final FlowRegistry registry = registryDAO.getFlowRegistry(registryDTO.getId()); final RevisionUpdate<FlowRegistry> revisionUpdate = revisionManager.updateRevision(revisionClaim, user, () -> { + final boolean duplicateName = registryDAO.getFlowRegistries().stream() + .anyMatch(reg -> reg.getName().equals(registryDTO.getName())); + + if (duplicateName) { + throw new IllegalStateException("Cannot update Flow Registry because a Flow Registry already exists with the name " + registryDTO.getName()); + } + registry.setDescription(registryDTO.getDescription()); registry.setName(registryDTO.getName()); registry.setURL(registryDTO.getUri()); http://git-wip-us.apache.org/repos/asf/nifi/blob/20b539aa/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp index 6017f37..35da1c0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp @@ -32,7 +32,7 @@ </div> </div> <div class="setting"> - <div class="setting-name">Name</div> + <div class="setting-name">Flow Name</div> <div id="save-flow-version-registry-container" class="setting-field"> <span id="save-flow-version-process-group-id" class="hidden"></span> <input type="text" id="save-flow-version-name-field" class="setting-input hidden"/> @@ -41,14 +41,14 @@ </div> </div> <div class="setting"> - <div class="setting-name">Description</div> + <div class="setting-name">Flow Description</div> <div class="setting-field"> <textarea id="save-flow-version-description-field" class="setting-input hidden"></textarea> <div id="save-flow-version-description" class="hidden"></div> </div> </div> <div class="setting"> - <div class="setting-name">Comments</div> + <div class="setting-name">Version Comments</div> <div class="setting-field"> <textarea id="save-flow-version-change-comments" class="setting-input"></textarea> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/20b539aa/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 584cac6..4d56c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <hwx.registry.version>0.3.0</hwx.registry.version> <jackson.version>2.9.1</jackson.version> <atlas.version>0.8.1</atlas.version> - <nifi.registry.version>0.0.1-SNAPSHOT</nifi.registry.version> + <nifi.registry.version>0.1.0</nifi.registry.version> </properties> <repositories>
