This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-uimaj-io-jsoncas.git
commit 31527e5a8965611bc110921e97e1d60cf2ab3aa4 Merge: bddbf68 f8f2386 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Fri Feb 18 18:23:19 2022 +0100 Merge pull request #1 from apache/feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS [UIMA 6266] Clean json wire format for CAS .gitignore | 17 + Jenkinsfile | 24 + README.adoc | 459 ++++++ pom.xml | 202 +++ .../uima/json/jsoncas2/JsonCas2Deserializer.java | 99 ++ .../apache/uima/json/jsoncas2/JsonCas2Names.java | 101 ++ .../uima/json/jsoncas2/JsonCas2Serializer.java | 177 +++ .../json/jsoncas2/encoding/OffsetConverter.java | 22 +- .../encoding/Utf16CodeunitOffsetConverter.java | 28 +- .../encoding/Utf32CodepointOffsetConverter.java | 84 ++ .../jsoncas2/encoding/Utf8ByteOffsetConverter.java | 87 ++ .../uima/json/jsoncas2/mode/ArrayTypeMode.java | 45 + .../json/jsoncas2/mode/FeatureStructuresMode.java | 31 +- .../json/jsoncas2/mode/OffsetConversionMode.java | 87 ++ .../apache/uima/json/jsoncas2/mode/SofaMode.java | 30 +- .../uima/json/jsoncas2/mode/TypeSystemMode.java | 54 +- .../apache/uima/json/jsoncas2/mode/ViewsMode.java | 31 +- .../json/jsoncas2/model/FeatureStructures.java | 42 +- .../apache/uima/json/jsoncas2/model/Header.java | 51 + .../org/apache/uima/json/jsoncas2/model/Views.java | 40 +- .../ref/FeatureStructureIdToViewIndex.java | 54 + .../jsoncas2/ref/FeatureStructureToIdIndex.java | 72 + .../jsoncas2/ref/FeatureStructureToViewIndex.java | 71 + .../ref/FullyQualifiedTypeRefGenerator.java | 23 +- .../uima/json/jsoncas2/ref/ReferenceCache.java | 99 ++ .../jsoncas2/ref/SequentialIdRefGenerator.java | 30 +- .../json/jsoncas2/ref/ShortTypeRefGenerator.java | 39 +- .../uima/json/jsoncas2/ser/CasDeserializer.java | 140 ++ .../jsoncas2/ser/CasDeserializer_ImplBase.java | 89 ++ .../uima/json/jsoncas2/ser/CasSerializer.java | 127 ++ .../json/jsoncas2/ser/CommonArrayFSSerializer.java | 119 ++ .../json/jsoncas2/ser/FeatureDeserializer.java | 75 + .../uima/json/jsoncas2/ser/FeatureSerializer.java | 116 ++ .../jsoncas2/ser/FeatureStructureDeserializer.java | 658 +++++++++ .../jsoncas2/ser/FeatureStructureSerializer.java | 138 ++ .../ser/FeatureStructureSerializer_ImplBase.java | 94 ++ .../ser/FeatureStructuresAsArrayDeserializer.java | 61 + .../ser/FeatureStructuresAsArraySerializer.java | 53 + .../ser/FeatureStructuresAsObjectDeserializer.java | 61 + .../ser/FeatureStructuresAsObjectSerializer.java | 52 + .../uima/json/jsoncas2/ser/SofaSerializer.java | 56 + .../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 | 85 ++ .../uima/json/jsoncas2/ser/ViewsSerializer.java | 77 + ...ionDeserialization_JsonCas2_FsAsArray_Test.java | 199 +++ ...onDeserialization_JsonCas2_FsAsObject_Test.java | 199 +++ .../org/apache/uima/json/jsoncas2/Fixtures.java | 116 ++ .../Performance_JsonCas2_FsAsArray_Test.java | 78 + .../Utf32CodepointOffsetConverterTest.java | 164 +++ .../encoding/Utf8ByteOffsetConverterTest.java | 168 +++ .../json/jsoncas2/ser/FeatureDeSerializerTest.java | 140 ++ .../json/jsoncas2/ser/TypeDeSerializerTest.java | 77 + .../data.json | 78 + .../debug-typesystem.xml | 17 + .../debug.xmi | 15 + .../casWithFloatingPointSpecialValues/data.json | 76 + .../debug-typesystem.xml | 74 + .../casWithFloatingPointSpecialValues/debug.xmi | 7 + .../typesystem.xml | 74 + .../ser-ref/casWithFsList/data.json | 286 ++++ .../ser-ref/casWithFsList/debug-typesystem.xml | 117 ++ .../ser-ref/casWithFsList/debug.xmi | 38 + .../ser-ref/casWithFsList/typesystem.xml | 117 ++ .../casWithLeftToRightTextAndAnnotations/data.json | 36 + .../debug-typesystem.xml | 17 + .../casWithLeftToRightTextAndAnnotations/debug.xmi | 8 + .../ser-ref/casWithSofaDataArray/data.json | 21 + .../casWithSofaDataArray/debug-typesystem.xml | 17 + .../ser-ref/casWithSofaDataArray/debug.xmi | 5 + .../ser-ref/casWithSofaDataURI/data.json | 17 + .../casWithSofaDataURI/debug-typesystem.xml | 17 + .../ser-ref/casWithSofaDataURI/debug.xmi | 4 + .../ser-ref/casWithText/data.json | 24 + .../ser-ref/casWithText/debug-typesystem.xml | 17 + .../ser-ref/casWithText/debug.xmi | 6 + .../ser-ref/casWithTextAndAnnotations/data.json | 48 + .../casWithTextAndAnnotations/debug-typesystem.xml | 17 + .../ser-ref/casWithTextAndAnnotations/debug.xmi | 9 + .../data.json | 48 + .../debug-typesystem.xml | 17 + .../debug.xmi | 10 + .../casWithoutTextButWithAnnotations/data.json | 39 + .../debug-typesystem.xml | 17 + .../casWithoutTextButWithAnnotations/debug.xmi | 9 + .../ser-ref/emptyCas/data.json | 9 + .../ser-ref/emptyCas/debug-typesystem.xml | 17 + .../ser-ref/emptyCas/debug.xmi | 3 + .../data.json | 79 + .../debug-typesystem.xml | 17 + .../debug.xmi | 15 + .../casWithFloatingPointSpecialValues/data.json | 77 + .../debug-typesystem.xml | 74 + .../casWithFloatingPointSpecialValues/debug.xmi | 7 + .../typesystem.xml | 74 + .../casWithLeftToRightTextAndAnnotations/data.json | 37 + .../debug-typesystem.xml | 17 + .../casWithLeftToRightTextAndAnnotations/debug.xmi | 8 + .../ser-ref/casWithSofaDataArray/data.json | 22 + .../casWithSofaDataArray/debug-typesystem.xml | 17 + .../ser-ref/casWithSofaDataArray/debug.xmi | 5 + .../ser-ref/casWithSofaDataURI/data.json | 18 + .../casWithSofaDataURI/debug-typesystem.xml | 17 + .../ser-ref/casWithSofaDataURI/debug.xmi | 4 + .../ser-ref/casWithText/data.json | 25 + .../ser-ref/casWithText/debug-typesystem.xml | 17 + .../ser-ref/casWithText/debug.xmi | 6 + .../ser-ref/casWithTextAndAnnotations/data.json | 49 + .../casWithTextAndAnnotations/debug-typesystem.xml | 17 + .../ser-ref/casWithTextAndAnnotations/debug.xmi | 9 + .../data.json | 49 + .../debug-typesystem.xml | 17 + .../debug.xmi | 10 + .../casWithoutTextButWithAnnotations/data.json | 40 + .../debug-typesystem.xml | 17 + .../casWithoutTextButWithAnnotations/debug.xmi | 9 + .../ser-ref/emptyCas/data.json | 9 + .../ser-ref/emptyCas/debug-typesystem.xml | 17 + .../ser-ref/emptyCas/debug.xmi | 3 + uimaj-json/.gitignore | 2 - ...marker-file-identifying-api-compatibility-check | 1 - uimaj-json/pom.xml | 121 -- .../org/apache/uima/json/Json2CasDeserializer.java | 236 --- .../org/apache/uima/json/Json2CasSerializer.java | 491 ------ .../main/java/org/apache/uima/json/Json2Names.java | 30 - .../org/apache/uima/json/JsonCasSerializer.java | 1556 -------------------- .../apache/uima/json/JsonMetaDataSerializer.java | 189 --- .../impl/JsonContentHandlerJacksonWrapper.java | 447 ------ .../json/impl/MetaDataObjectSerializer_json.java | 238 --- .../json/model/json2/Json2FeatureStructure.java | 93 -- .../apache/uima/json/model/json2/Json2Type.java | 79 - .../json/Json2CasDeserializeSerializeTest.java | 61 - .../apache/uima/json/Json2DeserializerTest.java | 56 - .../org/apache/uima/json/Json2SerializerTest.java | 129 -- .../apache/uima/json/JsonCasSerializerTest.java | 617 -------- .../apache/uima/json/JsonMetaDataObjectTest.java | 194 --- .../resource/metadata/impl/TestFruitBagObject.java | 74 - .../resource/metadata/impl/TestFruitObject.java | 150 -- .../test/java/org/apache/uima/test/AllTypes.java | 746 ---------- .../test/java/org/apache/uima/test/RefTypes.java | 161 -- .../CASTests/desc/casTestCaseTypesystem.xml | 243 --- .../json/expected/testTypesystem-plain.json | 1 - .../CASTests/json/expected/testTypesystem.json | 23 - .../resources/CasSerialization/desc/allTypes.xml | 170 --- .../CasSerialization/desc/nameSpaceNeeded.xml | 47 - .../resources/CasSerialization/desc/refTypes.xml | 58 - .../expected/json/allValuesNoOmits.txt | 43 - .../expected/json/allValuesOmits.txt | 43 - .../expected/json/allValuesStaticNoOmits.txt | 31 - .../expected/json/array-a1-not-a.txt | 10 - .../expected/json/array-a1-not-l.txt | 21 - .../expected/json/array-a2-not-a.txt | 10 - .../expected/json/array-a2-not-l.txt | 20 - .../expected/json/array-a3-not-a.txt | 10 - .../expected/json/array-a3-not-l.txt | 18 - .../expected/json/array-all-embeddable-a.txt | 10 - .../expected/json/array-all-embeddable-l.txt | 21 - .../expected/json/array-non-embeddable-a.txt | 10 - .../expected/json/array-non-embeddable-l.txt | 17 - .../json/array-self-items-all-embeddable-a.txt | 12 - .../json/array-self-items-all-embeddable-l.txt | 16 - .../expected/json/array-self-non-embeddable-a.txt | 12 - .../expected/json/array-self-non-embeddable-l.txt | 15 - .../CasSerialization/expected/json/emptyCAS.txt | 1 - .../expected/json/indexedAndRef.txt | 8 - .../expected/json/indexedSingleList.txt | 15 - .../expected/json/indexedSingleListStatic.txt | 19 - .../expected/json/multipleViews.txt | 47 - .../expected/json/nameSpaceCollision.txt | 1 - .../expected/json/nameSpaceCollision2.txt | 1 - .../expected/json/nameSpaceCollision2Omits.txt | 1 - .../expected/json/nameSpaceCollision2pp.txt | 30 - .../expected/json/nameSpaceCollision2ppOmits.txt | 30 - .../expected/json/nameSpaceCollisionOmits.txt | 1 - .../expected/json/nameSpaceCollsionFiltered.txt | 1 - .../expected/json/nameSpaceNoCollsionFiltered.txt | 1 - .../expected/json/topAndTokenOnly.txt | 1 - .../expected/json/topAndTokenOnlyNoContext.txt | 1 - .../json/topAndTokenOnlyNoExpandedTypeNames.txt | 1 - .../expected/json/topAndTokenOnlyNoSubtypes.txt | 1 - .../expected/json/topExpandedNamesNoViews.txt | 1 - .../expected/json/topNoContext.txt | 1 - .../expected/json/topNoExpandedTypeNames.txt | 1 - .../expected/json/topWithDefaultViewOmits.txt | 1 - .../expected/json/topWithNamedViewOmits.txt | 1 - .../expected/json/twoListMerge.txt | 18 - .../expected/json/twoListMergeStatic.txt | 20 - .../expected/xmi/allValuesNoOmits.xml | 16 - .../expected/xmi/allValuesOmits.xml | 16 - .../expected/xmi/allValuesStaticNoOmits.xml | 16 - .../expected/xmi/array-a1-not-a.xml | 9 - .../expected/xmi/array-a1-not-l.xml | 9 - .../expected/xmi/array-a2-not-a.xml | 9 - .../expected/xmi/array-a2-not-l.xml | 9 - .../expected/xmi/array-a3-not-a.xml | 9 - .../expected/xmi/array-a3-not-l.xml | 9 - .../expected/xmi/array-all-embeddable-a.xml | 9 - .../expected/xmi/array-all-embeddable-l.xml | 9 - .../expected/xmi/array-non-embeddable-a.xml | 9 - .../expected/xmi/array-non-embeddable-l.xml | 9 - .../xmi/array-self-items-all-embeddable-a.xml | 10 - .../xmi/array-self-items-all-embeddable-l.xml | 13 - .../expected/xmi/array-self-non-embeddable-a.xml | 10 - .../expected/xmi/array-self-non-embeddable-l.xml | 13 - .../CasSerialization/expected/xmi/emptyCAS.xml | 1 - .../expected/xmi/indexedAndRef.xml | 7 - .../expected/xmi/indexedSingleList.xml | 8 - .../expected/xmi/indexedSingleListStatic.xml | 8 - .../expected/xmi/multipleViews.xml | 27 - .../expected/xmi/nameSpaceCollision.xml | 1 - .../expected/xmi/nameSpaceCollision2.xml | 1 - .../expected/xmi/nameSpaceCollision2Omits.xml | 1 - .../expected/xmi/nameSpaceCollision2pp.xml | 9 - .../expected/xmi/nameSpaceCollision2ppOmits.xml | 9 - .../expected/xmi/nameSpaceCollisionOmits.xml | 1 - .../expected/xmi/nameSpaceCollsionFiltered.xml | 1 - .../expected/xmi/nameSpaceNoCollsionFiltered.xml | 1 - .../expected/xmi/topAndTokenOnly.xml | 1 - .../expected/xmi/topAndTokenOnlyNoContext.xml | 1 - .../xmi/topAndTokenOnlyNoExpandedTypeNames.xml | 1 - .../expected/xmi/topAndTokenOnlyNoSubtypes.xml | 1 - .../expected/xmi/topExpandedNamesNoViews.xml | 1 - .../CasSerialization/expected/xmi/topNoContext.xml | 1 - .../expected/xmi/topNoExpandedTypeNames.xml | 1 - .../expected/xmi/topWithDefaultViewOmits.xml | 1 - .../expected/xmi/topWithNamedViewOmits.xml | 1 - .../CasSerialization/expected/xmi/twoListMerge.xml | 9 - .../expected/xmi/twoListMergeStatic.xml | 9 - .../Json2Deserializer/feature_structures_only.json | 23 - .../resources/Json2Deserializer/text_only.json | 1 - .../customAnnotationType/reference.json | 21 - .../reference.json | 39 - .../reference.json | 40 - .../multipleViewsAndSofas/reference.json | 35 - 236 files changed, 7458 insertions(+), 7366 deletions(-)
