DATAREST-994 - Fixed two argument constructor of RepositoryRestHandlerMapping.

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

Author: schauder

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java

@@ -266,14 +266,14 @@ public String resolveStringValue(String value) {
 	static class RepositoryCorsConfigurationAccessor {
 
 		private final @NonNull ResourceMappings mappings;
-		private final @NonNull Repositories repositories;
+		private final Repositories repositories;
 		private final @NonNull StringValueResolver embeddedValueResolver;
 
 		CorsConfiguration findCorsConfiguration(String lookupPath) {
 
 			ResourceMetadata resource = getResourceMetadata(getRepositoryBasePath(lookupPath));
 
-			return resource != null ? createConfiguration(
+			return resource != null && repositories != null ? createConfiguration(
 					repositories.getRepositoryInformationFor(resource.getDomainType()).getRepositoryInterface()) : null;
 		}
 

spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/RepositoryCorsConfigurationAccessorTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.rest.webmvc;
+
+import static java.util.Arrays.*;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.rest.core.Path;
+import org.springframework.data.rest.core.mapping.ResourceMappings;
+import org.springframework.data.rest.core.mapping.ResourceMetadata;
+
+/**
+ * Unit tests for {@link RepositoryRestHandlerMapping.RepositoryCorsConfigurationAccessor}.
+ *
+ * @author Jens Schauder
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RepositoryCorsConfigurationAccessorTest {
+
+	@Mock ResourceMappings mappings;
+
+	@Before
+	public void before() {
+		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());
+	}
+
+	@Test // DATAREST-994
+	public void returnsNullCorsConfigurationWithNullRepositories() {
+
+		RepositoryRestHandlerMapping.RepositoryCorsConfigurationAccessor configurationAccessor =
+				new RepositoryRestHandlerMapping.RepositoryCorsConfigurationAccessor(
+						mappings,
+						null,
+						RepositoryRestHandlerMapping.NoOpStringValueResolver.INSTANCE);
+
+		assertThat(configurationAccessor.findCorsConfiguration("/people"), is(nullValue()));
+	}
+
+}

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

@@ -42,7 +42,7 @@
 
 /**
  * Unit tests for {@link RepositoryRestHandlerMapping}.
- * 
+ *
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
@@ -212,4 +212,10 @@ public void rejectsUnexpandedUriTemplateWithNotFound() throws Exception {
 
 		assertThat(handlerMapping.getHandler(mockRequest), is(nullValue()));
 	}
+
+	@Test // DATAREST-994
+	public void twoArgumentConstructorDoesNotThrowException() {
+
+		new RepositoryRestHandlerMapping(mappings, configuration);
+	}
 }