xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development

Browse source 
Former-commit-id: 2ffe348d85 [formerly ce4a95a082] [formerly 37c08d3e82 [formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]
Former-commit-id: 37c08d3e82
Former-commit-id: 8a301388e1
This commit is contained in:
Richard Peter 2013-12-03 12:53:26 -06:00 • committed by Gerrit Code Review
commit 686de8b760
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/adapters/EnumSetAdapter.java
View file

@ -28,15 +28,16 @@ import com.raytheon.uf.common.serialization.ISerializationTypeAdapter;
import com.raytheon.uf.common.serialization.SerializationException;
/**
* Dynamic serialize adapter for EnumSet. Due to the restrictions on EnumSet, an
* empty EnumSet will be deserialized as null.
* Dynamic serialize adapter for EnumSet.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 16, 2009 rjpeter Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Dec 16, 2009 rjpeter Initial creation
* Dec 02, 2013 2537 bsteffen Serialize empty enum sets.
*
*
* </pre>
*
@ -53,28 +54,22 @@ public class EnumSetAdapter implements ISerializationTypeAdapter<EnumSet> {
int setSize = deserializer.readI32();
EnumSet rval = null;
if (setSize > 0) {
String enumClassName = deserializer.readString();
try {
Class baseClass = Class.forName(enumClassName);
if (baseClass.isEnum()) {
Enum firstEnum = Enum.valueOf(baseClass, deserializer
.readString());
rval = EnumSet.of(firstEnum);
for (int i = 1; i < setSize; i++) {
rval.add(Enum.valueOf(baseClass, deserializer
.readString()));
}
} else {
throw new SerializationException(
"Cannot deserialize EnumSet. Class ["
+ enumClassName + "] is not an enum");
String enumClassName = deserializer.readString();
try {
Class baseClass = Class.forName(enumClassName);
if (baseClass.isEnum()) {
rval = EnumSet.noneOf(baseClass);
for (int i = 0; i < setSize; i++) {
rval.add(Enum.valueOf(baseClass, deserializer.readString()));
}
} catch (ClassNotFoundException e) {
throw new SerializationException("Unable to find enum class ["
+ enumClassName + "]", e);
} else {
throw new SerializationException(
"Cannot deserialize EnumSet. Class [" + enumClassName
+ "] is not an enum");
}
} catch (ClassNotFoundException e) {
throw new SerializationException("Unable to find enum class ["
+ enumClassName + "]", e);
}
return rval;
@ -94,6 +89,15 @@ public class EnumSetAdapter implements ISerializationTypeAdapter<EnumSet> {
while (iter.hasNext()) {
serializer.writeString(((Enum) iter.next()).name());
}
} else {
/*
* Due to generic type erasure there is no simple way to access the
* enum type from the enum set. To work around this limitation get
* the complement of the empty set which will contain all the values
* and use an arbitrary example Object to access the enum class.
*/
Object example = EnumSet.complementOf(set).iterator().next();
serializer.writeString(example.getClass().getName());
}
}
}

24
pythonPackages/dynamicserialize/adapters/EnumSetAdapter.py
View file

@ -28,6 +28,7 @@
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 07/28/11 dgilling Initial Creation.
# 12/02/13 2537 bsteffen Serialize empty enum sets.
#
#
#
@ -42,20 +43,15 @@ ClassAdapter = ['java.util.EnumSet', 'java.util.RegularEnumSet']
def serialize(context, set):
setSize = len(set)
context.writeI32(setSize)
if setSize > 0:
context.writeString(set.getEnumClass())
for val in set:
context.writeString(val)
context.writeString(set.getEnumClass())
for val in set:
context.writeString(val)
def deserialize(context):
setSize = context.readI32()
retVal = None
if setSize > 0:
enumClassName = context.readString()
valList = []
for i in xrange(setSize):
valList.append(context.readString())
retVal = EnumSet(enumClassName, valList)
return retVal
enumClassName = context.readString()
valList = []
for i in xrange(setSize):
valList.append(context.readString())
return EnumSet(enumClassName, valList)