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 2022/02/18 17:23:33 UTC
[uima-uimaj-io-jsoncas] branch main updated (bddbf68 -> 31527e5)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-uimaj-io-jsoncas.git.
from bddbf68 [UIMA-6266] Clean JSON Wire Format for CAS
add 0dd7e8c [UIMA-6266] Clean JSON Wire Format for CAS
add 4c9ccb6 [UIMA-6266] Clean JSON Wire Format for CAS
add 2fa7ba1 [UIMA-6266] Clean JSON Wire Format for CAS
add 030e32b [UIMA-6266] Clean JSON Wire Format for CAS
add 34cf19e [UIMA-6266] Clean JSON Wire Format for CAS
add e7d3d81 [UIMA-6266] Clean JSON Wire Format for CAS
add 39afc4d [UIMA-6266] Clean JSON Wire Format for CAS
add 8814e10 [UIMA-6266] Clean JSON Wire Format for CAS
add 546eea9 [UIMA-4024] repackage json support for uimaj sdk with that project, but keep it separated from uimaj-core (so uimaj-core has no dependencies on it). Clean up javadoc formatting.
add 68a5bc0 [UIMA-4024] put back 2 duplicate test classes needed for testing
add d8d17bc [UIMA-3969] support dynamic embedding for Json serialization. Update tests
add 9b58ceb [UIMA-3969] fix parent-pom relative path
add df022b6 [UIMA-3969] run the JSON tests with the XMI serializer, for more coverage of the XMI serialization. Add tests for case of indexed single ref'd list, static and dynamic.
add ae57f39 [UIMA-4056] do xml comparison using xmlunit
add ebc56bf [UIMA-4083][UIMA-4082] fix serialization issue with FSs that are both ref'd and indexed, and add tests. Change serialization format for @views to use the ViewName as the key, instead of the corresponding Sofa Xmi Id.
add d68286c [UIMA-4083] fixes for JSON serialization, new tests
add 4652afe [UIMA-4083] fix test cases after minor update changed the ordering in a few cases.
add c524b27 no Jira - preparation work for 2.7.0 release - convert poms to 2.7.0-SNAPSHOT, update readme, releasenotes
add eb7a402 [UIMA-4116][UIMA-4117] Change default and method name to set omit 0 values. Change special key names from @xxx to _xxx
add 2d3b97f [maven-release-plugin] prepare release uimaj-2.7.0
add cd5fba3 [maven-release-plugin] prepare for next development iteration
add 28d2a85 no Jira - roll back to 2.7.0-SNAPSHOT to redo release try
add d403a9a [maven-release-plugin] prepare release uimaj-2.7.0
add ef0b9b1 [maven-release-plugin] prepare for next development iteration
add 3c17a64 no Jira - roll back to 2.7.0-SNAPSHOT
add 05fe586 no Jira fix javadoc comment
add c0aaa97 [maven-release-plugin] prepare release uimaj-2.7.0
add d913c75 [maven-release-plugin] prepare for next development iteration
add f2dd402 no Jira - rollback release try to fix a blocker
add ee7f27c [maven-release-plugin] prepare release uimaj-2.7.0
add 990720c [maven-release-plugin] prepare for next development iteration
add 3c4b91c no Jira - roll back 2.7.1-SNAPSHOT -> 2.7.0-SNAPSHOT for another release try
add b25c3da [maven-release-plugin] prepare release uimaj-2.7.0
add 8d65c12 [maven-release-plugin] prepare for next development iteration
add 665cdf2 no Jira - roll back to 2.7.0-SNAPSHOT for another release try
add abb570a [maven-release-plugin] prepare release uimaj-2.7.0
add 5d65b99 [maven-release-plugin] prepare for next development iteration
add 8aea5f9 no Jira - roll back to 2.7.0-SNAPSHOT after failed RC6
add 9f4474f [maven-release-plugin] prepare release uimaj-2.7.0
add 8e867c7 [maven-release-plugin] prepare for next development iteration
add 74cfae2 no Jira - roll back to 2.7.0 to redo release candidate 7 - after typo accidentally deleted the local artifacts.
add 1006eb0 [maven-release-plugin] prepare release uimaj-2.7.0
add be54b7f [maven-release-plugin] prepare for next development iteration
add da14c8e no jira - roll back to 2.7.0-SNAPSHOT after failing rc7
add a742eec [maven-release-plugin] prepare release uimaj-2.7.0
add 17ad353 [maven-release-plugin] prepare for next development iteration
add 514755e [UIMA-4481] change version to 2.8.0-SNAPSHOT to meet semantic versioning standard
add f14199a [UIMA-4436] add projects to API compatibility checking
add ad5bc48 [UIMA-4436] rename marker file to follow convention and avoid RAT check. Also fix one missing license (Rat check)
add e35b005 [UIMA-4436] add exclude in each of the affected projects, since the inherited configuration is being overridden in each one of these.
add 5c2d812 [maven-release-plugin] prepare release uimaj-2.8.0
add 2965425 [maven-release-plugin] prepare for next development iteration
add 7e24923 no Jira - back to 2.8.0-SNAPSHOT for next release candidate
add a0f72df [maven-release-plugin] prepare release uimaj-2.8.0
add c914509 [maven-release-plugin] prepare for next development iteration
add 1cd2d72 no jira, roll back release for another try after rc2 failed, and fix the issues-fixed report property that caused the failure.
add c6d09db [maven-release-plugin] prepare release uimaj-2.8.0
add f016138 [maven-release-plugin] prepare for next development iteration
add 0ee2c16 no Jira roll back to 2.8.0-SNAPSHOT for rc4 try
add 40c1783 [maven-release-plugin] prepare release uimaj-2.8.0
add f057569 [maven-release-plugin] prepare for next development iteration
add 533c2d3 no jira -roll back to 2.8.0-SNAPSHOT
add 4954f03 [maven-release-plugin] prepare release uimaj-2.8.0
add 45e56c2 [maven-release-plugin] prepare for next development iteration
add 906c2ef [maven-release-plugin] prepare release uimaj-2.8.1
add 68f5b81 [maven-release-plugin] prepare for next development iteration
add 0e077f6 no jira roll back to 2.8.1-SNAPSHOT
add b0fff7e [maven-release-plugin] prepare release uimaj-2.8.1
add 62a8b4c [maven-release-plugin] prepare for next development iteration
add 6bb2c68 UIMA-5014 - set version to 2.9.0-SNAPSHOT
add 7689509 [UIMA-5041] fix lack of namespace when collision only happens on non-instantiated supertypes.
add e282c3d [UIMA-5041] update namespace collision tests for xmi tests for change of test descriptors to test json name collision.
add 1cecf1e no Jira fix findbugs issue - missing super call in setup
add 3eac428 [maven-release-plugin] prepare release uimaj-2.9.0
add 1a4a6d9 [maven-release-plugin] prepare for next development iteration
add e204132 [UIMA-5171] use the same comparator for binarysearch as was used in sorting. misc comment updates too. Update one test expected result
add 942cdb1 [UIMA-5205] 2.10.0 version.
add 116331a [UIMA-5093][UIMA-5211] add dependency for xmlunit to uimaj-test-util, remove old explicit junit versions (except from parent-pom).
add dbd4e3d [UIMA-5093] update import for JUnit 4
add bcb3842 [maven-release-plugin] prepare release uimaj-2.10.0
add 63f5718 [maven-release-plugin] prepare for next development iteration
add a876852 [UIMA-5532] just comment updates
add fcbca48 [UIMA-5532] fixes for this, correcting some mistakes in expected results.
add 552a86b [maven-release-plugin] prepare release uimaj-2.10.1
add 004461c [maven-release-plugin] prepare for next development iteration
add 0b0739d no Jira roll back to 2.10.1-SNAPSHOT for retry
add a416782 [maven-release-plugin] rollback the release of uimaj-2.10.2
add 6586ed6 [maven-release-plugin] prepare release uimaj-2.10.1
add be22ec3 [maven-release-plugin] prepare for next development iteration
add 7db55ad [UIMA-5558] fix json test case compare value which depended on previous bug
add e7d7f7a [maven-release-plugin] prepare release uimaj-2.10.2
add be61c10 [maven-release-plugin] prepare for next development iteration
add 4ebb2be no jira - roll back for rc2; update release notes
add abd7995 [maven-release-plugin] prepare release uimaj-2.10.2
add d6442b9 [maven-release-plugin] prepare for next development iteration
add 0fcef66 [maven-release-plugin] prepare release uimaj-2.10.3
add 216522c [maven-release-plugin] prepare for next development iteration
add 5dd7879 no jira, rollback version to 2.10.3-SNAPSHOT for another try at rc1
add a09c908 [maven-release-plugin] prepare release uimaj-2.10.3
add 1d3149e [maven-release-plugin] prepare for next development iteration
add d1bcad3 no jira, roll back release for rc2
add 021a5e0 [maven-release-plugin] prepare release uimaj-2.10.3
add 728bbf2 [maven-release-plugin] prepare for next development iteration
add 7b0b42c [UIMA-6087] switch to using https from http where reasonable
add 35040ae [maven-release-plugin] prepare release uimaj-2.10.4
add c954798 [maven-release-plugin] prepare for next development iteration
add df660f0 [UIMA-6138] change scm in pom for git
add f088072 Merge pull request #15 from apache/UIMA-6138-v2
add 251bdc2 [UIMA-6322] Clean up rat configuration
add efc0ab6 Merge pull request #106 from apache/feature/UIMA-6322-Clean-up-rat-configuration-v2
add d69b983 no jira - change to version 3.0.0-SNAPSHOT for the experimental v3 branch. also change to jave 8, and 2.5.0 version of bndl plugin
add 361412b no Jira - catch-up merge from trunk for 2.8.1-rc1 changes
add 7b8b63a [UIMA-4674] _typeImpl not final (to support ll_setInt backward compatibility), change refs to it to _getTypeImpl() for protection, and change in data type returned for getFeatureImpls.
add acfba15 [UIMA-4666] new jcasgend versions
add 20d0499 [UIMA-4666] new jcasgend versions
add c2ea115 no jira - update variable name for name-change
add df3d751 no jira - slight modification of when default sofa is created
add 6c7c61d no Jira - rename fs.id() to fs._id() to avoid colliding with user methods
add 24c138f [UIMA-5041] merge fix
add 8136dd4 no jira merge catchup no change except merge info
add 6e05bd8 no Jira comment change only
add ddc1348 no Jira - update expected for consecutive ids
add af5fd9a [UIMA-5171] put back the getShortFeatureName subroutine. fix binarySearch to use correct comparator.
add d32186e [UIMA-5211]
add 0dc9357 no Jira - reorganize imports
add 75829e0 [UIMA-5233] replace CommonArray with v2 named equiv class, CommonArrayFS
add 15eb55e no Jira, update ref for junit version 4 import
add ff63f38 no jira, rename version to 3.0.0-alpha-SNAPSHOT
add 6dda602 [maven-release-plugin] prepare release uimaj-3.0.0-alpha
add a26308a [maven-release-plugin] prepare for next development iteration
add 00d7291 no Jira roll back for release retry to 3.0.0-alpha
add c842fd3 [maven-release-plugin] prepare release uimaj-3.0.0-alpha
add 505374a [maven-release-plugin] rollback the release of uimaj-3.0.0-alpha
add cac4f6b no Jira - align pom scm element with where this project is, not in trunk but in branches/experiment-v3-jcas
add 85628fb [maven-release-plugin] prepare release uimaj-3.0.0-alpha
add 1a0c44f [maven-release-plugin] prepare for next development iteration
add 9051269 [UIMA-5265] rename version to just 3.0.0, not 3.0.0-alpha or beta
add f37527e [maven-release-plugin] prepare release uimaj-3.0.0
add 89ebed5 [maven-release-plugin] prepare for next development iteration
add c5d1e19 no jira rollback to 3.0.0-SNAPSHOT for another release try
add c5bb564 [maven-release-plugin] prepare release uimaj-3.0.0
add f61f279 [maven-release-plugin] prepare for next development iteration
add 27202ff no jira roll back to 3.0.0 for another release try
add 1258f21 [maven-release-plugin] prepare release uimaj-3.0.0
add dfba58e [maven-release-plugin] prepare for next development iteration
add 21c51bf [UIMA-5275] [UIMA-5267] add new semibuiltins to list of no-gen types to avoid accidentally generating them. Switch version to -alpha-SNAPSHOT. Update v3 user guide to mention how to import by name, and needing to have uimaj-core on project's classpath
add 7d5c10f [maven-release-plugin] prepare release uimaj-3.0.0-alpha
add aad5276 [maven-release-plugin] prepare for next development iteration
add b611f56 no Jira prepare for release, rename version to 3.0.0-alpha02
add 0ae4cad [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add e91e069 [maven-release-plugin] prepare for next development iteration
add 663e18a [UIMA-5320] roll back to alpha02 release level as well as reduce dependency on log4j 2 to provided
add 0cbb06f [UIMA-5352] add slf4j-jdk14 test dependency where needed, insure at test scope
add b5c5d92 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add ec12a65 [maven-release-plugin] prepare for next development iteration
add 69fe339 no Jira, roll back to alpha02
add 7382e96 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 67899c1 [maven-release-plugin] prepare for next development iteration
add 3618520 no jira - roll back version alpha03 -> alpha02, for retry build of release candidate
add 814d586 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 04fc25b [maven-release-plugin] prepare for next development iteration
add 2815ddf no Jira roll back version for retry
add 19d7a87 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 977e293 [maven-release-plugin] prepare for next development iteration
add 1c6ed75 [maven-release-plugin] rollback the release of uimaj-3.0.0-alpha02
add f37e9ef [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add f7b031b [maven-release-plugin] prepare for next development iteration
add e10d117 no Jira roll back to alpha02 version
add 0b7192b [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 9ae98cd [maven-release-plugin] prepare for next development iteration
add 1bdf9e2 [maven-release-plugin] rollback the release of uimaj-3.0.0-alpha02
add b373e41 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add bbbfbc0 [maven-release-plugin] prepare for next development iteration
add 9de354b [maven-release-plugin] rollback the release of uimaj-3.0.0-alpha02
add 9489d50 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add be8ed01 [maven-release-plugin] rollback the release of uimaj-3.0.0-alpha02
add ab4e4a4 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 51776a0 [maven-release-plugin] prepare for next development iteration
add aad4ed2 roll back to redo rc6 because of ip address issue splitting upload to repository.a.o
add 8128407 [maven-release-plugin] prepare release uimaj-3.0.0-alpha02
add 65c6452 [maven-release-plugin] prepare for next development iteration
add fb209bc [UIMA-5359] update scm refs to account for move in svn
add d4cf51d no Jira switch version to 3.0.0-beta.
add dee2a08 [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 13b2bf6 [maven-release-plugin] rollback the release of uimaj-3.0.0-beta
add b8b406d [maven-release-plugin] prepare release uimaj-3.0.0-beta
add a62fadd [maven-release-plugin] prepare for next development iteration
add 9ca3cd4 no Jira roll back release to 3.0.0-beta for retry
add 09a57ef [UIMA-5532] fixes for JSON serialization, including dynamic multi-refs
add 0816c4a [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 50b3f79 [maven-release-plugin] prepare for next development iteration
add ce5a7d6 no Jira rollback to 3.0.0-beta-SNAPSHOT for another rc
add 15e5709 [UIMA-5558] fix json expected result that was dependent on this bug
add 6919037 [maven-release-plugin] prepare release uimaj-3.0.0-beta
add e5982b0 [maven-release-plugin] prepare for next development iteration
add 1de625a no Jira, rollback version to 3.0.0-beta-SNAPSHOT for another RC try
add 9eca76c [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 335f1eb [maven-release-plugin] prepare for next development iteration
add 529cbbf no Jira roll back to 3.0.0-beta-SNAPSHOT for another rc try
add 4d8d43a [maven-release-plugin] prepare release uimaj-3.0.0-beta
add e8bdb58 [maven-release-plugin] prepare for next development iteration
add 20e07c5 no Jira - roll back to 3.0.0-beta-SNAPSHOT for another rc4 try
add a5561de [maven-release-plugin] prepare release uimaj-3.0.0-beta
add d5e60b9 [maven-release-plugin] prepare for next development iteration
add cfb9fd4 no Jira, correct use of type system in case of pre-existing one.
add 55662c2 no Jira set version (rollback from failed rc4, in prep for rc5) to 3.0.0-beta-SNAPSHOT
add 54eb351 [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 9b3f011 [maven-release-plugin] prepare for next development iteration
add eb4b7c6 no jira roll back to 3.0.0-SNAPSHOT level for rc6 try
add fd00c39 [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 099f11d [maven-release-plugin] prepare for next development iteration
add d22213f [maven-release-plugin] rollback the release of uimaj-3.0.0-beta
add 0c9c91f [maven-release-plugin] prepare release uimaj-3.0.0-beta
add d74962c [maven-release-plugin] prepare for next development iteration
add 1274ed0 no Jira, roll back for rc7
add 0f6e715 [maven-release-plugin] prepare release uimaj-3.0.0-beta
add fe5bfde [maven-release-plugin] prepare for next development iteration
add b616a12 no Jira remove unused imports
add 4918828 no jira roll back to 3.0.0-beta
add e60f86d [maven-release-plugin] prepare release uimaj-3.0.0-beta
add 31f187a [maven-release-plugin] prepare for next development iteration
add f07176a [UIMA-5655]
add bc166ca no Jira - make Jackson version a property, change refs to use it.
add 422064c no Jira - upgrade jcas classes to beta level
add 98225e5 git-svn-id: https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk@1822173 13f79535-47bb-0310-9956-ffa450edef68
add 5ee5b95 no Jira switch version to 3.0.0-SNAPSHOT
add 3d3872d [maven-release-plugin] prepare release uimaj-3.0.0
add 0bb86e5 [maven-release-plugin] prepare for next development iteration
add 4a3d6a6 no Jira, roll back to 3.0.0-SNAPSHOT for rc2
add af96429 [maven-release-plugin] prepare release uimaj-3.0.0
add c22b96f [maven-release-plugin] prepare for next development iteration
add 697335d no jira, roll back verson to 3.0.0-SNAPSHOT for rc3
add 783a818 [maven-release-plugin] prepare release uimaj-3.0.0
add 318f6dd [maven-release-plugin] prepare for next development iteration
add bc0d0ee no Jira rollback to 3.0.0-SNAPSHOT for retry of building rc3
add 1137818 [maven-release-plugin] rollback the release of uimaj-3.0.1
add 5cde9c9 no Jira rollback to 3.0.0-SNAPSHOT for retry of building rc3
add 70efb8e [maven-release-plugin] prepare release uimaj-3.0.0
add 0537a73 [maven-release-plugin] prepare for next development iteration
add 213c88d [maven-release-plugin] rollback the release of uimaj-3.0.0
add 06119b0 [maven-release-plugin] prepare release uimaj-3.0.0
add 0b5d983 [maven-release-plugin] prepare for next development iteration
add cec26c7 no Jira rollback to 3.0.0-SNAPSHOT for rc4 try
add 7ee0cc5 [maven-release-plugin] prepare release uimaj-3.0.0
add 5e816a1 [maven-release-plugin] prepare for next development iteration
add 74ebb33 [maven-release-plugin] prepare release uimaj-3.0.1
add 77cb7ad [maven-release-plugin] prepare for next development iteration
add b354355 no Jira - roll back uv3 to 3.0.1-SNAPSHOT for rc2 try
add a57ef4c [maven-release-plugin] prepare release uimaj-3.0.1
add 769768c [maven-release-plugin] prepare for next development iteration
add edb25c8 [UIMA-5921] refactor cleanups for Java 8 - mostly type inference, plus some others. Manually reviewed, plus ran all test cases
add 492c461 [UIMA-5922] remove unnecessary boxing / unboxing
add 21017ae [UIMA-5931] try-with-resources
add c1d4704 [maven-release-plugin] prepare release uimaj-3.0.2
add a7ffb54 [maven-release-plugin] prepare for next development iteration
add a4078e3 [UIMA-6018] change 3.0.2 version to 3.1.0
add 1714b55 [maven-release-plugin] prepare release uimaj-3.1.0
add a0a231f [maven-release-plugin] prepare for next development iteration
add fb78fdc [UIMA-6018] revert back to 3.0.2
add e78d0be [maven-release-plugin] prepare release uimaj-3.0.2
add a150132 [maven-release-plugin] prepare for next development iteration
add 073e9cd no jira - roll back to 3.0.2-SNAPSHOT, and fix jira version
add b82f266 [maven-release-plugin] prepare release uimaj-3.0.2
add 5cfe842 [maven-release-plugin] prepare for next development iteration
add 150b56b [maven-release-plugin] rollback the release of uimaj-3.0.2
add 1621bd7 [maven-release-plugin] prepare release uimaj-3.0.2
add 3973cdd [maven-release-plugin] prepare for next development iteration
add de29af6 [UIMA-6087] update poms to use https where reasonable.
add 7a63a6b [maven-release-plugin] prepare release uimaj-3.0.3
add 6bf54a8 [maven-release-plugin] prepare for next development iteration
add 15d893c no Jira roll back to 3.0.3 snapshot
add f35e3b9 [maven-release-plugin] prepare release uimaj-3.0.3
add bc05712 [maven-release-plugin] prepare for next development iteration
add 5f37c99 [maven-release-plugin] rollback the release of uimaj-3.0.3
add efc5a1d no Jira update all <excludes> (mainly for rat excludes) to include the combine.children="append" option.
add 0da2994 [maven-release-plugin] prepare release uimaj-3.0.3
add bb7c432 [maven-release-plugin] prepare for next development iteration
add 5465303 [UIMA-6108] switch version to 3.1.0-SNAPSHOT
add d6a7633 [maven-release-plugin] prepare release uimaj-3.1.0
add cf7d496 [maven-release-plugin] prepare for next development iteration
add 27573ab [UIMA-6115] copy uv3/uimaj-v3/trunk to uimaj/trunk
add b6c9cef UIMA-6138 update scm elements on all poms to git equivalents
add 20dc3d4 Merge pull request #14 from apache/UIMA-6138
add 103c858 [maven-release-plugin] prepare release uimaj-3.1.1
add 933aa35 [maven-release-plugin] prepare for next development iteration
add 7de227d no jira - roll back pom version to 3.1.1-SNAPSHOT
add 697becd [maven-release-plugin] prepare release uimaj-3.1.1
add 0186e96 [maven-release-plugin] prepare for next development iteration
add 3973f71 Merge branch 'master-v2' into master-merge-v2
add 062356e Merge branch 'master' into rc/uimaj-3.1.1
add 808ab23 [No Jira] Set version to 3.2.0-SNAPSHOT
add c4fed14 Merge pull request #101 from apache/no-jira-set-version-to-3.2.0-SNAPSHOT
add c6d115d [UIMA-6322] Clean up rat configuration
add 7db7aa3 Merge pull request #105 from apache/feature/UIMA-6322-Clean-up-rat-configuration
add 7527690 Merge branch 'main' into feature/UIMA-6316-Stop-using-the-deprecated-Pack200-when-building-update-sites
add dddef51 Merge pull request #109 from apache/feature/UIMA-6316-Stop-using-the-deprecated-Pack200-when-building-update-sites
add f085401 [maven-release-plugin] prepare release uimaj-3.2.0
add ae0f92d [maven-release-plugin] prepare for next development iteration
add 061c79a [maven-release-plugin] prepare release uimaj-3.2.0
add 9820adf [maven-release-plugin] prepare for next development iteration
add 878e139 [maven-release-plugin] prepare release uimaj-3.2.0
add e6ed199 [maven-release-plugin] prepare for next development iteration
add 87c6dff [maven-release-plugin] prepare release uimaj-3.2.0
add f81ef53 [maven-release-plugin] prepare for next development iteration
add d7d93c6 Merge pull request #110 from apache/UIMA-6329-UIMA-Java-SDK-3.2.0-release
add 5af6821 [NO-JIRA] Set version to 3.3.0-SNAPSHOT
add 85371ce Merge pull request #124 from apache/NO-JIRA-Set-version
add c3ef469 [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5
add 661ec4f [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5
add f40b262 [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5
add bbf19ef Merge pull request #128 from apache/refactoring/UIMA-6372-Upgrade-from-JUnit-3-to-JUnit-4-to-JUnit-5
add 92739d1 [UIMA-6373] Format UIMA Core Java SDK codebase
add 1b931c4 [UIMA-6373] Format UIMA Core Java SDK codebase
add 551d6d0 [UIMA-6373] Format UIMA Core Java SDK codebase
add 0857df4 [UIMA-6373] Format UIMA Core Java SDK codebase
add cf3a8cb Merge pull request #129 from apache/refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
add 2ee74f2 [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5
add aa37f5e Merge pull request #130 from apache/refactoring/UIMA-6372-Upgrade-from-JUnit-3-to-JUnit-4-to-JUnit-5
add 0eca364 [UIMA-6373] Format UIMA Core Java SDK codebase
add 49dbe37 Merge pull request #135 from apache/refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
add 5928094 Merge branch 'origin/feature/UIMA-6374-Create-CAS-de--serialization-test-suite' into feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
add 22faae5 [UIMA-6266] Clean JSON Wire Format for CAS
add 83ed8bb [UIMA-6266] Clean JSON Wire Format for CAS
add ca12876 [UIMA-6266] Clean JSON Wire Format for CAS
add 9b7cd7c [UIMA-6266] Clean JSON Wire Format for CAS
add b21e601 [UIMA-6266] Clean JSON Wire Format for CAS
add 4d3761a [UIMA-6266] Clean JSON Wire Format for CAS
add a112c8e [UIMA-6266] Clean JSON Wire Format for CAS
add 7f898c6 [UIMA-6266] Clean JSON Wire Format for CAS
add 679d87f [UIMA-6266] Clean JSON Wire Format for CAS
add f467d3e [UIMA-6266] Clean JSON Wire Format for CAS
add b23b59a [UIMA-6266] Clean JSON Wire Format for CAS
add 0f7576e [UIMA-6266] Clean JSON Wire Format for CAS
add 899c2fe [UIMA-6266] Clean JSON Wire Format for CAS
add 808e7d4 [UIMA-6266] Clean JSON Wire Format for CAS
add 6501590 [UIMA-6266] Clean JSON Wire Format for CAS
add 423c172 [UIMA-6266] Clean JSON Wire Format for CAS
add c344aa5 [UIMA-6266] Clean JSON Wire Format for CAS
add df800eb [UIMA-6266] Clean JSON Wire Format for CAS
add df4a78b [UIMA-6266] Clean JSON Wire Format for CAS
add b0b878e [UIMA-6266] Clean JSON Wire Format for CAS
add 0f92656 [UIMA-6266] Clean JSON Wire Format for CAS
add 64f5170 [UIMA-6266] Clean JSON Wire Format for CAS
add 0d679bc [UIMA-6266] Clean JSON Wire Format for CAS
add 19452f6 [UIMA-6266] Clean JSON Wire Format for CAS
add 3e2c80a [UIMA-6266] Clean JSON Wire Format for CAS
add 080058c [UIMA-6266] Clean JSON Wire Format for CAS
add 6fb1089 [UIMA-6266] Clean JSON Wire Format for CAS
add f8f2386 [UIMA-6266] Clean JSON Wire Format for CAS
new 31527e5 Merge pull request #1 from apache/feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
create mode 100644 .gitignore
create mode 100644 Jenkinsfile
create mode 100644 README.adoc
create mode 100644 pom.xml
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Deserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Names.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/JsonCas2Serializer.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/encoding/OffsetConverter.java (55%)
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/encoding/Utf16CodeunitOffsetConverter.java (57%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/encoding/Utf32CodepointOffsetConverter.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/encoding/Utf8ByteOffsetConverter.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/mode/ArrayTypeMode.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/mode/FeatureStructuresMode.java (56%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/mode/OffsetConversionMode.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/mode/SofaMode.java (56%)
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/mode/TypeSystemMode.java (50%)
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/mode/ViewsMode.java (56%)
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/model/FeatureStructures.java (50%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/model/Header.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/model/Views.java (57%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureIdToViewIndex.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureToIdIndex.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ref/FeatureStructureToViewIndex.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/ref/FullyQualifiedTypeRefGenerator.java (57%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ref/ReferenceCache.java
copy uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/ref/SequentialIdRefGenerator.java (57%)
rename uimaj-json/src/test/java/org/apache/uima/json/JsonXmiCasSerializerTest.java => src/main/java/org/apache/uima/json/jsoncas2/ref/ShortTypeRefGenerator.java (56%)
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/CasDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/CasDeserializer_ImplBase.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/CasSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/CommonArrayFSSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructureSerializer_ImplBase.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsArrayDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsArraySerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsObjectDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/FeatureStructuresAsObjectSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/SofaSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/TypeDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSystemDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/TypeSystemSerializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/ViewsDeserializer.java
create mode 100644 src/main/java/org/apache/uima/json/jsoncas2/ser/ViewsSerializer.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/CasSerializationDeserialization_JsonCas2_FsAsArray_Test.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/CasSerializationDeserialization_JsonCas2_FsAsObject_Test.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/Fixtures.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/Performance_JsonCas2_FsAsArray_Test.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/encoding/Utf32CodepointOffsetConverterTest.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/encoding/Utf8ByteOffsetConverterTest.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/ser/FeatureDeSerializerTest.java
create mode 100644 src/test/java/org/apache/uima/json/jsoncas2/ser/TypeDeSerializerTest.java
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFloatingPointSpecialValues/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFloatingPointSpecialValues/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFloatingPointSpecialValues/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFloatingPointSpecialValues/typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFsList/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFsList/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFsList/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithFsList/typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithLeftToRightTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithLeftToRightTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithLeftToRightTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithText/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithText/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithText/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithoutTextButWithAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithoutTextButWithAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/casWithoutTextButWithAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/emptyCas/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/emptyCas/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsArray_Test/ser-ref/emptyCas/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithEmojiUnicodeTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithFloatingPointSpecialValues/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithFloatingPointSpecialValues/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithFloatingPointSpecialValues/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithFloatingPointSpecialValues/typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithLeftToRightTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithLeftToRightTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithLeftToRightTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataArray/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataArray/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataArray/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataURI/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataURI/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithSofaDataURI/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithText/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithText/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithText/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithTraditionalChineseTextAndAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithoutTextButWithAnnotations/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithoutTextButWithAnnotations/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/casWithoutTextButWithAnnotations/debug.xmi
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/emptyCas/data.json
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/emptyCas/debug-typesystem.xml
create mode 100644 src/test/resources/CasSerializationDeserialization_JsonCas2_FsAsObject_Test/ser-ref/emptyCas/debug.xmi
delete mode 100644 uimaj-json/.gitignore
delete mode 100644 uimaj-json/marker-file-identifying-api-compatibility-check
delete mode 100644 uimaj-json/pom.xml
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/Json2CasDeserializer.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/Json2CasSerializer.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/Json2Names.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/JsonMetaDataSerializer.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/impl/MetaDataObjectSerializer_json.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/model/json2/Json2FeatureStructure.java
delete mode 100644 uimaj-json/src/main/java/org/apache/uima/json/model/json2/Json2Type.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/Json2CasDeserializeSerializeTest.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/Json2DeserializerTest.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/Json2SerializerTest.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/test/AllTypes.java
delete mode 100644 uimaj-json/src/test/java/org/apache/uima/test/RefTypes.java
delete mode 100644 uimaj-json/src/test/resources/CASTests/desc/casTestCaseTypesystem.xml
delete mode 100644 uimaj-json/src/test/resources/CASTests/json/expected/testTypesystem-plain.json
delete mode 100644 uimaj-json/src/test/resources/CASTests/json/expected/testTypesystem.json
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/desc/allTypes.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/desc/nameSpaceNeeded.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/desc/refTypes.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/emptyCAS.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml
delete mode 100644 uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml
delete mode 100644 uimaj-json/src/test/resources/Json2Deserializer/feature_structures_only.json
delete mode 100644 uimaj-json/src/test/resources/Json2Deserializer/text_only.json
delete mode 100644 uimaj-json/src/test/resources/Json2SerializerTest/customAnnotationType/reference.json
delete mode 100644 uimaj-json/src/test/resources/Json2SerializerTest/featureStructureIndexedInMultipleViewsInline/reference.json
delete mode 100644 uimaj-json/src/test/resources/Json2SerializerTest/featureStructureIndexedInMultipleViewsSeparate/reference.json
delete mode 100644 uimaj-json/src/test/resources/Json2SerializerTest/multipleViewsAndSofas/reference.json
[uima-uimaj-io-jsoncas] 01/01: Merge pull request #1 from apache/feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
Posted by re...@apache.org.
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 <re...@apache.org>
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(-)