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

DATAREST-107 - Add tests to verify ambiguous mapping detection.

Browse Source
This commit is contained in:
Greg Turnquist
2014-01-10 09:29:55 -06:00
committed by Oliver Gierke
parent e7ce0e3f0b
commit bc30b74cbe
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-data-rest-core/src/test/java/org/springframework/data/rest/core/domain/jpa/PersonRepository.java
View File

@@ -27,4 +27,11 @@ public interface PersonRepository extends PagingAndSortingRepository<Person, Lon
@Query("select p from Person p where p.created > :date")
Page<Person> findByCreatedUsingISO8601Date(@Param("date") @DateTimeFormat(iso = ISO.DATE_TIME) Date date,
Pageable pageable);
/**
* @see DATAREST-107 - this method matches the earlier one, causing an ambiguous mapping
* except for the exported setting
*/
@RestResource(rel = "firstname", path="firstname", exported = false)
Person findByFirstName(@Param("firstName") String firstName);
}

21
spring-data-rest-core/src/test/java/org/springframework/data/rest/core/mapping/ResourceMappingsIntegrationTest.java
View File

@@ -36,6 +36,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* Integration tests for {@link ResourceMappings}.
*
@@ -59,7 +63,7 @@ public class ResourceMappingsIntegrationTest {
@Test
public void detectsAllMappings() {
assertThat(mappings, is(Matchers.<ResourceMetadata> iterableWithSize(6)));
assertThat(mappings, is(Matchers.<ResourceMetadata>iterableWithSize(6)));
}
@Test
@@ -69,6 +73,15 @@ public class ResourceMappingsIntegrationTest {
assertThat(personMappings.isExported(), is(true));
assertThat(personMappings.getSearchResourceMappings().isExported(), is(true));
// @see DATAREST-107
List<String> methodNames = new ArrayList<String>();
for (MethodResourceMapping method : personMappings.getSearchResourceMappings()) {
methodNames.add(method.getMethod().getName());
}
assertThat(methodNames.size(), equalTo(3));
assertThat(methodNames, hasItems("findByFirstName", "findByCreatedGreaterThan", "findByCreatedUsingISO8601Date"));
}
@Test
@@ -78,6 +91,12 @@ public class ResourceMappingsIntegrationTest {
assertThat(creditCardMapping.isExported(), is(false));
assertThat(creditCardMapping.getSearchResourceMappings().isExported(), is(false));
int items = 0;
for (MethodResourceMapping method : creditCardMapping.getSearchResourceMappings()) {
items++;
}
assertThat(items, equalTo(0));
}
/**