Request with Non User Error should not return the problem that occurred.

madgik · Oct 12, 2020 · a6918cd · a6918cd
1 parent 7d151b7
commit a6918cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...ster/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryConstants.java b/...ster/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryConstants.java
@@ -5,7 +5,11 @@ public class HBPQueryConstants {
     public static String pathologyNotProvided = "Please provide a pathology.";
     public static String datasetXDoesNotExistInPathologyY = "Dataset(s) %s does not exist in pathology %s.";
 
-    public static String datasetsXYZAreInactive = "The following datasets %s are currently unavailable. Please try again later.";
+    public static String datasetsXYZAreInactive =
+            "The following datasets %s are currently unavailable. Please try again later.";
 
     public static String nodesUnavailable = "Some nodes are unavailable. Please try again later.";
+
+    public static String serverErrorOccurred =
+            "Something went wrong. Please consult the system administrator or try again later.";
 }
diff --git a/...master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java b/...master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 
 import static madgik.exareme.master.gateway.GatewayConstants.COOKIE_ALGORITHM_EXECUTION_ID;
+import static madgik.exareme.master.gateway.async.handler.HBP.HBPQueryConstants.serverErrorOccurred;
 
 public class HBPQueryHandler implements HttpAsyncRequestHandler<HttpRequest> {
 
@@ -176,18 +177,18 @@ private void handleHBPAlgorithmExecution(HttpRequest request, HttpResponse respo
             response.setStatusCode(HttpStatus.SC_BAD_REQUEST);
             response.setEntity(createErrorResponseEntity(e.getMessage(), errorType));
 
-        } catch (JsonSyntaxException e) {
-            log.error("Could not parse the algorithms properly.");
-            String errorType = HBPQueryHelper.ErrorResponse.ErrorResponseTypes.error;
-            response.setStatusCode(HttpStatus.SC_BAD_REQUEST);
-            response.setEntity(createErrorResponseEntity("Could not parse the algorithms properly.", errorType));
-
         } catch (UserException e) {
             log.error(e.getMessage());
             String errorType = HBPQueryHelper.ErrorResponse.ErrorResponseTypes.user_error;
             response.setStatusCode(HttpStatus.SC_BAD_REQUEST);
             response.setEntity(createErrorResponseEntity(e.getMessage(), errorType));
 
+        } catch (JsonSyntaxException e) {
+            log.error("Could not parse the algorithms properly.");
+            String errorType = HBPQueryHelper.ErrorResponse.ErrorResponseTypes.error;
+            response.setStatusCode(HttpStatus.SC_BAD_REQUEST);
+            response.setEntity(createErrorResponseEntity(serverErrorOccurred, errorType));
+
         } catch (Exception e) {
             log.error(e.getMessage());
             for (StackTraceElement stack : e.getStackTrace()) {
@@ -197,7 +198,7 @@ private void handleHBPAlgorithmExecution(HttpRequest request, HttpResponse respo
             log.error(e.getStackTrace());
             String errorType = HBPQueryHelper.ErrorResponse.ErrorResponseTypes.error;
             response.setStatusCode(HttpStatus.SC_BAD_REQUEST);
-            response.setEntity(createErrorResponseEntity(e.getMessage(), errorType));
+            response.setEntity(createErrorResponseEntity(serverErrorOccurred, errorType));
         }
     }