Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-730: 

- Updating logic now that original is guaranteed to be non null.
- Always reporting 100% once the drop request has completed.
This commit is contained in:
Matt Gilman 2015-11-02 08:59:11 -05:00
parent f5727cfb0f
commit 5a04021dd7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
View File

@ -296,6 +296,10 @@ public final class DtoFactory {
return new PositionDTO(position.getX(), position.getY()); return new PositionDTO(position.getX(), position.getY());
} }
private boolean isDropRequestComplete(final DropFlowFileState state) {
return DropFlowFileState.COMPLETE.equals(state) || DropFlowFileState.CANCELED.equals(state) || DropFlowFileState.FAILURE.equals(state);
}
/** /**
* Creates a DropRequestDTO from the specified flow file status. * Creates a DropRequestDTO from the specified flow file status.
* *
@ -309,9 +313,7 @@ public final class DtoFactory {
dto.setLastUpdated(new Date(dropRequest.getLastUpdated())); dto.setLastUpdated(new Date(dropRequest.getLastUpdated()));
dto.setState(dropRequest.getState().toString()); dto.setState(dropRequest.getState().toString());
dto.setFailureReason(dropRequest.getFailureReason()); dto.setFailureReason(dropRequest.getFailureReason());
dto.setFinished(DropFlowFileState.COMPLETE.equals(dropRequest.getState()) dto.setFinished(isDropRequestComplete(dropRequest.getState()));
|| DropFlowFileState.CANCELED.equals(dropRequest.getState())
|| DropFlowFileState.FAILURE.equals(dropRequest.getState()));
final QueueSize dropped = dropRequest.getDroppedSize(); final QueueSize dropped = dropRequest.getDroppedSize();
dto.setDroppedCount(dropped.getObjectCount()); dto.setDroppedCount(dropped.getObjectCount());
@ -323,15 +325,15 @@ public final class DtoFactory {
dto.setCurrentSize(current.getByteCount()); dto.setCurrentSize(current.getByteCount());
dto.setCurrent(FormatUtils.formatCount(current.getObjectCount()) + " / " + FormatUtils.formatDataSize(current.getByteCount())); dto.setCurrent(FormatUtils.formatCount(current.getObjectCount()) + " / " + FormatUtils.formatDataSize(current.getByteCount()));
if (dropRequest.getOriginalSize() != null) { final QueueSize original = dropRequest.getOriginalSize();
final QueueSize original = dropRequest.getOriginalSize(); dto.setOriginalCount(original.getObjectCount());
dto.setOriginalCount(original.getObjectCount()); dto.setOriginalSize(original.getByteCount());
dto.setOriginalSize(original.getByteCount()); dto.setOriginal(FormatUtils.formatCount(original.getObjectCount()) + " / " + FormatUtils.formatDataSize(original.getByteCount()));
dto.setOriginal(FormatUtils.formatCount(original.getObjectCount()) + " / " + FormatUtils.formatDataSize(original.getByteCount()));
dto.setPercentCompleted((dropped.getObjectCount() * 100) / original.getObjectCount()); if (isDropRequestComplete(dropRequest.getState())) {
dto.setPercentCompleted(100);
} else { } else {
dto.setPercentCompleted(0); dto.setPercentCompleted((dropped.getObjectCount() * 100) / original.getObjectCount());
} }
return dto; return dto;