fix: diverse chores (#307)

* fix: remove duplicated authentication manager

* fix: sonar coverage

* fix: send 4xx in case of validation errors

* fix: jacoco coverage in sonar

* make test stable

Author: steve192

pom.xml

@@ -22,9 +22,6 @@
 
         <!-- JaCoCo Properties -->
         <jacoco.version>0.8.12</jacoco.version>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-        <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.language>java</sonar.language>
     </properties>
 
@@ -197,20 +194,29 @@
                 <version>${jacoco.version}</version>
                 <executions>
                     <execution>
-                        <id>jacoco-initialize</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
+                    <id>prepare-agent</id>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
                     </execution>
                     <execution>
-                        <id>jacoco-site</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
+                    <id>report</id>
+                    <goals>
+                        <goal>report</goal>
+                    </goals>
+                    <configuration>
+                        <formats>
+                        <format>XML</format>
+                        </formats>
+                    </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.9.1.2184</version>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/sterul/opencookbookapiserver/configurations/security/WebSecurityConfiguration.java

@@ -61,12 +61,6 @@ public class WebSecurityConfiguration {
         @Autowired
         private PasswordEncoder passwordEncoder;
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-                // Configure service to check if credentials are valid
-                auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder);
-        }
-
         private RequestMatcher allowedPathRequestMatcher() {
                 return (HttpServletRequest request) -> AUTH_WHITELIST.stream()
                                 .anyMatch(whitelistedUrl -> new AntPathRequestMatcher(whitelistedUrl).matches(request));

src/main/java/com/sterul/opencookbookapiserver/controllers/CustomControllerAdvice.java

@@ -0,0 +1,66 @@
+package com.sterul.opencookbookapiserver.controllers;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+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;
+
+@Order(Ordered.HIGHEST_PRECEDENCE)
+@ControllerAdvice
+public class CustomControllerAdvice {
+
+    @ResponseStatus(BAD_REQUEST)
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Error methodArgumentNotValidException(MethodArgumentNotValidException ex) {
+        BindingResult result = ex.getBindingResult();
+        List<org.springframework.validation.FieldError> fieldErrors = result.getFieldErrors();
+        return processFieldErrors(fieldErrors);
+    }
+
+    private Error processFieldErrors(List<org.springframework.validation.FieldError> fieldErrors) {
+        Error error = new Error(BAD_REQUEST.value(), "validation error");
+        for (org.springframework.validation.FieldError fieldError : fieldErrors) {
+            error.addFieldError(fieldError.getObjectName(), fieldError.getField(), fieldError.getDefaultMessage());
+        }
+        return error;
+    }
+
+    static class Error {
+        private final int status;
+        private final String message;
+        private List<FieldError> fieldErrors = new ArrayList<>();
+
+        Error(int status, String message) {
+            this.status = status;
+            this.message = message;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void addFieldError(String objectName, String path, String message) {
+            FieldError error = new FieldError(objectName, path, message);
+            fieldErrors.add(error);
+        }
+
+        public List<FieldError> getFieldErrors() {
+            return fieldErrors;
+        }
+    }
+}

src/test/java/com/sterul/opencookbookapiserver/integration/CustomControllerAdviceTest.java

@@ -0,0 +1,30 @@
+package com.sterul.opencookbookapiserver.integration;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("integration-test")
+@Testcontainers
+class CustomControllerAdviceTest extends IntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    void testThatInvalidRequestFormatProduces400() throws Exception {
+        mockMvc.perform(post("/api/v1/users/resetPassword")
+                .contentType("application/json")
+                .content("{}"))
+                .andExpect(status().isBadRequest());
+    }
+}