IllegalArgumentException ISBNValidatorNotAccessibleAdvice

jpfrehe · Oct 13, 2021 · 3bb77f0 · 3bb77f0
1 parent 77b4baa
commit 3bb77f0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/src/main/java/de/hswhameln/isbnvalidator/exceptions/ISBNValidatorNotAccessibleAdvice.java b/src/main/java/de/hswhameln/isbnvalidator/exceptions/ISBNValidatorNotAccessibleAdvice.java
@@ -0,0 +1,18 @@
+package de.hswhameln.isbnvalidator.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class ISBNValidatorNotAccessibleAdvice {
+
+    @ResponseBody
+    @ExceptionHandler(ISBNValidatorNotAccessibleException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    String isbnValidatorNotAccessibleHandler(ISBNValidatorNotAccessibleException ex) {
+        return ex.getMessage();
+    }
+}
diff --git a/src/main/java/de/hswhameln/isbnvalidator/exceptions/IllegalArgumentAdvice.java b/src/main/java/de/hswhameln/isbnvalidator/exceptions/IllegalArgumentAdvice.java
@@ -0,0 +1,18 @@
+package de.hswhameln.isbnvalidator.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class IllegalArgumentAdvice {
+
+    @ResponseBody
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    String illegalArgumentHandler(IllegalArgumentException ex) {
+        return ex.getMessage();
+    }
+}
diff --git a/src/main/java/de/hswhameln/isbnvalidator/utils/RestConsumer.java b/src/main/java/de/hswhameln/isbnvalidator/utils/RestConsumer.java
@@ -20,12 +20,14 @@ public RestConsumer(String url) {
     public JSONObject postRequest(String urlPath, Map<String, String> params) {
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> response = restTemplate.postForEntity(url + urlPath, params, String.class);
-        if(response.getStatusCode().equals(HttpStatus.OK)) {
+        if (response.getStatusCode().equals(HttpStatus.OK)) {
             try {
                 return new JSONObject(response.getBody());
-            } catch(JSONException e) {
+            } catch (JSONException e) {
                 throw new ISBNValidatorNotAccessibleException();
             }
+        } else if (response.getStatusCode().equals(HttpStatus.CONFLICT)) {
+            throw new IllegalArgumentException();
         } else {
             throw new ISBNValidatorNotAccessibleException();
         }
@@ -36,12 +38,14 @@ public JSONObject getRequest(String urlPath, String isbn) {
         params.put("isbn", isbn);
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> response = restTemplate.getForEntity(url + urlPath, String.class, params);
-        if(response.getStatusCode().equals(HttpStatus.OK)) {
+        if (response.getStatusCode().equals(HttpStatus.OK)) {
             try {
                 return new JSONObject(response.getBody());
-            } catch(JSONException e) {
+            } catch (JSONException e) {
                 throw new ISBNValidatorNotAccessibleException();
             }
+        } else if (response.getStatusCode().equals(HttpStatus.CONFLICT)) {
+            throw new IllegalArgumentException();
         } else {
             throw new ISBNValidatorNotAccessibleException();
         }