Repository: nifi Updated Branches: refs/heads/master 45c31c830 -> fbb705e46
NIFI-2511: - Ensuring Process Group bulletins are bubbling up as expected. This closes #822. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fbb705e4 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fbb705e4 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fbb705e4 Branch: refs/heads/master Commit: fbb705e461e8bb89049973646b2016042123305f Parents: 45c31c8 Author: Matt Gilman <[email protected]> Authored: Tue Aug 9 12:55:18 2016 -0400 Committer: Bryan Bende <[email protected]> Committed: Tue Aug 9 16:28:57 2016 -0400 ---------------------------------------------------------------------- .../nifi/web/StandardNiFiServiceFacade.java | 55 ++++++++++++++++++-- .../org/apache/nifi/web/api/dto/DtoFactory.java | 16 +++--- .../apache/nifi/web/api/dto/EntityFactory.java | 2 +- .../nifi/web/controller/ControllerFacade.java | 12 ----- .../src/main/resources/nifi-web-api-context.xml | 2 - .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 25 +++++---- .../src/main/webapp/js/nf/nf-common.js | 34 ++++++------ 7 files changed, 95 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/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 a912479..9db15c0 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 @@ -203,6 +203,8 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -1606,7 +1608,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { final ProcessGroup group = processGroupDAO.getProcessGroup(groupId); final ProcessGroupStatus groupStatus = controllerFacade.getProcessGroupStatus(groupId); - return dtoFactory.createFlowDto(group, groupStatus, snippet, revisionManager); + return dtoFactory.createFlowDto(group, groupStatus, snippet, revisionManager, this::getProcessGroupBulletins); } @Override @@ -2591,10 +2593,57 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { final RevisionDTO revision = dtoFactory.createRevisionDTO(revisionManager.getRevision(group.getIdentifier())); final PermissionsDTO permissions = dtoFactory.createPermissionsDto(group); final ProcessGroupStatusDTO status = dtoFactory.createConciseProcessGroupStatusDto(controllerFacade.getProcessGroupStatus(group.getIdentifier())); - final List<BulletinDTO> bulletins = dtoFactory.createBulletinDtos(bulletinRepository.findBulletinsForSource(group.getIdentifier())); + final List<BulletinDTO> bulletins = getProcessGroupBulletins(group); return entityFactory.createProcessGroupEntity(dtoFactory.createProcessGroupDto(group), revision, permissions, status, bulletins); } + private List<BulletinDTO> getProcessGroupBulletins(final ProcessGroup group) { + final List<Bulletin> bulletins = new ArrayList<>(bulletinRepository.findBulletinsForGroupBySource(group.getIdentifier())); + + for (final ProcessGroup descendantGroup : group.findAllProcessGroups()) { + bulletins.addAll(bulletinRepository.findBulletinsForGroupBySource(descendantGroup.getIdentifier())); + } + + List<BulletinDTO> dtos = new ArrayList<>(); + for (final Bulletin bulletin : bulletins) { + if (authorizeBulletin(bulletin)) { + dtos.add(dtoFactory.createBulletinDto(bulletin)); + } else { + final BulletinDTO bulletinDTO = new BulletinDTO(); + bulletinDTO.setTimestamp(bulletin.getTimestamp()); + bulletinDTO.setId(bulletin.getId()); + bulletinDTO.setSourceId(bulletin.getSourceId()); + bulletinDTO.setGroupId(bulletin.getGroupId()); + dtos.add(bulletinDTO); + } + } + + // sort the bulletins + Collections.sort(dtos, new Comparator<BulletinDTO>() { + @Override + public int compare(BulletinDTO o1, BulletinDTO o2) { + if (o1 == null && o2 == null) { + return 0; + } + if (o1 == null) { + return 1; + } + if (o2 == null) { + return -1; + } + + return -Long.compare(o1.getId(), o2.getId()); + } + }); + + // prune the response to only include the max number of bulletins + if (dtos.size() > BulletinRepository.MAX_BULLETINS_PER_COMPONENT) { + dtos = dtos.subList(0, BulletinRepository.MAX_BULLETINS_PER_COMPONENT); + } + + return dtos; + } + @Override public Set<ProcessGroupEntity> getProcessGroups(final String parentGroupId) { final Set<ProcessGroup> groups = processGroupDAO.getProcessGroups(parentGroupId); @@ -2706,7 +2755,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { // read lock on every component being accessed in the dto conversion final ProcessGroupStatus groupStatus = controllerFacade.getProcessGroupStatus(groupId); final PermissionsDTO permissions = dtoFactory.createPermissionsDto(processGroup); - return entityFactory.createProcessGroupFlowEntity(dtoFactory.createProcessGroupFlowDto(processGroup, groupStatus, revisionManager), permissions); + return entityFactory.createProcessGroupFlowEntity(dtoFactory.createProcessGroupFlowDto(processGroup, groupStatus, revisionManager, this::getProcessGroupBulletins), permissions); } @Override http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index 9c54494..e847b8b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -1603,12 +1603,14 @@ public final class DtoFactory { return createProcessGroupDto(group, false); } - public ProcessGroupFlowDTO createProcessGroupFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final RevisionManager revisionManager) { + public ProcessGroupFlowDTO createProcessGroupFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final RevisionManager revisionManager, + final Function<ProcessGroup, List<BulletinDTO>> getProcessGroupBulletins) { + final ProcessGroupFlowDTO dto = new ProcessGroupFlowDTO(); dto.setId(group.getIdentifier()); dto.setLastRefreshed(new Date()); dto.setBreadcrumb(createBreadcrumbEntity(group)); - dto.setFlow(createFlowDto(group, groupStatus, revisionManager)); + dto.setFlow(createFlowDto(group, groupStatus, revisionManager, getProcessGroupBulletins)); final ProcessGroup parent = group.getParent(); if (parent != null) { @@ -1618,7 +1620,8 @@ public final class DtoFactory { return dto; } - public FlowDTO createFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final FlowSnippetDTO snippet, final RevisionManager revisionManager) { + public FlowDTO createFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final FlowSnippetDTO snippet, final RevisionManager revisionManager, + final Function<ProcessGroup, List<BulletinDTO>> getProcessGroupBulletins) { if (snippet == null) { return null; } @@ -1700,7 +1703,7 @@ public final class DtoFactory { () -> groupStatus.getProcessGroupStatus().stream().filter(processGroupStatus -> processGroup.getIdentifier().equals(processGroupStatus.getId())).findFirst().orElse(null), processGroupStatus -> createConciseProcessGroupStatusDto(processGroupStatus) ); - final List<BulletinDTO> bulletins = createBulletinDtos(bulletinRepository.findBulletinsForSource(processGroup.getIdentifier())); + final List<BulletinDTO> bulletins = getProcessGroupBulletins.apply(processGroup); flow.getProcessGroups().add(entityFactory.createProcessGroupEntity(dto, revision, accessPolicy, status, bulletins)); } @@ -1748,7 +1751,8 @@ public final class DtoFactory { return statusDTO; } - public FlowDTO createFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final RevisionManager revisionManager) { + public FlowDTO createFlowDto(final ProcessGroup group, final ProcessGroupStatus groupStatus, final RevisionManager revisionManager, + final Function<ProcessGroup, List<BulletinDTO>> getProcessGroupBulletins) { final FlowDTO dto = new FlowDTO(); for (final ProcessorNode procNode : group.getProcessors()) { @@ -1791,7 +1795,7 @@ public final class DtoFactory { () -> groupStatus.getProcessGroupStatus().stream().filter(processGroupStatus -> childGroup.getIdentifier().equals(processGroupStatus.getId())).findFirst().orElse(null), processGroupStatus -> createConciseProcessGroupStatusDto(processGroupStatus) ); - final List<BulletinDTO> bulletins = createBulletinDtos(bulletinRepository.findBulletinsForSource(childGroup.getIdentifier())); + final List<BulletinDTO> bulletins = getProcessGroupBulletins.apply(childGroup); dto.getProcessGroups().add(entityFactory.createProcessGroupEntity(createProcessGroupDto(childGroup), revision, permissions, status, bulletins)); } http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java index 565826f..e3e30d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java @@ -124,9 +124,9 @@ public final class EntityFactory { entity.setDisabledCount(dto.getDisabledCount()); entity.setActiveRemotePortCount(dto.getActiveRemotePortCount()); entity.setInactiveRemotePortCount(dto.getInactiveRemotePortCount()); + entity.setBulletins(bulletins); // include bulletins as authorized descendant component bulletins should be available if (permissions != null && permissions.getCanRead()) { entity.setComponent(dto); - entity.setBulletins(bulletins); } } return entity; http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java index f781cea..d64956d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java @@ -29,7 +29,6 @@ import org.apache.nifi.authorization.resource.Authorizable; import org.apache.nifi.authorization.resource.ResourceFactory; import org.apache.nifi.authorization.user.NiFiUser; import org.apache.nifi.authorization.user.NiFiUserUtils; -import org.apache.nifi.cluster.coordination.ClusterCoordinator; import org.apache.nifi.cluster.protocol.NodeIdentifier; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.connectable.Connectable; @@ -79,7 +78,6 @@ import org.apache.nifi.provenance.search.SearchTerms; import org.apache.nifi.provenance.search.SearchableField; import org.apache.nifi.registry.VariableRegistry; import org.apache.nifi.remote.RootGroupPort; -import org.apache.nifi.reporting.BulletinRepository; import org.apache.nifi.reporting.ReportingTask; import org.apache.nifi.scheduling.SchedulingStrategy; import org.apache.nifi.search.SearchContext; @@ -140,8 +138,6 @@ public class ControllerFacade implements Authorizable { // nifi components private FlowController flowController; private FlowService flowService; - private ClusterCoordinator clusterCoordinator; - private BulletinRepository bulletinRepository; private Authorizer authorizer; // properties @@ -1808,14 +1804,6 @@ public class ControllerFacade implements Authorizable { this.dtoFactory = dtoFactory; } - public void setClusterCoordinator(ClusterCoordinator clusterCoordinator) { - this.clusterCoordinator = clusterCoordinator; - } - - public void setBulletinRepository(BulletinRepository bulletinRepository) { - this.bulletinRepository = bulletinRepository; - } - public void setVariableRegistry(VariableRegistry variableRegistry) { this.variableRegistry = variableRegistry; } http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml index 456b7eb..28dbb62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml @@ -115,10 +115,8 @@ <property name="properties" ref="nifiProperties"/> <property name="flowController" ref="flowController"/> <property name="flowService" ref="flowService"/> - <property name="clusterCoordinator" ref="clusterCoordinator" /> <property name="authorizer" ref="authorizer"/> <property name="dtoFactory" ref="dtoFactory"/> - <property name="bulletinRepository" ref="bulletinRepository"/> <property name="variableRegistry" ref="variableRegistry"/> </bean> <bean id="authorizableLookup" class="org.apache.nifi.authorization.StandardAuthorizableLookup"> http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js index 8256c8e..e49f820 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js @@ -482,8 +482,20 @@ nf.CanvasUtils = (function () { tip.remove(); } - // if there are bulletins show them, otherwise hide + var hasBulletins = false; if (!nf.Common.isEmpty(d.bulletins)) { + // format the bulletins + var bulletins = nf.Common.getFormattedBulletins(d.bulletins); + hasBulletins = bulletins.length > 0; + + if (hasBulletins) { + // create the unordered list based off the formatted bulletins + var list = nf.Common.formatUnorderedList(bulletins); + } + } + + // if there are bulletins show them, otherwise hide + if (hasBulletins) { // update the tooltip selection.select('text.bulletin-icon') .each(function () { @@ -494,16 +506,7 @@ nf.CanvasUtils = (function () { }) .attr('class', 'tooltip nifi-tooltip') .html(function () { - // format the bulletins - var bulletins = nf.Common.getFormattedBulletins(d.bulletins); - - // create the unordered list based off the formatted bulletins - var list = nf.Common.formatUnorderedList(bulletins); - if (list === null || list.length === 0) { - return ''; - } else { - return $('<div></div>').append(list).html(); - } + return $('<div></div>').append(list).html(); }); // add the tooltip http://git-wip-us.apache.org/repos/asf/nifi/blob/fbb705e4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js index c82fda6..80e4d62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js @@ -1217,25 +1217,27 @@ nf.Common = (function () { getFormattedBulletins: function (bulletins) { var formattedBulletins = []; $.each(bulletins, function (j, bulletin) { - // format the node address - var nodeAddress = ''; - if (nf.Common.isDefinedAndNotNull(bulletin.nodeAddress)) { - nodeAddress = '- ' + nf.Common.escapeHtml(bulletin.nodeAddress) + ' - '; - } + if (!nf.Common.isBlank(bulletin.level)) { + // format the node address + var nodeAddress = ''; + if (nf.Common.isDefinedAndNotNull(bulletin.nodeAddress)) { + nodeAddress = '- ' + nf.Common.escapeHtml(bulletin.nodeAddress) + ' - '; + } - // set the bulletin message (treat as text) - var bulletinMessage = $('<pre></pre>').css({ - 'white-space': 'pre-wrap' - }).text(bulletin.message); + // set the bulletin message (treat as text) + var bulletinMessage = $('<pre></pre>').css({ + 'white-space': 'pre-wrap' + }).text(bulletin.message); - // create the bulletin message - var formattedBulletin = $('<div>' + - nf.Common.escapeHtml(bulletin.timestamp) + ' ' + - nodeAddress + ' ' + - '<b>' + nf.Common.escapeHtml(bulletin.level) + '</b> ' + - '</div>').append(bulletinMessage); + // create the bulletin message + var formattedBulletin = $('<div>' + + nf.Common.escapeHtml(bulletin.timestamp) + ' ' + + nodeAddress + ' ' + + '<b>' + nf.Common.escapeHtml(bulletin.level) + '</b> ' + + '</div>').append(bulletinMessage); - formattedBulletins.push(formattedBulletin); + formattedBulletins.push(formattedBulletin); + } }); return formattedBulletins; }
