You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/08/14 23:45:05 UTC
svn commit: r1618064 - in /uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/cas/impl/ test/java/org/apache/uima/cas/impl/
test/resources/CasSerialization/expected/
Author: schor
Date: Thu Aug 14 21:45:05 2014
New Revision: 1618064
URL: http://svn.apache.org/r1618064
Log:
[UIMA-3969] add function and tests for omitting default feature values, as a settable option.
Added:
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesByTypeOmits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesOmits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2Omits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2ppOmits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollisionOmits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithDefaultViewOmits.txt
uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithNamedViewOmits.txt
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/JsonCasSerializerTest.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=1618064&r1=1618063&r2=1618064&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Thu Aug 14 21:45:05 2014
@@ -2174,20 +2174,38 @@ public class XmiCasSerializer {
case LowLevelCAS.TYPE_CLASS_FLOAT:
case LowLevelCAS.TYPE_CLASS_DOUBLE:
case LowLevelCAS.TYPE_CLASS_BOOLEAN:
-
- jgWriteFieldName(getSerializedString(featName));
-
+
if (fsClass == LowLevelCAS.TYPE_CLASS_BYTE ||
fsClass == LowLevelCAS.TYPE_CLASS_SHORT ||
fsClass == LowLevelCAS.TYPE_CLASS_INT) {
+
+ if (featValRaw == 0 && isOmitDefaultValues) continue;
+ jgWriteFieldName(getSerializedString(featName));
jgWriteNumber(featValRaw);
+
} else if (fsClass == LowLevelCAS.TYPE_CLASS_LONG) {
- jgWriteNumber(cas.ll_getLongValue(featValRaw));
+
+ final long longVal = cas.ll_getLongValue(featValRaw);
+ if (longVal == 0L && isOmitDefaultValues) continue;
+ jgWriteFieldName(getSerializedString(featName));
+ jgWriteNumber(longVal);
+
} else if (fsClass == LowLevelCAS.TYPE_CLASS_FLOAT) {
- jgWriteNumber(CASImpl.int2float(featValRaw));
+
+ final float floatVal = CASImpl.int2float(featValRaw);
+ if (floatVal == 0.F && isOmitDefaultValues) continue;
+ jgWriteFieldName(getSerializedString(featName));
+ jgWriteNumber(floatVal);
+
} else if (fsClass == LowLevelCAS.TYPE_CLASS_DOUBLE) {
- jgWriteNumber(cas.ll_getDoubleValue(addr, featCode));
+
+ final double doubleVal = cas.ll_getDoubleValue(addr, featCode);
+ if (doubleVal == 0L && isOmitDefaultValues) continue;
+ jgWriteFieldName(getSerializedString(featName));
+ jgWriteNumber(doubleVal);
+
} else {
+ jgWriteFieldName(getSerializedString(featName));
jgWriteBoolean(cas.ll_getBooleanValue(addr, featCode));
}
break;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/JsonCasSerializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/JsonCasSerializerTest.java?rev=1618064&r1=1618063&r2=1618064&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/JsonCasSerializerTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/JsonCasSerializerTest.java Thu Aug 14 21:45:05 2014
@@ -86,13 +86,13 @@ public class JsonCasSerializerTest exten
cas = (CASImpl) cas.createView("basicView");
cas.addFsToIndexes(cas.createFS(annotationType));
r = serialize();
- assertEquals(getExpected("topWithNamedView.txt"), r);
+ assertEquals(getExpected("topWithNamedViewOmits.txt"), r);
cas.reset();
cas = (CASImpl) cas.getCurrentView(); // default view
cas.addFsToIndexes(cas.createFS(annotationType));
r = serialize();
- assertEquals(getExpected("topWithDefaultView.txt"), r);
+ assertEquals(getExpected("topWithDefaultViewOmits.txt"), r);
cas.reset();
xcs.setJsonContext(JsonContextFormat.omitContext);
@@ -138,14 +138,26 @@ public class JsonCasSerializerTest exten
cas.addFsToIndexes(cas.createFS(t2));
String r = serialize();
+ assertEquals(getExpected("nameSpaceCollisionOmits.txt"), r);
+
+ xcs.setOmitDefaultValues(false);
+ r = serialize();
assertEquals(getExpected("nameSpaceCollision.txt"), r);
cas.addFsToIndexes(cas.createFS(t3));
r = serialize();
assertEquals(getExpected("nameSpaceCollision2.txt"), r);
-
+
+ xcs.setOmitDefaultValues(true);
+ r = serialize();
+ assertEquals(getExpected("nameSpaceCollision2Omits.txt"), r);
+
xcs.setPrettyPrint(true);
r = serialize();
+ assertEquals(getExpected("nameSpaceCollision2ppOmits.txt"), r);
+
+ xcs.setOmitDefaultValues(false);
+ r = serialize();
assertEquals(getExpected("nameSpaceCollision2pp.txt"), r);
}
@@ -156,11 +168,20 @@ public class JsonCasSerializerTest exten
xcs.setPrettyPrint(true);
String r = serialize();
- assertEquals(getExpected("allValues.txt"), r);
+ assertEquals(getExpected("allValuesOmits.txt"), r);
xcs.setJsonFormat(JsonCasFormat.ByType);
r = serialize();
+ assertEquals(getExpected("allValuesByTypeOmits.txt"), r);
+
+ xcs.setOmitDefaultValues(false);
+ r = serialize();
assertEquals(getExpected("allValuesByType.txt"), r);
+
+ xcs.setJsonFormat(JsonCasFormat.ById);
+ r = serialize();
+ assertEquals(getExpected("allValues.txt"), r);
+
}
private FeatureStructure setAllValues() {
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesByTypeOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesByTypeOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesByTypeOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesByTypeOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1,37 @@
+{"@context" : {
+ "AllTypes" : {
+ "@id" : "org.apache.uima.test.AllTypes",
+ "_featureRefs" : ["sofa", "aFS", "aArrayMrBoolean", "aArrayMrByte", "aArrayMrShort", "aArrayMrString", "aListMrInteger", "aListMrString", "aListFs", "aListMrFs" ],
+ "_superTypes" : ["uima.tcas.Annotation", "uima.cas.AnnotationBase", "uima.cas.TOP" ] },
+ "BooleanArray" : {
+ "@id" : "uima.cas.BooleanArray",
+ "_superTypes" : ["uima.cas.FSArray", "uima.cas.ArrayBase", "uima.cas.TOP" ] },
+ "ByteArray" : {
+ "@id" : "uima.cas.ByteArray",
+ "_superTypes" : ["uima.cas.FSArray" ] },
+ "ShortArray" : {
+ "@id" : "uima.cas.ShortArray",
+ "_superTypes" : ["uima.cas.FSArray" ] },
+ "Sofa" : {
+ "@id" : "uima.cas.Sofa",
+ "_featureRefs" : ["sofaArray" ],
+ "_superTypes" : ["uima.cas.TOP" ] },
+ "StringArray" : {
+ "@id" : "uima.cas.StringArray",
+ "_superTypes" : ["uima.cas.FSArray" ] } },
+ "_cas_feature_structures" : {
+ "StringArray" : [
+ {"@id" : 83, "_elements" : [null ] } ],
+ "BooleanArray" : [
+ {"@id" : 74, "_elements" : [false ] } ],
+ "ByteArray" : [
+ {"@id" : 77, "_elements" : [0, 0 ] } ],
+ "ShortArray" : [
+ {"@id" : 80, "_elements" : [ ] } ],
+ "Sofa" : [
+ {"@id" : 28, "sofaNum" : 1, "sofaID" : "_InitialView" } ],
+ "AllTypes" : [
+ {"@id" : 1, "sofa" : 28, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"", "aFS" : 35, "aArrayBoolean" : [false ], "aArrayMrBoolean" : 74, "aArrayMrByte" : 77, "aArrayByte" : [0, 0 ], "aArrayShort" : [ ], "aArrayMrShort" : 80, "aArrayString" : [null ], "aArrayMrString" : 83 },
+ {"@id" : 35, "sofa" : 28, "aBoolean" : false } ] },
+ "_cas_views" : {
+ "28" : [1 ] } }
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/allValuesOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1,31 @@
+{"@context" : {
+ "AllTypes" : {
+ "@id" : "org.apache.uima.test.AllTypes",
+ "_featureRefs" : ["sofa", "aFS", "aArrayMrBoolean", "aArrayMrByte", "aArrayMrShort", "aArrayMrString", "aListMrInteger", "aListMrString", "aListFs", "aListMrFs" ],
+ "_superTypes" : ["uima.tcas.Annotation", "uima.cas.AnnotationBase", "uima.cas.TOP" ] },
+ "BooleanArray" : {
+ "@id" : "uima.cas.BooleanArray",
+ "_superTypes" : ["uima.cas.FSArray", "uima.cas.ArrayBase", "uima.cas.TOP" ] },
+ "ByteArray" : {
+ "@id" : "uima.cas.ByteArray",
+ "_superTypes" : ["uima.cas.FSArray" ] },
+ "ShortArray" : {
+ "@id" : "uima.cas.ShortArray",
+ "_superTypes" : ["uima.cas.FSArray" ] },
+ "Sofa" : {
+ "@id" : "uima.cas.Sofa",
+ "_featureRefs" : ["sofaArray" ],
+ "_superTypes" : ["uima.cas.TOP" ] },
+ "StringArray" : {
+ "@id" : "uima.cas.StringArray",
+ "_superTypes" : ["uima.cas.FSArray" ] } },
+ "_cas_feature_structures" : {
+ "28" : {"Sofa" : {"sofaNum" : 1, "sofaID" : "_InitialView" } },
+ "1" : {"AllTypes" : {"sofa" : 28, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"", "aFS" : 35, "aArrayBoolean" : [false ], "aArrayMrBoolean" : 74, "aArrayMrByte" : 77, "aArrayByte" : [0, 0 ], "aArrayShort" : [ ], "aArrayMrShort" : 80, "aArrayString" : [null ], "aArrayMrString" : 83 } },
+ "83" : {"StringArray" : [null ] },
+ "80" : {"ShortArray" : [ ] },
+ "77" : {"ByteArray" : [0, 0 ] },
+ "74" : {"BooleanArray" : [false ] },
+ "35" : {"AllTypes" : {"sofa" : 28, "aBoolean" : false } } },
+ "_cas_views" : {
+ "28" : [1 ] } }
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2Omits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2Omits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2Omits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2Omits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1 @@
+{"@context":{"cas:Sofa":{"@id":"uima.cas.Sofa","_featureRefs":["sofaArray"],"_superTypes":["uima.cas.TOP"]},"test:Token":{"@id":"org.apache.uima.test.Token","_featureRefs":["sofa"],"_superTypes":["uima.tcas.Annotation","uima.cas.AnnotationBase","uima.cas.TOP"]},"test22:Token":{"@id":"org.apache.uima.test2.Token","_featureRefs":["sofa"],"_superTypes":["uima.tcas.Annotation"]},"test2:Token":{"@id":"org.apache.uimax.test.Token","_featureRefs":["sofa"],"_superTypes":["uima.tcas.Annotation"]}},"_cas_feature_structures":{"5":{"cas:Sofa":{"sofaNum":1,"sofaID":"_InitialView"}},"1":{"test:Token":{"sofa":5}},"12":{"test2:Token":{"sofa":5}},"16":{"test22:Token":{"sofa":5}}},"_cas_views":{"5":[1,12,16]}}
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2ppOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2ppOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2ppOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollision2ppOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1,24 @@
+{"@context" : {
+ "cas:Sofa" : {
+ "@id" : "uima.cas.Sofa",
+ "_featureRefs" : ["sofaArray" ],
+ "_superTypes" : ["uima.cas.TOP" ] },
+ "test:Token" : {
+ "@id" : "org.apache.uima.test.Token",
+ "_featureRefs" : ["sofa" ],
+ "_superTypes" : ["uima.tcas.Annotation", "uima.cas.AnnotationBase", "uima.cas.TOP" ] },
+ "test22:Token" : {
+ "@id" : "org.apache.uima.test2.Token",
+ "_featureRefs" : ["sofa" ],
+ "_superTypes" : ["uima.tcas.Annotation" ] },
+ "test2:Token" : {
+ "@id" : "org.apache.uimax.test.Token",
+ "_featureRefs" : ["sofa" ],
+ "_superTypes" : ["uima.tcas.Annotation" ] } },
+ "_cas_feature_structures" : {
+ "5" : {"cas:Sofa" : {"sofaNum" : 1, "sofaID" : "_InitialView" } },
+ "1" : {"test:Token" : {"sofa" : 5 } },
+ "12" : {"test2:Token" : {"sofa" : 5 } },
+ "16" : {"test22:Token" : {"sofa" : 5 } } },
+ "_cas_views" : {
+ "5" : [1, 12, 16 ] } }
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollisionOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollisionOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollisionOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/nameSpaceCollisionOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1 @@
+{"@context":{"cas:Sofa":{"@id":"uima.cas.Sofa","_featureRefs":["sofaArray"],"_superTypes":["uima.cas.TOP"]},"test:Token":{"@id":"org.apache.uima.test.Token","_featureRefs":["sofa"],"_superTypes":["uima.tcas.Annotation","uima.cas.AnnotationBase","uima.cas.TOP"]},"test2:Token":{"@id":"org.apache.uimax.test.Token","_featureRefs":["sofa"],"_superTypes":["uima.tcas.Annotation"]}},"_cas_feature_structures":{"5":{"cas:Sofa":{"sofaNum":1,"sofaID":"_InitialView"}},"1":{"test:Token":{"sofa":5}},"12":{"test2:Token":{"sofa":5}}},"_cas_views":{"5":[1,12]}}
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithDefaultViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithDefaultViewOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithDefaultViewOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithDefaultViewOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1 @@
+{"@context":{"Annotation":{"@id":"uima.tcas.Annotation","_featureRefs":["sofa"],"_superTypes":["uima.cas.AnnotationBase","uima.cas.TOP"]},"Sofa":{"@id":"uima.cas.Sofa","_featureRefs":["sofaArray"],"_superTypes":["uima.cas.TOP"]}},"_cas_feature_structures":{"5":{"Sofa":{"sofaNum":1,"sofaID":"_InitialView"}},"1":{"Annotation":{"sofa":5}}},"_cas_views":{"5":[1]}}
\ No newline at end of file
Added: uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithNamedViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithNamedViewOmits.txt?rev=1618064&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithNamedViewOmits.txt (added)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CasSerialization/expected/topWithNamedViewOmits.txt Thu Aug 14 21:45:05 2014
@@ -0,0 +1 @@
+{"@context":{"Annotation":{"@id":"uima.tcas.Annotation","_featureRefs":["sofa"],"_superTypes":["uima.cas.AnnotationBase","uima.cas.TOP"]},"Sofa":{"@id":"uima.cas.Sofa","_featureRefs":["sofaArray"],"_superTypes":["uima.cas.TOP"]}},"_cas_feature_structures":{"1":{"Sofa":{"sofaNum":2,"sofaID":"basicView"}},"8":{"Annotation":{"sofa":1}}},"_cas_views":{"0":[],"1":[8]}}
\ No newline at end of file