DATAREST-427 - Refactorings in UriToEntityConverter.

Instead of using a DomainClassConverter directly we now use a raw ConversionService in UriToEntityConverter. This allos us to get rid off the bean definitions for UriToEntityConverter and DomainClassConverter. The population of the ConversionService is now taken care of by calling SpringDataWebConfiguration's addFormatter(…) in defaultConversionService().

Added unit tests for UriToEntityConverter.

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/RepositoryTestsConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -25,7 +25,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.repository.support.DomainClassConverter;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.domain.jpa.ConfiguredPersonRepository;
@@ -71,18 +70,8 @@ public class RepositoryTestsConfig {
 		return new DefaultFormattingConversionService();
 	}
 
-	@Bean
-	public DomainClassConverter<?> domainClassConverter() {
-		return new DomainClassConverter<DefaultFormattingConversionService>(defaultConversionService());
-	}
-
 	@Bean
 	public PersistentEntities persistentEntities() {
 		return new PersistentEntities(mappingContexts);
 	}
-
-	@Bean
-	public UriToEntityConverter uriToEntityConverter() {
-		return new UriToEntityConverter(persistentEntities(), domainClassConverter());
-	}
 }

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/UriToEntityConverterUnitTests.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015 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.core;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+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.core.convert.ConversionFailedException;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
+import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link UriToEntityConverter}.
+ * 
+ * @author Oliver Gierke
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class UriToEntityConverterUnitTests {
+
+	static final TypeDescriptor URI_TYPE = TypeDescriptor.valueOf(URI.class);
+	static final TypeDescriptor STRING_TYPE = TypeDescriptor.valueOf(String.class);
+	static final TypeDescriptor ENTITY_TYPE = TypeDescriptor.valueOf(Entity.class);
+
+	@Mock ConversionService conversionService;
+
+	MongoMappingContext context;
+	UriToEntityConverter converter;
+
+	@Before
+	@SuppressWarnings("unchecked")
+	public void setUp() {
+
+		this.context = new MongoMappingContext();
+		this.context.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(Entity.class, NonEntity.class)));
+		this.context.afterPropertiesSet();
+
+		this.converter = new UriToEntityConverter(new PersistentEntities(Arrays.asList(this.context)), conversionService);
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test
+	public void supportsOnlyEntitiesWithIdProperty() {
+
+		Set<ConvertiblePair> result = converter.getConvertibleTypes();
+
+		assertThat(result, hasItem(new ConvertiblePair(URI.class, Entity.class)));
+		assertThat(result, not(hasItem(new ConvertiblePair(URI.class, NonEntity.class))));
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test
+	public void cannotConvertEntityWithIdPropertyIfStringConversionMissing() {
+		assertThat(converter.matches(URI_TYPE, ENTITY_TYPE), is(false));
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test
+	public void canConvertEntityWithIdPropertyAndFromStringConversionPossible() {
+
+		when(conversionService.canConvert(STRING_TYPE, ENTITY_TYPE)).thenReturn(true);
+
+		assertThat(converter.matches(URI_TYPE, ENTITY_TYPE), is(true));
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test
+	public void cannotConvertEntityWithoutIdentifier() {
+		assertThat(converter.matches(URI_TYPE, TypeDescriptor.valueOf(NonEntity.class)), is(false));
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test
+	public void invokesConverterWithLastUriPathSegment() {
+
+		Entity reference = new Entity();
+		when(conversionService.convert("1", Entity.class)).thenReturn(reference);
+
+		assertThat(converter.convert(URI.create("/foo/bar/1"), URI_TYPE, ENTITY_TYPE), is((Object) reference));
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test(expected = ConversionFailedException.class)
+	public void rejectsUnknownType() {
+		converter.convert(URI.create("/foo/1"), URI_TYPE, STRING_TYPE);
+	}
+
+	/**
+	 * @see DATAREST-427
+	 */
+	@Test(expected = ConversionFailedException.class)
+	public void rejectsUriWithLessThanTwoSegments() {
+		converter.convert(URI.create("1"), URI_TYPE, ENTITY_TYPE);
+	}
+
+	static class Entity {
+		String id;
+	}
+
+	static class NonEntity {
+		String value;
+	}
+}