Skip to content

Fix for #66. Added verification for repository metadata information. #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2013
Merged

Fix for #66. Added verification for repository metadata information. #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ...t-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,18 +1790,17 @@ private Map throwableToMap(Throwable t) {
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;
}

Expand Down