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

Merge pull request #73 from oferrero/1.0.0.RELEASE

Browse Source 
Fix for #66.  Added verification for repository metadata information.
This commit is contained in:
Jon Brisbin
2013-03-04 12:27:45 -08:00
parent 84004e0d1d 719f850add
commit 2150542f95
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View File

@@ -1790,18 +1790,17 @@ public class RepositoryRestController
private String objectToMapKey(Object obj) {
Assert.notNull(obj, "Map key cannot be null!");
RepositoryMetadata repoMeta;
String key;
if(ClassUtils.isAssignable(obj.getClass(), String.class)) {
key = (String)obj;
} else if(null != (repoMeta = repositoryMetadataFor(obj.getClass()))) {
AttributeMetadata attrMeta = repoMeta.entityMetadata().idAttribute();
String id = attrMeta.get(obj).toString();
key = "@" + buildUri(config.getBaseUri(), repoMeta.name(), id);
if (ClassUtils.isAssignable(obj.getClass(), String.class)) {
key = (String) obj;
} else if(hasRepositoryMetadataFor(obj.getClass())) {
RepositoryMetadata repoMeta = repositoryMetadataFor(obj.getClass());
AttributeMetadata attrMeta = repoMeta.entityMetadata().idAttribute();
String id = attrMeta.get(obj).toString();
key = "@" + buildUri(config.getBaseUri(), repoMeta.name(), id);
} else {
key = conversionService.convert(obj, String.class);
key = conversionService.convert(obj, String.class);
}
return key;
}