Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make use of new GetMapping and PostMapping annotations

Browse Source 
Closes gh-5277
This commit is contained in:
Andy Wilkinson
2016-05-09 16:34:53 +01:00
parent 12bd53777e
commit 3348ed5bb3
49 changed files with 144 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
View File

@@ -90,8 +90,8 @@ import org.springframework.security.oauth2.provider.token.store.InMemoryTokenSto
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
@@ -191,7 +191,8 @@ public class OAuth2AutoConfigurationTests {
EnvironmentTestUtils.addEnvironment(context,
"security.oauth2.client.clientId=client");
context.refresh();
assertThat(countBeans(context, ClientCredentialsResourceDetails.class)).isEqualTo(1);
assertThat(countBeans(context, ClientCredentialsResourceDetails.class))
.isEqualTo(1);
context.close();
}
@@ -465,13 +466,13 @@ public class OAuth2AutoConfigurationTests {
@RestController
protected static class TestWebApp {
@RequestMapping(value = "/securedFind", method = RequestMethod.GET)
@GetMapping("/securedFind")
@PreAuthorize("#oauth2.hasScope('read')")
public String secureFind() {
return "You reached an endpoint secured by Spring Security OAuth2";
}
@RequestMapping(value = "/securedSave", method = RequestMethod.POST)
@PostMapping("/securedSave")
@PreAuthorize("#oauth2.hasScope('write')")
public String secureSave() {
return "You reached an endpoint secured by Spring Security OAuth2";

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
View File

@@ -49,9 +49,9 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.validation.BindException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.View;
@@ -263,7 +263,7 @@ public class BasicErrorControllerIntegrationTests {
throw error;
}
@RequestMapping(path = "/bodyValidation", method = RequestMethod.POST, produces = "application/json")
@PostMapping(path = "/bodyValidation", produces = "application/json")
public String bodyValidation(@Valid @RequestBody DummyBody body) {
return body.content;
}