#1032 : RESTful services: return "404 Not Found" instead "503 Service…

… Unavailable" if referenced Archive AE is not configured
dcm4che · Oct 17, 2017 · def6eef · def6eef
1 parent 86d2ea5
commit def6eef
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 63 deletions.
diff --git a/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteExpiredStudiesScheduler.java b/...-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeleteExpiredStudiesScheduler.java
@@ -120,7 +120,7 @@ protected void execute() {
         ApplicationEntity ae = getApplicationEntity(arcDev.getRejectExpiredStudiesAETitle());
         if (ae == null || !ae.isInstalled()) {
             LOG.warn("No such Application Entity: " + arcDev.getRejectExpiredStudiesAETitle(),
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         }
         RejectionNote rn = getRejectionNote(arcDev.getRejectionNotes());
         if (rn == null) {

diff --git a/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/DiffRS.java b/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/DiffRS.java
@@ -269,7 +269,7 @@ private ApplicationEntity getApplicationEntity() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 

diff --git a/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/EchoRS.java b/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/EchoRS.java
@@ -87,20 +87,15 @@ public class EchoRS {
     private HttpServletRequest request;
 
     private ApplicationEntity getApplicationEntity() {
-        ApplicationEntity ae = device.getApplicationEntity(aet);
+        ApplicationEntity ae = device.getApplicationEntity(aet, true);
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 
     private ApplicationEntity getRemoteApplicationEntity() throws ConfigurationException {
-        ApplicationEntity ae = device.getApplicationEntity(aet, true);
-        if (ae == null || !ae.isInstalled())
-            throw new WebApplicationException(
-                    "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
         try {
             return conf.findApplicationEntity(remoteAET);
         } catch (ConfigurationNotFoundException e) {

diff --git a/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/QueryRS.java b/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/QueryRS.java
@@ -169,7 +169,7 @@ private ApplicationEntity getApplicationEntity() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 

diff --git a/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/RejectRS.java b/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/RejectRS.java
@@ -269,7 +269,7 @@ private ApplicationEntity getApplicationEntity() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 

diff --git a/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/RetrieveRS.java b/dcm4chee-arc-dimse-rs/src/main/java/org/dcm4chee/arc/dimse/rs/RetrieveRS.java
@@ -259,7 +259,7 @@ private ApplicationEntity getApplicationEntity() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 

diff --git a/dcm4chee-arc-export-rs/src/main/java/org/dcm4chee/arc/export/rs/ExporterRS.java b/dcm4chee-arc-export-rs/src/main/java/org/dcm4chee/arc/export/rs/ExporterRS.java
@@ -152,7 +152,7 @@ private Response export(String studyUID, String seriesUID, String objectUID, Str
         LOG.info("Process POST {} from {}@{}", request.getRequestURI(), request.getRemoteUser(), request.getRemoteHost());
         ApplicationEntity ae = device.getApplicationEntity(aet, true);
         if (ae == null || !ae.isInstalled())
-            return errResponse(Response.Status.SERVICE_UNAVAILABLE, "No such Application Entity: " + aet);
+            return errResponse(Response.Status.NOT_FOUND, "No such Application Entity: " + aet);
 
         boolean bOnlyIAN = Boolean.parseBoolean(onlyIAN);
         boolean bOnlyStgCmt = Boolean.parseBoolean(onlyStgCmt);

diff --git a/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java b/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java
@@ -604,7 +604,7 @@ private ArchiveAEExtension getArchiveAE() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(getResponse(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE));
+                    Response.Status.NOT_FOUND));
         ArchiveAEExtension arcAE = ae.getAEExtension(ArchiveAEExtension.class);
         if (request.getAttribute(ORG_KEYCLOAK_KEYCLOAK_SECURITY_CONTEXT) != null)
             if(!authenticatedUser(arcAE.getAcceptedUserRoles()))

diff --git a/dcm4chee-arc-mwl-rs/src/main/java/org/dcm4chee/arc/mwl/rs/MwlRS.java b/dcm4chee-arc-mwl-rs/src/main/java/org/dcm4chee/arc/mwl/rs/MwlRS.java
@@ -199,7 +199,7 @@ private ArchiveAEExtension getArchiveAE() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(getResponse(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE));
+                    Response.Status.NOT_FOUND));
         ArchiveAEExtension arcAE = ae.getAEExtension(ArchiveAEExtension.class);
         if (request.getAttribute(ORG_KEYCLOAK_KEYCLOAK_SECURITY_CONTEXT) != null)
             if(!authenticatedUser(arcAE.getAcceptedUserRoles()))

diff --git a/dcm4chee-arc-qido/src/main/java/org/dcm4chee/arc/qido/QidoRS.java b/dcm4chee-arc-qido/src/main/java/org/dcm4chee/arc/qido/QidoRS.java
@@ -412,7 +412,7 @@ private ApplicationEntity getApplicationEntity() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
         return ae;
     }
 

diff --git a/dcm4chee-arc-stow/src/main/java/org/dcm4chee/arc/stow/StowRS.java b/dcm4chee-arc-stow/src/main/java/org/dcm4chee/arc/stow/StowRS.java
@@ -341,7 +341,7 @@ private ApplicationEntity getApplicationEntity() {
         ApplicationEntity ae = device.getApplicationEntity(aet, true);
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(getResponse(
-                    "No such Application Entity: " + aet, Response.Status.SERVICE_UNAVAILABLE));
+                    "No such Application Entity: " + aet, Response.Status.NOT_FOUND));
         return ae;
     }
 

diff --git a/dcm4chee-arc-ui2/src/swagger/swagger.json b/dcm4chee-arc-ui2/src/swagger/swagger.json
@@ -3559,50 +3559,6 @@
         }
       }
     },
-    "/aets/{aet}/rs/mwlitems/{studyUID}/{spsID}/move": {
-      "delete": {
-        "tags": [
-          "IOCM-RS",
-          "MWL-RS"
-        ],
-        "summary": "Delete Scheduled Procedure Step",
-        "operationId": "DeleteSPS",
-        "parameters": [
-          {
-            "name": "aet",
-            "in": "path",
-            "description": "Archive AE Title",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "studyUID",
-            "in": "path",
-            "description": "Unique Identifier of the Study",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "spsID",
-            "in": "path",
-            "description": "Identifier of the Scheduled Procedure Step",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "successful operation"
-          },
-          "404": {
-            "description": "no such SPS"
-          },
-          "default": {
-            "description": "unexpected error"
-          }
-        }
-      }
-    },
     "/aets/{aet}/rs/studies": {
       "post": {
         "tags": [

diff --git a/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoRS.java b/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoRS.java
@@ -419,7 +419,7 @@ private void checkAET() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
     }
 
     private enum Output {

diff --git a/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoURI.java b/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoURI.java
@@ -263,7 +263,7 @@ private void checkAET() {
         if (ae == null || !ae.isInstalled())
             throw new WebApplicationException(
                     "No such Application Entity: " + aet,
-                    Response.Status.SERVICE_UNAVAILABLE);
+                    Response.Status.NOT_FOUND);
     }
 
     private StreamingOutput entityOf(RetrieveContext ctx, InstanceLocations inst, ObjectType objectType,