You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/08/06 14:45:07 UTC
[uima-uimaj] branch
feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS updated (0adeaa9 ->
6063cfc)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from 0adeaa9 [UIMA-6266] Clean JSON Wire Format for CAS
add 8320f36 [UIMA-6374] Create CAS (de)serialization test suite
add d953cfe Merge branch 'feature/UIMA-6374-Create-CAS-de--serialization-test-suite' into feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
add 6063cfc [UIMA-6266] Clean JSON Wire Format for CAS
No new revisions were added by this update.
Summary of changes:
uimaj-core/pom.xml | 3 +-
.../CasSerializationDeserialization_XCAS_Test.java | 9 +
...izationDeserialization_XMI_1_0_PRETTY_Test.java | 5 +
...izationDeserialization_XMI_1_1_PRETTY_Test.java | 4 +
.../apache/uima/cas/serdes/SerDesAssuptions.java | 33 ++
.../ProgrammaticallyCreatedCasDataSuite.java | 40 +-
.../cas/serdes/scenario/SerRefTestScenario.java | 3 +-
.../ser-ref/casWithSofaDataArray/cas.bin | Bin 0 -> 2316 bytes
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/cas.bin | Bin 0 -> 2540 bytes
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/cas.bin | Bin 0 -> 188 bytes
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/cas.bin | Bin 0 -> 412 bytes
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/cas.bin | Bin 0 -> 2394 bytes
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/cas.bin | Bin 0 -> 2476 bytes
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/cas.bin | Bin 0 -> 2742 bytes
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/cas.bin | Bin 0 -> 2839 bytes
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/cas.xcas | 19 +
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/cas.xcas | 3 +
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/data.xmi | 5 +
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/data.xmi | 4 +
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithSofaDataArray/data.xmi | 5 +
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/data.xmi | 4 +
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../document.txt | 1 +
.../json/flexjson/FlexJsonCasDeserializer.java | 9 +-
.../uima/json/flexjson/FlexJsonCasSerializer.java | 23 +-
.../{Json2Names.java => FlexJsonNames.java} | 3 +-
.../json/flexjson/model/Json2FeatureStructure.java | 13 +-
.../apache/uima/json/flexjson/model/Json2Type.java | 7 +-
.../apache/uima/json/json3/Json3CasSerializer.java | 14 -
.../org/apache/uima/json/json3/Json3Names.java | 47 ---
.../org/apache/uima/json/json3/model/Json3Cas.java | 15 -
.../json/json3/model/Json3FeatureStructure.java | 99 -----
.../apache/uima/json/json3/model/Json3Type.java | 69 ----
.../apache/uima/json/json3/model/Json3View.java | 10 -
.../uima/json/jsoncas2/JsonCas2Deserializer.java | 62 ++++
.../apache/uima/json/jsoncas2/JsonCas2Names.java | 74 ++++
.../uima/json/jsoncas2/JsonCas2Serializer.java | 103 ++++++
.../uima/json/jsoncas2/mode/ArrayTypeMode.java | 45 +++
.../json/jsoncas2/mode/FeatureStructuresMode.java | 36 ++
.../apache/uima/json/jsoncas2/mode/SofaMode.java | 35 ++
.../apache/uima/json/jsoncas2/mode/ViewsMode.java | 36 ++
.../json/jsoncas2/model/FeatureStructures.java | 41 +++
.../org/apache/uima/json/jsoncas2/model/Views.java | 47 +++
.../ref/FeatureStructureIdToViewIndex.java | 54 +++
.../jsoncas2/ref/FeatureStructureToIdIndex.java | 62 ++++
.../jsoncas2/ref/FeatureStructureToViewIndex.java | 71 ++++
.../ref/FullyQualifiedTypeRefGenerator.java | 30 ++
.../uima/json/jsoncas2/ref/ReferenceCache.java | 99 +++++
.../jsoncas2/ref/SequentialIdRefGenerator.java | 32 ++
.../json/jsoncas2/ref/ShortTypeRefGenerator.java | 46 +++
.../uima/json/jsoncas2/ser/CasDeserializer.java | 123 +++++++
.../jsoncas2/ser/CasDeserializer_ImplBase.java | 89 +++++
.../uima/json/jsoncas2/ser/CasSerializer.java | 87 +++++
.../json/jsoncas2/ser/CommonArrayFSSerializer.java | 107 ++++++
.../json/jsoncas2/ser/FeatureDeserializer.java | 75 ++++
.../uima/json/jsoncas2/ser/FeatureSerializer.java | 116 ++++++
.../jsoncas2/ser/FeatureStructureDeserializer.java | 405 +++++++++++++++++++++
.../jsoncas2/ser/FeatureStructureSerializer.java | 100 +++++
.../ser/FeatureStructureSerializer_ImplBase.java | 94 +++++
.../ser/FeatureStructuresAsArraySerializer.java | 70 ++++
.../ser/FeatureStructuresAsObjectSerializer.java | 52 +++
.../ser/FeatureStructuresDeserializer.java | 60 +++
.../uima/json/jsoncas2/ser/SofaSerializer.java | 54 +++
.../uima/json/jsoncas2/ser/TypeDeserializer.java | 73 ++++
.../uima/json/jsoncas2/ser/TypeSerializer.java | 71 ++++
.../json/jsoncas2/ser/TypeSystemDeserializer.java | 64 ++++
.../json/jsoncas2/ser/TypeSystemSerializer.java | 82 +++++
.../uima/json/jsoncas2/ser/ViewsDeserializer.java | 88 +++++
.../uima/json/jsoncas2/ser/ViewsSerializer.java | 78 ++++
...ion_FlexJson_ViewsSeparate_FsAsObject_Test.java | 137 -------
.../FlexJsonCasDeserializeSerializeTest.java | 12 +-
.../json/flexjson/FlexJsonDeserializerTest.java | 6 +-
...onDeserialization_JsonCas2_FsAsArray_Test.java} | 90 ++---
...nDeserialization_JsonCas2_FsAsObject_Test.java} | 41 +--
.../json/jsoncas2/ser/FeatureDeSerializerTest.java | 143 ++++++++
.../json/jsoncas2/ser/TypeDeSerializerTest.java | 79 ++++
.../ser-ref/casWithSofaDataArray/data.json | 21 ++
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 5 +
.../ser-ref/casWithSofaDataURI/data.json | 17 +
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 4 +
.../ser-ref/casWithText/data.json | 25 ++
.../ser-ref/casWithText}/debug-typesystem.xml | 0
.../ser-ref/casWithText/debug.xmi | 0
.../ser-ref/casWithTextAndAnnotation/data.json | 31 ++
.../casWithTextAndAnnotation}/debug-typesystem.xml | 0
.../ser-ref/casWithTextAndAnnotation/debug.xmi | 0
.../feature_structures_only.json | 0
.../text_only.json | 0
.../customAnnotationType/reference.json | 0
.../reference.json | 0
.../reference.json | 0
.../multipleViewsAndSofas/reference.json | 0
uimaj-parent/pom.xml | 2 +-
122 files changed, 3384 insertions(+), 500 deletions(-)
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/serdes/SerDesAssuptions.java
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataArray/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataURI/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataArray/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataURI/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataArray/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataURI/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataArray/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataURI/cas.bin
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataArray/cas.xcas
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataURI/cas.xcas
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataArray/data.xmi
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataURI/data.xmi
copy uimaj-core/src/test/resources/{CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithSofaDataArray/data.xmi
copy uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/{one-way/empty_cas => ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithSofaDataURI/data.xmi
copy uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/{one-way/empty_cas => ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-core/src/test/resources/ProgrammaticallyCreatedCasDataSuite/document.txt
rename uimaj-json/src/main/java/org/apache/uima/json/flexjson/{Json2Names.java => FlexJsonNames.java} (97%)
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/Json3CasSerializer.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/Json3Names.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/model/Json3Cas.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/model/Json3FeatureStructure.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/model/Json3Type.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/json3/model/Json3View.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Deserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Names.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Serializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/mode/ArrayTypeMode.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/mode/FeatureStructuresMode.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/mode/SofaMode.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/mode/ViewsMode.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/model/FeatureStructures.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/model/Views.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureIdToViewIndex.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureToIdIndex.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureToViewIndex.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/FullyQualifiedTypeRefGenerator.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/ReferenceCache.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/SequentialIdRefGenerator.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ref/ShortTypeRefGenerator.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/CasDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/CasDeserializer_ImplBase.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/CasSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/CommonArrayFSSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureSerializer_ImplBase.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsArraySerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsObjectSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/SofaSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/TypeDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSystemDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSystemSerializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/ViewsDeserializer.java
create mode 100644 uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/ViewsSerializer.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/flexjson/CasSerializationDeserialization_FlexJson_ViewsSeparate_FsAsObject_Test.java
rename uimaj-json/src/test/java/org/apache/uima/json/{flexjson/CasSerializationDeserialization_FlexJson_ViewsSeparate_FsAsArray_Test.java => jsoncas2/CasSerializationDeserialization_JsonCas2_FsAsArray_Test.java} (59%)
rename uimaj-json/src/test/java/org/apache/uima/json/{flexjson/CasSerializationDeserialization_FlexJson_ViewsInline_FsAsArray_Test.java => jsoncas2/CasSerializationDeserialization_JsonCas2_FsAsObject_Test.java} (72%)
create mode 100644 uimaj-json/src/test/java/org/apache/uima/json/jsoncas2/ser/FeatureDeSerializerTest.java
create mode 100644 uimaj-json/src/test/java/org/apache/uima/json/jsoncas2/ser/TypeDeSerializerTest.java
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray/data.json
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI/data.json
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithText/data.json
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithText}/debug-typesystem.xml (100%)
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test}/ser-ref/casWithText/debug.xmi (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotation/data.json
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/one-way/empty_cas => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotation}/debug-typesystem.xml (100%)
copy {uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test => uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test}/ser-ref/casWithTextAndAnnotation/debug.xmi (100%)
rename uimaj-json/src/test/resources/{Json2Deserializer => FlexJsonDeserializer}/feature_structures_only.json (100%)
rename uimaj-json/src/test/resources/{Json2Deserializer => FlexJsonDeserializer}/text_only.json (100%)
rename uimaj-json/src/test/resources/{Json2SerializerTest => FlexJsonSerializerTest}/customAnnotationType/reference.json (100%)
rename uimaj-json/src/test/resources/{Json2SerializerTest => FlexJsonSerializerTest}/featureStructureIndexedInMultipleViewsInline/reference.json (100%)
rename uimaj-json/src/test/resources/{Json2SerializerTest => FlexJsonSerializerTest}/featureStructureIndexedInMultipleViewsSeparate/reference.json (100%)
rename uimaj-json/src/test/resources/{Json2SerializerTest => FlexJsonSerializerTest}/multipleViewsAndSofas/reference.json (100%)