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/11/21 16:15:12 UTC
svn commit: r1640932 [1/2] - in /uima/uimaj/trunk:
uima-docbook-references/src/docbook/
uimaj-json/src/main/java/org/apache/uima/json/
uimaj-json/src/test/java/org/apache/uima/json/
uimaj-json/src/test/resources/CasSerialization/expected/json/
Author: schor
Date: Fri Nov 21 15:15:11 2014
New Revision: 1640932
URL: http://svn.apache.org/r1640932
Log:
[UIMA-4116][UIMA-4117] Change default and method name to set omit 0 values. Change special key names from @xxx to _xxx
Modified:
uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.json.xml
uima/uimaj/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java
uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
Modified: uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.json.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.json.xml?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.json.xml (original)
+++ uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.json.xml Fri Nov 21 15:15:11 2014
@@ -368,7 +368,7 @@ jcs.setJsonContext(JsonContextFormat.omi
as references have a <code>null</code> reference coded as the number 0; references which are embedded are serialized as
<code>null</code>.</para></note>
- <para>Configuring the serializer with <code>setOmitDefaultValues(true)</code> (which is also the default) causes
+ <para>Configuring the serializer with <code>setOmit0Values(true)</code> causes
additional primitive features (byte/short/int/long/float/double) to be omitted, when their values are 0 or 0.0</para>
</section>
@@ -514,7 +514,8 @@ jcs.setJsonContext(JsonContextFormat.omi
is found to have multiple references.</para>
</listitem>
<listitem>
- <para>A switch to control omitting of features that have default values (default is to omit these).</para>
+ <para>A switch to control omitting of numeric features that have 0 values (default is to include these).
+ See the <code>setOmit0Values(true_or_false)</code> method in JsonCasSerializer.</para>
</listitem>
<listitem>
<para>a pretty printing flag (default is not to do pretty-printing)</para>
@@ -614,7 +615,7 @@ jcs.serialize(cas, sw); // serialize int
<para>Many of the common configuration methods generally return the instance, so they can be chained together.
For example, if <code>jcs</code> is an instance of the JsonCasSerializer, you can write
- <code>jcs.setPrettyPrint(true).setOmitDefaultvalues(false);</code> to configure both of these.</para>
+ <code>jcs.setPrettyPrint(true).setOmit0values(true);</code> to configure both of these.</para>
<!-- of configuring -->
Modified: uima/uimaj/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java Fri Nov 21 15:15:11 2014
@@ -101,30 +101,30 @@ public class JsonCasSerializer {
private static final Integer[] EMPTY_INTEGER_ARRAY = new Integer[0];
- private static final SerializedString CONTEXT_NAME = new SerializedString("@context");
+ private static final SerializedString CONTEXT_NAME = new SerializedString("_context");
- private static final SerializedString TYPE_SYSTEM_NAME = new SerializedString("@type_system");
+ private static final SerializedString TYPE_SYSTEM_NAME = new SerializedString("_type_system");
- private static final SerializedString TYPES_NAME = new SerializedString("@types");
+ private static final SerializedString TYPES_NAME = new SerializedString("_types");
- private static final SerializedString ID_NAME = new SerializedString("@id");
- private static final SerializedString SUB_TYPES_NAME = new SerializedString("@subtypes");
+ private static final SerializedString ID_NAME = new SerializedString("_id");
+ private static final SerializedString SUB_TYPES_NAME = new SerializedString("_subtypes");
- private static final SerializedString FEATURE_TYPES_NAME = new SerializedString("@feature_types");
- private static final SerializedString FEATURE_REFS_NAME = new SerializedString("@ref");
- private static final SerializedString FEATURE_ARRAY_NAME = new SerializedString("@array");
- private static final SerializedString FEATURE_BYTE_ARRAY_NAME = new SerializedString("@byte_array");
+ private static final SerializedString FEATURE_TYPES_NAME = new SerializedString("_feature_types");
+ private static final SerializedString FEATURE_REFS_NAME = new SerializedString("_ref");
+ private static final SerializedString FEATURE_ARRAY_NAME = new SerializedString("_array");
+ private static final SerializedString FEATURE_BYTE_ARRAY_NAME = new SerializedString("_byte_array");
- private static final SerializedString REFERENCED_FSS_NAME = new SerializedString("@referenced_fss");
- private static final SerializedString VIEWS_NAME = new SerializedString("@views");
+ private static final SerializedString REFERENCED_FSS_NAME = new SerializedString("_referenced_fss");
+ private static final SerializedString VIEWS_NAME = new SerializedString("_views");
- private static final SerializedString TYPE_NAME = new SerializedString("@type");
+ private static final SerializedString TYPE_NAME = new SerializedString("_type");
- private static final SerializedString COLLECTION_NAME = new SerializedString("@collection");
+ private static final SerializedString COLLECTION_NAME = new SerializedString("_collection");
- private static final SerializedString DELTA_CAS_NAME = new SerializedString("@delta_cas");
+ private static final SerializedString DELTA_CAS_NAME = new SerializedString("_delta_cas");
private static final SerializedString ADDED_MEMBERS_NAME = new SerializedString("added_members");
private static final SerializedString DELETED_MEMBERS_NAME = new SerializedString("deleted_members");
@@ -165,7 +165,7 @@ public class JsonCasSerializer {
private boolean isWithContext = true;
private boolean isWithSubtypes = true;
private boolean isWithExpandedTypeNames = true;
- private boolean isOmitDefaultValues = true;
+ private boolean isOmit0Values = false; // https://issues.apache.org/jira/browse/UIMA-4117
private String typeSystemReference;
@@ -175,7 +175,7 @@ public class JsonCasSerializer {
***********************************************/
/**
- * Creates a new XmiCasSerializer
+ * Creates a new JsonCasSerializer
*/
public JsonCasSerializer() {
}
@@ -418,8 +418,8 @@ public class JsonCasSerializer {
return this;
}
- public JsonCasSerializer setOmitDefaultValues(boolean omitDefaultValues) {
- isOmitDefaultValues = omitDefaultValues;
+ public JsonCasSerializer setOmit0Values(boolean omitDefaultValues) {
+ isOmit0Values = omitDefaultValues;
return this;
}
@@ -478,7 +478,7 @@ public class JsonCasSerializer {
private boolean indexId; // true causes fs to be listed as "id" : { ...}, false as "type" : [ {...}
- private boolean isEmbedded = false; // true for embedded FSs, causes @type to be included
+ private boolean isEmbedded = false; // true for embedded FSs, causes _type to be included
private boolean isEmbeddedFromFsFeature; // used for NL formatting, false if embedded due to Array or List
@@ -487,7 +487,7 @@ public class JsonCasSerializer {
private JsonDocSerializer(ContentHandler ch, CASImpl cas, XmiSerializationSharedData sharedData, MarkerImpl marker) {
cds = css.new CasDocSerializer(ch, cas, sharedData, marker, this, JsonCasSerializer.this.isDynamicEmbedding);
- this.isOmitDefaultValues = JsonCasSerializer.this.isOmitDefaultValues;
+ this.isOmitDefaultValues = JsonCasSerializer.this.isOmit0Values;
isWithExpandedTypeNames = JsonCasSerializer.this.isWithExpandedTypeNames;
isWithSubtypes = JsonCasSerializer.this.isWithSubtypes;
typeSystemReference = JsonCasSerializer.this.typeSystemReference;
@@ -504,7 +504,7 @@ public class JsonCasSerializer {
cds.sharedData.hasOutOfTypeSystemArrayElements())) {
throw new UnsupportedOperationException("Can't do JSON serialization "
+ "if there are out-of-type-system elements,"
- + " because there's no type information available (needed for @context)");
+ + " because there's no type information available (needed for _context)");
}
}
@@ -565,7 +565,7 @@ public class JsonCasSerializer {
jg.writeEndObject();
}
- jg.writeEndObject(); // end of value for @views
+ jg.writeEndObject(); // end of value for _views
// write the non-embeddable referenced FSs
@@ -580,7 +580,7 @@ public class JsonCasSerializer {
@Override
protected void writeEndOfSerialization() throws IOException {
- jg.writeEndObject(); // wrapper of @context and cas
+ jg.writeEndObject(); // wrapper of _context and cas
jg.flush();
}
@@ -678,12 +678,12 @@ public class JsonCasSerializer {
*
* <p>The information for each type has 3 sections:</p>
* <ol>
- * <li>@subtypes - a JSON map of key-value pairs, keyed by the short type-name of
+ * <li>_subtypes - a JSON map of key-value pairs, keyed by the short type-name of
* used subtypes of this type. If this type has
* no used subtypes, this element is omitted.
* The value is an instance of this structure, for that type.</li>
*
- * <li>@id - the fully qualified UIMA type name</li>
+ * <li>_id - the fully qualified UIMA type name</li>
*
* <li>@featureTypes - a map with keys being specific features of the type
* that need extra information about their contents,
@@ -754,13 +754,13 @@ public class JsonCasSerializer {
}
- jg.writeEndObject(); // end of @types
+ jg.writeEndObject(); // end of _types
- jg.writeEndObject(); // end of @context
+ jg.writeEndObject(); // end of _context
}
/**
- * @feature_types : { "featName" : "@ref" or "@byte_array, ... }
+ * _feature_types : { "featName" : "_ref" or "_byte_array, ... }
*
* @param type the type for which to generate the feature context info
* @throws IOException
@@ -1280,7 +1280,7 @@ public class JsonCasSerializer {
*
* @param fsClass the class of the feature
* @param featCode the feature code
- * @return @ref, @array, @byte_array, or null
+ * @return _ref, _array, _byte_array, or null
*/
private SerializedString featureTypeLabel(int fsClass, int featCode) {
Modified: uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java Fri Nov 21 15:15:11 2014
@@ -101,6 +101,7 @@ public class JsonCasSerializerTest exten
protected void setUp() throws Exception {
jcs = new JsonCasSerializer();
+ jcs.setOmit0Values(true);
doJson = true;
}
@@ -163,11 +164,11 @@ public class JsonCasSerializerTest exten
serializeAndCompare("topAndTokenOnlyNoContext.txt");
jcs = new JsonCasSerializer();
- jcs.setJsonContext(JsonContextFormat.omitExpandedTypeNames);
+ jcs.setJsonContext(JsonContextFormat.omitExpandedTypeNames).setOmit0Values(true);
serializeAndCompare("topAndTokenOnlyNoExpandedTypeNames.txt");
jcs = new JsonCasSerializer();
- jcs.setJsonContext(JsonContextFormat.omitSubtypes);
+ jcs.setJsonContext(JsonContextFormat.omitSubtypes).setOmit0Values(true);
serializeAndCompare("topAndTokenOnlyNoSubtypes.txt");
@@ -188,7 +189,7 @@ public class JsonCasSerializerTest exten
serializeAndCompare("topNoContext.txt");
cas.reset();
- jcs = new JsonCasSerializer();
+ jcs = new JsonCasSerializer().setOmit0Values(true);
jcs.setTypeSystemReference("A URI to TypeSystem");
cas.addFsToIndexes(cas.createFS(topType));
serializeAndCompare("topExpandedNamesNoViews.txt");
@@ -213,19 +214,19 @@ public class JsonCasSerializerTest exten
serializeAndCompare("nameSpaceCollisionOmits.txt");
- jcs.setOmitDefaultValues(false);
+ jcs.setOmit0Values(false);
serializeAndCompare("nameSpaceCollision.txt");
cas.addFsToIndexes(cas.createFS(t3));
serializeAndCompare("nameSpaceCollision2.txt");
- jcs.setOmitDefaultValues(true);
+ jcs.setOmit0Values(true);
serializeAndCompare("nameSpaceCollision2Omits.txt");
jcs.setPrettyPrint(true);
serializeAndCompare("nameSpaceCollision2ppOmits.txt");
- jcs.setOmitDefaultValues(false);
+ jcs.setOmit0Values(false);
serializeAndCompare("nameSpaceCollision2pp.txt");
// filtering
@@ -234,7 +235,7 @@ public class JsonCasSerializerTest exten
// filter out the 2 types causing namespaces to be needed.
tsMgr.addType("org.apache.uima.test.Token", a2t);
tsMgr.commit();
- jcs = new JsonCasSerializer();
+ jcs = new JsonCasSerializer().setOmit0Values(true);
jcs.setFilterTypes((TypeSystemImpl) tsMgr);
serializeAndCompare("nameSpaceNoCollsionFiltered.txt");
@@ -253,10 +254,10 @@ public class JsonCasSerializerTest exten
public void testAllValues() throws Exception {
setupTypeSystem("allTypes.xml");
setAllValues(0);
- jcs.setPrettyPrint(true);
+ jcs.setPrettyPrint(true).setOmit0Values(true);
serializeAndCompare("allValuesOmits.txt");
- jcs.setOmitDefaultValues(false);
+ jcs.setOmit0Values(false);
serializeAndCompare("allValuesNoOmits.txt");
jcs.setStaticEmbedding();
@@ -295,7 +296,7 @@ public class JsonCasSerializerTest exten
serializeAndCompare("twoListMergeStatic.txt");
cas.reset();
- jcs = new JsonCasSerializer();
+ jcs = new JsonCasSerializer().setOmit0Values(true);
jcs.setPrettyPrint(true);
fss[0] = emptyIntList();
fss[1] = intList(33, fss[0]); // value 33, linked to 0
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt Fri Nov 21 15:15:11 2014
@@ -1,42 +1,42 @@
-{"@context" : {
- "@types" : {
- "AllTypes" : {"@id" : "org.apache.uima.test.AllTypes",
- "@feature_types" : {"sofa" : "@ref", "aFS" : "@ref", "aArrayBoolean" : "@array", "aArrayMrBoolean" : "@array", "aArrayMrByte" : "@byte_array", "aArrayByte" : "@byte_array", "aArrayShort" : "@array", "aArrayMrShort" : "@array", "aArrayString" : "@array", "aArrayMrString" : "@array", "aListInteger" : "@array", "aListMrInteger" : "@array", "aListString" : "@array", "aListMrString" : "@array", "aListFs" : "@ref", "aListMrFs" : "@ref", "aArrayFS" : "@ref" } },
- "BooleanArray" : {"@id" : "uima.cas.BooleanArray" },
- "ByteArray" : {"@id" : "uima.cas.ByteArray" },
- "EmptyFSList" : {"@id" : "uima.cas.EmptyFSList" },
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "EmptyStringList" : {"@id" : "uima.cas.EmptyStringList" },
- "NonEmptyFSList" : {"@id" : "uima.cas.NonEmptyFSList",
- "@feature_types" : {"head" : "@ref", "tail" : "@ref" } },
- "NonEmptyStringList" : {"@id" : "uima.cas.NonEmptyStringList",
- "@feature_types" : {"tail" : "@array" } },
- "ShortArray" : {"@id" : "uima.cas.ShortArray" },
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "StringArray" : {"@id" : "uima.cas.StringArray" },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["AllTypes" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
- "ArrayBase" : {"@id" : "uima.cas.ArrayBase",
- "@subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
- "FSList" : {"@id" : "uima.cas.FSList",
- "@subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["FSList", "IntegerList", "StringList" ] },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList" ] },
- "StringList" : {"@id" : "uima.cas.StringList",
- "@subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "AllTypes" : {"_id" : "org.apache.uima.test.AllTypes",
+ "_feature_types" : {"sofa" : "_ref", "aFS" : "_ref", "aArrayBoolean" : "_array", "aArrayMrBoolean" : "_array", "aArrayMrByte" : "_byte_array", "aArrayByte" : "_byte_array", "aArrayShort" : "_array", "aArrayMrShort" : "_array", "aArrayString" : "_array", "aArrayMrString" : "_array", "aListInteger" : "_array", "aListMrInteger" : "_array", "aListString" : "_array", "aListMrString" : "_array", "aListFs" : "_ref", "aListMrFs" : "_ref", "aArrayFS" : "_ref" } },
+ "BooleanArray" : {"_id" : "uima.cas.BooleanArray" },
+ "ByteArray" : {"_id" : "uima.cas.ByteArray" },
+ "EmptyFSList" : {"_id" : "uima.cas.EmptyFSList" },
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
+ "NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
+ "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
+ "_feature_types" : {"tail" : "_array" } },
+ "ShortArray" : {"_id" : "uima.cas.ShortArray" },
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "StringArray" : {"_id" : "uima.cas.StringArray" },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["AllTypes" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
+ "ArrayBase" : {"_id" : "uima.cas.ArrayBase",
+ "_subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
+ "FSList" : {"_id" : "uima.cas.FSList",
+ "_subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["FSList", "IntegerList", "StringList" ] },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList" ] },
+ "StringList" : {"_id" : "uima.cas.StringList",
+ "_subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
+ "_views" : {
"_InitialView" : {
"AllTypes" : [
{"sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aInteger" : 0, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
- "aFS" : {"@type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
- "@referenced_fss" : {
- "29" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "aFS" : {"_type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ "_referenced_fss" : {
+ "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt Fri Nov 21 15:15:11 2014
@@ -1,42 +1,42 @@
-{"@context" : {
- "@types" : {
- "AllTypes" : {"@id" : "org.apache.uima.test.AllTypes",
- "@feature_types" : {"sofa" : "@ref", "aFS" : "@ref", "aArrayBoolean" : "@array", "aArrayMrBoolean" : "@array", "aArrayMrByte" : "@byte_array", "aArrayByte" : "@byte_array", "aArrayShort" : "@array", "aArrayMrShort" : "@array", "aArrayString" : "@array", "aArrayMrString" : "@array", "aListInteger" : "@array", "aListMrInteger" : "@array", "aListString" : "@array", "aListMrString" : "@array", "aListFs" : "@ref", "aListMrFs" : "@ref", "aArrayFS" : "@ref" } },
- "BooleanArray" : {"@id" : "uima.cas.BooleanArray" },
- "ByteArray" : {"@id" : "uima.cas.ByteArray" },
- "EmptyFSList" : {"@id" : "uima.cas.EmptyFSList" },
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "EmptyStringList" : {"@id" : "uima.cas.EmptyStringList" },
- "NonEmptyFSList" : {"@id" : "uima.cas.NonEmptyFSList",
- "@feature_types" : {"head" : "@ref", "tail" : "@ref" } },
- "NonEmptyStringList" : {"@id" : "uima.cas.NonEmptyStringList",
- "@feature_types" : {"tail" : "@array" } },
- "ShortArray" : {"@id" : "uima.cas.ShortArray" },
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "StringArray" : {"@id" : "uima.cas.StringArray" },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["AllTypes" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
- "ArrayBase" : {"@id" : "uima.cas.ArrayBase",
- "@subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
- "FSList" : {"@id" : "uima.cas.FSList",
- "@subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["FSList", "IntegerList", "StringList" ] },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList" ] },
- "StringList" : {"@id" : "uima.cas.StringList",
- "@subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "AllTypes" : {"_id" : "org.apache.uima.test.AllTypes",
+ "_feature_types" : {"sofa" : "_ref", "aFS" : "_ref", "aArrayBoolean" : "_array", "aArrayMrBoolean" : "_array", "aArrayMrByte" : "_byte_array", "aArrayByte" : "_byte_array", "aArrayShort" : "_array", "aArrayMrShort" : "_array", "aArrayString" : "_array", "aArrayMrString" : "_array", "aListInteger" : "_array", "aListMrInteger" : "_array", "aListString" : "_array", "aListMrString" : "_array", "aListFs" : "_ref", "aListMrFs" : "_ref", "aArrayFS" : "_ref" } },
+ "BooleanArray" : {"_id" : "uima.cas.BooleanArray" },
+ "ByteArray" : {"_id" : "uima.cas.ByteArray" },
+ "EmptyFSList" : {"_id" : "uima.cas.EmptyFSList" },
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
+ "NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
+ "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
+ "_feature_types" : {"tail" : "_array" } },
+ "ShortArray" : {"_id" : "uima.cas.ShortArray" },
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "StringArray" : {"_id" : "uima.cas.StringArray" },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["AllTypes" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
+ "ArrayBase" : {"_id" : "uima.cas.ArrayBase",
+ "_subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
+ "FSList" : {"_id" : "uima.cas.FSList",
+ "_subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["FSList", "IntegerList", "StringList" ] },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList" ] },
+ "StringList" : {"_id" : "uima.cas.StringList",
+ "_subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
+ "_views" : {
"_InitialView" : {
"AllTypes" : [
{"sofa" : 29, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
- "aFS" : {"@type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
- "@referenced_fss" : {
- "29" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "aFS" : {"_type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ "_referenced_fss" : {
+ "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt Fri Nov 21 15:15:11 2014
@@ -1,31 +1,31 @@
-{"@context" : {
- "@types" : {
- "AllTypes" : {"@id" : "org.apache.uima.test.AllTypes",
- "@feature_types" : {"sofa" : "@ref", "aFS" : "@ref", "aArrayBoolean" : "@array", "aArrayMrBoolean" : "@array", "aArrayMrByte" : "@byte_array", "aArrayByte" : "@byte_array", "aArrayShort" : "@array", "aArrayMrShort" : "@array", "aArrayString" : "@array", "aArrayMrString" : "@array", "aListInteger" : "@array", "aListMrInteger" : "@array", "aListString" : "@array", "aListMrString" : "@array", "aListFs" : "@ref", "aListMrFs" : "@ref", "aArrayFS" : "@ref" } },
- "BooleanArray" : {"@id" : "uima.cas.BooleanArray" },
- "ByteArray" : {"@id" : "uima.cas.ByteArray" },
- "ShortArray" : {"@id" : "uima.cas.ShortArray" },
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "StringArray" : {"@id" : "uima.cas.StringArray" },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["AllTypes" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["AnnotationBase", "ArrayBase", "Sofa" ] },
- "ArrayBase" : {"@id" : "uima.cas.ArrayBase",
- "@subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "AllTypes" : {"_id" : "org.apache.uima.test.AllTypes",
+ "_feature_types" : {"sofa" : "_ref", "aFS" : "_ref", "aArrayBoolean" : "_array", "aArrayMrBoolean" : "_array", "aArrayMrByte" : "_byte_array", "aArrayByte" : "_byte_array", "aArrayShort" : "_array", "aArrayMrShort" : "_array", "aArrayString" : "_array", "aArrayMrString" : "_array", "aListInteger" : "_array", "aListMrInteger" : "_array", "aListString" : "_array", "aListMrString" : "_array", "aListFs" : "_ref", "aListMrFs" : "_ref", "aArrayFS" : "_ref" } },
+ "BooleanArray" : {"_id" : "uima.cas.BooleanArray" },
+ "ByteArray" : {"_id" : "uima.cas.ByteArray" },
+ "ShortArray" : {"_id" : "uima.cas.ShortArray" },
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "StringArray" : {"_id" : "uima.cas.StringArray" },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["AllTypes" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["AnnotationBase", "ArrayBase", "Sofa" ] },
+ "ArrayBase" : {"_id" : "uima.cas.ArrayBase",
+ "_subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] } } },
+ "_views" : {
"_InitialView" : {
"AllTypes" : [
{"sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aInteger" : 0, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"", "aFS" : 36, "aArrayBoolean" : [false ], "aArrayMrBoolean" : 165, "aArrayMrByte" : 168, "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : 171, "aArrayString" : [null ], "aArrayMrString" : 174, "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
- "@referenced_fss" : {
- "29" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"@type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 },
- "165" : {"@type" : "BooleanArray", "@collection" : [false ] },
- "168" : {"@type" : "ByteArray", "@collection" : "AAA=" },
- "171" : {"@type" : "ShortArray", "@collection" : [ ] },
- "174" : {"@type" : "StringArray", "@collection" : [null ] } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "36" : {"_type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 },
+ "165" : {"_type" : "BooleanArray", "_collection" : [false ] },
+ "168" : {"_type" : "ByteArray", "_collection" : "AAA=" },
+ "171" : {"_type" : "ShortArray", "_collection" : [ ] },
+ "174" : {"_type" : "StringArray", "_collection" : [null ] } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 15 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aListFs" : [15,
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 } ] }, 15 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 } ] }, 15 ] } },
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 22 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aListFs" : [
- {"@type" : "RefTypes", "sofa" : 8 }, 22,
- {"@type" : "RefTypes", "sofa" : 8 } ] }, 22 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "22" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ {"_type" : "RefTypes", "sofa" : 8 }, 22,
+ {"_type" : "RefTypes", "sofa" : 8 } ] }, 22 ] } },
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aListFs" : [
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 }, 29 ] }, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 }, 29 ] }, 29 ] } },
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : [15, 22, 29 ] } ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aListFs" : [
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 } ] } ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 } ] } ] } },
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 15, 22, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt Fri Nov 21 15:15:11 2014
@@ -1,10 +1,10 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aListFs" : [15, 22, 29 ] }, 15, 22, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt Fri Nov 21 15:15:11 2014
@@ -1,12 +1,12 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"FSArray" : [36 ],
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : 36 } ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"@type" : "FSArray", "@collection" : [
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "36" : {"_type" : "FSArray", "_collection" : [
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt Fri Nov 21 15:15:11 2014
@@ -1,12 +1,12 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"NonEmptyFSList" : [41 ],
"RefTypes" : [
{"sofa" : 8, "aListFs" : 41 } ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "41" : {"@type" : "NonEmptyFSList",
- "head" : {"@type" : "RefTypes", "sofa" : 8 }, "tail" : [
- {"@type" : "RefTypes", "sofa" : 8 },
- {"@type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "41" : {"_type" : "NonEmptyFSList",
+ "head" : {"_type" : "RefTypes", "sofa" : 8 }, "tail" : [
+ {"_type" : "RefTypes", "sofa" : 8 },
+ {"_type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt Fri Nov 21 15:15:11 2014
@@ -1,12 +1,12 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"FSArray" : [36 ],
"RefTypes" : [
{"sofa" : 8, "aArrayFS" : 36 }, 15, 22, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"@type" : "FSArray", "@collection" : [15, 22, 29 ] },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "36" : {"_type" : "FSArray", "_collection" : [15, 22, 29 ] },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt Fri Nov 21 15:15:11 2014
@@ -1,12 +1,12 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"NonEmptyFSList" : [41 ],
"RefTypes" : [
{"sofa" : 8, "aListFs" : 41 }, 15, 22, 29 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "41" : {"@type" : "NonEmptyFSList", "head" : 15, "tail" : [22, 29 ] },
- "15" : {"@type" : "RefTypes", "sofa" : 8 },
- "22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "41" : {"_type" : "NonEmptyFSList", "head" : 15, "tail" : [22, 29 ] },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 },
+ "22" : {"_type" : "RefTypes", "sofa" : 8 },
+ "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@types":{}},"@views":{}}
\ No newline at end of file
+{"_context":{"_types":{}},"_views":{}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt Fri Nov 21 15:15:11 2014
@@ -1,8 +1,8 @@
{
- "@views" : {
+ "_views" : {
"_InitialView" : {
"RefTypes" : [
{"sofa" : 8, "aFS" : 15 }, 15 ] } },
- "@referenced_fss" : {
- "8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "15" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt Fri Nov 21 15:15:11 2014
@@ -1,15 +1,15 @@
-{"@context" : {
- "@types" : {
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "NonEmptyIntegerList" : {"@id" : "uima.cas.NonEmptyIntegerList",
- "@feature_types" : {"tail" : "@array" } },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["IntegerList" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["ListBase" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "NonEmptyIntegerList" : {"_id" : "uima.cas.NonEmptyIntegerList",
+ "_feature_types" : {"tail" : "_array" } },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["IntegerList" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["ListBase" ] } } },
+ "_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
{"head" : 11, "tail" : [22, 33 ] } ] } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt Fri Nov 21 15:15:11 2014
@@ -1,19 +1,19 @@
-{"@context" : {
- "@types" : {
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "NonEmptyIntegerList" : {"@id" : "uima.cas.NonEmptyIntegerList",
- "@feature_types" : {"tail" : "@array" } },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["IntegerList" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["ListBase" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "NonEmptyIntegerList" : {"_id" : "uima.cas.NonEmptyIntegerList",
+ "_feature_types" : {"tail" : "_array" } },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["IntegerList" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["ListBase" ] } } },
+ "_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
{"head" : 11, "tail" : 5 } ] } },
- "@referenced_fss" : {
- "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
- "2" : {"@type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
- "1" : {"@type" : "EmptyIntegerList" } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
+ "2" : {"_type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
+ "1" : {"_type" : "EmptyIntegerList" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt Fri Nov 21 15:15:11 2014
@@ -1,47 +1,47 @@
-{"@context" : {
- "@types" : {
- "AllTypes" : {"@id" : "org.apache.uima.test.AllTypes",
- "@feature_types" : {"sofa" : "@ref", "aFS" : "@ref", "aArrayBoolean" : "@array", "aArrayMrBoolean" : "@array", "aArrayMrByte" : "@byte_array", "aArrayByte" : "@byte_array", "aArrayShort" : "@array", "aArrayMrShort" : "@array", "aArrayString" : "@array", "aArrayMrString" : "@array", "aListInteger" : "@array", "aListMrInteger" : "@array", "aListString" : "@array", "aListMrString" : "@array", "aListFs" : "@ref", "aListMrFs" : "@ref", "aArrayFS" : "@ref" } },
- "BooleanArray" : {"@id" : "uima.cas.BooleanArray" },
- "ByteArray" : {"@id" : "uima.cas.ByteArray" },
- "EmptyFSList" : {"@id" : "uima.cas.EmptyFSList" },
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "EmptyStringList" : {"@id" : "uima.cas.EmptyStringList" },
- "NonEmptyFSList" : {"@id" : "uima.cas.NonEmptyFSList",
- "@feature_types" : {"head" : "@ref", "tail" : "@ref" } },
- "NonEmptyStringList" : {"@id" : "uima.cas.NonEmptyStringList",
- "@feature_types" : {"tail" : "@array" } },
- "ShortArray" : {"@id" : "uima.cas.ShortArray" },
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "StringArray" : {"@id" : "uima.cas.StringArray" },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["AllTypes" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
- "ArrayBase" : {"@id" : "uima.cas.ArrayBase",
- "@subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
- "FSList" : {"@id" : "uima.cas.FSList",
- "@subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["FSList", "IntegerList", "StringList" ] },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList" ] },
- "StringList" : {"@id" : "uima.cas.StringList",
- "@subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "AllTypes" : {"_id" : "org.apache.uima.test.AllTypes",
+ "_feature_types" : {"sofa" : "_ref", "aFS" : "_ref", "aArrayBoolean" : "_array", "aArrayMrBoolean" : "_array", "aArrayMrByte" : "_byte_array", "aArrayByte" : "_byte_array", "aArrayShort" : "_array", "aArrayMrShort" : "_array", "aArrayString" : "_array", "aArrayMrString" : "_array", "aListInteger" : "_array", "aListMrInteger" : "_array", "aListString" : "_array", "aListMrString" : "_array", "aListFs" : "_ref", "aListMrFs" : "_ref", "aArrayFS" : "_ref" } },
+ "BooleanArray" : {"_id" : "uima.cas.BooleanArray" },
+ "ByteArray" : {"_id" : "uima.cas.ByteArray" },
+ "EmptyFSList" : {"_id" : "uima.cas.EmptyFSList" },
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
+ "NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
+ "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
+ "_feature_types" : {"tail" : "_array" } },
+ "ShortArray" : {"_id" : "uima.cas.ShortArray" },
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "StringArray" : {"_id" : "uima.cas.StringArray" },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["AllTypes" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["AnnotationBase", "ArrayBase", "ListBase", "Sofa" ] },
+ "ArrayBase" : {"_id" : "uima.cas.ArrayBase",
+ "_subtypes" : ["BooleanArray", "ByteArray", "ShortArray", "StringArray" ] },
+ "FSList" : {"_id" : "uima.cas.FSList",
+ "_subtypes" : ["EmptyFSList", "NonEmptyFSList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["FSList", "IntegerList", "StringList" ] },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList" ] },
+ "StringList" : {"_id" : "uima.cas.StringList",
+ "_subtypes" : ["EmptyStringList", "NonEmptyStringList" ] } } },
+ "_views" : {
"_InitialView" : {
"AllTypes" : [
{"sofa" : 29, "aBoolean" : false, "aInteger" : 1, "aLong" : 4321, "aFloat" : "NaN", "aDouble" : "-Infinity", "aString" : "some \"String\"",
- "aFS" : {"@type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [ ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "", "aArrayShort" : [0, 0 ], "aArrayMrShort" : [ ], "aArrayString" : [ ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] },
+ "aFS" : {"_type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [ ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "", "aArrayShort" : [0, 0 ], "aArrayMrShort" : [ ], "aArrayString" : [ ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] },
"View2" : {
"AllTypes" : [
{"sofa" : 185, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
- "aFS" : {"@type" : "AllTypes", "sofa" : 185, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
- "@referenced_fss" : {
- "29" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "185" : {"@type" : "Sofa", "sofaNum" : 2, "sofaID" : "View2" } } }
\ No newline at end of file
+ "aFS" : {"_type" : "AllTypes", "sofa" : 185, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ "_referenced_fss" : {
+ "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "185" : {"_type" : "Sofa", "sofaNum" : 2, "sofaID" : "View2" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@types":{"Sofa":{"@id":"uima.cas.Sofa","@feature_types":{"sofaArray":"@ref"}},"test:Token":{"@id":"org.apache.uima.test.Token","@feature_types":{"sofa":"@ref"}},"test22:Token":{"@id":"org.apache.uima.test2.Token","@feature_types":{"sofa":"@ref"}},"test2:Token":{"@id":"org.apache.uimax.test.Token","@feature_types":{"sofa":"@ref"}},"TOP":{"@id":"uima.cas.TOP","@subtypes":["Sofa","AnnotationBase"]},"Annotation":{"@id":"uima.tcas.Annotation","@feature_types":{"sofa":"@ref"},"@subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0}],"test2:Token":[{"sofa":5,"begin":0,"end":0}]}},"@referenced_fss":{"5":{"@type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0}],"test2:Token":[{"sofa":5,"begin":0,"end":0}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@types":{"Sofa":{"@id":"uima.cas.Sofa","@feature_types":{"sofaArray":"@ref"}},"test:Token":{"@id":"org.apache.uima.test.Token","@feature_types":{"sofa":"@ref"}},"test22:Token":{"@id":"org.apache.uima.test2.Token","@feature_types":{"sofa":"@ref"}},"test2:Token":{"@id":"org.apache.uimax.test.Token","@feature_types":{"sofa":"@ref"}},"TOP":{"@id":"uima.cas.TOP","@subtypes":["Sofa","AnnotationBase"]},"Annotation":{"@id":"uima.tcas.Annotation","@feature_types":{"sofa":"@ref"},"@subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0},{"sofa":5,"begin":0,"end":0}],"test2:Token":[{"sofa":5,"begin":0,"end":0}]}},"@referenced_fss":{"5":{"@type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0},{"sofa":5,"begin":0,"end":0}],"test2:Token":[{"sofa":5,"begin":0,"end":0}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@types":{"Sofa":{"@id":"uima.cas.Sofa","@feature_types":{"sofaArray":"@ref"}},"test:Token":{"@id":"org.apache.uima.test.Token","@feature_types":{"sofa":"@ref"}},"test22:Token":{"@id":"org.apache.uima.test2.Token","@feature_types":{"sofa":"@ref"}},"test2:Token":{"@id":"org.apache.uimax.test.Token","@feature_types":{"sofa":"@ref"}},"TOP":{"@id":"uima.cas.TOP","@subtypes":["Sofa","AnnotationBase"]},"Annotation":{"@id":"uima.tcas.Annotation","@feature_types":{"sofa":"@ref"},"@subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5},{"sofa":5}],"test2:Token":[{"sofa":5}]}},"@referenced_fss":{"5":{"@type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5},{"sofa":5}],"test2:Token":[{"sofa":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt Fri Nov 21 15:15:11 2014
@@ -1,22 +1,22 @@
-{"@context" : {
- "@types" : {
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "test:Token" : {"@id" : "org.apache.uima.test.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "test22:Token" : {"@id" : "org.apache.uima.test2.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "test2:Token" : {"@id" : "org.apache.uimax.test.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["Sofa", "AnnotationBase" ] },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["test:Token", "test22:Token", "test2:Token" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "test:Token" : {"_id" : "org.apache.uima.test.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "test22:Token" : {"_id" : "org.apache.uima.test2.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "test2:Token" : {"_id" : "org.apache.uimax.test.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["Sofa", "AnnotationBase" ] },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["test:Token", "test22:Token", "test2:Token" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] } } },
+ "_views" : {
"_InitialView" : {
"test:Token" : [
{"sofa" : 5, "begin" : 0, "end" : 0 } ],
@@ -25,5 +25,5 @@
{"sofa" : 5, "begin" : 0, "end" : 0 } ],
"test2:Token" : [
{"sofa" : 5, "begin" : 0, "end" : 0 } ] } },
- "@referenced_fss" : {
- "5" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "5" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt Fri Nov 21 15:15:11 2014
@@ -1,22 +1,22 @@
-{"@context" : {
- "@types" : {
- "Sofa" : {"@id" : "uima.cas.Sofa",
- "@feature_types" : {"sofaArray" : "@ref" } },
- "test:Token" : {"@id" : "org.apache.uima.test.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "test22:Token" : {"@id" : "org.apache.uima.test2.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "test2:Token" : {"@id" : "org.apache.uimax.test.Token",
- "@feature_types" : {"sofa" : "@ref" } },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["Sofa", "AnnotationBase" ] },
- "Annotation" : {"@id" : "uima.tcas.Annotation",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["test:Token", "test22:Token", "test2:Token" ] },
- "AnnotationBase" : {"@id" : "uima.cas.AnnotationBase",
- "@feature_types" : {"sofa" : "@ref" },
- "@subtypes" : ["Annotation" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "Sofa" : {"_id" : "uima.cas.Sofa",
+ "_feature_types" : {"sofaArray" : "_ref" } },
+ "test:Token" : {"_id" : "org.apache.uima.test.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "test22:Token" : {"_id" : "org.apache.uima.test2.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "test2:Token" : {"_id" : "org.apache.uimax.test.Token",
+ "_feature_types" : {"sofa" : "_ref" } },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["Sofa", "AnnotationBase" ] },
+ "Annotation" : {"_id" : "uima.tcas.Annotation",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["test:Token", "test22:Token", "test2:Token" ] },
+ "AnnotationBase" : {"_id" : "uima.cas.AnnotationBase",
+ "_feature_types" : {"sofa" : "_ref" },
+ "_subtypes" : ["Annotation" ] } } },
+ "_views" : {
"_InitialView" : {
"test:Token" : [
{"sofa" : 5 } ],
@@ -25,5 +25,5 @@
{"sofa" : 5 } ],
"test2:Token" : [
{"sofa" : 5 } ] } },
- "@referenced_fss" : {
- "5" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "5" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@types":{"Sofa":{"@id":"uima.cas.Sofa","@feature_types":{"sofaArray":"@ref"}},"test:Token":{"@id":"org.apache.uima.test.Token","@feature_types":{"sofa":"@ref"}},"test22:Token":{"@id":"org.apache.uima.test2.Token","@feature_types":{"sofa":"@ref"}},"test2:Token":{"@id":"org.apache.uimax.test.Token","@feature_types":{"sofa":"@ref"}},"TOP":{"@id":"uima.cas.TOP","@subtypes":["Sofa","AnnotationBase"]},"Annotation":{"@id":"uima.tcas.Annotation","@feature_types":{"sofa":"@ref"},"@subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5}],"test2:Token":[{"sofa":5}]}},"@referenced_fss":{"5":{"@type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token","test2:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5}],"test2:Token":[{"sofa":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file