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/12 11:28:52 UTC
[uima-uimaj] branch
feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS updated (e6e18f8 ->
a8bc5bf)
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 e6e18f8 Merge branch 'main' into feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
add a8bc5bf [UIMA-6266] Clean JSON Wire Format for CAS
No new revisions were added by this update.
Summary of changes:
.../uima/json/jsoncas2/JsonCas2Deserializer.java | 26 ++++-
.../jsoncas2/ser/FeatureStructureDeserializer.java | 8 +-
.../ser/FeatureStructureSerializer_ImplBase.java | 6 +-
...a => FeatureStructuresAsArrayDeserializer.java} | 4 +-
... => FeatureStructuresAsObjectDeserializer.java} | 17 +--
...ionDeserialization_JsonCas2_FsAsArray_Test.java | 2 +
...onDeserialization_JsonCas2_FsAsObject_Test.java | 129 ++++++++++++++-------
.../ser-ref/casWithSofaDataArray/data.json | 22 ++++
.../casWithSofaDataArray}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataArray/debug.xmi | 0
.../ser-ref/casWithSofaDataURI/data.json | 18 +++
.../casWithSofaDataURI}/debug-typesystem.xml | 0
.../ser-ref/casWithSofaDataURI/debug.xmi | 0
.../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
19 files changed, 235 insertions(+), 53 deletions(-)
copy uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/{FeatureStructuresDeserializer.java => FeatureStructuresAsArrayDeserializer.java} (92%)
rename uimaj-json/src/main/java/org/apache/uima/json/jsoncas2/ser/{FeatureStructuresDeserializer.java => FeatureStructuresAsObjectDeserializer.java} (83%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataArray/data.json
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotation => CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataArray}/debug-typesystem.xml (100%)
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test => CasSerializationDeserialization_JsonCas2_FsAsObject_Test}/ser-ref/casWithSofaDataArray/debug.xmi (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataURI/data.json
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotation => CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataURI}/debug-typesystem.xml (100%)
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test => CasSerializationDeserialization_JsonCas2_FsAsObject_Test}/ser-ref/casWithSofaDataURI/debug.xmi (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithText/data.json
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotation => CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithText}/debug-typesystem.xml (100%)
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test => CasSerializationDeserialization_JsonCas2_FsAsObject_Test}/ser-ref/casWithText/debug.xmi (100%)
create mode 100644 uimaj-json/src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTextAndAnnotation/data.json
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test => CasSerializationDeserialization_JsonCas2_FsAsObject_Test}/ser-ref/casWithTextAndAnnotation/debug-typesystem.xml (100%)
copy uimaj-json/src/test/resources/{CasSerializationDeserialization_JsonCas2_FsAsArray_Test => CasSerializationDeserialization_JsonCas2_FsAsObject_Test}/ser-ref/casWithTextAndAnnotation/debug.xmi (100%)