Repository: nifi Updated Branches: refs/heads/master d4bbd647c -> 0e90a0f76
http://git-wip-us.apache.org/repos/asf/nifi/blob/08735a4f/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 7d0cdce..2a25447 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 @@ -16,6 +16,7 @@ */ package org.apache.nifi.web.api.dto; +import org.apache.nifi.web.api.dto.action.ActionDTO; import org.apache.nifi.web.api.dto.flow.FlowBreadcrumbDTO; import org.apache.nifi.web.api.dto.flow.ProcessGroupFlowDTO; import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO; @@ -31,7 +32,9 @@ import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusSnapshotDTO; import org.apache.nifi.web.api.dto.status.StatusHistoryDTO; import org.apache.nifi.web.api.entity.AccessPolicyEntity; import org.apache.nifi.web.api.entity.AccessPolicySummaryEntity; +import org.apache.nifi.web.api.entity.ActionEntity; import org.apache.nifi.web.api.entity.AllowableValueEntity; +import org.apache.nifi.web.api.entity.BulletinEntity; import org.apache.nifi.web.api.entity.ConnectionEntity; import org.apache.nifi.web.api.entity.ConnectionStatusEntity; import org.apache.nifi.web.api.entity.ConnectionStatusSnapshotEntity; @@ -169,7 +172,7 @@ public final class EntityFactory { } public ProcessorEntity createProcessorEntity(final ProcessorDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, - final ProcessorStatusDTO status, final List<BulletinDTO> bulletins) { + final ProcessorStatusDTO status, final List<BulletinEntity> bulletins) { final ProcessorEntity entity = new ProcessorEntity(); entity.setRevision(revision); @@ -187,7 +190,7 @@ public final class EntityFactory { return entity; } - public PortEntity createPortEntity(final PortDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final PortStatusDTO status, final List<BulletinDTO> bulletins) { + public PortEntity createPortEntity(final PortDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final PortStatusDTO status, final List<BulletinEntity> bulletins) { final PortEntity entity = new PortEntity(); entity.setRevision(revision); if (dto != null) { @@ -205,7 +208,7 @@ public final class EntityFactory { } public ProcessGroupEntity createProcessGroupEntity(final ProcessGroupDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, - final ProcessGroupStatusDTO status, final List<BulletinDTO> bulletins) { + final ProcessGroupStatusDTO status, final List<BulletinEntity> bulletins) { final ProcessGroupEntity entity = new ProcessGroupEntity(); entity.setRevision(revision); if (dto != null) { @@ -359,7 +362,7 @@ public final class EntityFactory { } public RemoteProcessGroupEntity createRemoteProcessGroupEntity(final RemoteProcessGroupDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, - final RemoteProcessGroupStatusDTO status, final List<BulletinDTO> bulletins) { + final RemoteProcessGroupStatusDTO status, final List<BulletinEntity> bulletins) { final RemoteProcessGroupEntity entity = new RemoteProcessGroupEntity(); entity.setRevision(revision); if (dto != null) { @@ -397,7 +400,7 @@ public final class EntityFactory { return entity; } - public ReportingTaskEntity createReportingTaskEntity(final ReportingTaskDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinDTO> bulletins) { + public ReportingTaskEntity createReportingTaskEntity(final ReportingTaskDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinEntity> bulletins) { final ReportingTaskEntity entity = new ReportingTaskEntity(); entity.setRevision(revision); if (dto != null) { @@ -412,7 +415,7 @@ public final class EntityFactory { return entity; } - public ControllerServiceEntity createControllerServiceEntity(final ControllerServiceDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinDTO> bulletins) { + public ControllerServiceEntity createControllerServiceEntity(final ControllerServiceDTO dto, final RevisionDTO revision, final PermissionsDTO permissions, final List<BulletinEntity> bulletins) { final ControllerServiceEntity entity = new ControllerServiceEntity(); entity.setRevision(revision); if (dto != null) { @@ -460,4 +463,34 @@ public final class EntityFactory { entity.setAllowableValue(dto); return entity; } + + public ActionEntity createActionEntity(final ActionDTO dto, final boolean canRead) { + final ActionEntity entity = new ActionEntity(); + if (dto != null) { + entity.setId(dto.getId()); + entity.setSourceId(dto.getSourceId()); + entity.setTimestamp(dto.getTimestamp()); + entity.setCanRead(canRead); + if (canRead) { + entity.setAction(dto); + } + } + return entity; + } + + public BulletinEntity createBulletinEntity(final BulletinDTO dto, final boolean canRead) { + final BulletinEntity entity = new BulletinEntity(); + if (dto != null) { + entity.setId(dto.getId()); + entity.setSourceId(dto.getSourceId()); + entity.setGroupId(dto.getGroupId()); + entity.setTimestamp(dto.getTimestamp()); + entity.setNodeAddress(dto.getNodeAddress()); + entity.setCanRead(canRead); + if (canRead) { + entity.setBulletin(dto); + } + } + return entity; + } }
