inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AR-359: Property values never persisted as Serializable unless absolutely necessary. Bumped schema version up to 4.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-01-30 01:45:32 +00:00
parent 41aa673a3c
commit 7955eb623a
8 changed files with 257 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
source/java/org/alfresco/repo/domain/PropertyValue.java
View File

@@ -69,7 +69,7 @@ public class PropertyValue implements Cloneable, Serializable
INTEGER
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.LONG;
}
@@ -106,6 +106,23 @@ public class PropertyValue implements Cloneable, Serializable
},
STRING
{
/**
* Strings longer than the maximum of 1024 characters will be serialized.
*/
@Override
protected ValueType getPersistedType(Serializable value)
{
if (value instanceof String)
{
String valueStr = (String) value;
if (valueStr.length() > 1024)
{
return ValueType.SERIALIZABLE;
}
}
return ValueType.STRING;
}
@Override
Serializable convert(Serializable value)
{
@@ -115,7 +132,7 @@ public class PropertyValue implements Cloneable, Serializable
DATE
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.STRING;
}
@@ -128,6 +145,66 @@ public class PropertyValue implements Cloneable, Serializable
},
SERIALIZABLE
{
/**
* As <code>Serializable</code> persistence is the last resort, being both
* more verbose as well as unusable in queries, the value is used to
* determine a more appropriate persistent type. This method defers to
* the other, more basic types' version of this method to fulfill the request.
*/
@Override
protected ValueType getPersistedType(Serializable value)
{
if (value == null)
{
throw new IllegalArgumentException("Persisted type cannot be determined by null value");
}
// check the value to determine the most appropriate type to defer to
if (value instanceof Boolean)
{
return ValueType.BOOLEAN.getPersistedType(value);
}
else if ((value instanceof Integer) || (value instanceof Long))
{
return ValueType.LONG.getPersistedType(value);
}
else if (value instanceof Float)
{
return ValueType.FLOAT.getPersistedType(value);
}
else if (value instanceof Double)
{
return ValueType.DOUBLE.getPersistedType(value);
}
else if (value instanceof String)
{
return ValueType.STRING.getPersistedType(value);
}
else if (value instanceof Date)
{
return ValueType.DATE.getPersistedType(value);
}
else if (value instanceof ContentData)
{
return ValueType.CONTENT.getPersistedType(value);
}
else if (value instanceof NodeRef)
{
return ValueType.NODEREF.getPersistedType(value);
}
else if (value instanceof QName)
{
return ValueType.QNAME.getPersistedType(value);
}
else if (value instanceof Path)
{
return ValueType.PATH.getPersistedType(value);
}
else
{
return this;
}
}
@Override
Serializable convert(Serializable value)
{
@@ -137,7 +214,7 @@ public class PropertyValue implements Cloneable, Serializable
CONTENT
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.STRING;
}
@@ -151,7 +228,7 @@ public class PropertyValue implements Cloneable, Serializable
NODEREF
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.STRING;
}
@@ -165,7 +242,7 @@ public class PropertyValue implements Cloneable, Serializable
QNAME
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.STRING;
}
@@ -179,7 +256,7 @@ public class PropertyValue implements Cloneable, Serializable
PATH
{
@Override
protected ValueType getPersistedType()
protected ValueType getPersistedType(Serializable value)
{
return ValueType.SERIALIZABLE;
}
@@ -191,8 +268,12 @@ public class PropertyValue implements Cloneable, Serializable
}
};
/** override if the type gets persisted in a different format */
protected ValueType getPersistedType()
/**
* Override if the type gets persisted in a different format
*
* @param value the actual value that is to be persisted. May not be null.
*/
protected ValueType getPersistedType(Serializable value)
{
return this;
}
@@ -302,7 +383,7 @@ public class PropertyValue implements Cloneable, Serializable
{
// get the persisted type
ValueType valueType = makeValueType(typeQName);
ValueType persistedValueType = valueType.getPersistedType();
ValueType persistedValueType = valueType.getPersistedType(value);
// convert to the persistent type
value = persistedValueType.convert(value);
setPersistedValue(persistedValueType, value);