This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8bc1acf34721d7a5356a9794aa1c4f0bed8d45f5 Merge: b6e7af4 b2e442d Author: tallison <[email protected]> AuthorDate: Thu Dec 16 10:29:13 2021 -0500 Merge remote-tracking branch 'origin/branch_1x' into branch_1x .../tika/parser/microsoft/onenote/CompactID.java | 10 +- .../tika/parser/microsoft/onenote/Error.java | 12 +- .../parser/microsoft/onenote/ExtendedGUID.java | 37 +- .../microsoft/onenote/FileChunkReference.java | 21 +- .../microsoft/onenote/FileDataStoreObject.java | 1 + .../tika/parser/microsoft/onenote/FileNode.java | 105 ++-- .../parser/microsoft/onenote/FileNodeList.java | 1 + .../microsoft/onenote/FileNodeListHeader.java | 35 +- .../tika/parser/microsoft/onenote/FileNodePtr.java | 10 +- .../microsoft/onenote/FileNodePtrBackPush.java | 1 + .../parser/microsoft/onenote/FileNodeUnion.java | 34 +- .../microsoft/onenote/FndStructureConstants.java | 44 +- .../apache/tika/parser/microsoft/onenote/GUID.java | 80 +-- .../tika/parser/microsoft/onenote/IndentUtil.java | 7 +- .../tika/parser/microsoft/onenote/Int24.java | 1 + .../apache/tika/parser/microsoft/onenote/JCID.java | 45 +- .../microsoft/onenote/JCIDPropertySetTypeEnum.java | 76 ++- .../onenote/ObjectDeclarationWithRefCount.java | 27 +- .../onenote/ObjectDeclarationWithRefCountBody.java | 3 +- .../onenote/ObjectSpaceObjectPropSet.java | 14 +- ...ctSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java | 6 +- .../onenote/OneNoteDirectFileResource.java | 11 +- .../parser/microsoft/onenote/OneNoteDocument.java | 14 +- .../parser/microsoft/onenote/OneNoteHeader.java | 36 +- .../onenote/OneNoteLegacyDumpStrings.java | 52 +- .../parser/microsoft/onenote/OneNoteParser.java | 188 ++++--- .../microsoft/onenote/OneNotePropertyEnum.java | 213 +++----- .../microsoft/onenote/OneNotePropertyId.java | 14 +- .../tika/parser/microsoft/onenote/OneNotePtr.java | 521 ++++++++++--------- .../microsoft/onenote/OneNoteTreeWalker.java | 210 ++++---- .../onenote/OneNoteTreeWalkerOptions.java | 17 +- .../parser/microsoft/onenote/PropertyIDType.java | 8 +- .../tika/parser/microsoft/onenote/PropertySet.java | 38 +- .../parser/microsoft/onenote/PropertyValue.java | 20 +- .../tika/parser/microsoft/onenote/Revision.java | 24 +- .../parser/microsoft/onenote/RevisionManifest.java | 1 + .../microsoft/onenote/RootObjectReference.java | 3 +- .../IFSSHTTPBSerializable.java} | 26 +- .../onenote/fsshttpb/MSOneStorePackage.java | 307 ++++++++++++ .../onenote/fsshttpb/MSOneStoreParser.java | 199 ++++++++ .../exception/DataElementParseErrorException.java} | 19 +- .../onenote/fsshttpb/property/ArrayNumber.java | 52 ++ .../fsshttpb/property/EightBytesOfData.java | 52 ++ .../onenote/fsshttpb/property/FourBytesOfData.java | 51 ++ .../property/IProperty.java} | 42 +- .../property/NoData.java} | 41 +- .../onenote/fsshttpb/property/OneByteOfData.java | 49 ++ .../property/PrtArrayOfPropertyValues.java | 77 +++ .../PrtFourBytesOfLengthFollowedByData.java | 68 +++ .../onenote/fsshttpb/property/TwoBytesOfData.java | 52 ++ .../streamobj/CellManifestCurrentRevision.java | 72 +++ .../streamobj/CellManifestDataElementData.java | 64 +++ .../onenote/fsshttpb/streamobj/DataElement.java | 189 +++++++ .../fsshttpb/streamobj/DataElementData.java | 46 ++ .../fsshttpb/streamobj/DataElementHash.java | 80 +++ .../fsshttpb/streamobj/DataElementPackage.java | 81 +++ .../onenote/fsshttpb/streamobj/DataHashObject.java | 103 ++++ .../onenote/fsshttpb/streamobj/DataSizeObject.java | 71 +++ .../streamobj/EncryptionObject.java} | 20 +- .../streamobj/FileDataObject.java} | 19 +- .../fsshttpb/streamobj/IntermediateNodeObject.java | 114 +++++ .../onenote/fsshttpb/streamobj/JCIDObject.java | 45 ++ .../onenote/fsshttpb/streamobj/LeafNodeObject.java | 257 ++++++++++ .../onenote/fsshttpb/streamobj/NodeObject.java | 45 ++ .../fsshttpb/streamobj/ObjectGroupData.java | 115 +++++ .../streamobj/ObjectGroupDataElementData.java | 286 +++++++++++ .../streamobj/ObjectGroupDeclarations.java | 112 +++++ .../fsshttpb/streamobj/ObjectGroupMetadata.java | 83 +++ .../streamobj/ObjectGroupMetadataDeclarations.java | 97 ++++ .../ObjectGroupObjectBLOBDataDeclaration.java | 103 ++++ .../fsshttpb/streamobj/ObjectGroupObjectData.java | 83 +++ .../ObjectGroupObjectDataBLOBReference.java | 86 ++++ .../streamobj/ObjectGroupObjectDeclare.java | 103 ++++ .../onenote/fsshttpb/streamobj/PropertySet.java | 136 +++++ .../fsshttpb/streamobj/PropertySetObject.java | 46 ++ .../fsshttpb/streamobj/RevisionManifest.java | 75 +++ .../streamobj/RevisionManifestDataElementData.java | 109 ++++ .../RevisionManifestObjectGroupReferences.java | 85 ++++ .../streamobj/RevisionManifestRootDeclare.java | 77 +++ .../streamobj/RevisionStoreObject.java} | 40 +- .../streamobj/RevisionStoreObjectGroup.java | 118 +++++ .../fsshttpb/streamobj/SignatureObject.java | 82 +++ .../streamobj/StorageIndexCellMapping.java | 84 ++++ .../streamobj/StorageIndexDataElementData.java | 119 +++++ .../streamobj/StorageIndexManifestMapping.java | 76 +++ .../streamobj/StorageIndexRevisionMapping.java | 83 +++ .../streamobj/StorageManifestDataElementData.java | 96 ++++ .../streamobj/StorageManifestRootDeclare.java | 79 +++ .../streamobj/StorageManifestSchemaGUID.java | 77 +++ .../onenote/fsshttpb/streamobj/StreamObject.java | 329 ++++++++++++ .../streamobj/StreamObjectHeaderEnd.java} | 19 +- .../streamobj/StreamObjectHeaderEnd16bit.java | 117 +++++ .../streamobj/StreamObjectHeaderEnd8bit.java | 121 +++++ .../streamobj/StreamObjectHeaderStart.java | 94 ++++ .../streamobj/StreamObjectHeaderStart16bit.java | 144 ++++++ .../streamobj/StreamObjectHeaderStart32bit.java | 145 ++++++ .../streamobj/StreamObjectParseErrorException.java | 54 ++ .../streamobj/StreamObjectTypeHeaderEnd.java | 175 +++++++ .../streamobj/StreamObjectTypeHeaderStart.java | 457 +++++++++++++++++ .../fsshttpb/streamobj/basic/AdapterHelper.java | 65 +++ .../streamobj/basic/AlternativePackaging.java | 81 +++ .../fsshttpb/streamobj/basic/BasicObject.java | 79 +++ .../fsshttpb/streamobj/basic/BinaryItem.java | 89 ++++ .../onenote/fsshttpb/streamobj/basic/CellID.java | 127 +++++ .../fsshttpb/streamobj/basic/CellIDArray.java | 101 ++++ .../fsshttpb/streamobj/basic/Compact64bitInt.java | 224 +++++++++ .../fsshttpb/streamobj/basic/CompactID.java | 59 +++ .../fsshttpb/streamobj/basic/DataElementType.java | 90 ++++ .../streamobj/basic/DataNodeObjectData.java | 52 ++ .../fsshttpb/streamobj/basic/ExGUIDArray.java | 118 +++++ .../onenote/fsshttpb/streamobj/basic/ExGuid.java | 201 ++++++++ .../fsshttpb/streamobj/basic/HeaderCell.java | 61 +++ .../onenote/fsshttpb/streamobj/basic/JCID.java | 75 +++ .../fsshttpb/streamobj/basic/PropertyID.java | 65 +++ .../fsshttpb/streamobj/basic/PropertyType.java | 110 ++++ .../fsshttpb/streamobj/basic/RequestTypes.java | 73 +++ .../fsshttpb/streamobj/basic/SerialNumber.java | 112 +++++ .../fsshttpb/streamobj/basic/ZipHeader.java | 47 ++ .../streamobj/chunking/AbstractChunking.java} | 42 +- .../streamobj/chunking/ChunkingFactory.java | 120 +++++ .../streamobj/chunking/ChunkingMethod.java} | 25 +- .../streamobj/chunking/RDCAnalysisChunking.java | 250 +++++++++ .../streamobj/chunking/SimpleChunking.java | 89 ++++ .../streamobj/chunking/ZipFilesChunking.java | 222 ++++++++ .../streamobj/space/ObjectSpaceObjectPropSet.java | 87 ++++ .../space/ObjectSpaceObjectStreamHeader.java | 63 +++ .../space/ObjectSpaceObjectStreamOfContextIDs.java | 72 +++ .../space/ObjectSpaceObjectStreamOfOIDs.java | 73 +++ .../space/ObjectSpaceObjectStreamOfOSIDs.java | 72 +++ .../microsoft/onenote/fsshttpb/unsigned/UByte.java | 312 ++++++++++++ .../onenote/fsshttpb/unsigned/UInteger.java | 381 ++++++++++++++ .../microsoft/onenote/fsshttpb/unsigned/ULong.java | 289 +++++++++++ .../microsoft/onenote/fsshttpb/unsigned/UMath.java | 113 +++++ .../unsigned/UNumber.java} | 30 +- .../onenote/fsshttpb/unsigned/UShort.java | 191 +++++++ .../onenote/fsshttpb/unsigned/Unsigned.java | 193 +++++++ .../microsoft/onenote/fsshttpb/util/Bit.java | 54 ++ .../onenote/fsshttpb/util/BitConverter.java | 137 +++++ .../microsoft/onenote/fsshttpb/util/BitReader.java | 197 ++++++++ .../microsoft/onenote/fsshttpb/util/BitWriter.java | 125 +++++ .../util/ByteUtil.java} | 36 +- .../onenote/fsshttpb/util/DataElementUtils.java | 557 +++++++++++++++++++++ .../util/GuidUtil.java} | 16 +- .../fsshttpb/util/LittleEndianBitConverter.java | 177 +++++++ .../fsshttpb/util/SequenceNumberGenerator.java | 93 ++++ .../util/UuidUtils.java} | 23 +- .../microsoft/onenote/OneNoteParserTest.java | 167 +++--- ...OrEarlier1.one => testOneNote2007OrEarlier.one} | Bin .../test-documents/testOneNote2007OrEarlier2.one | Bin 36786 -> 0 bytes .../test-documents/testOneNoteFromOffice365-2.one | Bin 0 -> 69986 bytes .../test-documents/testOneNoteFromOffice365.one | Bin 0 -> 29387 bytes .../test-documents/testOneNoteNonAscii.one | Bin 13528 -> 0 bytes 152 files changed, 13177 insertions(+), 1144 deletions(-)
