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

#186 - AnnotationMappingDiscoverer now uses first mapping in case multiple ones are defined.

Browse Source
This commit is contained in:
Oliver Gierke
2016-01-12 10:56:33 +01:00
parent e1afab94de
commit 911bec4bd6
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/hateoas/core/AnnotationMappingDiscoverer.java
View File

@@ -70,11 +70,6 @@ public class AnnotationMappingDiscoverer implements MappingDiscoverer {
String[] mapping = getMappingFrom(findAnnotation(type, annotationType));
if (mapping.length > 1) {
throw new IllegalStateException(
String.format("Multiple class level mappings defined on class %s!", type.getName()));
}
return mapping.length == 0 ? null : mapping[0];
}
@@ -100,12 +95,6 @@ public class AnnotationMappingDiscoverer implements MappingDiscoverer {
Assert.notNull(method, "Method must not be null!");
String[] mapping = getMappingFrom(findAnnotation(method, annotationType));
if (mapping.length > 1) {
throw new IllegalStateException(
String.format("Multiple method level mappings defined on method %s!", method.toString()));
}
String typeMapping = getMapping(type);
if (mapping == null || mapping.length == 0) {