Revize c1ad4a51

Metrics integrated into UI

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/controller/detecting/DetectingController.java

@@ -5 +5 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.HandlerMapping;
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/errorHandler/CustomErrorHandler.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.errorHandler;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.HttpClientErrorException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author Jiri Trefil
+ * Custom HTTP error handler for RestTemplate class
+ *
+ */
+public class CustomErrorHandler extends DefaultResponseErrorHandler {
+    /**
+     *
+     * Override default custom behavior of Response Handler to be able to read body of error responses
+     * because default error handle can only parse body of generic errors.
+     * @param response Http response containing error code
+     * @throws IOException if file descriptor (socket) is no longer valid in the response
+     */
+    @Override
+    public void handleError(ClientHttpResponse response) throws IOException {
+        if (response.getStatusCode() == HttpStatus.UNAUTHORIZED) {
+            final InputStream inputStream = response.getBody();
+            byte[] responseBody = inputStream.readAllBytes();
+            inputStream.close();
+            //String responseBody = StreamUtils.copyToString(response.getBody(),StandardCharsets.UTF_8);
+            throw new HttpClientErrorException(response.getStatusCode(),response.getStatusText(),responseBody,StandardCharsets.UTF_8);
+        } else {
+            super.handleError(response);
+        }
+    }
+
+
+}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/errorHandler/CustomResponseErrorHandler.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.errorHandler;
+
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.ResponseErrorHandler;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
+
+public class CustomResponseErrorHandler implements ResponseErrorHandler {
+    @Override
+    public void handleError(ClientHttpResponse response) throws IOException {
+        HttpStatus statusCode = response.getStatusCode();
+
+        if (statusCode == HttpStatus.CONFLICT) {
+            throw new HttpClientErrorException(statusCode, "Conflict error.");
+        } else if (statusCode == HttpStatus.BAD_REQUEST) {
+            throw new HttpClientErrorException(statusCode, "Bad Request.");
+        } else {
+            throw new HttpClientErrorException(statusCode, "Unexpected error occurred.");
+        }
+    }
+
+    @Override
+    public boolean hasError(ClientHttpResponse response) throws IOException {
+        return response.getStatusCode().isError();
+    }
+}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/httpErrorHandler/CustomErrorHandler.java

@@ -1 @@
-package cz.zcu.fav.kiv.antipatterndetectionapp.httpErrorHandler;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.StreamUtils;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.HttpClientErrorException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author Jiri Trefil
- * Custom HTTP error handler for RestTemplate class
- *
- */
-public class CustomErrorHandler extends DefaultResponseErrorHandler {
-    /**
-     *
-     * Override default custom behavior of Response Handler to be able to read body of error responses
-     * because default error handle can only parse body of generic errors.
-     * @param response Http response containing error code
-     * @throws IOException if file descriptor (socket) is no longer valid in the response
-     */
-    @Override
-    public void handleError(ClientHttpResponse response) throws IOException {
-        if (response.getStatusCode() == HttpStatus.UNAUTHORIZED) {
-            final InputStream inputStream = response.getBody();
-            byte[] responseBody = inputStream.readAllBytes();
-            inputStream.close();
-            //String responseBody = StreamUtils.copyToString(response.getBody(),StandardCharsets.UTF_8);
-            throw new HttpClientErrorException(response.getStatusCode(),response.getStatusText(),responseBody,StandardCharsets.UTF_8);
-        } else {
-            super.handleError(response);
-        }
-    }
-
-
-}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/detecting/DetectingService.java

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestClientResponseException;
 import org.springframework.web.client.RestTemplate;
 
 @Service
@@ -15 +18 @@
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
 
-        HttpEntity<String> requestEntity = null;
-        if (requestBody != null) {
-            requestEntity = new HttpEntity<>(requestBody, headers);
-        } else {
-            requestEntity = new HttpEntity<>(headers);
-        }
+        HttpEntity<String> requestEntity = new HttpEntity<>(requestBody, headers);
 
-        return restTemplate.exchange(url, method, requestEntity, String.class);
+        try {
+            return restTemplate.exchange(url, method, requestEntity, String.class);
+        } catch (RestClientResponseException e) {
+                return ResponseEntity.status(e.getRawStatusCode()).body(e.getStatusText());
+        }
     }
 }
-

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/spring/AppConfig.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.spring;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.errorHandler.CustomResponseErrorHandler;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -57 +58 @@
 
     @Bean
     public RestTemplate restTemplate() {
-        return new RestTemplate();
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.setErrorHandler(new CustomResponseErrorHandler());
+        return restTemplate;
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/utils/RequestBuilder.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.utils;
 
-import cz.zcu.fav.kiv.antipatterndetectionapp.httpErrorHandler.CustomErrorHandler;
+import cz.zcu.fav.kiv.antipatterndetectionapp.errorHandler.CustomErrorHandler;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;