mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added back basic enum support; added the support for mapping 'id' properties to '_id' key

Browse Source
This commit is contained in:
Thomas Risberg
2010-12-01 17:31:08 -05:00
parent 94776dd24d
commit 4f4d93f41e
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java
View File

@@ -25,7 +25,6 @@ import java.lang.reflect.TypeVariable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -102,7 +101,8 @@ public class SimpleMongoConverter implements MongoConverter {
basics.add(Pattern.class.getName()); basics.add(Pattern.class.getName());
basics.add(CodeWScope.class.getName()); basics.add(CodeWScope.class.getName());
basics.add(ObjectId.class.getName()); basics.add(ObjectId.class.getName());
// TODO check on enums.. basics.add(Enum.class.getName()); // TODO check on enums..
basics.add(Enum.class.getName());
SIMPLE_TYPES = Collections.unmodifiableSet(basics); SIMPLE_TYPES = Collections.unmodifiableSet(basics);
} }
@@ -138,6 +138,7 @@ public class SimpleMongoConverter implements MongoConverter {
conversionContext.convertToDBObject(dbo, null, obj); conversionContext.convertToDBObject(dbo, null, obj);
}*/ }*/
@SuppressWarnings("rawtypes")
public void write(Object obj, DBObject dbo) { public void write(Object obj, DBObject dbo) {
BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(obj); BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(obj);
@@ -153,7 +154,12 @@ public class SimpleMongoConverter implements MongoConverter {
if (isValidProperty(pd)) { if (isValidProperty(pd)) {
// TODO validate Enums... // TODO validate Enums...
writeValue(dbo, keyToUse, value); if (value != null && Enum.class.isAssignableFrom(pd.getPropertyType())) {
writeValue(dbo, keyToUse, ((Enum)value).name());
}
else {
writeValue(dbo, keyToUse, value);
}
// dbo.put(keyToUse, value); // dbo.put(keyToUse, value);
} else { } else {
//TODO exclude Class properties from consideration //TODO exclude Class properties from consideration
@@ -221,9 +227,6 @@ public class SimpleMongoConverter implements MongoConverter {
}*/ }*/
public Object read(Class<? extends Object> clazz, DBObject dbo) { public Object read(Class<? extends Object> clazz, DBObject dbo) {
Assert.state(clazz != null, "Mapped class was not specified"); Assert.state(clazz != null, "Mapped class was not specified");
Object mappedObject = BeanUtils.instantiate(clazz); Object mappedObject = BeanUtils.instantiate(clazz);
BeanWrapper bw = PropertyAccessorFactory BeanWrapper bw = PropertyAccessorFactory
@@ -237,19 +240,31 @@ public class SimpleMongoConverter implements MongoConverter {
.getPropertyDescriptors(clazz); .getPropertyDescriptors(clazz);
for (PropertyDescriptor pd : propertyDescriptors) { for (PropertyDescriptor pd : propertyDescriptors) {
if (dbo.containsField(pd.getName())) { String keyToUse = ("id".equals(pd.getName()) ? "_id" : pd.getName());
Object value = dbo.get(pd.getName()); System.out.println("??? " + pd.getName() + " " + keyToUse + " = " + dbo.get(keyToUse));
if (dbo.containsField(keyToUse)) {
Object value = dbo.get(keyToUse);
if (value instanceof ObjectId) { if (value instanceof ObjectId) {
setObjectIdOnObject(bw, pd, (ObjectId) value); setObjectIdOnObject(bw, pd, (ObjectId) value);
} else { } else {
if (isValidProperty(pd)) { if (isValidProperty(pd)) {
// This will leverage the conversion service. // This will leverage the conversion service.
// bw.setPropertyValue(pd.getName(), if (!isSimpleType(value.getClass())) {
// dbo.get(pd.getName())); if (value instanceof DBObject) {
readValue(bw, pd, dbo); bw.setPropertyValue(pd.getName(), readCompoundValue(pd, (DBObject) value));
}
else {
logger.warn("Unable to map compound DBObject field "
+ keyToUse + " to property " + pd.getName()
+ ". Should have been a 'DBObject' but was " + value.getClass().getName());
}
}
else {
bw.setPropertyValue(pd.getName(), value);
}
} else { } else {
logger.warn("Unable to map DBObject field " logger.warn("Unable to map DBObject field "
+ pd.getName() + " to property " + pd.getName() + keyToUse + " to property " + pd.getName()
+ ". Skipping."); + ". Skipping.");
} }
} }
@@ -259,18 +274,6 @@ public class SimpleMongoConverter implements MongoConverter {
return mappedObject; return mappedObject;
} }
protected void readValue(BeanWrapper bw, PropertyDescriptor pd, DBObject dbo) {
Object value = dbo.get(pd.getName());
// is not a simple type.
if (!isSimpleType(value.getClass())) {
bw.setPropertyValue(pd.getName(),readCompoundValue(pd, (DBObject) dbo.get(pd.getName())));
} else {
bw.setPropertyValue(pd.getName(), value);
}
}
private Object readCompoundValue(PropertyDescriptor pd, DBObject dbo) { private Object readCompoundValue(PropertyDescriptor pd, DBObject dbo) {
Class propertyClazz = pd.getPropertyType(); Class propertyClazz = pd.getPropertyType();
if (Map.class.isAssignableFrom(propertyClazz)) { if (Map.class.isAssignableFrom(propertyClazz)) {