DATAREST-774 - Separated integration tests from core project to avoid classpath overlap.

Extracted store specific tests into separate test modules to prevent classpath overlap between projects. Those tests are now executed in an "it" build profile to prevent the tests being packaged for distribution on release.

Use Map-based repositories and mapping contexts for test in the Core and WebMvc module.

Slightly changed the configuration API for lookup types on RepositoryRestConfiguration.

Related ticket: DATAREST-776.

Author: odrotbohm

pom.xml

@@ -34,8 +34,10 @@
 		<springdata.gemfire>1.8.0.BUILD-SNAPSHOT</springdata.gemfire>
 		<springdata.solr>2.0.0.BUILD-SNAPSHOT</springdata.solr>
 		<springdata.cassandra>1.4.0.BUILD-SNAPSHOT</springdata.cassandra>
+		<springdata.keyvalue>1.1.0.BUILD-SNAPSHOT</springdata.keyvalue>
 
 		<hibernate.version>4.3.10.Final</hibernate.version>
+		<jsonpath>0.9.1</jsonpath>
 		<bundlor.enabled>false</bundlor.enabled>
 	</properties>
 
@@ -67,7 +69,23 @@
 	<profiles>
 
 		<profile>
+
+			<id>it</id>
+
+			<modules>
+				<module>spring-data-rest-core</module>
+				<module>spring-data-rest-webmvc</module>
+				<module>spring-data-rest-distribution</module>
+				<module>spring-data-rest-hal-browser</module>
+				<module>spring-data-rest-tests</module>
+			</modules>
+
+		</profile>
+
+		<profile>
+
 			<id>release</id>
+
 			<build>
 				<plugins>
 					<plugin>
@@ -77,6 +95,7 @@
 					</plugin>
 				</plugins>
 			</build>
+
 		</profile>
 
 	</profiles>
@@ -90,45 +109,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- JPA -->
-
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
-			<version>${springdata.jpa}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>${hibernate.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.3.2</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- MongoDB -->
-
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-mongodb</artifactId>
-			<version>${springdata.mongodb}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-mongodb</artifactId>
-			<version>${querydsl}</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
 	<repositories>

spring-data-rest-core/pom.xml

@@ -51,13 +51,6 @@
 			<version>${evoinflector}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${jodatime}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
@@ -71,6 +64,13 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-keyvalue</artifactId>
+			<version>${springdata.keyvalue}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 </project>

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -61,7 +61,7 @@ class EntityLookupConfiguration implements EntityLookupRegistrar {
 	 * @see org.springframework.data.rest.core.config.EntityLookupRegistrar#forValueRepository(java.lang.Class)
 	 */
 	@Override
-	public <T, ID extends Serializable, R extends Repository<T, ?>> IdMappingRegistrar<T, R> forValueRepository(
+	public <T, ID extends Serializable, R extends Repository<T, ?>> IdMappingRegistrar<T, R> forLookupRepository(
 			Class<R> type) {
 		this.lookupTypes.add(AbstractRepositoryMetadata.getMetadata(type).getDomainType());
 		return forRepository(type);

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -38,7 +38,14 @@ public interface EntityLookupRegistrar {
 	 */
 	<T, ID extends Serializable, R extends Repository<T, ?>> IdMappingRegistrar<T, R> forRepository(Class<R> type);
 
-	<T, ID extends Serializable, R extends Repository<T, ?>> IdMappingRegistrar<T, R> forValueRepository(Class<R> type);
+	/**
+	 * Starts building a custom {@link EntityLookup} for the given repository type and registers the domain type of the
+	 * given repository as lookup type.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @return
+	 */
+	<T, ID extends Serializable, R extends Repository<T, ?>> IdMappingRegistrar<T, R> forLookupRepository(Class<R> type);
 
 	interface IdMappingRegistrar<T, R extends Repository<T, ?>> {
 
@@ -61,6 +68,14 @@ interface IdMappingRegistrar<T, R extends Repository<T, ?>> {
 	<T, ID extends Serializable, R extends Repository<T, ?>> EntityLookupRegistrar forRepository(Class<R> type,
 			Converter<T, ID> identifierMapping, Lookup<R, ID> lookup);
 
+	/**
+	 * Registers an {@link EntityLookup} for the given repository type, identifier mapping and lookup operation and
+	 * registers the domain type managed by the given repository as lookup type.
+	 * 
+	 * @param type must not be {@literal null}.
+	 * @param identifierMapping must not be {@literal null}.
+	 * @param lookup must not be {@literal null}.
+	 */
 	<T, ID extends Serializable, R extends Repository<T, ?>> EntityLookupRegistrar forValueRepository(Class<R> type,
 			Converter<T, ID> identifierMapping, Lookup<R, ID> lookup);
 

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/ValidatingRepositoryEventListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2016 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.
@@ -23,7 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.data.repository.support.Repositories;
+import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.rest.core.RepositoryConstraintViolationException;
 import org.springframework.data.rest.core.ValidationErrors;
 import org.springframework.util.Assert;
@@ -44,19 +44,19 @@ public class ValidatingRepositoryEventListener extends AbstractRepositoryEventLi
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ValidatingRepositoryEventListener.class);
 
-	private final ObjectFactory<Repositories> repositoriesFactory;
+	private final ObjectFactory<PersistentEntities> persistentEntitiesFactory;
 	private final MultiValueMap<String, Validator> validators;
 
 	/**
 	 * Creates a new {@link ValidatingRepositoryEventListener} using the given repositories.
 	 * 
-	 * @param repositoriesFactory must not be {@literal null}.
+	 * @param persistentEntitiesFactory must not be {@literal null}.
 	 */
-	public ValidatingRepositoryEventListener(ObjectFactory<Repositories> repositoriesFactory) {
+	public ValidatingRepositoryEventListener(ObjectFactory<PersistentEntities> persistentEntitiesFactory) {
 
-		Assert.notNull(repositoriesFactory, "Repositories must not be null!");
+		Assert.notNull(persistentEntitiesFactory, "PersistentEntities must not be null!");
 
-		this.repositoriesFactory = repositoriesFactory;
+		this.persistentEntitiesFactory = persistentEntitiesFactory;
 		this.validators = new LinkedMultiValueMap<String, Validator>();
 	}
 
@@ -159,31 +159,34 @@ protected void onAfterDelete(Object entity) {
 		validate("afterDelete", entity);
 	}
 
-	private Errors validate(String event, Object o) {
+	private Errors validate(String event, Object entity) {
 
-		if (o == null) {
+		if (entity == null) {
 			return null;
 		}
 
-		Class<?> domainType = o.getClass();
-		Repositories repositories = repositoriesFactory.getObject();
-		Errors errors = new ValidationErrors(domainType.getSimpleName(), o, repositories.getPersistentEntity(domainType));
+		Class<?> domainType = entity.getClass();
+		PersistentEntities persistentEntities = persistentEntitiesFactory.getObject();
+		Errors errors = new ValidationErrors(domainType.getSimpleName(), entity,
+				persistentEntities.getPersistentEntity(domainType));
 
 		for (Validator v : getValidatorsForEvent(event)) {
+
 			if (v.supports(domainType)) {
-				LOGGER.debug("{}: {} with {}", event, o, v);
-				ValidationUtils.invokeValidator(v, o, errors);
+				LOGGER.debug("{}: {} with {}", event, entity, v);
+				ValidationUtils.invokeValidator(v, entity, errors);
 			}
 		}
 
-		if (errors.getErrorCount() > 0) {
+		if (errors.hasErrors()) {
 			throw new RepositoryConstraintViolationException(errors);
 		}
 
 		return errors;
 	}
 
 	private Collection<Validator> getValidatorsForEvent(String event) {
+
 		Collection<Validator> validators = this.validators.get(event);
 		return validators == null ? Collections.<Validator> emptySet() : validators;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2016 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.
@@ -18,8 +18,8 @@
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.rest.core.domain.jpa.Person;
-import org.springframework.data.rest.core.domain.jpa.PersonRepository;
+import org.springframework.data.rest.core.domain.Person;
+import org.springframework.data.rest.core.domain.PersonRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -7,7 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.config.ResourceMapping;
-import org.springframework.data.rest.core.domain.jpa.ConfiguredPersonRepository;
+import org.springframework.data.rest.core.domain.ConfiguredPersonRepository;
 
 /**
  * Tests to check that {@link ResourceMapping}s are handled correctly.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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,6 +25,8 @@
 import org.springframework.data.rest.core.config.MetadataConfiguration;
 import org.springframework.data.rest.core.config.ProjectionDefinitionConfiguration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
+import org.springframework.data.rest.core.domain.Profile;
+import org.springframework.data.rest.core.domain.ProfileRepository;
 import org.springframework.http.MediaType;
 
 /**
@@ -125,4 +127,15 @@ public void returnsBodyForCreateIfExplicitlyActivated() {
 		assertThat(configuration.returnBodyOnCreate(""), is(true));
 		assertThat(configuration.returnBodyOnCreate(MediaType.APPLICATION_JSON_VALUE), is(true));
 	}
+
+	/**
+	 * @see DATAREST-776
+	 */
+	@Test
+	public void consideresDomainTypeOfValueRepositoryLookupTypes() {
+
+		configuration.withEntityLookup().forLookupRepository(ProfileRepository.class);
+
+		assertThat(configuration.isLookupType(Profile.class), is(true));
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 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.
@@ -24,26 +24,25 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.data.map.repository.config.EnableMapRepositories;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.data.rest.core.config.EnumTranslationConfiguration;
 import org.springframework.data.rest.core.config.MetadataConfiguration;
 import org.springframework.data.rest.core.config.ProjectionDefinitionConfiguration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
-import org.springframework.data.rest.core.domain.jpa.ConfiguredPersonRepository;
-import org.springframework.data.rest.core.domain.jpa.JpaRepositoryConfig;
-import org.springframework.data.rest.core.domain.jpa.Person;
-import org.springframework.data.rest.core.domain.jpa.PersonRepository;
+import org.springframework.data.rest.core.domain.ConfiguredPersonRepository;
+import org.springframework.data.rest.core.domain.Person;
+import org.springframework.data.rest.core.domain.PersonRepository;
 import org.springframework.format.support.DefaultFormattingConversionService;
 
 /**
  * @author Jon Brisbin
  * @author Oliver Gierke
  */
 @Configuration
-@Import({ JpaRepositoryConfig.class })
+@EnableMapRepositories
 public class RepositoryTestsConfig {
 
 	@Autowired private ApplicationContext context;

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

@@ -32,8 +32,9 @@
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.data.repository.support.RepositoryInvoker;
@@ -54,14 +55,14 @@ public class UriToEntityConverterUnitTests {
 	@Mock Repositories repositories;
 	@Mock RepositoryInvokerFactory invokerFactory;
 
-	MongoMappingContext context;
+	KeyValueMappingContext context;
 	UriToEntityConverter converter;
 
 	@Before
 	@SuppressWarnings("unchecked")
 	public void setUp() {
 
-		this.context = new MongoMappingContext();
+		this.context = new KeyValueMappingContext();
 		this.context.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(Entity.class, NonEntity.class)));
 		this.context.afterPropertiesSet();
 
@@ -164,7 +165,7 @@ public void rejectsNullRepositories() {
 	}
 
 	static class Entity {
-		String id;
+		@Id String id;
 	}
 
 	static class NonEntity {