From 7e0d59d37998d44cc14d68a2915ae3d42e31fafb Mon Sep 17 00:00:00 2001
From: NThakur4 <nthakur4@slb.com>
Date: Wed, 3 May 2023 10:13:16 -0500
Subject: [PATCH] fix global exception API response
---
.../osdu/notification/api/GlobalErrorController.java | 2 +-
.../notification/api/GlobalErrorControllerTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/GlobalErrorController.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/GlobalErrorController.java
index 52aa9b1da..ba530936f 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/GlobalErrorController.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/GlobalErrorController.java
@@ -76,7 +76,7 @@ public class GlobalErrorController implements ErrorController {
err = exception == null ? "An unknown error has occurred" : exception.getMessage();
}
- return String.format("{\"code\": %s, \"reason:\": \"%s\" \"message\":\"%s\" }",
+ return String.format("{\"code\": %s, \"reason\": \"%s\", \"message\":\"%s\"}",
statusCode, HttpStatus.resolve(statusCode).getReasonPhrase(), err);
}
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/api/GlobalErrorControllerTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/api/GlobalErrorControllerTest.java
index 6c4570a42..bb90755de 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/api/GlobalErrorControllerTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/api/GlobalErrorControllerTest.java
@@ -47,35 +47,35 @@ public class GlobalErrorControllerTest {
public void handleErrorGetTest() {
when(httpServletRequest.getAttribute(eq("javax.servlet.error.status_code"))).thenReturn(500);
String expected = globalErrorController.handleErrorGet(httpServletRequest);
- assertEquals(expected, "{\"code\": 500, \"reason:\": \"Internal Server Error\" \"message\":\"An unknown error has occurred\" }");
+ assertEquals(expected, "{\"code\": 500, \"reason\": \"Internal Server Error\", \"message\":\"An unknown error has occurred\"}");
}
@Test
public void handleErrorPutTest() {
when(httpServletRequest.getAttribute(eq("javax.servlet.error.status_code"))).thenReturn(404);
String expected = globalErrorController.handleErrorPut(httpServletRequest);
- assertEquals(expected, "{\"code\": 404, \"reason:\": \"Not Found\" \"message\":\"sample exception\" }");
+ assertEquals(expected, "{\"code\": 404, \"reason\": \"Not Found\", \"message\":\"sample exception\"}");
}
@Test
public void handleErrorPatchTest() {
when(httpServletRequest.getAttribute(eq("javax.servlet.error.status_code"))).thenReturn(500);
String expected = globalErrorController.handleErrorPatch(httpServletRequest);
- assertEquals(expected, "{\"code\": 500, \"reason:\": \"Internal Server Error\" \"message\":\"An unknown error has occurred\" }");
+ assertEquals(expected, "{\"code\": 500, \"reason\": \"Internal Server Error\", \"message\":\"An unknown error has occurred\"}");
}
@Test
public void handleErrorDeleteTest() {
when(httpServletRequest.getAttribute(eq("javax.servlet.error.status_code"))).thenReturn(500);
String expected = globalErrorController.handleErrorDelete(httpServletRequest);
- assertEquals(expected, "{\"code\": 500, \"reason:\": \"Internal Server Error\" \"message\":\"An unknown error has occurred\" }");
+ assertEquals(expected, "{\"code\": 500, \"reason\": \"Internal Server Error\", \"message\":\"An unknown error has occurred\"}");
}
@Test
public void handleErrorPostTest() {
when(httpServletRequest.getAttribute(eq("javax.servlet.error.status_code"))).thenReturn(500);
String expected = globalErrorController.handleErrorPost(httpServletRequest);
- assertEquals(expected, "{\"code\": 500, \"reason:\": \"Internal Server Error\" \"message\":\"An unknown error has occurred\" }");
+ assertEquals(expected, "{\"code\": 500, \"reason\": \"Internal Server Error\", \"message\":\"An unknown error has occurred\"}");
}
@Test
--
GitLab