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

DATAREST-994 - Fixed two argument constructor of RepositoryRestHandlerMapping.

Browse Source 
Repositories in RepositoryCorsConfigurationAccessor may be null now. findCorsConfiguration returns null when no repositories are provided.

Original pull request: #257.
This commit is contained in:
Jens Schauder
2017-02-02 09:48:07 +01:00
parent b06f8664f1
commit ea482e0577
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryCorsConfigurationAccessorUnitTests.java
View File

@@ -15,8 +15,10 @@
*/
package org.springframework.data.rest.webmvc;
import static java.util.Collections.*;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.Test;
@@ -24,7 +26,9 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.data.repository.support.Repositories;
import org.springframework.data.rest.core.Path;
import org.springframework.data.rest.core.mapping.ResourceMappings;
import org.springframework.data.rest.core.mapping.ResourceMetadata;
import org.springframework.data.rest.webmvc.RepositoryRestHandlerMapping.NoOpStringValueResolver;
import org.springframework.data.rest.webmvc.RepositoryRestHandlerMapping.RepositoryCorsConfigurationAccessor;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -49,7 +53,7 @@ public class RepositoryCorsConfigurationAccessorUnitTests {
@Before
public void before() throws Exception {
accessor = new RepositoryCorsConfigurationAccessor(mappings, repositories, NoOpStringValueResolver.INSTANCE);
accessor = new RepositoryCorsConfigurationAccessor(mappings, NoOpStringValueResolver.INSTANCE, repositories);
}
@Test // DATAREST-573
@@ -82,6 +86,21 @@ public class RepositoryCorsConfigurationAccessorUnitTests {
assertThat(configuration.getMaxAge(), is(1234L));
}
@Test // DATAREST-994
public void returnsNullCorsConfigurationWithNullRepositories() {
accessor = new RepositoryCorsConfigurationAccessor(mappings, NoOpStringValueResolver.INSTANCE, null);
ResourceMetadata resourceMetadata = mock(ResourceMetadata.class);
when(resourceMetadata.getPath()).thenReturn(new Path("/people"));
when(resourceMetadata.isExported()).thenReturn(true);
when(mappings.exportsTopLevelResourceFor("/people")).thenReturn(true);
when(mappings.iterator()).thenReturn(singletonList(resourceMetadata).iterator());
assertThat(accessor.findCorsConfiguration("/people"), is(nullValue()));
}
interface PlainRepository {}
@CrossOrigin

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

@@ -42,7 +42,7 @@ import org.springframework.web.method.HandlerMethod;
/**
* Unit tests for {@link RepositoryRestHandlerMapping}.
*
*
* @author Oliver Gierke
* @author Greg Turnquist
*/
@@ -212,4 +212,9 @@ public class RepositoryRestHandlerMappingUnitTests {
assertThat(handlerMapping.getHandler(mockRequest), is(nullValue()));
}
@Test // DATAREST-994
public void twoArgumentConstructorDoesNotThrowException() {
new RepositoryRestHandlerMapping(mappings, configuration);
}
}