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

DATAREST-553 - Removed RepositoryRestConfiguration.setBaseUri(…).

Browse Source 
Updated existing unit tests to use setBasePath. Added extra assertion to setBasePath to guard against sending in a URI with a protocol.

Original pull request: #178.
This commit is contained in:
Greg Turnquist
2015-05-29 15:17:49 -05:00
committed by Oliver Gierke
parent 018fa22593
commit 07986acc54
4 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AugmentingHandlerMappingUnitTests.java
View File

@@ -34,6 +34,7 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
* Unit tests for {@link BasePathAwareHandlerMapping}.
*
* @author Oliver Gierke
* @author Greg Turnquist
*/
public class AugmentingHandlerMappingUnitTests {
@@ -47,11 +48,10 @@ public class AugmentingHandlerMappingUnitTests {
}
@Test
@SuppressWarnings("deprecation")
public void augmentsRequestMappingsWithBaseUriFromConfiguration() {
RepositoryRestConfiguration configuration = new RepositoryRestConfiguration();
configuration.setBaseUri("api");
configuration.setBasePath("api");
BasePathAwareHandlerMapping mapping = new BasePathAwareHandlerMapping(configuration);
mapping.setApplicationContext(new AnnotationConfigApplicationContext(Config.class));

13
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMappingUnitTests.java
View File

@@ -40,6 +40,7 @@ import org.springframework.web.method.HandlerMethod;
* Unit tests for {@link RepositoryRestHandlerMapping}.
*
* @author Oliver Gierke
* @author Greg Turnquist
*/
@RunWith(MockitoJUnitRunner.class)
public class RepositoryRestHandlerMappingUnitTests {
@@ -150,13 +151,12 @@ public class RepositoryRestHandlerMappingUnitTests {
* @see DATAREST-276
*/
@Test
@SuppressWarnings("deprecation")
public void returnsRepositoryHandlerMethodForAbsoluteBaseUri() throws Exception {
when(mappings.exportsTopLevelResourceFor("/people")).thenReturn(true);
mockRequest = new MockHttpServletRequest("GET", "/base/people/");
configuration.setBaseUri("http://localhost/base");
configuration.setBasePath("/base");
handlerMapping.afterPropertiesSet();
HandlerMethod method = handlerMapping.lookupHandlerMethod("/base/people/", mockRequest);
@@ -169,14 +169,13 @@ public class RepositoryRestHandlerMappingUnitTests {
* @see DATAREST-276
*/
@Test
@SuppressWarnings("deprecation")
public void returnsRepositoryHandlerMethodForAbsoluteBaseUriWithServletMapping() throws Exception {
when(mappings.exportsTopLevelResourceFor("/people")).thenReturn(true);
mockRequest = new MockHttpServletRequest("GET", "/base/people");
mockRequest.setServletPath("/base/people");
configuration.setBaseUri("http://localhost/base");
configuration.setBasePath("/base");
handlerMapping.afterPropertiesSet();
HandlerMethod method = handlerMapping.lookupHandlerMethod("/base/people", mockRequest);
@@ -189,14 +188,13 @@ public class RepositoryRestHandlerMappingUnitTests {
* @see DATAREST-276
*/
@Test
@SuppressWarnings("deprecation")
public void refrainsFromMappingIfTheRequestDoesNotPointIntoAbsolutelyDefinedUriSpace() throws Exception {
when(mappings.exportsTopLevelResourceFor("/people")).thenReturn(true);
mockRequest = new MockHttpServletRequest("GET", "/servlet-path");
mockRequest.setServletPath("/servlet-path");
configuration.setBaseUri("http://localhost/base");
configuration.setBasePath("/base");
HandlerMethod method = handlerMapping.lookupHandlerMethod("/servlet-path", mockRequest);
@@ -207,7 +205,6 @@ public class RepositoryRestHandlerMappingUnitTests {
* @see DATAREST-276
*/
@Test
@SuppressWarnings("deprecation")
public void refrainsFromMappingWhenUrisDontMatch() throws Exception {
String baseUri = "foo";
@@ -217,7 +214,7 @@ public class RepositoryRestHandlerMappingUnitTests {
mockRequest = new MockHttpServletRequest("GET", uri);
mockRequest.setServletPath(uri);
configuration.setBaseUri(baseUri);
configuration.setBasePath(baseUri);
HandlerMethod method = handlerMapping.lookupHandlerMethod("/people", mockRequest);