Skip to content

Commit

Permalink
Issues : #598, #1023, #1385, #1386, #1387
Browse files Browse the repository at this point in the history
  • Loading branch information
@vrindanayak
vrindanayak committed May 16, 2018
1 parent a538e2c commit 805d07a
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 48 deletions.
22 changes: 10 additions & 12 deletions dcm4chee-arc-diff-rs/src/main/java/org/dcm4chee/arc/diff/rs/DiffTaskRS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,7 @@ public Response cancelDiffTask(@PathParam("taskPK") long pk) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.CancelTasks);
try {
return Response.status(diffService.cancelDiffTask(pk, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(diffService.cancelDiffTask(pk, queueEvent));
} catch (IllegalTaskStateException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -259,10 +256,7 @@ public Response rescheduleTask(@PathParam("taskPK") long pk) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.RescheduleTasks);
try {
return Response.status(diffService.rescheduleDiffTask(pk, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(diffService.rescheduleDiffTask(pk, queueEvent));
} catch (IllegalTaskStateException | DifferentDeviceException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -321,10 +315,7 @@ public Response deleteTask(@PathParam("taskPK") long pk) {
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.DeleteTasks);
boolean deleteDiffTask = diffService.deleteDiffTask(pk, queueEvent);
queueMsgEvent.fire(queueEvent);
return Response.status(deleteDiffTask
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(deleteDiffTask);
}

@DELETE
Expand Down Expand Up @@ -439,6 +430,13 @@ private static Response rsp(Response.Status status, Object entity) {
return Response.status(status).entity(entity).build();
}

private static Response rsp(boolean result) {
return Response.status(result
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
}

private static int parseInt(String s) {
return s != null ? Integer.parseInt(s) : 0;
}
Expand Down
22 changes: 10 additions & 12 deletions dcm4chee-arc-export-rs/src/main/java/org/dcm4chee/arc/export/rs/ExportTaskRS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,7 @@ public Response cancelExportTask(@PathParam("taskPK") long pk) {
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.CancelTasks);

try {
return Response.status(mgr.cancelExportTask(pk, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.cancelExportTask(pk, queueEvent));
} catch (IllegalTaskStateException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -229,10 +226,7 @@ public Response rescheduleTask(@PathParam("taskPK") long pk, @PathParam("Exporte

QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.RescheduleTasks);
try {
return Response.status(mgr.rescheduleExportTask(pk, exporter, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.rescheduleExportTask(pk, exporter, queueEvent));
} catch (IllegalTaskStateException|DifferentDeviceException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -309,10 +303,7 @@ public Response deleteTask(@PathParam("taskPK") long pk) {
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.DeleteTasks);
boolean deleteExportTask = mgr.deleteExportTask(pk, queueEvent);
queueMsgEvent.fire(queueEvent);
return Response.status(deleteExportTask
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(deleteExportTask);
}

@DELETE
Expand All @@ -333,6 +324,13 @@ private static Response rsp(Response.Status status, Object entity) {
return Response.status(status).entity(entity).build();
}

private static Response rsp(boolean result) {
return Response.status(result
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
}

private static Response count(long count) {
return rsp(Response.Status.OK, "{\"count\":" + count + '}');
}
Expand Down
22 changes: 10 additions & 12 deletions dcm4chee-arc-qmgt-rs/src/main/java/org/dcm4chee/arc/qmgt/rs/QueueManagerRS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,7 @@ public Response cancelProcessing(@PathParam("msgId") String msgId) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.CancelTasks);
try {
return Response.status(mgr.cancelTask(msgId, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.cancelTask(msgId, queueEvent));
} catch (IllegalTaskStateException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -200,10 +197,7 @@ public Response rescheduleMessage(@PathParam("msgId") String msgId) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.RescheduleTasks);
try {
return Response.status(mgr.rescheduleTask(msgId, null, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.rescheduleTask(msgId, null, queueEvent));
} catch (IllegalTaskStateException|DifferentDeviceException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -259,10 +253,7 @@ public Response deleteMessage(@PathParam("msgId") String msgId) {
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.DeleteTasks);
boolean deleteTask = mgr.deleteTask(msgId, queueEvent);
queueMsgEvent.fire(queueEvent);
return Response.status(deleteTask
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(deleteTask);
}

@DELETE
Expand All @@ -281,6 +272,13 @@ private static Response rsp(Response.Status status, Object entity) {
return Response.status(status).entity(entity).build();
}

private static Response rsp(boolean result) {
return Response.status(result
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
}

private static Response count(long count) {
return rsp(Response.Status.OK, "{\"count\":" + count + '}');
}
Expand Down
22 changes: 10 additions & 12 deletions dcm4chee-arc-retrieve-rs/src/main/java/org/dcm4chee/arc/retrieve/rs/RetrieveTaskRS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@ public Response cancelRetrieveTask(@PathParam("taskPK") long pk) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.CancelTasks);
try {
return Response.status(mgr.cancelRetrieveTask(pk, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.cancelRetrieveTask(pk, queueEvent));
} catch (IllegalTaskStateException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -228,10 +225,7 @@ public Response rescheduleTask(@PathParam("taskPK") long pk) {
logRequest();
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.RescheduleTasks);
try {
return Response.status(mgr.rescheduleRetrieveTask(pk, queueEvent)
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(mgr.rescheduleRetrieveTask(pk, queueEvent));
} catch (IllegalTaskStateException|DifferentDeviceException e) {
queueEvent.setException(e);
return rsp(Response.Status.CONFLICT, e.getMessage());
Expand Down Expand Up @@ -289,10 +283,7 @@ public Response deleteTask(@PathParam("taskPK") long pk) {
QueueMessageEvent queueEvent = new QueueMessageEvent(request, QueueMessageOperation.DeleteTasks);
boolean deleteRetrieveTask = mgr.deleteRetrieveTask(pk, queueEvent);
queueMsgEvent.fire(queueEvent);
return Response.status(deleteRetrieveTask
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
return rsp(deleteRetrieveTask);
}

@DELETE
Expand All @@ -313,6 +304,13 @@ private static Response rsp(Response.Status status, Object entity) {
return Response.status(status).entity(entity).build();
}

private static Response rsp(boolean result) {
return Response.status(result
? Response.Status.NO_CONTENT
: Response.Status.NOT_FOUND)
.build();
}

private static Response count(long count) {
return rsp(Response.Status.OK, "{\"count\":" + count + '}');
}
Expand Down

0 comments on commit 805d07a

Please sign in to comment.