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

DATACOUCH-110 - SimpleTypeHolders in CouchbaseList

Browse Source 
Include the customSimpleTypes from Converters in SimpleTypeHolders
This commit is contained in:
Ståle Lyngaas
2014-10-15 18:19:17 +02:00
committed by Michael Nitschinger
parent ff15112959
commit 5ed6ec3490
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java
View File

@@ -87,7 +87,7 @@ public class CustomConversions {
registerConversion(converter);
}
simpleTypeHolder = new SimpleTypeHolder();
simpleTypeHolder = new SimpleTypeHolder(customSimpleTypes, true);
}
/**

6
src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
View File

@@ -498,7 +498,7 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter
if (val == null || conversions.isSimpleType(val.getClass())) {
writeSimpleInternal(val, target, simpleKey);
} else if (val instanceof Collection || val.getClass().isArray()) {
target.put(simpleKey, writeCollectionInternal(asCollection(val), new CouchbaseList(), type.getMapValueType()));
target.put(simpleKey, writeCollectionInternal(asCollection(val), new CouchbaseList(conversions.getSimpleTypeHolder()), type.getMapValueType()));
} else {
CouchbaseDocument embeddedDoc = new CouchbaseDocument();
TypeInformation<?> valueTypeInfo = type.isMap() ? type.getMapValueType() : ClassTypeInformation.OBJECT;
@@ -521,7 +521,7 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter
* @return the created couchbase list.
*/
private CouchbaseList createCollection(final Collection<?> collection, final CouchbasePersistentProperty prop) {
return writeCollectionInternal(collection, new CouchbaseList(), prop.getTypeInformation());
return writeCollectionInternal(collection, new CouchbaseList(conversions.getSimpleTypeHolder()), prop.getTypeInformation());
}
/**
@@ -542,7 +542,7 @@ public class MappingCouchbaseConverter extends AbstractCouchbaseConverter
if (elementType == null || conversions.isSimpleType(elementType)) {
target.put(element);
} else if (element instanceof Collection || elementType.isArray()) {
target.put(writeCollectionInternal(asCollection(element), new CouchbaseList(), componentType));
target.put(writeCollectionInternal(asCollection(element), new CouchbaseList(conversions.getSimpleTypeHolder()), componentType));
} else {
CouchbaseDocument embeddedDoc = new CouchbaseDocument();
writeInternal(element, embeddedDoc, componentType);

26
src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java
View File

@@ -54,12 +54,34 @@ public class CouchbaseList implements CouchbaseStorable {
* @param initialPayload the initial data to store.
*/
public CouchbaseList(final List<Object> initialPayload) {
payload = initialPayload;
this(initialPayload, null);
}
/**
* Create a new (empty) list with an existing {@link SimpleTypeHolder}.
*
* @param simpleTypeHolder context instance.
*/
public CouchbaseList(final SimpleTypeHolder simpleTypeHolder) {
this(new ArrayList<Object>(), simpleTypeHolder);
}
/**
* Create a new list with a given payload on construction and an existing {@link SimpleTypeHolder}.
*
* @param initialPayload the initial data to store.
* @param simpleTypeHolder context instance.
*/
public CouchbaseList(final List<Object> initialPayload, final SimpleTypeHolder simpleTypeHolder) {
this.payload = initialPayload;
Set<Class<?>> additionalTypes = new HashSet<Class<?>>();
additionalTypes.add(CouchbaseDocument.class);
additionalTypes.add(CouchbaseList.class);
simpleTypeHolder = new SimpleTypeHolder(additionalTypes, true);
if (simpleTypeHolder != null) {
this.simpleTypeHolder = new SimpleTypeHolder(additionalTypes, simpleTypeHolder);
} else {
this.simpleTypeHolder = new SimpleTypeHolder(additionalTypes, true);
}
}
/**