Fix registration of SecurityExceptionHandling controller advice

problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ExceptionHandling.java

@@ -8,6 +8,6 @@
 
 @API(status = INTERNAL)
 @ControllerAdvice
-final class ExceptionHandling implements ProblemHandling {
+public final class ExceptionHandling implements ProblemHandling {
 
 }

problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemAutoConfiguration.java

@@ -19,7 +19,7 @@ public class ProblemAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(AdviceTrait.class)
-    public AdviceTrait exceptionHandling() {
+    public ExceptionHandling exceptionHandling() {
         return new ExceptionHandling();
     }
 

problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/security/ProblemSecurityAutoConfiguration.java

@@ -33,7 +33,7 @@ public class ProblemSecurityAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(AdviceTrait.class)
-    public AdviceTrait securityExceptionHandling() {
+    public SecurityExceptionHandling securityExceptionHandling() {
         return new SecurityExceptionHandling();
     }
 

problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/security/SecurityExceptionHandling.java

@@ -9,7 +9,7 @@
 
 @API(status = INTERNAL)
 @ControllerAdvice
-final class SecurityExceptionHandling
+public final class SecurityExceptionHandling
         implements ProblemHandling, SecurityAdviceTrait {
 
 }

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomAdviceTraitTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/CustomAdviceTraitTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure;
+package org.zalando.problem.spring.web.autoconfiguretests;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomWebMvcApplicationTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/CustomWebMvcApplicationTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure;
+package org.zalando.problem.spring.web.autoconfiguretests;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/NonWebApplicationTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/NonWebApplicationTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure;
+package org.zalando.problem.spring.web.autoconfiguretests;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/WebApplicationTest.java

@@ -0,0 +1,66 @@
+package org.zalando.problem.spring.web.autoconfiguretests;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.zalando.problem.jackson.ProblemModule;
+import org.zalando.problem.spring.web.advice.AdviceTrait;
+import org.zalando.problem.spring.web.autoconfigure.ExceptionHandling;
+import org.zalando.problem.violations.ConstraintViolationProblemModule;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
+final class WebApplicationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Configuration
+    static class TestApplication {
+        @RestController
+        static class Controller {
+            @GetMapping("/exception")
+            void getException() {
+                throw new RuntimeException("An exception from GET");
+            }
+        }
+    }
+
+    @Test
+    void shouldConfigureExceptionHandling(
+            @Autowired final AdviceTrait trait) throws Exception {
+        assertThat(trait).isExactlyInstanceOf(ExceptionHandling.class);
+        mockMvc.perform(get("/exception"))
+                .andExpect(status().isInternalServerError())
+                .andExpect(jsonPath("$.status", is(500)))
+                .andExpect(jsonPath("$.title", is("Internal Server Error")))
+                .andExpect(jsonPath("$.detail", is("An exception from GET")));
+    }
+
+    @Test
+    void shouldConfigureProblemModule(
+            @Autowired final ProblemModule module) {
+        assertThat(module).isNotNull();
+    }
+
+    @Test
+    void shouldConfigureConstraintViolationProblemModule(
+            @Autowired final ConstraintViolationProblemModule module) {
+        assertThat(module).isNotNull();
+    }
+
+}

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/security/NoConfigurerSecurityTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/security/NoConfigurerSecurityTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure.security;
+package org.zalando.problem.spring.web.autoconfiguretests.security;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/security/ProblemHttpConfigurerTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/security/ProblemHttpConfigurerTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure.security;
+package org.zalando.problem.spring.web.autoconfiguretests.security;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -14,6 +14,7 @@
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.ClassUtils;
 import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport;
+import org.zalando.problem.spring.web.autoconfigure.security.ProblemHttpConfigurer;
 
 import java.util.HashMap;
 import java.util.Map;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/security/ProblemSecurityAutoConfigurationTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/security/ProblemSecurityAutoConfigurationTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure.security;
+package org.zalando.problem.spring.web.autoconfiguretests.security;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -13,6 +13,9 @@
 import org.zalando.problem.spring.web.advice.AdviceTrait;
 import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport;
 import org.zalando.problem.spring.web.autoconfigure.ProblemAutoConfiguration;
+import org.zalando.problem.spring.web.autoconfigure.security.ProblemSecurityAutoConfiguration;
+import org.zalando.problem.spring.web.autoconfigure.security.ProblemSecurityBeanPostProcessor;
+import org.zalando.problem.spring.web.autoconfigure.security.SecurityExceptionHandling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/security/ProblemSecurityBeanPostProcessorTest.java → problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/security/ProblemSecurityBeanPostProcessorTest.java

@@ -1,4 +1,4 @@
-package org.zalando.problem.spring.web.autoconfigure.security;
+package org.zalando.problem.spring.web.autoconfiguretests.security;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,6 +10,7 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport;
+import org.zalando.problem.spring.web.autoconfigure.security.ProblemSecurityBeanPostProcessor;
 
 import java.util.HashMap;
 import java.util.function.Consumer;

problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfiguretests/security/SecurityTest.java

@@ -0,0 +1,89 @@
+package org.zalando.problem.spring.web.autoconfiguretests.security;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.zalando.problem.spring.common.MediaTypes;
+
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@DirtiesContext
+final class SecurityTest {
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    void shouldConfigureExceptionHandling() throws Exception {
+        mockMvc.perform(get("/not-exists-url"))
+                .andExpect(status().isUnauthorized())
+                .andExpect(jsonPath("$.status", is(401)))
+                .andExpect(jsonPath("$.title", is("Unauthorized")))
+                .andExpect(jsonPath("$.detail", is("Full authentication is required to access this resource")));
+    }
+
+    @Test
+    void shouldRespectResponseStatus() throws Exception {
+        mockMvc.perform(get("/custom-not-found"))
+                .andExpect(status().isNotFound())
+                .andExpect(jsonPath("$.status", is(404)))
+                .andExpect(jsonPath("$.title", is("Not Found")))
+                .andExpect(jsonPath("$.detail", is("Custom NotFoundException")));
+    }
+
+    @Test
+    void shouldReturnCorrectContentType() throws Exception {
+        mockMvc.perform(get("/custom-not-found").accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isNotFound())
+                .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.PROBLEM_VALUE))
+                .andExpect(jsonPath("$.status", is(404)))
+                .andExpect(jsonPath("$.title", is("Not Found")))
+                .andExpect(jsonPath("$.detail", is("Custom NotFoundException")));
+    }
+
+    @SpringBootApplication
+    static class TestApp {
+        @RestController
+        static class Controller {
+            @GetMapping("/custom-not-found")
+            void getException() {
+                throw new NotFoundException();
+            }
+        }
+
+        @ResponseStatus(HttpStatus.NOT_FOUND)
+        static class NotFoundException extends RuntimeException {
+            public NotFoundException() {
+                super("Custom NotFoundException");
+            }
+        }
+
+        @Configuration(proxyBeanMethods = false)
+        static class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+            @Override
+            protected void configure(HttpSecurity http) throws Exception {
+                http.authorizeRequests()
+                        .mvcMatchers("/custom-not-found").permitAll()
+                        .anyRequest().authenticated();
+            }
+        }
+    }
+}