Repository: nifi Updated Branches: refs/heads/NIFI-1563 [created] ad32cb824
http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.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/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index a67e74b..b5fadcc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -16,19 +16,13 @@ */ package org.apache.nifi.web.api; -import com.sun.jersey.api.core.ResourceContext; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; + import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -46,13 +40,13 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + +import org.apache.commons.lang3.StringUtils; import org.apache.nifi.cluster.manager.impl.WebClusterManager; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.ConfigurationSnapshot; -import org.apache.nifi.web.IllegalClusterResourceRequestException; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; -import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID; import org.apache.nifi.web.api.dto.FlowSnippetDTO; import org.apache.nifi.web.api.dto.PositionDTO; import org.apache.nifi.web.api.dto.ProcessGroupDTO; @@ -67,9 +61,16 @@ import org.apache.nifi.web.api.entity.StatusHistoryEntity; import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.LongParameter; -import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; +import com.sun.jersey.api.core.ResourceContext; +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiOperation; +import com.wordnik.swagger.annotations.ApiParam; +import com.wordnik.swagger.annotations.ApiResponse; +import com.wordnik.swagger.annotations.ApiResponses; +import com.wordnik.swagger.annotations.Authorization; + /** * RESTful endpoint for managing a Group. */ @@ -979,7 +980,7 @@ public class ProcessGroupResource extends ApplicationResource { headersToOverride.put("content-type", MediaType.APPLICATION_JSON); // replicate put request - return (Response) clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(processGroupEntity), getHeaders(headersToOverride)).getResponse(); + return clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(processGroupEntity), getHeaders(headersToOverride)).getResponse(); } // handle expects request (usually from the cluster manager) @@ -1284,6 +1285,10 @@ public class ProcessGroupResource extends ApplicationResource { @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @QueryParam("recursive") @DefaultValue(RECURSIVE) Boolean recursive) { + if (properties.isClusterManager()) { + return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse(); + } + // get the status final ProcessGroupStatusDTO statusReport = serviceFacade.getProcessGroupStatus(groupId); @@ -1345,7 +1350,7 @@ public class ProcessGroupResource extends ApplicationResource { // replicate if cluster manager if (properties.isClusterManager()) { - throw new IllegalClusterResourceRequestException("This request is only supported in standalone mode."); + return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse(); } // get the specified processor status history http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.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/ProcessorResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java index 9fb90b5..0e4c979 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java @@ -16,12 +16,6 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; @@ -52,50 +46,49 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import org.apache.commons.lang3.StringUtils; import org.apache.nifi.cluster.manager.exception.IllegalClusterStateException; import org.apache.nifi.cluster.manager.impl.WebClusterManager; import org.apache.nifi.cluster.node.Node; import org.apache.nifi.scheduling.SchedulingStrategy; +import org.apache.nifi.ui.extension.UiExtension; +import org.apache.nifi.ui.extension.UiExtensionMapping; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.ConfigurationSnapshot; -import org.apache.nifi.web.IllegalClusterResourceRequestException; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; -import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID; - +import org.apache.nifi.web.UiExtensionType; import org.apache.nifi.web.api.dto.ComponentStateDTO; import org.apache.nifi.web.api.dto.PositionDTO; import org.apache.nifi.web.api.dto.ProcessorConfigDTO; import org.apache.nifi.web.api.dto.ProcessorDTO; +import org.apache.nifi.web.api.dto.PropertyDescriptorDTO; import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.status.StatusHistoryDTO; import org.apache.nifi.web.api.entity.ComponentStateEntity; import org.apache.nifi.web.api.entity.ProcessorEntity; import org.apache.nifi.web.api.entity.ProcessorsEntity; +import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; import org.apache.nifi.web.api.entity.StatusHistoryEntity; import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; - -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.ui.extension.UiExtension; -import org.apache.nifi.ui.extension.UiExtensionMapping; -import org.apache.nifi.web.UiExtensionType; -import org.apache.nifi.web.api.dto.PropertyDescriptorDTO; -import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiOperation; +import com.wordnik.swagger.annotations.ApiParam; +import com.wordnik.swagger.annotations.ApiResponse; +import com.wordnik.swagger.annotations.ApiResponses; +import com.wordnik.swagger.annotations.Authorization; + /** * RESTful endpoint for managing a Processor. */ @Api(hidden = true) public class ProcessorResource extends ApplicationResource { - private static final Logger logger = LoggerFactory.getLogger(ProcessorResource.class); - private static final List<Long> POSSIBLE_RUN_DURATIONS = Arrays.asList(0L, 25L, 50L, 100L, 250L, 500L, 1000L, 2000L); private NiFiServiceFacade serviceFacade; @@ -328,7 +321,7 @@ public class ProcessorResource extends ApplicationResource { headersToOverride.put("content-type", MediaType.APPLICATION_JSON); // replicate put request - return (Response) clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(processorEntity), getHeaders(headersToOverride)).getResponse(); + return clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(processorEntity), getHeaders(headersToOverride)).getResponse(); } @@ -467,7 +460,7 @@ public class ProcessorResource extends ApplicationResource { // replicate if cluster manager if (properties.isClusterManager()) { - throw new IllegalClusterResourceRequestException("This request is only supported in standalone mode."); + return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse(); } // get the specified processor status history http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.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/RemoteProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java index e466666..f1e10f7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java @@ -16,18 +16,13 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; + import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -45,19 +40,19 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + +import org.apache.commons.lang3.StringUtils; import org.apache.nifi.cluster.manager.impl.WebClusterManager; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.ConfigurationSnapshot; -import org.apache.nifi.web.IllegalClusterResourceRequestException; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; -import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID; -import static org.apache.nifi.web.api.ApplicationResource.VERSION; import org.apache.nifi.web.api.dto.PositionDTO; import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO; import org.apache.nifi.web.api.dto.RemoteProcessGroupPortDTO; import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.status.StatusHistoryDTO; +import org.apache.nifi.web.api.entity.ConnectionsEntity; import org.apache.nifi.web.api.entity.RemoteProcessGroupEntity; import org.apache.nifi.web.api.entity.RemoteProcessGroupPortEntity; import org.apache.nifi.web.api.entity.RemoteProcessGroupsEntity; @@ -66,20 +61,21 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.web.api.entity.ConnectionsEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiOperation; +import com.wordnik.swagger.annotations.ApiParam; +import com.wordnik.swagger.annotations.ApiResponse; +import com.wordnik.swagger.annotations.ApiResponses; +import com.wordnik.swagger.annotations.Authorization; + /** * RESTful endpoint for managing a Remote group. */ @Api(hidden = true) public class RemoteProcessGroupResource extends ApplicationResource { - private static final Logger logger = LoggerFactory.getLogger(RemoteProcessGroupResource.class); - private static final String VERBOSE_DEFAULT_VALUE = "false"; private NiFiServiceFacade serviceFacade; @@ -300,7 +296,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { // replicate if cluster manager if (properties.isClusterManager()) { - throw new IllegalClusterResourceRequestException("This request is only supported in standalone mode."); + return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse(); } // get the specified processor status history @@ -446,7 +442,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { headersToOverride.put("content-type", MediaType.APPLICATION_JSON); // replicate put request - return (Response) clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(remoteProcessGroupEntity), getHeaders(headersToOverride)).getResponse(); + return clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(remoteProcessGroupEntity), getHeaders(headersToOverride)).getResponse(); } // handle expects request (usually from the cluster manager) http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.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/ReportingTaskResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java index d7b77b2..802f46f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -16,12 +16,6 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; @@ -30,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -49,39 +44,42 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + +import org.apache.commons.lang3.StringUtils; import org.apache.nifi.cluster.manager.impl.WebClusterManager; +import org.apache.nifi.ui.extension.UiExtension; +import org.apache.nifi.ui.extension.UiExtensionMapping; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.ConfigurationSnapshot; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; -import org.apache.nifi.web.api.dto.ComponentStateDTO; -import org.apache.nifi.web.api.dto.RevisionDTO; -import org.apache.nifi.web.api.entity.ComponentStateEntity; -import org.apache.nifi.web.api.request.ClientIdParameter; -import org.apache.nifi.web.api.request.LongParameter; -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.ui.extension.UiExtension; -import org.apache.nifi.ui.extension.UiExtensionMapping; import org.apache.nifi.web.UiExtensionType; -import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID; +import org.apache.nifi.web.api.dto.ComponentStateDTO; import org.apache.nifi.web.api.dto.PropertyDescriptorDTO; import org.apache.nifi.web.api.dto.ReportingTaskDTO; +import org.apache.nifi.web.api.dto.RevisionDTO; +import org.apache.nifi.web.api.entity.ComponentStateEntity; import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; import org.apache.nifi.web.api.entity.ReportingTaskEntity; import org.apache.nifi.web.api.entity.ReportingTasksEntity; +import org.apache.nifi.web.api.request.ClientIdParameter; +import org.apache.nifi.web.api.request.LongParameter; import org.apache.nifi.web.util.Availability; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiOperation; +import com.wordnik.swagger.annotations.ApiParam; +import com.wordnik.swagger.annotations.ApiResponse; +import com.wordnik.swagger.annotations.ApiResponses; +import com.wordnik.swagger.annotations.Authorization; + /** * RESTful endpoint for managing a Reporting Task. */ @Api(hidden = true) public class ReportingTaskResource extends ApplicationResource { - private static final Logger logger = LoggerFactory.getLogger(ReportingTaskResource.class); - private NiFiServiceFacade serviceFacade; private WebClusterManager clusterManager; private NiFiProperties properties; @@ -344,7 +342,7 @@ public class ReportingTaskResource extends ApplicationResource { headersToOverride.put("content-type", MediaType.APPLICATION_JSON); // replicate put request - return (Response) clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(reportingTaskEntity), getHeaders(headersToOverride)).getResponse(); + return clusterManager.applyRequest(HttpMethod.PUT, putUri, updateClientId(reportingTaskEntity), getHeaders(headersToOverride)).getResponse(); } // handle expects request (usually from the cluster manager) http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/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 652fd04..1b4e920 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 @@ -127,6 +127,7 @@ import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO; import org.apache.nifi.web.api.dto.status.ProcessorStatusDTO; import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusDTO; import org.apache.nifi.web.api.dto.status.StatusDTO; +import org.apache.nifi.web.api.dto.status.StatusMerger; import javax.ws.rs.WebApplicationException; import java.text.Collator; @@ -322,7 +323,7 @@ public final class DtoFactory { final StateMapDTO dto = new StateMapDTO(); dto.setScope(scope.toString()); - final TreeMap<String, String> sortedState = new TreeMap(SortedStateUtils.getKeyComparator()); + final TreeMap<String, String> sortedState = new TreeMap<>(SortedStateUtils.getKeyComparator()); final Map<String, String> state = stateMap.toMap(); sortedState.putAll(state); @@ -708,13 +709,6 @@ public final class DtoFactory { return copy; } - private String formatCount(final Integer intStatus) { - return intStatus == null ? "-" : FormatUtils.formatCount(intStatus); - } - - private String formatDataSize(final Long longStatus) { - return longStatus == null ? "-" : FormatUtils.formatDataSize(longStatus); - } public RemoteProcessGroupStatusDTO createRemoteProcessGroupStatusDto(final RemoteProcessGroupStatus remoteProcessGroupStatus) { final RemoteProcessGroupStatusDTO dto = new RemoteProcessGroupStatusDTO(); @@ -724,10 +718,13 @@ public final class DtoFactory { dto.setName(remoteProcessGroupStatus.getName()); dto.setTransmissionStatus(remoteProcessGroupStatus.getTransmissionStatus().toString()); dto.setActiveThreadCount(remoteProcessGroupStatus.getActiveThreadCount()); - dto.setSent(formatCount(remoteProcessGroupStatus.getSentCount()) + " / " + formatDataSize(remoteProcessGroupStatus.getSentContentSize())); - dto.setReceived(formatCount(remoteProcessGroupStatus.getReceivedCount()) + " / " + formatDataSize(remoteProcessGroupStatus.getReceivedContentSize())); + dto.setFlowFilesSent(remoteProcessGroupStatus.getSentCount()); + dto.setBytesSent(remoteProcessGroupStatus.getSentContentSize()); + dto.setFlowFilesReceived(remoteProcessGroupStatus.getReceivedCount()); + dto.setBytesReceived(remoteProcessGroupStatus.getReceivedContentSize()); dto.setAuthorizationIssues(remoteProcessGroupStatus.getAuthorizationIssues()); + StatusMerger.updatePrettyPrintedFields(dto); return dto; } @@ -737,20 +734,20 @@ public final class DtoFactory { processGroupStatusDto.setId(processGroupStatus.getId()); processGroupStatusDto.setName(processGroupStatus.getName()); processGroupStatusDto.setStatsLastRefreshed(new Date(processGroupStatus.getCreationTimestamp())); - processGroupStatusDto.setRead(formatDataSize(processGroupStatus.getBytesRead())); - processGroupStatusDto.setWritten(formatDataSize(processGroupStatus.getBytesWritten())); - processGroupStatusDto.setInput(formatCount(processGroupStatus.getInputCount()) + " / " + formatDataSize(processGroupStatus.getInputContentSize())); - processGroupStatusDto.setOutput(formatCount(processGroupStatus.getOutputCount()) + " / " + formatDataSize(processGroupStatus.getOutputContentSize())); - processGroupStatusDto.setTransferred(formatCount(processGroupStatus.getFlowFilesTransferred()) + " / " + formatDataSize(processGroupStatus.getBytesTransferred())); - processGroupStatusDto.setSent(formatCount(processGroupStatus.getFlowFilesSent()) + " / " + formatDataSize(processGroupStatus.getBytesSent())); - processGroupStatusDto.setReceived(formatCount(processGroupStatus.getFlowFilesReceived()) + " / " + formatDataSize(processGroupStatus.getBytesReceived())); + processGroupStatusDto.setBytesRead(processGroupStatus.getBytesRead()); + processGroupStatusDto.setBytesWritten(processGroupStatus.getBytesWritten()); + processGroupStatusDto.setFlowFilesIn(processGroupStatus.getInputCount()); + processGroupStatusDto.setBytesIn(processGroupStatus.getInputContentSize()); + processGroupStatusDto.setFlowFilesOut(processGroupStatus.getOutputCount()); + processGroupStatusDto.setBytesOut(processGroupStatus.getOutputContentSize()); + processGroupStatusDto.setFlowFilesTransferred(processGroupStatus.getFlowFilesTransferred()); + processGroupStatusDto.setBytesTransferred(processGroupStatus.getBytesTransferred()); + processGroupStatusDto.setFlowFilesSent(processGroupStatus.getFlowFilesSent()); + processGroupStatusDto.setBytesSent(processGroupStatus.getBytesSent()); + processGroupStatusDto.setFlowFilesReceived(processGroupStatus.getFlowFilesReceived()); + processGroupStatusDto.setBytesReceived(processGroupStatus.getBytesReceived()); processGroupStatusDto.setActiveThreadCount(processGroupStatus.getActiveThreadCount()); - - final String queuedCount = FormatUtils.formatCount(processGroupStatus.getQueuedCount()); - final String queuedSize = FormatUtils.formatDataSize(processGroupStatus.getQueuedContentSize()); - processGroupStatusDto.setQueuedCount(queuedCount); - processGroupStatusDto.setQueuedSize(queuedSize); - processGroupStatusDto.setQueued(queuedCount + " / " + queuedSize); + StatusMerger.updatePrettyPrintedFields(processGroupStatusDto); final Map<String, StatusDTO> componentStatusDtoMap = new HashMap<>(); @@ -896,7 +893,6 @@ public final class DtoFactory { } public ConnectionStatusDTO createConnectionStatusDto(final ConnectionStatus connectionStatus) { - final ConnectionStatusDTO connectionStatusDto = new ConnectionStatusDTO(); connectionStatusDto.setGroupId(connectionStatus.getGroupId()); connectionStatusDto.setId(connectionStatus.getId()); @@ -906,46 +902,36 @@ public final class DtoFactory { connectionStatusDto.setDestinationId(connectionStatus.getDestinationId()); connectionStatusDto.setDestinationName(connectionStatus.getDestinationName()); - final String queuedCount = FormatUtils.formatCount(connectionStatus.getQueuedCount()); - final String queuedSize = FormatUtils.formatDataSize(connectionStatus.getQueuedBytes()); - connectionStatusDto.setQueuedCount(queuedCount); - connectionStatusDto.setQueuedSize(queuedSize); - connectionStatusDto.setQueued(queuedCount + " / " + queuedSize); + connectionStatusDto.setFlowFilesQueued(connectionStatus.getQueuedCount()); + connectionStatusDto.setBytesQueued(connectionStatus.getQueuedBytes()); - final int inputCount = connectionStatus.getInputCount(); - final long inputBytes = connectionStatus.getInputBytes(); - connectionStatusDto.setInput(FormatUtils.formatCount(inputCount) + " / " + FormatUtils.formatDataSize(inputBytes)); + connectionStatusDto.setFlowFilesIn(connectionStatus.getInputCount()); + connectionStatusDto.setBytesIn(connectionStatus.getInputBytes()); - final int outputCount = connectionStatus.getOutputCount(); - final long outputBytes = connectionStatus.getOutputBytes(); - connectionStatusDto.setOutput(FormatUtils.formatCount(outputCount) + " / " + FormatUtils.formatDataSize(outputBytes)); + connectionStatusDto.setFlowFilesOut(connectionStatus.getOutputCount()); + connectionStatusDto.setBytesOut(connectionStatus.getOutputBytes()); + StatusMerger.updatePrettyPrintedFields(connectionStatusDto); return connectionStatusDto; } public ProcessorStatusDTO createProcessorStatusDto(final ProcessorStatus procStatus) { - final ProcessorStatusDTO dto = new ProcessorStatusDTO(); dto.setId(procStatus.getId()); dto.setGroupId(procStatus.getGroupId()); dto.setName(procStatus.getName()); - final int processedCount = procStatus.getOutputCount(); - final long numProcessedBytes = procStatus.getOutputBytes(); - dto.setOutput(FormatUtils.formatCount(processedCount) + " / " + FormatUtils.formatDataSize(numProcessedBytes)); - - final int inputCount = procStatus.getInputCount(); - final long inputBytes = procStatus.getInputBytes(); - dto.setInput(FormatUtils.formatCount(inputCount) + " / " + FormatUtils.formatDataSize(inputBytes)); + dto.setFlowFilesOut(procStatus.getOutputCount()); + dto.setBytesOut(procStatus.getOutputBytes()); - final long readBytes = procStatus.getBytesRead(); - dto.setRead(FormatUtils.formatDataSize(readBytes)); + dto.setFlowFilesIn(procStatus.getInputCount()); + dto.setBytesIn(procStatus.getInputBytes()); - final long writtenBytes = procStatus.getBytesWritten(); - dto.setWritten(FormatUtils.formatDataSize(writtenBytes)); + dto.setBytesRead(procStatus.getBytesRead()); + dto.setBytesWritten(procStatus.getBytesWritten()); - dto.setTasksDuration(FormatUtils.formatHoursMinutesSeconds(procStatus.getProcessingNanos(), TimeUnit.NANOSECONDS)); - dto.setTasks(FormatUtils.formatCount(procStatus.getInvocations())); + dto.setTaskCount(procStatus.getInvocations()); + dto.setTaskDuration(procStatus.getProcessingNanos()); // determine the run status dto.setRunStatus(procStatus.getRunStatus().toString()); @@ -953,6 +939,7 @@ public final class DtoFactory { dto.setActiveThreadCount(procStatus.getActiveThreadCount()); dto.setType(procStatus.getType()); + StatusMerger.updatePrettyPrintedFields(dto); return dto; } @@ -971,13 +958,12 @@ public final class DtoFactory { dto.setRunStatus(portStatus.getRunStatus().toString()); dto.setTransmitting(portStatus.isTransmitting()); - final int processedCount = portStatus.getOutputCount(); - final long numProcessedBytes = portStatus.getOutputBytes(); - dto.setOutput(FormatUtils.formatCount(processedCount) + " / " + FormatUtils.formatDataSize(numProcessedBytes)); + dto.setFlowFilesOut(portStatus.getOutputCount()); + dto.setBytesOut(portStatus.getOutputBytes()); - final int inputCount = portStatus.getInputCount(); - final long inputBytes = portStatus.getInputBytes(); - dto.setInput(FormatUtils.formatCount(inputCount) + " / " + FormatUtils.formatDataSize(inputBytes)); + dto.setFlowFilesIn(portStatus.getInputCount()); + dto.setBytesIn(portStatus.getInputBytes()); + StatusMerger.updatePrettyPrintedFields(dto); return dto; } @@ -1765,6 +1751,7 @@ public final class DtoFactory { * @param node node * @return dto */ + @SuppressWarnings("deprecation") public ProvenanceNodeDTO createProvenanceEventNodeDTO(final ProvenanceEventLineageNode node) { final ProvenanceNodeDTO dto = new ProvenanceNodeDTO(); dto.setId(node.getIdentifier()); @@ -1785,6 +1772,7 @@ public final class DtoFactory { * @param node node * @return dto */ + @SuppressWarnings("deprecation") public ProvenanceNodeDTO createFlowFileNodeDTO(final LineageNode node) { final ProvenanceNodeDTO dto = new ProvenanceNodeDTO(); dto.setId(node.getIdentifier()); http://git-wip-us.apache.org/repos/asf/nifi/blob/ad32cb82/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 c9326b2..1a57e22 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 @@ -245,6 +245,7 @@ <bean id="clusterResource" class="org.apache.nifi.web.api.ClusterResource" scope="singleton"> <property name="serviceFacade" ref="serviceFacade"/> <property name="properties" ref="nifiProperties"/> + <property name="clusterManager" ref="clusterManager"/> </bean> <bean id="nodeResource" class="org.apache.nifi.web.api.NodeResource" scope="singleton"> <property name="serviceFacade" ref="serviceFacade"/>
