Add GlobalExceptionHandler.java

src/main/java/com/ypm/dto/request/MergePlayListsRequest.java

@@ -4,5 +4,4 @@
 
 public record MergePlayListsRequest(String mergedPlayListTitle,
                                     List<String> playListsIds,
-                                    boolean deleteAfterMerge) {
-}
+                                    boolean deleteAfterMerge) { }

src/main/java/com/ypm/dto/response/ExceptionResponse.java

@@ -0,0 +1,6 @@
+package com.ypm.dto.response;
+
+import java.time.Instant;
+
+public record ExceptionResponse(int code, String message, Instant date) {
+}

src/main/java/com/ypm/error/GlobalExceptionHandler.java

@@ -0,0 +1,56 @@
+package com.ypm.error;
+
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.ypm.dto.response.ExceptionResponse;
+import com.ypm.exception.PlayListNotFoundException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import java.io.IOException;
+import java.time.Instant;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+    public GlobalExceptionHandler() {
+        super();
+    }
+
+    @ExceptionHandler({GoogleJsonResponseException.class})
+    public ResponseEntity<?> handleBadRequest(final GoogleJsonResponseException ex,
+                                              final WebRequest request) {
+
+        ExceptionResponse exceptionResponse = new ExceptionResponse(
+            ex.getStatusCode(), ex.getDetails().getMessage(), Instant.now());
+
+        return handleExceptionInternal(ex, exceptionResponse,
+            new HttpHeaders(), HttpStatus.valueOf(ex.getStatusCode()), request);
+    }
+
+    @ExceptionHandler({PlayListNotFoundException.class})
+    public ResponseEntity<?> handleBadRequest(final PlayListNotFoundException ex,
+                                              final WebRequest request) {
+
+        ExceptionResponse exceptionResponse = new ExceptionResponse(
+            HttpStatus.NOT_FOUND.value(), ex.getMessage(), Instant.now());
+
+        return handleExceptionInternal(ex, exceptionResponse,
+            new HttpHeaders(), HttpStatus.NOT_FOUND, request);
+    }
+
+    @ExceptionHandler({IOException.class})
+    public ResponseEntity<?> handleInternal(final IOException ex,
+                                            final WebRequest request) {
+
+        ExceptionResponse exceptionResponse = new ExceptionResponse(
+            HttpStatus.INTERNAL_SERVER_ERROR.value(), ex.getMessage(), Instant.now());
+
+        return handleExceptionInternal(ex, exceptionResponse,
+            new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR, request);
+    }
+}

src/main/java/com/ypm/exception/PlayListNotFoundException.java

@@ -1,12 +1,8 @@
 package com.ypm.exception;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(HttpStatus.BAD_REQUEST)
 public class PlayListNotFoundException extends RuntimeException {
 
     public PlayListNotFoundException(String identifier, String message) {
-        super(String.format("Playlist with %s identifier was not found %n%s%n", identifier, message));
+        super(String.format("Playlist with the '%s' identifier was not found. %s", identifier, message));
     }
 }

src/main/java/com/ypm/service/PlayListService.java

@@ -88,8 +88,7 @@ public Playlist getPlayListById(String accessToken, String playListId) throws IO
             .findFirst()
             .orElseThrow(() ->
                 new PlayListNotFoundException(playListId,
-                    "At some stage we were not able to find one of the request-related playlists."
-                        + " Please repeat the request."));
+                    "At some stage we were not able to find one of the request-related playlists."));
     }
 
     public void deletePlayList(String accessToken, String playListId) throws IOException {