From 2e5b1ac48d4066107371708e1a6f374050d5f727 Mon Sep 17 00:00:00 2001 From: eugenp Date: Mon, 25 Jan 2016 00:55:53 +0200 Subject: [PATCH] naming cleanup --- spring-security-rest-full/.springBeans | 6 +++++- ...ecSecurityConfig.java => SecurityWithoutCsrfConfig.java} | 4 ++-- .../java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java | 3 +++ .../java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) rename spring-security-rest-full/src/main/java/org/baeldung/spring/{SecSecurityConfig.java => SecurityWithoutCsrfConfig.java} (94%) diff --git a/spring-security-rest-full/.springBeans b/spring-security-rest-full/.springBeans index d11fb034bd..78c6703708 100644 --- a/spring-security-rest-full/.springBeans +++ b/spring-security-rest-full/.springBeans @@ -1,14 +1,18 @@ 1 - + src/main/webapp/WEB-INF/api-servlet.xml + java:org.baeldung.spring.SecurityWithoutCsrfConfig + + java:org.baeldung.spring.Application + diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/SecurityWithoutCsrfConfig.java similarity index 94% rename from spring-security-rest-full/src/main/java/org/baeldung/spring/SecSecurityConfig.java rename to spring-security-rest-full/src/main/java/org/baeldung/spring/SecurityWithoutCsrfConfig.java index 75daacbb04..6e3974f86d 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/spring/SecSecurityConfig.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/SecurityWithoutCsrfConfig.java @@ -17,12 +17,12 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) // @ImportResource({ "classpath:webSecurityConfig.xml" }) -public class SecSecurityConfig extends WebSecurityConfigurerAdapter { +public class SecurityWithoutCsrfConfig extends WebSecurityConfigurerAdapter { @Autowired private CustomAccessDeniedHandler accessDeniedHandler; - public SecSecurityConfig() { + public SecurityWithoutCsrfConfig() { super(); } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java b/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java index 19ba8fdd3c..a94dd554f1 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration public class CsrfAbstractIntegrationTest { + @Autowired private WebApplicationContext context; @@ -30,6 +31,8 @@ public class CsrfAbstractIntegrationTest { protected MockMvc mvc; + // + @Before public void setup() { mvc = MockMvcBuilders.webAppContextSetup(context).addFilters(springSecurityFilterChain).build(); diff --git a/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java b/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java index 082a37c9f1..d223e89fe0 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java @@ -4,13 +4,13 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.SecSecurityConfig; +import org.baeldung.spring.SecurityWithoutCsrfConfig; import org.baeldung.spring.WebConfig; import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -@ContextConfiguration(classes = { SecSecurityConfig.class, PersistenceConfig.class, WebConfig.class }) +@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) public class CsrfDisabledIntegrationTest extends CsrfAbstractIntegrationTest { @Test