iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

naming cleanup

Browse Source
This commit is contained in:
eugenp 2016-01-25 00:55:53 +02:00
parent bec77d6a89
commit 2e5b1ac48d
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-security-rest-full/.springBeans
View File

@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription> <beansProjectDescription>
<version>1</version> <version>1</version>
<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion> <pluginVersion><![CDATA[3.7.2.201511260958-RELEASE]]></pluginVersion>
<configSuffixes> <configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix> <configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes> </configSuffixes>
<enableImports><![CDATA[false]]></enableImports> <enableImports><![CDATA[false]]></enableImports>
<configs> <configs>
<config>src/main/webapp/WEB-INF/api-servlet.xml</config> <config>src/main/webapp/WEB-INF/api-servlet.xml</config>
<config>java:org.baeldung.spring.SecurityWithoutCsrfConfig</config>
</configs> </configs>
<autoconfigs>
<config>java:org.baeldung.spring.Application</config>
</autoconfigs>
<configSets> <configSets>
</configSets> </configSets>
</beansProjectDescription> </beansProjectDescription>

4
spring-security-rest-full/src/main/java/org/baeldung/spring/SecSecurityConfig.java → spring-security-rest-full/src/main/java/org/baeldung/spring/SecurityWithoutCsrfConfig.java
View File

@ -17,12 +17,12 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
@EnableWebSecurity @EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true) @EnableGlobalMethodSecurity(prePostEnabled = true)
// @ImportResource({ "classpath:webSecurityConfig.xml" }) // @ImportResource({ "classpath:webSecurityConfig.xml" })
public class SecSecurityConfig extends WebSecurityConfigurerAdapter { public class SecurityWithoutCsrfConfig extends WebSecurityConfigurerAdapter {
@Autowired @Autowired
private CustomAccessDeniedHandler accessDeniedHandler; private CustomAccessDeniedHandler accessDeniedHandler;
public SecSecurityConfig() { public SecurityWithoutCsrfConfig() {
super(); super();
} }

3
spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfAbstractIntegrationTest.java
View File

@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@WebAppConfiguration @WebAppConfiguration
public class CsrfAbstractIntegrationTest { public class CsrfAbstractIntegrationTest {
@Autowired @Autowired
private WebApplicationContext context; private WebApplicationContext context;
@ -30,6 +31,8 @@ public class CsrfAbstractIntegrationTest {
protected MockMvc mvc; protected MockMvc mvc;
//
@Before @Before
public void setup() { public void setup() {
mvc = MockMvcBuilders.webAppContextSetup(context).addFilters(springSecurityFilterChain).build(); mvc = MockMvcBuilders.webAppContextSetup(context).addFilters(springSecurityFilterChain).build();

4
spring-security-rest-full/src/test/java/org/baeldung/csrf/CsrfDisabledIntegrationTest.java
View File

@ -4,13 +4,13 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.baeldung.spring.PersistenceConfig; import org.baeldung.spring.PersistenceConfig;
import org.baeldung.spring.SecSecurityConfig; import org.baeldung.spring.SecurityWithoutCsrfConfig;
import org.baeldung.spring.WebConfig; import org.baeldung.spring.WebConfig;
import org.junit.Test; import org.junit.Test;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.ContextConfiguration; 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 { public class CsrfDisabledIntegrationTest extends CsrfAbstractIntegrationTest {
@Test @Test