You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/12/06 16:50:01 UTC
[tika] branch TIKA-3446 updated: fix capitalization
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3446
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-3446 by this push:
new faf98a0 fix capitalization
faf98a0 is described below
commit faf98a0325fb5d5a1d6113df1e96a39e5e56fc18
Author: tallison <ta...@apache.org>
AuthorDate: Mon Dec 6 11:49:39 2021 -0500
fix capitalization
---
.../parser/microsoft/onenote/OneNoteParser.java | 8 +-
.../onenote/fsshttpb/IFSSHTTPBSerializable.java | 2 +-
.../onenote/fsshttpb/MSOneStorePackage.java | 32 +++---
.../onenote/fsshttpb/MSOneStoreParser.java | 64 ++++++------
.../onenote/fsshttpb/property/ArrayNumber.java | 4 +-
.../fsshttpb/property/EightBytesOfData.java | 4 +-
.../onenote/fsshttpb/property/FourBytesOfData.java | 4 +-
.../onenote/fsshttpb/property/IProperty.java | 4 +-
.../onenote/fsshttpb/property/NoData.java | 4 +-
.../onenote/fsshttpb/property/OneByteOfData.java | 4 +-
.../property/PrtArrayOfPropertyValues.java | 12 +--
.../PrtFourBytesOfLengthFollowedByData.java | 6 +-
.../onenote/fsshttpb/property/TwoBytesOfData.java | 4 +-
.../streamobj/CellManifestCurrentRevision.java | 6 +-
.../streamobj/CellManifestDataElementData.java | 8 +-
.../onenote/fsshttpb/streamobj/DataElement.java | 22 ++--
.../fsshttpb/streamobj/DataElementData.java | 4 +-
.../fsshttpb/streamobj/DataElementHash.java | 8 +-
.../fsshttpb/streamobj/DataElementPackage.java | 8 +-
.../onenote/fsshttpb/streamobj/DataHashObject.java | 6 +-
.../onenote/fsshttpb/streamobj/DataSizeObject.java | 8 +-
.../fsshttpb/streamobj/EncryptionObject.java | 6 +-
.../onenote/fsshttpb/streamobj/FileDataObject.java | 8 +-
.../fsshttpb/streamobj/IntermediateNodeObject.java | 18 ++--
.../onenote/fsshttpb/streamobj/JCIDObject.java | 3 +-
.../onenote/fsshttpb/streamobj/LeafNodeObject.java | 27 +++--
.../onenote/fsshttpb/streamobj/NodeObject.java | 2 +-
.../fsshttpb/streamobj/ObjectGroupData.java | 14 +--
.../streamobj/ObjectGroupDataElementData.java | 26 ++---
.../streamobj/ObjectGroupDeclarations.java | 17 ++-
.../fsshttpb/streamobj/ObjectGroupMetadata.java | 6 +-
.../streamobj/ObjectGroupMetadataDeclarations.java | 13 +--
.../ObjectGroupObjectBLOBDataDeclaration.java | 16 +--
.../fsshttpb/streamobj/ObjectGroupObjectData.java | 10 +-
.../ObjectGroupObjectDataBLOBReference.java | 10 +-
.../streamobj/ObjectGroupObjectDeclare.java | 14 +--
.../onenote/fsshttpb/streamobj/PropertySet.java | 12 +--
.../fsshttpb/streamobj/PropertySetObject.java | 3 +-
.../fsshttpb/streamobj/RevisionManifest.java | 8 +-
.../streamobj/RevisionManifestDataElementData.java | 30 +++---
.../RevisionManifestObjectGroupReferences.java | 12 +--
.../streamobj/RevisionManifestRootDeclare.java | 8 +-
.../fsshttpb/streamobj/RevisionStoreObject.java | 1 +
.../streamobj/RevisionStoreObjectGroup.java | 9 +-
.../fsshttpb/streamobj/SignatureObject.java | 6 +-
.../streamobj/StorageIndexCellMapping.java | 10 +-
.../streamobj/StorageIndexDataElementData.java | 28 ++---
.../streamobj/StorageIndexManifestMapping.java | 8 +-
.../streamobj/StorageIndexRevisionMapping.java | 10 +-
.../streamobj/StorageManifestDataElementData.java | 26 ++---
.../streamobj/StorageManifestRootDeclare.java | 8 +-
.../streamobj/StorageManifestSchemaGUID.java | 7 +-
.../onenote/fsshttpb/streamobj/StreamObject.java | 45 ++++----
.../streamobj/StreamObjectHeaderEnd16bit.java | 28 +++--
.../streamobj/StreamObjectHeaderEnd8bit.java | 28 +++--
.../streamobj/StreamObjectHeaderStart.java | 4 +-
.../streamobj/StreamObjectHeaderStart16bit.java | 35 +++----
.../streamobj/StreamObjectHeaderStart32bit.java | 34 +++---
.../fsshttpb/streamobj/basic/AdapterHelper.java | 6 +-
.../streamobj/basic/AlternativePackaging.java | 20 ++--
.../fsshttpb/streamobj/basic/BasicObject.java | 10 +-
.../fsshttpb/streamobj/basic/BinaryItem.java | 6 +-
.../onenote/fsshttpb/streamobj/basic/CellID.java | 8 +-
.../fsshttpb/streamobj/basic/CellIDArray.java | 8 +-
.../fsshttpb/streamobj/basic/Compact64bitInt.java | 57 ++++++-----
.../fsshttpb/streamobj/basic/CompactID.java | 12 +--
.../fsshttpb/streamobj/basic/ExGUIDArray.java | 8 +-
.../onenote/fsshttpb/streamobj/basic/ExGuid.java | 48 ++++-----
.../fsshttpb/streamobj/basic/HeaderCell.java | 6 +-
.../onenote/fsshttpb/streamobj/basic/JCID.java | 32 +++---
.../fsshttpb/streamobj/basic/PropertyID.java | 16 +--
.../fsshttpb/streamobj/basic/SerialNumber.java | 18 ++--
.../fsshttpb/streamobj/basic/ZipHeader.java | 2 +-
.../streamobj/chunking/AbstractChunking.java | 2 +-
.../streamobj/chunking/ChunkingFactory.java | 14 +--
.../streamobj/chunking/RDCAnalysisChunking.java | 16 +--
.../streamobj/chunking/SimpleChunking.java | 8 +-
.../streamobj/chunking/ZipFilesChunking.java | 44 ++++----
.../streamobj/space/ObjectSpaceObjectPropSet.java | 20 ++--
.../space/ObjectSpaceObjectStreamHeader.java | 18 ++--
.../space/ObjectSpaceObjectStreamOfContextIDs.java | 10 +-
.../space/ObjectSpaceObjectStreamOfOIDs.java | 10 +-
.../space/ObjectSpaceObjectStreamOfOSIDs.java | 10 +-
.../onenote/fsshttpb/unsigned/UInteger.java | 8 +-
.../microsoft/onenote/fsshttpb/unsigned/ULong.java | 3 +-
.../microsoft/onenote/fsshttpb/util/Bit.java | 6 +-
.../onenote/fsshttpb/util/BitConverter.java | 8 +-
.../microsoft/onenote/fsshttpb/util/BitReader.java | 46 ++++-----
.../microsoft/onenote/fsshttpb/util/BitWriter.java | 26 ++---
.../onenote/fsshttpb/util/DataElementUtils.java | 114 ++++++++++-----------
.../fsshttpb/util/LittleEndianBitConverter.java | 42 ++++----
91 files changed, 711 insertions(+), 723 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
index 221d785..e0e0672 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
@@ -80,8 +80,8 @@ public class OneNoteParser extends AbstractParser {
try (TemporaryResources temporaryResources = new TemporaryResources();
TikaInputStream tikaInputStream = TikaInputStream.get(oneStoreFileBytes);
- OneNoteDirectFileResource oneNoteDirectFileResource =
- new OneNoteDirectFileResource(tikaInputStream.getFile())) {
+ OneNoteDirectFileResource oneNoteDirectFileResource = new OneNoteDirectFileResource(
+ tikaInputStream.getFile())) {
XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
xhtml.startDocument();
temporaryResources.addResource(oneNoteDirectFileResource);
@@ -160,11 +160,11 @@ public class OneNoteParser extends AbstractParser {
} else if (header.isLegacyOrAlternativePackaging()) {
try {
AlternativePackaging alternatePackageOneStoreFile = new AlternativePackaging();
- alternatePackageOneStoreFile.DoDeserializeFromByteArray(oneStoreFileBytes, 0);
+ alternatePackageOneStoreFile.doDeserializeFromByteArray(oneStoreFileBytes, 0);
MSOneStoreParser onenoteParser = new MSOneStoreParser();
MSOneStorePackage pkg =
- onenoteParser.Parse(alternatePackageOneStoreFile.dataElementPackage);
+ onenoteParser.parse(alternatePackageOneStoreFile.dataElementPackage);
pkg.walkTree(options, metadata, xhtml);
} catch (Exception e) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/IFSSHTTPBSerializable.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/IFSSHTTPBSerializable.java
index d70bffc..f2bbec7 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/IFSSHTTPBSerializable.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/IFSSHTTPBSerializable.java
@@ -29,5 +29,5 @@ public interface IFSSHTTPBSerializable {
*
* @return The byte list.
*/
- List<Byte> SerializeToByteList();
+ List<Byte> serializeToByteList();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStorePackage.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStorePackage.java
index 006da05..1514285 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStorePackage.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStorePackage.java
@@ -91,14 +91,14 @@ public class MSOneStorePackage {
private final Set<String> authors = new HashSet<>();
private final Set<String> mostRecentAuthors = new HashSet<>();
private final Set<String> originalAuthors = new HashSet<>();
- public StorageIndexDataElementData StorageIndex;
- public StorageManifestDataElementData StorageManifest;
- public CellManifestDataElementData HeaderCellCellManifest;
- public RevisionManifestDataElementData HeaderCellRevisionManifest;
- public List<RevisionManifestDataElementData> RevisionManifests;
- public List<CellManifestDataElementData> CellManifests;
+ public StorageIndexDataElementData storageIndex;
+ public StorageManifestDataElementData storageManifest;
+ public CellManifestDataElementData headerCellCellManifest;
+ public RevisionManifestDataElementData headerCellRevisionManifest;
+ public List<RevisionManifestDataElementData> revisionManifests;
+ public List<CellManifestDataElementData> cellManifests;
public HeaderCell headerCell;
- public List<RevisionStoreObjectGroup> DataRoot;
+ public List<RevisionStoreObjectGroup> dataRoot;
public List<RevisionStoreObjectGroup> OtherFileNodeList;
private boolean mostRecentAuthorProp = false;
private boolean originalAuthorProp = false;
@@ -107,8 +107,8 @@ public class MSOneStorePackage {
private long lastModified = Long.MIN_VALUE;
public MSOneStorePackage() {
- this.RevisionManifests = new ArrayList<>();
- this.CellManifests = new ArrayList<>();
+ this.revisionManifests = new ArrayList<>();
+ this.cellManifests = new ArrayList<>();
this.OtherFileNodeList = new ArrayList<>();
}
@@ -118,10 +118,10 @@ public class MSOneStorePackage {
* @param cellID Specify the Cell ID.
* @return Return the specific Storage Index Cell Mapping.
*/
- public StorageIndexCellMapping FindStorageIndexCellMapping(CellID cellID) {
+ public StorageIndexCellMapping findStorageIndexCellMapping(CellID cellID) {
StorageIndexCellMapping storageIndexCellMapping = null;
- if (this.StorageIndex != null) {
- storageIndexCellMapping = this.StorageIndex.StorageIndexCellMappingList.stream()
+ if (this.storageIndex != null) {
+ storageIndexCellMapping = this.storageIndex.storageIndexCellMappingList.stream()
.filter(s -> s.CellID.equals(cellID)).findFirst()
.orElse(new StorageIndexCellMapping());
}
@@ -134,11 +134,11 @@ public class MSOneStorePackage {
* @param revisionExtendedGUID Specify the Revision Mapping Extended GUID.
* @return Return the instance of Storage Index Revision Mapping.
*/
- public StorageIndexRevisionMapping FindStorageIndexRevisionMapping(
+ public StorageIndexRevisionMapping findStorageIndexRevisionMapping(
ExGuid revisionExtendedGUID) {
StorageIndexRevisionMapping instance = null;
- if (this.StorageIndex != null) {
- instance = this.StorageIndex.StorageIndexRevisionMappingList.stream()
+ if (this.storageIndex != null) {
+ instance = this.storageIndex.StorageIndexRevisionMappingList.stream()
.filter(r -> r.RevisionExGuid.equals(revisionExtendedGUID)).findFirst()
.orElse(new StorageIndexRevisionMapping());
}
@@ -295,7 +295,7 @@ public class MSOneStorePackage {
private long getScalar(IProperty property) throws TikaException {
if (property instanceof FourBytesOfData) {
FourBytesOfData fourBytesOfDataProp = (FourBytesOfData) property;
- return BitConverter.ToUInt32(fourBytesOfDataProp.Data, 0);
+ return BitConverter.toUInt32(fourBytesOfDataProp.Data, 0);
} else if (property instanceof EightBytesOfData) {
EightBytesOfData fourBytesOfDataProp = (EightBytesOfData) property;
return BitConverter.toInt64(fourBytesOfDataProp.Data, 0);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStoreParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStoreParser.java
index c0531ad..9685dc0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStoreParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/MSOneStoreParser.java
@@ -56,7 +56,7 @@ public class MSOneStoreParser {
// The DataElements of Object BLOB
private List<DataElement> objectBlOBElements;
- public MSOneStorePackage Parse(DataElementPackage dataElementPackage) {
+ public MSOneStorePackage parse(DataElementPackage dataElementPackage) {
MSOneStorePackage msOneStorePackage = new MSOneStorePackage();
storageIndexDataElements = dataElementPackage.DataElements.stream()
@@ -78,41 +78,41 @@ public class MSOneStoreParser {
.filter(d -> d.dataElementType == DataElementType.ObjectDataBLOBDataElementData)
.collect(Collectors.toList());
- msOneStorePackage.StorageIndex =
+ msOneStorePackage.storageIndex =
(StorageIndexDataElementData) storageIndexDataElements.get(0).data;
- msOneStorePackage.StorageManifest =
+ msOneStorePackage.storageManifest =
(StorageManifestDataElementData) storageManifestDataElements.get(0).data;
// Parse Header Cell
CellID headerCellID =
- msOneStorePackage.StorageManifest.StorageManifestRootDeclareList.get(0).cellID;
+ msOneStorePackage.storageManifest.storageManifestRootDeclareList.get(0).cellID;
StorageIndexCellMapping headerCellStorageIndexCellMapping =
- msOneStorePackage.FindStorageIndexCellMapping(headerCellID);
+ msOneStorePackage.findStorageIndexCellMapping(headerCellID);
storageIndexHashTab.add(headerCellID);
if (headerCellStorageIndexCellMapping != null) {
- msOneStorePackage.HeaderCellCellManifest =
- this.FindCellManifest(headerCellStorageIndexCellMapping.CellMappingExGuid);
+ msOneStorePackage.headerCellCellManifest =
+ this.findCellManifest(headerCellStorageIndexCellMapping.CellMappingExGuid);
StorageIndexRevisionMapping headerCellRevisionManifestMapping =
- msOneStorePackage.FindStorageIndexRevisionMapping(
- msOneStorePackage.HeaderCellCellManifest.cellManifestCurrentRevision
+ msOneStorePackage.findStorageIndexRevisionMapping(
+ msOneStorePackage.headerCellCellManifest.cellManifestCurrentRevision
.cellManifestCurrentRevisionExGuid);
- msOneStorePackage.HeaderCellRevisionManifest = this.FindRevisionManifestDataElement(
+ msOneStorePackage.headerCellRevisionManifest = this.findRevisionManifestDataElement(
headerCellRevisionManifestMapping.RevisionMappingExGuid);
msOneStorePackage.headerCell =
- this.ParseHeaderCell(msOneStorePackage.HeaderCellRevisionManifest);
+ this.parseHeaderCell(msOneStorePackage.headerCellRevisionManifest);
// Parse Data root
CellID dataRootCellID =
- msOneStorePackage.StorageManifest.StorageManifestRootDeclareList.get(1).cellID;
+ msOneStorePackage.storageManifest.storageManifestRootDeclareList.get(1).cellID;
storageIndexHashTab.add(dataRootCellID);
- msOneStorePackage.DataRoot = this.ParseObjectGroup(dataRootCellID, msOneStorePackage);
+ msOneStorePackage.dataRoot = this.parseObjectGroup(dataRootCellID, msOneStorePackage);
// Parse other data
- for (StorageIndexCellMapping storageIndexCellMapping : msOneStorePackage.StorageIndex
- .StorageIndexCellMappingList) {
+ for (StorageIndexCellMapping storageIndexCellMapping : msOneStorePackage.storageIndex
+ .storageIndexCellMappingList) {
if (!storageIndexHashTab.contains(storageIndexCellMapping.CellID)) {
msOneStorePackage.OtherFileNodeList.addAll(
- this.ParseObjectGroup(storageIndexCellMapping.CellID,
+ this.parseObjectGroup(storageIndexCellMapping.CellID,
msOneStorePackage));
storageIndexHashTab.add(storageIndexCellMapping.CellID);
}
@@ -127,7 +127,7 @@ public class MSOneStoreParser {
* @param cellMappingExtendedGUID The ExGuid of Cell Mapping Extended GUID.
* @return The CellManifestDataElementData instance.
*/
- private CellManifestDataElementData FindCellManifest(ExGuid cellMappingExtendedGUID) {
+ private CellManifestDataElementData findCellManifest(ExGuid cellMappingExtendedGUID) {
return (CellManifestDataElementData) this.cellManifestDataElements.stream()
.filter(d -> d.dataElementExGuid.equals(cellMappingExtendedGUID)).findFirst()
.orElse(new DataElement()).data;
@@ -139,39 +139,39 @@ public class MSOneStoreParser {
* @param revisionMappingExtendedGUID The Revision Mapping Extended GUID.
* @return Returns the instance of RevisionManifestDataElementData
*/
- private RevisionManifestDataElementData FindRevisionManifestDataElement(
+ private RevisionManifestDataElementData findRevisionManifestDataElement(
ExGuid revisionMappingExtendedGUID) {
return (RevisionManifestDataElementData) this.revisionManifestDataElements.stream()
.filter(d -> d.dataElementExGuid.equals(revisionMappingExtendedGUID)).findFirst()
.orElse(new DataElement()).data;
}
- private HeaderCell ParseHeaderCell(RevisionManifestDataElementData headerCellRevisionManifest) {
+ private HeaderCell parseHeaderCell(RevisionManifestDataElementData headerCellRevisionManifest) {
ExGuid rootObjectId =
- headerCellRevisionManifest.RevisionManifestObjectGroupReferencesList.get(
- 0).ObjectGroupExtendedGUID;
+ headerCellRevisionManifest.revisionManifestObjectGroupReferences.get(
+ 0).objectGroupExtendedGUID;
DataElement element = this.objectGroupDataElements.stream()
.filter(d -> d.dataElementExGuid.equals(rootObjectId)).findFirst()
.orElse(new DataElement());
- return HeaderCell.CreateInstance((ObjectGroupDataElementData) element.data);
+ return HeaderCell.createInstance((ObjectGroupDataElementData) element.data);
}
- private List<RevisionStoreObjectGroup> ParseObjectGroup(CellID objectGroupCellID,
+ private List<RevisionStoreObjectGroup> parseObjectGroup(CellID objectGroupCellID,
MSOneStorePackage msOneStorePackage) {
StorageIndexCellMapping storageIndexCellMapping =
- msOneStorePackage.FindStorageIndexCellMapping(objectGroupCellID);
+ msOneStorePackage.findStorageIndexCellMapping(objectGroupCellID);
CellManifestDataElementData cellManifest =
- this.FindCellManifest(storageIndexCellMapping.CellMappingExGuid);
+ this.findCellManifest(storageIndexCellMapping.CellMappingExGuid);
List<RevisionStoreObjectGroup> objectGroups = new ArrayList<>();
- msOneStorePackage.CellManifests.add(cellManifest);
+ msOneStorePackage.cellManifests.add(cellManifest);
StorageIndexRevisionMapping revisionMapping =
- msOneStorePackage.FindStorageIndexRevisionMapping(
+ msOneStorePackage.findStorageIndexRevisionMapping(
cellManifest.cellManifestCurrentRevision.cellManifestCurrentRevisionExGuid);
RevisionManifestDataElementData revisionManifest =
- FindRevisionManifestDataElement(revisionMapping.RevisionMappingExGuid);
- msOneStorePackage.RevisionManifests.add(revisionManifest);
+ findRevisionManifestDataElement(revisionMapping.RevisionMappingExGuid);
+ msOneStorePackage.revisionManifests.add(revisionManifest);
RevisionManifestRootDeclare encryptionKeyRoot =
revisionManifest.RevisionManifestRootDeclareList.stream()
.filter(r -> r.RootExGuid.equals(new ExGuid(3,
@@ -179,14 +179,14 @@ public class MSOneStoreParser {
.findFirst().orElse(null);
boolean isEncryption = encryptionKeyRoot != null;
for (RevisionManifestObjectGroupReferences objRef :
- revisionManifest.RevisionManifestObjectGroupReferencesList) {
+ revisionManifest.revisionManifestObjectGroupReferences) {
ObjectGroupDataElementData dataObject =
(ObjectGroupDataElementData) objectGroupDataElements.stream()
- .filter(d -> d.dataElementExGuid.equals(objRef.ObjectGroupExtendedGUID))
+ .filter(d -> d.dataElementExGuid.equals(objRef.objectGroupExtendedGUID))
.findFirst().get().data;
RevisionStoreObjectGroup objectGroup =
- RevisionStoreObjectGroup.CreateInstance(objRef.ObjectGroupExtendedGUID,
+ RevisionStoreObjectGroup.CreateInstance(objRef.objectGroupExtendedGUID,
dataObject, isEncryption);
objectGroups.add(objectGroup);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/ArrayNumber.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/ArrayNumber.java
index 3c2f6d4..0d448be 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/ArrayNumber.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/ArrayNumber.java
@@ -35,7 +35,7 @@ public class ArrayNumber implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the number of array.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
this.Number = BitConverter.toInt32(byteArray, startIndex);
return 4;
}
@@ -45,7 +45,7 @@ public class ArrayNumber implements IProperty {
*
* @return Return the byte list which store the byte information of the number of array.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return ByteUtil.toListOfByte(BitConverter.getBytes(this.Number));
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/EightBytesOfData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/EightBytesOfData.java
index 34e3850..041eef2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/EightBytesOfData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/EightBytesOfData.java
@@ -36,7 +36,7 @@ public class EightBytesOfData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the EightBytesOfData.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
this.Data = Arrays.copyOfRange(byteArray, startIndex, startIndex + 8);
return 8;
}
@@ -46,7 +46,7 @@ public class EightBytesOfData implements IProperty {
*
* @return Return the byte list which store the byte information of EightBytesOfData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return ByteUtil.toListOfByte(this.Data);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/FourBytesOfData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/FourBytesOfData.java
index 64e8c7f..02473d8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/FourBytesOfData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/FourBytesOfData.java
@@ -35,7 +35,7 @@ public class FourBytesOfData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the FourBytesOfData.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
this.Data = Arrays.copyOfRange(byteArray, startIndex, startIndex + 4);
return 4;
}
@@ -45,7 +45,7 @@ public class FourBytesOfData implements IProperty {
*
* @return Return the byte list which store the byte information of FourBytesOfData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return ByteUtil.toListOfByte(this.Data);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/IProperty.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/IProperty.java
index b54437d..793f97e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/IProperty.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/IProperty.java
@@ -29,7 +29,7 @@ public interface IProperty {
*
* @return Return the byte list which store the byte information of property.
*/
- List<Byte> SerializeToByteList();
+ List<Byte> serializeToByteList();
/**
* This method is used to deserialize the property from the specified byte array and start index.
@@ -38,5 +38,5 @@ public interface IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the property.
*/
- int DoDeserializeFromByteArray(byte[] byteArray, int startIndex);
+ int doDeserializeFromByteArray(byte[] byteArray, int startIndex);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/NoData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/NoData.java
index a05e7ea..4a2c7c2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/NoData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/NoData.java
@@ -31,7 +31,7 @@ public class NoData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
return 0;
}
@@ -40,7 +40,7 @@ public class NoData implements IProperty {
*
* @return Return the byte list which store the byte information of NoData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return new ArrayList<>();
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/OneByteOfData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/OneByteOfData.java
index 44ad03e..a7cb84d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/OneByteOfData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/OneByteOfData.java
@@ -33,7 +33,7 @@ public class OneByteOfData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
this.Data = byteArray[startIndex];
return 1;
}
@@ -43,7 +43,7 @@ public class OneByteOfData implements IProperty {
*
* @return Return the byte list which store the byte information of OneByteOfData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return new ArrayList<>(this.Data);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtArrayOfPropertyValues.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtArrayOfPropertyValues.java
index 4d5fa4f..3d0db9e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtArrayOfPropertyValues.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtArrayOfPropertyValues.java
@@ -40,17 +40,17 @@ public class PrtArrayOfPropertyValues implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.CProperties = BitConverter.toInt32(byteArray, index);
index += 4;
this.Prid = new PropertyID();
- int len = this.Prid.DoDeserializeFromByteArray(byteArray, index);
+ int len = this.Prid.doDeserializeFromByteArray(byteArray, index);
index += len;
this.Data = new PropertySet[this.CProperties];
for (int i = 0; i < this.CProperties; i++) {
this.Data[i] = new PropertySet();
- int length = this.Data[i].DoDeserializeFromByteArray(byteArray, index);
+ int length = this.Data[i].doDeserializeFromByteArray(byteArray, index);
index += length;
}
@@ -62,14 +62,14 @@ public class PrtArrayOfPropertyValues implements IProperty {
*
* @return Return the byte list which store the byte information of the prtArrayOfPropertyValues.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
for (byte b : BitConverter.getBytes(this.CProperties)) {
byteList.add(b);
}
- byteList.addAll(this.Prid.SerializeToByteList());
+ byteList.addAll(this.Prid.serializeToByteList());
for (PropertySet ps : this.Data) {
- byteList.addAll(ps.SerializeToByteList());
+ byteList.addAll(ps.serializeToByteList());
}
return byteList;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtFourBytesOfLengthFollowedByData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtFourBytesOfLengthFollowedByData.java
index e19da7d..712472f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtFourBytesOfLengthFollowedByData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/PrtFourBytesOfLengthFollowedByData.java
@@ -39,9 +39,9 @@ public class PrtFourBytesOfLengthFollowedByData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the prtFourBytesOfLengthFollowedByData.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
- this.CB = (int) BitConverter.ToUInt32(byteArray, startIndex);
+ this.CB = (int) BitConverter.toUInt32(byteArray, startIndex);
index += 4;
this.Data = Arrays.copyOfRange(byteArray, index, index + this.CB);
index += this.CB;
@@ -54,7 +54,7 @@ public class PrtFourBytesOfLengthFollowedByData implements IProperty {
*
* @return Return the byte list which store the byte information of prtFourBytesOfLengthFollowedByData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
for (byte b : BitConverter.getBytes(this.CB)) {
byteList.add(b);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/TwoBytesOfData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/TwoBytesOfData.java
index 0a4431d..e20881f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/TwoBytesOfData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/property/TwoBytesOfData.java
@@ -35,7 +35,7 @@ public class TwoBytesOfData implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the TwoBytesOfData.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
this.Data = new byte[]{byteArray[startIndex], byteArray[startIndex + 1]};
return 2;
@@ -46,7 +46,7 @@ public class TwoBytesOfData implements IProperty {
*
* @return Return the byte list which store the byte information of TwoBytesOfData.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
return ByteUtil.toListOfByte(this.Data);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestCurrentRevision.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestCurrentRevision.java
index 9243635..95e8833 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestCurrentRevision.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestCurrentRevision.java
@@ -41,7 +41,7 @@ public class CellManifestCurrentRevision extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.cellManifestCurrentRevisionExGuid = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -61,8 +61,8 @@ public class CellManifestCurrentRevision extends StreamObject {
* @return The number of elements actually contained in the list.
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- List<Byte> tmpList = this.cellManifestCurrentRevisionExGuid.SerializeToByteList();
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ List<Byte> tmpList = this.cellManifestCurrentRevisionExGuid.serializeToByteList();
byteList.addAll(tmpList);
return tmpList.size();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestDataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestDataElementData.java
index 5e10b8e..8d89666 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestDataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/CellManifestDataElementData.java
@@ -41,10 +41,10 @@ public class CellManifestDataElementData extends DataElementData {
* @return The element length
*/
@Override
- public int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
+ public int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
this.cellManifestCurrentRevision =
- StreamObject.GetCurrent(byteArray, index, CellManifestCurrentRevision.class);
+ StreamObject.getCurrent(byteArray, index, CellManifestCurrentRevision.class);
return index.get() - startIndex;
}
@@ -54,7 +54,7 @@ public class CellManifestDataElementData extends DataElementData {
* @return The Byte list
*/
@Override
- public List<Byte> SerializeToByteList() {
- return this.cellManifestCurrentRevision.SerializeToByteList();
+ public List<Byte> serializeToByteList() {
+ return this.cellManifestCurrentRevision.serializeToByteList();
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElement.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElement.java
index b203e6c..64f69ec 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElement.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElement.java
@@ -100,12 +100,11 @@ public class DataElement extends StreamObject {
* @return Data of
* the element
*/
- public <T extends DataElementData> T GetData(Class<T> clazz) {
+ public <T extends DataElementData> T getData(Class<T> clazz) {
if (this.data.getClass().equals(clazz)) {
return (T) this.data;
} else {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Unable to cast DataElementData to the type %s, its actual type is %s",
clazz.getName(), this.data.getClass().getName()));
}
@@ -123,7 +122,7 @@ public class DataElement extends StreamObject {
* the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
@@ -140,8 +139,7 @@ public class DataElement extends StreamObject {
if (index.get() - currentIndex.get() != lengthOfItems) {
throw new DataElementParseErrorException(currentIndex.get(),
"Failed to check the data element header length, whose value does not cover the " +
- "dataElementExGUID, SerialNumber and DataElementType",
- null);
+ "dataElementExGUID, SerialNumber and DataElementType", null);
}
if (dataElementDataTypeMapping.containsKey(this.dataElementType)) {
@@ -154,7 +152,7 @@ public class DataElement extends StreamObject {
try {
index.addAndGet(
- this.data.DeserializeDataElementDataFromByteArray(byteArray, index.get()));
+ this.data.deserializeDataElementDataFromByteArray(byteArray, index.get()));
} catch (Exception e) {
throw new DataElementParseErrorException(index.get(), e);
}
@@ -174,15 +172,15 @@ public class DataElement extends StreamObject {
* @return The element length
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int startIndex = byteList.size();
- byteList.addAll(this.dataElementExGuid.SerializeToByteList());
- byteList.addAll(this.serialNumber.SerializeToByteList());
+ byteList.addAll(this.dataElementExGuid.serializeToByteList());
+ byteList.addAll(this.serialNumber.serializeToByteList());
byteList.addAll(
- new Compact64bitInt(this.dataElementType.getIntVal()).SerializeToByteList());
+ new Compact64bitInt(this.dataElementType.getIntVal()).serializeToByteList());
int headerLength = byteList.size() - startIndex;
- byteList.addAll(this.data.SerializeToByteList());
+ byteList.addAll(this.data.serializeToByteList());
return headerLength;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementData.java
index 238c81c..ff0e199 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementData.java
@@ -32,12 +32,12 @@ public abstract class DataElementData implements IFSSHTTPBSerializable {
* @param startIndex The position where to start.
* @return The length of the item.
*/
- public abstract int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex);
+ public abstract int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex);
/**
* Serialize item to byte list.
*
* @return The byte list.
*/
- public abstract List<Byte> SerializeToByteList();
+ public abstract List<Byte> serializeToByteList();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementHash.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementHash.java
index a08dc9d..1dea6bb 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementHash.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementHash.java
@@ -46,7 +46,7 @@ public class DataElementHash extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.DataElementHashScheme = BasicObject.parse(byteArray, index, Compact64bitInt.class);
@@ -67,10 +67,10 @@ public class DataElementHash extends StreamObject {
* @return The number of elements actually contained in the list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int startPoint = byteList.size();
- byteList.addAll(this.DataElementHashScheme.SerializeToByteList());
- byteList.addAll(this.DataElementHashData.SerializeToByteList());
+ byteList.addAll(this.DataElementHashScheme.serializeToByteList());
+ byteList.addAll(this.DataElementHashData.serializeToByteList());
return byteList.size() - startPoint;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementPackage.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementPackage.java
index 2de405d..4464d0e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementPackage.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataElementPackage.java
@@ -42,7 +42,7 @@ public class DataElementPackage extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
if (lengthOfItems != 1) {
throw new StreamObjectParseErrorException(currentIndex.get(), "DataElementPackage",
@@ -53,7 +53,7 @@ public class DataElementPackage extends StreamObject {
this.DataElements = new ArrayList<>();
AtomicReference<DataElement> dataElement = new AtomicReference<>();
- while (StreamObject.TryGetCurrent(byteArray, currentIndex, dataElement,
+ while (StreamObject.tryGetCurrent(byteArray, currentIndex, dataElement,
DataElement.class)) {
this.DataElements.add(dataElement.get());
}
@@ -66,11 +66,11 @@ public class DataElementPackage extends StreamObject {
* @return The number of elements actually contained in the list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
// Add the reserved byte
byteList.add((byte) 0);
for (DataElement dataElement : DataElements) {
- byteList.addAll(dataElement.SerializeToByteList());
+ byteList.addAll(dataElement.serializeToByteList());
}
return 1;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataHashObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataHashObject.java
index 33e5238..a52e76d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataHashObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataHashObject.java
@@ -71,7 +71,7 @@ public class DataHashObject extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
@@ -92,9 +92,9 @@ public class DataHashObject extends StreamObject {
* @return The number of elements
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int length = byteList.size();
- byteList.addAll(this.Data.SerializeToByteList());
+ byteList.addAll(this.Data.serializeToByteList());
return byteList.size() - length;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataSizeObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataSizeObject.java
index 1738ec1..ace02e1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataSizeObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/DataSizeObject.java
@@ -44,14 +44,14 @@ public class DataSizeObject extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
if (lengthOfItems != 8) {
throw new StreamObjectParseErrorException(currentIndex.get(), "DataSize",
"Stream Object over-parse error", null);
}
- this.DataSize = LittleEndianBitConverter.ToUInt64(byteArray, currentIndex.get());
+ this.DataSize = LittleEndianBitConverter.toUInt64(byteArray, currentIndex.get());
currentIndex.addAndGet(8);
}
@@ -62,9 +62,9 @@ public class DataSizeObject extends StreamObject {
* @return A constant value 8
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
ByteUtil.appendByteArrayToListOfByte(byteList,
- LittleEndianBitConverter.GetBytes(this.DataSize));
+ LittleEndianBitConverter.getBytes(this.DataSize));
return 8;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/EncryptionObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/EncryptionObject.java
index 1702b66..cc52e3c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/EncryptionObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/EncryptionObject.java
@@ -21,7 +21,7 @@ package org.apache.tika.parser.microsoft.onenote.fsshttpb.streamobj;
/**
* The class is used to represent the encryption revision store object.
*/
-public class EncryptionObject {
- public ObjectGroupObjectDeclare ObjectDeclaration;
- public byte[] ObjectData;
+class EncryptionObject {
+ public ObjectGroupObjectDeclare objectDeclaration;
+ public byte[] objectData;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/FileDataObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/FileDataObject.java
index 1d6a9c0..be305f8 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/FileDataObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/FileDataObject.java
@@ -20,8 +20,8 @@ package org.apache.tika.parser.microsoft.onenote.fsshttpb.streamobj;
/**
* This class is used to represent the file data.
*/
-public class FileDataObject {
- public ObjectGroupObjectBLOBDataDeclaration ObjectDataBLOBDeclaration;
- public ObjectGroupObjectDataBLOBReference ObjectDataBLOBReference;
- public DataElement ObjectDataBLOBDataElement;
+class FileDataObject {
+ public ObjectGroupObjectBLOBDataDeclaration objectDataBLOBDeclaration;
+ public ObjectGroupObjectDataBLOBReference objectDataBLOBReference;
+ public DataElement objectDataBLOBDataElement;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/IntermediateNodeObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/IntermediateNodeObject.java
index d2877ef..eaf4d1a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/IntermediateNodeObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/IntermediateNodeObject.java
@@ -41,11 +41,11 @@ public class IntermediateNodeObject extends NodeObject {
* @return Return the byte list of root node object content.
*/
@Override
- public List<Byte> GetContent() {
+ public List<Byte> getContent() {
List<Byte> content = new ArrayList<>();
for (LeafNodeObject intermediateNode : this.IntermediateNodeObjectList) {
- content.addAll(intermediateNode.GetContent());
+ content.addAll(intermediateNode.getContent());
}
return content;
@@ -59,7 +59,7 @@ public class IntermediateNodeObject extends NodeObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
if (lengthOfItems != 0) {
@@ -67,8 +67,8 @@ public class IntermediateNodeObject extends NodeObject {
"Stream Object over-parse error", null);
}
- this.Signature = StreamObject.GetCurrent(byteArray, index, SignatureObject.class);
- this.DataSize = StreamObject.GetCurrent(byteArray, index, DataSizeObject.class);
+ this.Signature = StreamObject.getCurrent(byteArray, index, SignatureObject.class);
+ this.DataSize = StreamObject.getCurrent(byteArray, index, DataSizeObject.class);
currentIndex.set(index.get());
}
@@ -80,9 +80,9 @@ public class IntermediateNodeObject extends NodeObject {
* @return The Byte list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- byteList.addAll(this.Signature.SerializeToByteList());
- byteList.addAll(this.DataSize.SerializeToByteList());
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ byteList.addAll(this.Signature.serializeToByteList());
+ byteList.addAll(this.DataSize.serializeToByteList());
return 0;
}
@@ -104,7 +104,7 @@ public class IntermediateNodeObject extends NodeObject {
rootNode.ExGuid =
new ExGuid(SequenceNumberGenerator.GetCurrentSerialNumber(), UUID.randomUUID());
rootNode.IntermediateNodeObjectList =
- ChunkingFactory.CreateChunkingInstance(fileContent).Chunking();
+ ChunkingFactory.createChunkingInstance(fileContent).chunking();
return rootNode;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/JCIDObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/JCIDObject.java
index 98e4e68..7d0863a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/JCIDObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/JCIDObject.java
@@ -27,6 +27,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.util.ByteUtil;
public class JCIDObject {
public ObjectGroupObjectDeclare ObjectDeclaration;
public JCID JCID;
+
/**
* Construct the JCIDObject instance.
*
@@ -37,6 +38,6 @@ public class JCIDObject {
ObjectGroupObjectData objectData) {
this.ObjectDeclaration = objectDeclaration;
this.JCID = new JCID();
- this.JCID.DoDeserializeFromByteArray(ByteUtil.toByteArray(objectData.Data.Content), 0);
+ this.JCID.doDeserializeFromByteArray(ByteUtil.toByteArray(objectData.Data.Content), 0);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/LeafNodeObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/LeafNodeObject.java
index e8f20b8..840a84d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/LeafNodeObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/LeafNodeObject.java
@@ -47,14 +47,14 @@ public class LeafNodeObject extends NodeObject {
* @return Return the byte list of intermediate node object content.
*/
@Override
- public List<Byte> GetContent() {
+ public List<Byte> getContent() {
List<Byte> content = new ArrayList<Byte>();
if (this.DataNodeObjectData != null) {
ByteUtil.appendByteArrayToListOfByte(content, this.DataNodeObjectData.ObjectData);
} else if (this.IntermediateNodeObjectList != null) {
for (LeafNodeObject intermediateNode : this.IntermediateNodeObjectList) {
- content.addAll(intermediateNode.GetContent());
+ content.addAll(intermediateNode.getContent());
}
} else {
throw new RuntimeException(
@@ -73,7 +73,7 @@ public class LeafNodeObject extends NodeObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
if (lengthOfItems != 0) {
@@ -81,14 +81,14 @@ public class LeafNodeObject extends NodeObject {
"Stream Object over-parse error", null);
}
- this.Signature = StreamObject.GetCurrent(byteArray, index, SignatureObject.class);
- this.DataSize = StreamObject.GetCurrent(byteArray, index, DataSizeObject.class);
+ this.Signature = StreamObject.getCurrent(byteArray, index, SignatureObject.class);
+ this.DataSize = StreamObject.getCurrent(byteArray, index, DataSizeObject.class);
// Try to read StreamObjectHeaderStart to see there is data hash object or not
AtomicReference<StreamObjectHeaderStart> streamObjectHeader = new AtomicReference<>();
- if ((StreamObjectHeaderStart.TryParse(byteArray, index.get(), streamObjectHeader)) != 0) {
+ if ((StreamObjectHeaderStart.tryParse(byteArray, index.get(), streamObjectHeader)) != 0) {
if (streamObjectHeader.get().type == StreamObjectTypeHeaderStart.DataHashObject) {
- this.DataHash = StreamObject.GetCurrent(byteArray, index, DataHashObject.class);
+ this.DataHash = StreamObject.getCurrent(byteArray, index, DataHashObject.class);
}
}
@@ -102,9 +102,9 @@ public class LeafNodeObject extends NodeObject {
* @return A constant value
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- byteList.addAll(this.Signature.SerializeToByteList());
- byteList.addAll(this.DataSize.SerializeToByteList());
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ byteList.addAll(this.Signature.serializeToByteList());
+ byteList.addAll(this.DataSize.serializeToByteList());
return 0;
}
@@ -122,13 +122,12 @@ public class LeafNodeObject extends NodeObject {
*/
public LeafNodeObject Build(List<ObjectGroupDataElementData> objectGroupList,
ObjectGroupObjectData dataObj,
- org.apache.tika.parser.microsoft.onenote.fsshttpb.streamobj.basic.ExGuid
- intermediateGuid) {
+ ExGuid intermediateGuid) {
AtomicReference<LeafNodeObject> node = new AtomicReference<>();
AtomicReference<IntermediateNodeObject> rootNode = new AtomicReference<>();
AtomicInteger index = new AtomicInteger(0);
- if (StreamObject.TryGetCurrent(ByteUtil.toByteArray(dataObj.Data.Content), index, node,
+ if (StreamObject.tryGetCurrent(ByteUtil.toByteArray(dataObj.Data.Content), index, node,
LeafNodeObject.class)) {
if (dataObj.ObjectExGUIDArray == null) {
throw new RuntimeException(
@@ -164,7 +163,7 @@ public class LeafNodeObject extends NodeObject {
intermediateData, extGuid));
}
}
- } else if (StreamObject.TryGetCurrent(ByteUtil.toByteArray(dataObj.Data.Content), index,
+ } else if (StreamObject.tryGetCurrent(ByteUtil.toByteArray(dataObj.Data.Content), index,
rootNode, IntermediateNodeObject.class)) {
// In Sub chunking for larger than 1MB zip file, MOSS2010 could return IntermediateNodeObject.
// For easy further process, the rootNode will be replaced by intermediate node instead.
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/NodeObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/NodeObject.java
index 91c7dfe..68a78be 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/NodeObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/NodeObject.java
@@ -39,5 +39,5 @@ public abstract class NodeObject extends StreamObject {
*
* @return Return the byte list of node object content.
*/
- public abstract List<Byte> GetContent();
+ public abstract List<Byte> getContent();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupData.java
index 3275028..b564287 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupData.java
@@ -46,17 +46,17 @@ public class ObjectGroupData extends StreamObject {
* @return A constant value 0
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
if (this.ObjectGroupObjectDataList != null) {
for (ObjectGroupObjectData objectGroupObjectData : this.ObjectGroupObjectDataList) {
- byteList.addAll(objectGroupObjectData.SerializeToByteList());
+ byteList.addAll(objectGroupObjectData.serializeToByteList());
}
}
if (this.ObjectGroupObjectDataBLOBReferenceList != null) {
for (ObjectGroupObjectDataBLOBReference objectGroupObjectDataBLOBReference :
this.ObjectGroupObjectDataBLOBReferenceList) {
- byteList.addAll(objectGroupObjectDataBLOBReference.SerializeToByteList());
+ byteList.addAll(objectGroupObjectDataBLOBReference.serializeToByteList());
}
}
@@ -71,7 +71,7 @@ public class ObjectGroupData extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
if (lengthOfItems != 0) {
throw new StreamObjectParseErrorException(currentIndex.get(), "ObjectGroupDeclarations",
@@ -85,18 +85,18 @@ public class ObjectGroupData extends StreamObject {
this.ObjectGroupObjectDataList = new ArrayList<>();
this.ObjectGroupObjectDataBLOBReferenceList = new ArrayList<>();
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
StreamObjectTypeHeaderStart type = header.get().type;
if (type == StreamObjectTypeHeaderStart.ObjectGroupObjectData) {
index.addAndGet(headerLength);
this.ObjectGroupObjectDataList.add(
- (ObjectGroupObjectData) StreamObject.ParseStreamObject(header.get(),
+ (ObjectGroupObjectData) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else if (type == StreamObjectTypeHeaderStart.ObjectGroupObjectDataBLOBReference) {
index.addAndGet(headerLength);
this.ObjectGroupObjectDataBLOBReferenceList.add(
- (ObjectGroupObjectDataBLOBReference) StreamObject.ParseStreamObject(
+ (ObjectGroupObjectDataBLOBReference) StreamObject.parseStreamObject(
header.get(), byteArray, index));
} else {
throw new StreamObjectParseErrorException(index.get(), "ObjectGroupDeclarations",
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDataElementData.java
index fefe622..18524ec 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDataElementData.java
@@ -58,19 +58,19 @@ public class ObjectGroupDataElementData extends DataElementData {
* @return A Byte list
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> result = new ArrayList<>();
if (this.DataElementHash != null) {
- result.addAll(this.DataElementHash.SerializeToByteList());
+ result.addAll(this.DataElementHash.serializeToByteList());
}
- result.addAll(this.ObjectGroupDeclarations.SerializeToByteList());
+ result.addAll(this.ObjectGroupDeclarations.serializeToByteList());
if (this.ObjectMetadataDeclaration != null) {
- result.addAll(this.ObjectMetadataDeclaration.SerializeToByteList());
+ result.addAll(this.ObjectMetadataDeclaration.serializeToByteList());
}
- result.addAll(this.ObjectGroupData.SerializeToByteList());
+ result.addAll(this.ObjectGroupData.serializeToByteList());
return result;
}
@@ -82,25 +82,25 @@ public class ObjectGroupDataElementData extends DataElementData {
* @return The length of the element
*/
@Override
- public int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
+ public int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
AtomicReference<DataElementHash> dataElementHash = new AtomicReference<>();
- if (StreamObject.TryGetCurrent(byteArray, index, dataElementHash, DataElementHash.class)) {
+ if (StreamObject.tryGetCurrent(byteArray, index, dataElementHash, DataElementHash.class)) {
this.DataElementHash = dataElementHash.get();
}
this.ObjectGroupDeclarations =
- StreamObject.GetCurrent(byteArray, index, ObjectGroupDeclarations.class);
+ StreamObject.getCurrent(byteArray, index, ObjectGroupDeclarations.class);
AtomicReference<ObjectGroupMetadataDeclarations> objectMetadataDeclaration =
new AtomicReference<>(new ObjectGroupMetadataDeclarations());
- if (StreamObject.TryGetCurrent(byteArray, index, objectMetadataDeclaration,
+ if (StreamObject.tryGetCurrent(byteArray, index, objectMetadataDeclaration,
ObjectGroupMetadataDeclarations.class)) {
this.ObjectMetadataDeclaration = objectMetadataDeclaration.get();
}
- this.ObjectGroupData = StreamObject.GetCurrent(byteArray, index, ObjectGroupData.class);
+ this.ObjectGroupData = StreamObject.getCurrent(byteArray, index, ObjectGroupData.class);
return index.get() - startIndex;
}
@@ -192,7 +192,7 @@ public class ObjectGroupDataElementData extends DataElementData {
objectGroupObjectDeclare.ObjectPartitionID = new Compact64bitInt(1);
objectGroupObjectDeclare.CellReferencesCount = new Compact64bitInt(0);
objectGroupObjectDeclare.ObjectReferencesCount = new Compact64bitInt(0);
- objectGroupObjectDeclare.ObjectDataSize = new Compact64bitInt(node.GetContent().size());
+ objectGroupObjectDeclare.ObjectDataSize = new Compact64bitInt(node.getContent().size());
return objectGroupObjectDeclare;
}
@@ -232,7 +232,7 @@ public class ObjectGroupDataElementData extends DataElementData {
}
objectData.ObjectExGUIDArray = new ExGUIDArray(extendedGuidList);
- objectData.Data = new BinaryItem(node.SerializeToByteList());
+ objectData.Data = new BinaryItem(node.serializeToByteList());
return objectData;
}
@@ -258,7 +258,7 @@ public class ObjectGroupDataElementData extends DataElementData {
}
objectData.ObjectExGUIDArray = new ExGUIDArray(extendedGuidList);
- objectData.Data = new BinaryItem(node.SerializeToByteList());
+ objectData.Data = new BinaryItem(node.serializeToByteList());
return objectData;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDeclarations.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDeclarations.java
index c2ec347..40d3128 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDeclarations.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupDeclarations.java
@@ -46,7 +46,7 @@ public class ObjectGroupDeclarations extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
if (lengthOfItems != 0) {
throw new StreamObjectParseErrorException(currentIndex.get(), "ObjectGroupDeclarations",
@@ -58,25 +58,24 @@ public class ObjectGroupDeclarations extends StreamObject {
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
this.ObjectDeclarationList = new ArrayList<>();
this.ObjectGroupObjectBLOBDataDeclarationList = new ArrayList<>();
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
if (header.get().type == StreamObjectTypeHeaderStart.ObjectGroupObjectDeclare) {
index.addAndGet(headerLength);
this.ObjectDeclarationList.add(
- (ObjectGroupObjectDeclare) StreamObject.ParseStreamObject(header.get(),
+ (ObjectGroupObjectDeclare) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else if (header.get().type ==
StreamObjectTypeHeaderStart.ObjectGroupObjectBLOBDataDeclaration) {
index.addAndGet(headerLength);
this.ObjectGroupObjectBLOBDataDeclarationList.add(
- (ObjectGroupObjectBLOBDataDeclaration) StreamObject.ParseStreamObject(
+ (ObjectGroupObjectBLOBDataDeclaration) StreamObject.parseStreamObject(
header.get(), byteArray, index));
} else {
throw new StreamObjectParseErrorException(index.get(), "ObjectGroupDeclarations",
"Failed to parse ObjectGroupDeclarations, expect the inner object type either " +
"ObjectGroupObjectDeclare or ObjectGroupObjectBLOBDataDeclaration, " +
- "but actual type value is " +
- header.get().type, null);
+ "but actual type value is " + header.get().type, null);
}
}
@@ -90,17 +89,17 @@ public class ObjectGroupDeclarations extends StreamObject {
* @return A constant value 0
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
if (this.ObjectDeclarationList != null) {
for (ObjectGroupObjectDeclare objectGroupObjectDeclare : this.ObjectDeclarationList) {
- byteList.addAll(objectGroupObjectDeclare.SerializeToByteList());
+ byteList.addAll(objectGroupObjectDeclare.serializeToByteList());
}
}
if (this.ObjectGroupObjectBLOBDataDeclarationList != null) {
for (ObjectGroupObjectBLOBDataDeclaration objectGroupObjectBLOBDataDeclaration :
this.ObjectGroupObjectBLOBDataDeclarationList) {
- byteList.addAll(objectGroupObjectBLOBDataDeclaration.SerializeToByteList());
+ byteList.addAll(objectGroupObjectBLOBDataDeclaration.serializeToByteList());
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadata.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadata.java
index 8b6632c..6ceb82a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadata.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadata.java
@@ -52,7 +52,7 @@ public class ObjectGroupMetadata extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.ObjectChangeFrequency = BasicObject.parse(byteArray, index, Compact64bitInt.class);
@@ -72,8 +72,8 @@ public class ObjectGroupMetadata extends StreamObject {
* @return The number of elements actually contained in the list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- List<Byte> tmpList = this.ObjectChangeFrequency.SerializeToByteList();
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ List<Byte> tmpList = this.ObjectChangeFrequency.serializeToByteList();
byteList.addAll(tmpList);
return tmpList.size();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadataDeclarations.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadataDeclarations.java
index 35925fe..7f6668a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadataDeclarations.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupMetadataDeclarations.java
@@ -43,10 +43,10 @@ public class ObjectGroupMetadataDeclarations extends StreamObject {
* @return A constant value 0
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
if (this.ObjectGroupMetadataList != null) {
for (ObjectGroupMetadata objectGroupMetadata : this.ObjectGroupMetadataList) {
- byteList.addAll(objectGroupMetadata.SerializeToByteList());
+ byteList.addAll(objectGroupMetadata.serializeToByteList());
}
}
@@ -61,7 +61,7 @@ public class ObjectGroupMetadataDeclarations extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
if (lengthOfItems != 0) {
throw new StreamObjectParseErrorException(currentIndex.get(),
@@ -73,17 +73,18 @@ public class ObjectGroupMetadataDeclarations extends StreamObject {
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
this.ObjectGroupMetadataList = new ArrayList<>();
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
index.addAndGet(headerLength);
if (header.get().type == StreamObjectTypeHeaderStart.ObjectGroupMetadata) {
this.ObjectGroupMetadataList.add(
- (ObjectGroupMetadata) StreamObject.ParseStreamObject(header.get(),
+ (ObjectGroupMetadata) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else {
throw new StreamObjectParseErrorException(index.get(), "ObjectGroupDeclarations",
"Failed to parse ObjectGroupMetadataDeclarations, expect the inner object type " +
- "ObjectGroupMetadata, but actual type value is " + header.get().type, null);
+ "ObjectGroupMetadata, but actual type value is " +
+ header.get().type, null);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectBLOBDataDeclaration.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectBLOBDataDeclaration.java
index d8f68b3..db4140f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectBLOBDataDeclaration.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectBLOBDataDeclaration.java
@@ -62,7 +62,7 @@ public class ObjectGroupObjectBLOBDataDeclaration extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
@@ -87,14 +87,14 @@ public class ObjectGroupObjectBLOBDataDeclaration extends StreamObject {
* @return The number of the element
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.ObjectExGUID.SerializeToByteList());
- byteList.addAll(this.ObjectDataBLOBExGUID.SerializeToByteList());
- byteList.addAll(this.ObjectPartitionID.SerializeToByteList());
- byteList.addAll(this.ObjectDataSize.SerializeToByteList());
- byteList.addAll(this.ObjectReferencesCount.SerializeToByteList());
- byteList.addAll(this.CellReferencesCount.SerializeToByteList());
+ byteList.addAll(this.ObjectExGUID.serializeToByteList());
+ byteList.addAll(this.ObjectDataBLOBExGUID.serializeToByteList());
+ byteList.addAll(this.ObjectPartitionID.serializeToByteList());
+ byteList.addAll(this.ObjectDataSize.serializeToByteList());
+ byteList.addAll(this.ObjectReferencesCount.serializeToByteList());
+ byteList.addAll(this.CellReferencesCount.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectData.java
index 8614388..d1bd4ad 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectData.java
@@ -48,7 +48,7 @@ public class ObjectGroupObjectData extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.ObjectExGUIDArray = BasicObject.parse(byteArray, index, ExGUIDArray.class);
@@ -70,11 +70,11 @@ public class ObjectGroupObjectData extends StreamObject {
* @return The number of the element
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.ObjectExGUIDArray.SerializeToByteList());
- byteList.addAll(this.cellIDArray.SerializeToByteList());
- byteList.addAll(this.Data.SerializeToByteList());
+ byteList.addAll(this.ObjectExGUIDArray.serializeToByteList());
+ byteList.addAll(this.cellIDArray.serializeToByteList());
+ byteList.addAll(this.Data.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDataBLOBReference.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDataBLOBReference.java
index 4bd390c..4595b3b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDataBLOBReference.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDataBLOBReference.java
@@ -51,7 +51,7 @@ public class ObjectGroupObjectDataBLOBReference extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.ObjectExtendedGUIDArray = BasicObject.parse(byteArray, index, ExGUIDArray.class);
@@ -73,11 +73,11 @@ public class ObjectGroupObjectDataBLOBReference extends StreamObject {
* @return The number of the elements
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.ObjectExtendedGUIDArray.SerializeToByteList());
- byteList.addAll(cellIDArray.SerializeToByteList());
- byteList.addAll(this.BLOBExtendedGUID.SerializeToByteList());
+ byteList.addAll(this.ObjectExtendedGUIDArray.serializeToByteList());
+ byteList.addAll(cellIDArray.serializeToByteList());
+ byteList.addAll(this.BLOBExtendedGUID.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDeclare.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDeclare.java
index 55e2015..42ed412 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDeclare.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/ObjectGroupObjectDeclare.java
@@ -63,7 +63,7 @@ public class ObjectGroupObjectDeclare extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
@@ -88,13 +88,13 @@ public class ObjectGroupObjectDeclare extends StreamObject {
* @return The number of the element
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.ObjectExtendedGUID.SerializeToByteList());
- byteList.addAll(this.ObjectPartitionID.SerializeToByteList());
- byteList.addAll(this.ObjectDataSize.SerializeToByteList());
- byteList.addAll(this.ObjectReferencesCount.SerializeToByteList());
- byteList.addAll(this.CellReferencesCount.SerializeToByteList());
+ byteList.addAll(this.ObjectExtendedGUID.serializeToByteList());
+ byteList.addAll(this.ObjectPartitionID.serializeToByteList());
+ byteList.addAll(this.ObjectDataSize.serializeToByteList());
+ byteList.addAll(this.ObjectReferencesCount.serializeToByteList());
+ byteList.addAll(this.CellReferencesCount.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySet.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySet.java
index c0813c7..b5f4678 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySet.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySet.java
@@ -47,18 +47,18 @@ public class PropertySet implements IProperty {
*
* @return Return the byte list which store the byte information of PropertySet.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
for (byte b : BitConverter.getBytes(this.CProperties)) {
byteList.add(b);
}
for (PropertyID propertyId : this.RgPrids) {
- byteList.addAll(propertyId.SerializeToByteList());
+ byteList.addAll(propertyId.serializeToByteList());
}
for (IProperty property : this.RgData) {
- byteList.addAll(property.SerializeToByteList());
+ byteList.addAll(property.serializeToByteList());
}
return byteList;
@@ -71,7 +71,7 @@ public class PropertySet implements IProperty {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the PropertySet.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.CProperties = BitConverter.toInt16(byteArray, startIndex);
@@ -79,7 +79,7 @@ public class PropertySet implements IProperty {
this.RgPrids = new PropertyID[this.CProperties];
for (int i = 0; i < this.CProperties; i++) {
PropertyID propertyID = new PropertyID();
- propertyID.DoDeserializeFromByteArray(byteArray, index);
+ propertyID.doDeserializeFromByteArray(byteArray, index);
this.RgPrids[i] = propertyID;
index += 4;
}
@@ -124,7 +124,7 @@ public class PropertySet implements IProperty {
break;
}
if (property != null) {
- int len = property.DoDeserializeFromByteArray(byteArray, index);
+ int len = property.doDeserializeFromByteArray(byteArray, index);
this.RgData.add(property);
index += len;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySetObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySetObject.java
index 35f994b..a3b4374 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySetObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/PropertySetObject.java
@@ -27,6 +27,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.util.ByteUtil;
public class PropertySetObject {
public ObjectGroupObjectDeclare ObjectDeclaration;
public ObjectSpaceObjectPropSet ObjectSpaceObjectPropSet;
+
/**
* Construct the PropertySetObject instance.
*
@@ -37,7 +38,7 @@ public class PropertySetObject {
ObjectGroupObjectData objectData) {
this.ObjectDeclaration = objectDeclaration;
this.ObjectSpaceObjectPropSet = new ObjectSpaceObjectPropSet();
- this.ObjectSpaceObjectPropSet.DoDeserializeFromByteArray(
+ this.ObjectSpaceObjectPropSet.doDeserializeFromByteArray(
ByteUtil.toByteArray(objectData.Data.Content), 0);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifest.java
index b8ded21..4fe0498 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifest.java
@@ -42,7 +42,7 @@ public class RevisionManifest extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.RevisionID = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -63,10 +63,10 @@ public class RevisionManifest extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.RevisionID.SerializeToByteList());
- byteList.addAll(this.BaseRevisionID.SerializeToByteList());
+ byteList.addAll(this.RevisionID.serializeToByteList());
+ byteList.addAll(this.BaseRevisionID.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestDataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestDataElementData.java
index 1681dc0..b78b823 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestDataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestDataElementData.java
@@ -27,7 +27,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.exception.DataElementPa
public class RevisionManifestDataElementData extends DataElementData {
public RevisionManifest RevisionManifest;
public List<RevisionManifestRootDeclare> RevisionManifestRootDeclareList;
- public List<RevisionManifestObjectGroupReferences> RevisionManifestObjectGroupReferencesList;
+ public List<RevisionManifestObjectGroupReferences> revisionManifestObjectGroupReferences;
/**
* Initializes a new instance of the RevisionManifestDataElementData class.
@@ -35,7 +35,7 @@ public class RevisionManifestDataElementData extends DataElementData {
public RevisionManifestDataElementData() {
this.RevisionManifest = new RevisionManifest();
this.RevisionManifestRootDeclareList = new ArrayList<>();
- this.RevisionManifestObjectGroupReferencesList = new ArrayList<>();
+ this.revisionManifestObjectGroupReferences = new ArrayList<>();
}
/**
@@ -46,26 +46,26 @@ public class RevisionManifestDataElementData extends DataElementData {
* @return The length of the element
*/
@Override
- public int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
+ public int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
- this.RevisionManifest = StreamObject.GetCurrent(byteArray, index, RevisionManifest.class);
+ this.RevisionManifest = StreamObject.getCurrent(byteArray, index, RevisionManifest.class);
this.RevisionManifestRootDeclareList = new ArrayList<>();
- this.RevisionManifestObjectGroupReferencesList = new ArrayList<>();
+ this.revisionManifestObjectGroupReferences = new ArrayList<>();
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
int headerLength = 0;
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
if (header.get().type == StreamObjectTypeHeaderStart.RevisionManifestRootDeclare) {
index.addAndGet(headerLength);
this.RevisionManifestRootDeclareList.add(
- (RevisionManifestRootDeclare) StreamObject.ParseStreamObject(header.get(),
+ (RevisionManifestRootDeclare) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else if (header.get().type ==
StreamObjectTypeHeaderStart.RevisionManifestObjectGroupReferences) {
index.addAndGet(headerLength);
- this.RevisionManifestObjectGroupReferencesList.add(
- (RevisionManifestObjectGroupReferences) StreamObject.ParseStreamObject(
+ this.revisionManifestObjectGroupReferences.add(
+ (RevisionManifestObjectGroupReferences) StreamObject.parseStreamObject(
header.get(), byteArray, index));
} else {
throw new DataElementParseErrorException(index.get(),
@@ -84,20 +84,20 @@ public class RevisionManifestDataElementData extends DataElementData {
* @return A Byte list
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.RevisionManifest.SerializeToByteList());
+ byteList.addAll(this.RevisionManifest.serializeToByteList());
if (this.RevisionManifestRootDeclareList != null) {
for (RevisionManifestRootDeclare revisionManifestRootDeclare : this.RevisionManifestRootDeclareList) {
- byteList.addAll(revisionManifestRootDeclare.SerializeToByteList());
+ byteList.addAll(revisionManifestRootDeclare.serializeToByteList());
}
}
- if (this.RevisionManifestObjectGroupReferencesList != null) {
+ if (this.revisionManifestObjectGroupReferences != null) {
for (RevisionManifestObjectGroupReferences revisionManifestObjectGroupReferences :
- this.RevisionManifestObjectGroupReferencesList) {
- byteList.addAll(revisionManifestObjectGroupReferences.SerializeToByteList());
+ this.revisionManifestObjectGroupReferences) {
+ byteList.addAll(revisionManifestObjectGroupReferences.serializeToByteList());
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestObjectGroupReferences.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestObjectGroupReferences.java
index 9296dfc..a06f6d0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestObjectGroupReferences.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestObjectGroupReferences.java
@@ -27,7 +27,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.streamobj.basic.ExGuid;
* Specifies a revision manifest object group references, each followed by object group extended GUIDs
*/
public class RevisionManifestObjectGroupReferences extends StreamObject {
- public ExGuid ObjectGroupExtendedGUID;
+ public ExGuid objectGroupExtendedGUID;
/**
* Initializes a new instance of the RevisionManifestObjectGroupReferences class.
@@ -43,7 +43,7 @@ public class RevisionManifestObjectGroupReferences extends StreamObject {
*/
public RevisionManifestObjectGroupReferences(ExGuid objectGroupExtendedGUID) {
super(StreamObjectTypeHeaderStart.RevisionManifestObjectGroupReferences);
- this.ObjectGroupExtendedGUID = objectGroupExtendedGUID;
+ this.objectGroupExtendedGUID = objectGroupExtendedGUID;
}
/**
@@ -54,10 +54,10 @@ public class RevisionManifestObjectGroupReferences extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
- this.ObjectGroupExtendedGUID = BasicObject.parse(byteArray, index, ExGuid.class);
+ this.objectGroupExtendedGUID = BasicObject.parse(byteArray, index, ExGuid.class);
if (index.get() - currentIndex.get() != lengthOfItems) {
throw new StreamObjectParseErrorException(currentIndex.get(),
"RevisionManifestObjectGroupReferences", "Stream object over-parse error",
@@ -74,8 +74,8 @@ public class RevisionManifestObjectGroupReferences extends StreamObject {
* @return The number of elements actually contained in the list.
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- List<Byte> tmpList = this.ObjectGroupExtendedGUID.SerializeToByteList();
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ List<Byte> tmpList = this.objectGroupExtendedGUID.serializeToByteList();
byteList.addAll(tmpList);
return tmpList.size();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestRootDeclare.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestRootDeclare.java
index 3a9bbf9..5381b83 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestRootDeclare.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionManifestRootDeclare.java
@@ -45,7 +45,7 @@ public class RevisionManifestRootDeclare extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.RootExGuid = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -65,10 +65,10 @@ public class RevisionManifestRootDeclare extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.RootExGuid.SerializeToByteList());
- byteList.addAll(this.ObjectExGuid.SerializeToByteList());
+ byteList.addAll(this.RootExGuid.serializeToByteList());
+ byteList.addAll(this.ObjectExGuid.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObject.java
index f28326e..a1c27c7 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObject.java
@@ -35,6 +35,7 @@ public class RevisionStoreObject {
FileDataObject;
public ExGUIDArray ReferencedObjectID;
public CellIDArray ReferencedObjectSpacesID;
+
/**
* Initialize the class.
*/
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObjectGroup.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObjectGroup.java
index 1754b43..f45d491 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObjectGroup.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/RevisionStoreObjectGroup.java
@@ -29,6 +29,7 @@ public class RevisionStoreObjectGroup {
public ExGuid ObjectGroupID;
public List<RevisionStoreObject> Objects;
public List<EncryptionObject> EncryptionObjects;
+
public RevisionStoreObjectGroup(ExGuid objectGroupId) {
this.Objects = new ArrayList<>();
this.EncryptionObjects = new ArrayList<>();
@@ -87,9 +88,9 @@ public class RevisionStoreObjectGroup {
}
if (objectGroupObjectBLOBDataDeclaration.ObjectPartitionID.getDecodedValue() == 2) {
revisionObject.FileDataObject = new FileDataObject();
- revisionObject.FileDataObject.ObjectDataBLOBDeclaration =
+ revisionObject.FileDataObject.objectDataBLOBDeclaration =
objectGroupObjectBLOBDataDeclaration;
- revisionObject.FileDataObject.ObjectDataBLOBReference =
+ revisionObject.FileDataObject.objectDataBLOBReference =
objectGroupObjectDataBLOBReference;
}
}
@@ -104,8 +105,8 @@ public class RevisionStoreObjectGroup {
if (objectDeclaration.ObjectPartitionID.getDecodedValue() == 1) {
EncryptionObject encrypObject = new EncryptionObject();
- encrypObject.ObjectDeclaration = objectDeclaration;
- encrypObject.ObjectData = ByteUtil.toByteArray(objectData.Data.Content);
+ encrypObject.objectDeclaration = objectDeclaration;
+ encrypObject.objectData = ByteUtil.toByteArray(objectData.Data.Content);
objectGroup.EncryptionObjects.add(encrypObject);
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/SignatureObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/SignatureObject.java
index fbdd696..e8630bf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/SignatureObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/SignatureObject.java
@@ -50,7 +50,7 @@ public class SignatureObject extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
@@ -71,9 +71,9 @@ public class SignatureObject extends StreamObject {
* @return The number of elements
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int length = byteList.size();
- byteList.addAll(this.SignatureData.SerializeToByteList());
+ byteList.addAll(this.SignatureData.serializeToByteList());
return byteList.size() - length;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexCellMapping.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexCellMapping.java
index a13c930..dae4922 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexCellMapping.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexCellMapping.java
@@ -49,7 +49,7 @@ public class StorageIndexCellMapping extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.CellID = BasicObject.parse(byteArray, index, CellID.class);
@@ -71,11 +71,11 @@ public class StorageIndexCellMapping extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.CellID.SerializeToByteList());
- byteList.addAll(this.CellMappingExGuid.SerializeToByteList());
- byteList.addAll(this.CellMappingSerialNumber.SerializeToByteList());
+ byteList.addAll(this.CellID.serializeToByteList());
+ byteList.addAll(this.CellMappingExGuid.serializeToByteList());
+ byteList.addAll(this.CellMappingSerialNumber.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexDataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexDataElementData.java
index 96912fb..dfeb960 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexDataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexDataElementData.java
@@ -26,7 +26,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.exception.DataElementPa
public class StorageIndexDataElementData extends DataElementData {
public StorageIndexManifestMapping StorageIndexManifestMapping;
- public List<StorageIndexCellMapping> StorageIndexCellMappingList;
+ public List<StorageIndexCellMapping> storageIndexCellMappingList;
public List<StorageIndexRevisionMapping> StorageIndexRevisionMappingList;
/**
@@ -34,7 +34,7 @@ public class StorageIndexDataElementData extends DataElementData {
*/
public StorageIndexDataElementData() {
this.StorageIndexManifestMapping = new StorageIndexManifestMapping();
- this.StorageIndexCellMappingList = new ArrayList<>();
+ this.storageIndexCellMappingList = new ArrayList<>();
this.StorageIndexRevisionMappingList = new ArrayList<>();
}
@@ -44,23 +44,23 @@ public class StorageIndexDataElementData extends DataElementData {
* @return A Byte list
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
if (this.StorageIndexManifestMapping != null) {
- byteList.addAll(this.StorageIndexManifestMapping.SerializeToByteList());
+ byteList.addAll(this.StorageIndexManifestMapping.serializeToByteList());
}
- if (this.StorageIndexCellMappingList != null) {
- for (StorageIndexCellMapping cellMapping : this.StorageIndexCellMappingList) {
- byteList.addAll(cellMapping.SerializeToByteList());
+ if (this.storageIndexCellMappingList != null) {
+ for (StorageIndexCellMapping cellMapping : this.storageIndexCellMappingList) {
+ byteList.addAll(cellMapping.serializeToByteList());
}
}
// Storage Index Revision Mapping
if (this.StorageIndexRevisionMappingList != null) {
for (StorageIndexRevisionMapping revisionMapping : this.StorageIndexRevisionMappingList) {
- byteList.addAll(revisionMapping.SerializeToByteList());
+ byteList.addAll(revisionMapping.serializeToByteList());
}
}
@@ -75,12 +75,12 @@ public class StorageIndexDataElementData extends DataElementData {
* @return The length of the element
*/
@Override
- public int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
+ public int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
int headerLength = 0;
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
boolean isStorageIndexManifestMappingExist = false;
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
index.addAndGet(headerLength);
if (header.get().type == StreamObjectTypeHeaderStart.StorageIndexManifestMapping) {
@@ -91,17 +91,17 @@ public class StorageIndexDataElementData extends DataElementData {
}
this.StorageIndexManifestMapping =
- (StorageIndexManifestMapping) StreamObject.ParseStreamObject(header.get(),
+ (StorageIndexManifestMapping) StreamObject.parseStreamObject(header.get(),
byteArray, index);
isStorageIndexManifestMappingExist = true;
} else if (header.get().type == StreamObjectTypeHeaderStart.StorageIndexCellMapping) {
- this.StorageIndexCellMappingList.add(
- (StorageIndexCellMapping) StreamObject.ParseStreamObject(header.get(),
+ this.storageIndexCellMappingList.add(
+ (StorageIndexCellMapping) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else if (header.get().type ==
StreamObjectTypeHeaderStart.StorageIndexRevisionMapping) {
this.StorageIndexRevisionMappingList.add(
- (StorageIndexRevisionMapping) StreamObject.ParseStreamObject(header.get(),
+ (StorageIndexRevisionMapping) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else {
throw new DataElementParseErrorException(index.get() - headerLength,
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexManifestMapping.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexManifestMapping.java
index 385bba8..3378c7f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexManifestMapping.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexManifestMapping.java
@@ -43,7 +43,7 @@ public class StorageIndexManifestMapping extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.ManifestMappingExGuid = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -64,10 +64,10 @@ public class StorageIndexManifestMapping extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.ManifestMappingExGuid.SerializeToByteList());
- byteList.addAll(this.ManifestMappingSerialNumber.SerializeToByteList());
+ byteList.addAll(this.ManifestMappingExGuid.serializeToByteList());
+ byteList.addAll(this.ManifestMappingSerialNumber.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexRevisionMapping.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexRevisionMapping.java
index 8498ee5..f19158c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexRevisionMapping.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageIndexRevisionMapping.java
@@ -48,7 +48,7 @@ public class StorageIndexRevisionMapping extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.RevisionExGuid = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -70,11 +70,11 @@ public class StorageIndexRevisionMapping extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.RevisionExGuid.SerializeToByteList());
- byteList.addAll(this.RevisionMappingExGuid.SerializeToByteList());
- byteList.addAll(this.RevisionMappingSerialNumber.SerializeToByteList());
+ byteList.addAll(this.RevisionExGuid.serializeToByteList());
+ byteList.addAll(this.RevisionMappingExGuid.serializeToByteList());
+ byteList.addAll(this.RevisionMappingSerialNumber.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestDataElementData.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestDataElementData.java
index 605d400..ba94f9b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestDataElementData.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestDataElementData.java
@@ -26,7 +26,7 @@ import org.apache.tika.parser.microsoft.onenote.fsshttpb.exception.DataElementPa
public class StorageManifestDataElementData extends DataElementData {
public StorageManifestSchemaGUID storageManifestSchemaGUID;
- public List<StorageManifestRootDeclare> StorageManifestRootDeclareList;
+ public List<StorageManifestRootDeclare> storageManifestRootDeclareList;
/**
* Initializes a new instance of the StorageManifestDataElementData class.
@@ -34,7 +34,7 @@ public class StorageManifestDataElementData extends DataElementData {
public StorageManifestDataElementData() {
// Storage Manifest
this.storageManifestSchemaGUID = new StorageManifestSchemaGUID();
- this.StorageManifestRootDeclareList = new ArrayList<>();
+ this.storageManifestRootDeclareList = new ArrayList<>();
}
/**
@@ -43,13 +43,13 @@ public class StorageManifestDataElementData extends DataElementData {
* @return A Byte list
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<Byte>();
- byteList.addAll(this.storageManifestSchemaGUID.SerializeToByteList());
+ byteList.addAll(this.storageManifestSchemaGUID.serializeToByteList());
- if (this.StorageManifestRootDeclareList != null) {
- for (StorageManifestRootDeclare storageManifestRootDeclare : this.StorageManifestRootDeclareList) {
- byteList.addAll(storageManifestRootDeclare.SerializeToByteList());
+ if (this.storageManifestRootDeclareList != null) {
+ for (StorageManifestRootDeclare storageManifestRootDeclare : this.storageManifestRootDeclareList) {
+ byteList.addAll(storageManifestRootDeclare.serializeToByteList());
}
}
@@ -64,21 +64,21 @@ public class StorageManifestDataElementData extends DataElementData {
* @return The length of the array
*/
@Override
- public int DeserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
+ public int deserializeDataElementDataFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
this.storageManifestSchemaGUID =
- StreamObject.GetCurrent(byteArray, index, StorageManifestSchemaGUID.class);
- this.StorageManifestRootDeclareList = new ArrayList<>();
+ StreamObject.getCurrent(byteArray, index, StorageManifestSchemaGUID.class);
+ this.storageManifestRootDeclareList = new ArrayList<>();
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
int headerLength = 0;
- while ((headerLength = StreamObjectHeaderStart.TryParse(byteArray, index.get(), header)) !=
+ while ((headerLength = StreamObjectHeaderStart.tryParse(byteArray, index.get(), header)) !=
0) {
if (header.get().type == StreamObjectTypeHeaderStart.StorageManifestRootDeclare) {
index.addAndGet(headerLength);
- this.StorageManifestRootDeclareList.add(
- (StorageManifestRootDeclare) StreamObject.ParseStreamObject(header.get(),
+ this.storageManifestRootDeclareList.add(
+ (StorageManifestRootDeclare) StreamObject.parseStreamObject(header.get(),
byteArray, index));
} else {
throw new DataElementParseErrorException(index.get(),
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestRootDeclare.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestRootDeclare.java
index 27dc74a..f2a8310 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestRootDeclare.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestRootDeclare.java
@@ -46,7 +46,7 @@ public class StorageManifestRootDeclare extends StreamObject {
* @param lengthOfItems The length of items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
this.RootExGUID = BasicObject.parse(byteArray, index, ExGuid.class);
@@ -67,10 +67,10 @@ public class StorageManifestRootDeclare extends StreamObject {
* @return The length of list
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
+ protected int serializeItemsToByteList(List<Byte> byteList) {
int itemsIndex = byteList.size();
- byteList.addAll(this.RootExGUID.SerializeToByteList());
- byteList.addAll(this.cellID.SerializeToByteList());
+ byteList.addAll(this.RootExGUID.serializeToByteList());
+ byteList.addAll(this.cellID.serializeToByteList());
return byteList.size() - itemsIndex;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestSchemaGUID.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestSchemaGUID.java
index 3c53702..70f7990 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestSchemaGUID.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StorageManifestSchemaGUID.java
@@ -47,7 +47,7 @@ public class StorageManifestSchemaGUID extends StreamObject {
* @param lengthOfItems The length of the items
*/
@Override
- protected void DeserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
+ protected void deserializeItemsFromByteArray(byte[] byteArray, AtomicInteger currentIndex,
int lengthOfItems) {
AtomicInteger index = new AtomicInteger(currentIndex.get());
byte[] temp = Arrays.copyOf(byteArray, 16);
@@ -69,8 +69,9 @@ public class StorageManifestSchemaGUID extends StreamObject {
* @return A constant value 16
*/
@Override
- protected int SerializeItemsToByteList(List<Byte> byteList) {
- byteList.addAll(ByteUtil.toListOfByte(this.guid.toString().getBytes(StandardCharsets.UTF_8)));
+ protected int serializeItemsToByteList(List<Byte> byteList) {
+ byteList.addAll(
+ ByteUtil.toListOfByte(this.guid.toString().getBytes(StandardCharsets.UTF_8)));
return 16;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObject.java
index 06b5493..c547c9d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObject.java
@@ -119,13 +119,13 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @param index The position where to start.
* @return The current object instance.
*/
- public static <T extends StreamObject> T GetCurrent(byte[] byteArray, AtomicInteger index,
+ public static <T extends StreamObject> T getCurrent(byte[] byteArray, AtomicInteger index,
Class<T> clazz) {
AtomicInteger tmpIndex = new AtomicInteger(index.get());
int length;
AtomicReference<StreamObjectHeaderStart> streamObjectHeader = new AtomicReference<>();
if ((length =
- StreamObjectHeaderStart.TryParse(byteArray, tmpIndex.get(), streamObjectHeader)) ==
+ StreamObjectHeaderStart.tryParse(byteArray, tmpIndex.get(), streamObjectHeader)) ==
0) {
throw new StreamObjectParseErrorException(tmpIndex.get(), clazz.getName(),
"Failed to extract either 16bit or 32bit stream object header in the current index.",
@@ -135,7 +135,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
tmpIndex.addAndGet(length);
StreamObject streamObject =
- ParseStreamObject(streamObjectHeader.get(), byteArray, tmpIndex);
+ parseStreamObject(streamObjectHeader.get(), byteArray, tmpIndex);
if (!streamObject.getClass().equals(clazz)) {
String destClassName = "(null)";
@@ -144,8 +144,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
streamObjectTypeMapping.get(streamObjectHeader.get().type).getName();
}
throw new StreamObjectParseErrorException(tmpIndex.get(), clazz.getName(),
- String.format(
- Locale.US,
+ String.format(Locale.US,
"Failed to get stream object as expect type %s, actual type is %s",
clazz.getName(), destClassName), null);
}
@@ -163,7 +162,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @param index The position where to start.
* @return The instance of StreamObject.
*/
- public static StreamObject ParseStreamObject(StreamObjectHeaderStart header, byte[] byteArray,
+ public static StreamObject parseStreamObject(StreamObjectHeaderStart header, byte[] byteArray,
AtomicInteger index) {
if (streamObjectTypeMapping.containsKey(header.type)) {
Class headerTypeClass = streamObjectTypeMapping.get(header.type);
@@ -174,7 +173,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
throw new RuntimeException("Could not instantiate class " + headerTypeClass, e);
}
- int res = streamObject.DeserializeFromByteArray(header, byteArray, index.get());
+ int res = streamObject.deserializeFromByteArray(header, byteArray, index.get());
index.addAndGet(res);
return streamObject;
@@ -183,10 +182,10 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
int tmpIndex = index.get();
tmpIndex -=
header.headerType == StreamObjectHeaderStart.StreamObjectHeaderStart16bit ? 2 : 4;
- throw new StreamObjectParseErrorException(tmpIndex, "Unknown", String.format(
- Locale.US,
+ throw new StreamObjectParseErrorException(tmpIndex, "Unknown", String.format(Locale.US,
"Failed to create the specified stream object instance, the type %s of stream object " +
- "header in the current index is not defined", header.type.getIntVal()), null);
+ "header in the current index is not defined", header.type.getIntVal()),
+ null);
}
/**
@@ -198,7 +197,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @return The result of whether get success.
*/
- public static <T extends StreamObject> boolean TryGetCurrent(byte[] byteArray,
+ public static <T extends StreamObject> boolean tryGetCurrent(byte[] byteArray,
AtomicInteger index,
AtomicReference<T> streamObject,
Class<T> clazz) {
@@ -207,7 +206,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
int length = 0;
AtomicReference<StreamObjectHeaderStart> streamObjectHeader = new AtomicReference<>();
if ((length =
- StreamObjectHeaderStart.TryParse(byteArray, tmpIndex.get(), streamObjectHeader)) ==
+ StreamObjectHeaderStart.tryParse(byteArray, tmpIndex.get(), streamObjectHeader)) ==
0) {
return false;
}
@@ -215,7 +214,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
tmpIndex.addAndGet(length);
if (streamObjectTypeMapping.containsKey(streamObjectHeader.get().type) &&
streamObjectTypeMapping.get(streamObjectHeader.get().type).equals(clazz)) {
- streamObject.set((T) ParseStreamObject(streamObjectHeader.get(), byteArray, tmpIndex));
+ streamObject.set((T) parseStreamObject(streamObjectHeader.get(), byteArray, tmpIndex));
} else {
return false;
}
@@ -229,10 +228,10 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
*
* @return The byte list.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- int lengthOfItems = this.SerializeItemsToByteList(byteList);
+ int lengthOfItems = this.serializeItemsToByteList(byteList);
AtomicReference<StreamObjectHeaderStart> header = new AtomicReference<>();
if (this.streamObjectType.getIntVal() <= 0x3F && lengthOfItems <= 127) {
@@ -241,15 +240,15 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
header.set(new StreamObjectHeaderStart32bit(this.streamObjectType, lengthOfItems));
}
- byteList.addAll(0, header.get().SerializeToByteList());
+ byteList.addAll(0, header.get().serializeToByteList());
if (compoundTypes.contains(this.streamObjectType)) {
if (this.streamObjectType.getIntVal() <= 0x3F) {
byteList.addAll(new StreamObjectHeaderEnd8bit(
- this.streamObjectType.getIntVal()).SerializeToByteList());
+ this.streamObjectType.getIntVal()).serializeToByteList());
} else {
byteList.addAll(new StreamObjectHeaderEnd16bit(
- this.streamObjectType.getIntVal()).SerializeToByteList());
+ this.streamObjectType.getIntVal()).serializeToByteList());
}
}
@@ -264,7 +263,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @param startIndex The position where to start.
* @return The element length
*/
- public int DeserializeFromByteArray(StreamObjectHeaderStart header, byte[] byteArray,
+ public int deserializeFromByteArray(StreamObjectHeaderStart header, byte[] byteArray,
int startIndex) {
this.streamObjectType = header.type;
this.lengthOfItems = header.length;
@@ -278,12 +277,12 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
AtomicInteger index = new AtomicInteger(startIndex);
this.streamObjectHeaderStart = header;
- this.DeserializeItemsFromByteArray(byteArray, index, this.lengthOfItems);
+ this.deserializeItemsFromByteArray(byteArray, index, this.lengthOfItems);
if (compoundTypes.contains(this.streamObjectType)) {
StreamObjectHeaderEnd end = null;
BitReader bitReader = new BitReader(byteArray, index.get());
- int aField = bitReader.ReadInt32(2);
+ int aField = bitReader.readInt32(2);
if (aField == 0x1) {
end = BasicObject.parse(byteArray, index, StreamObjectHeaderEnd8bit.class);
}
@@ -309,7 +308,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @param byteList The byte list need to serialized.
* @return The length in bytes for additional data if the current stream object has, otherwise return 0.
*/
- protected abstract int SerializeItemsToByteList(List<Byte> byteList);
+ protected abstract int serializeItemsToByteList(List<Byte> byteList);
/**
* De-serialize items from byte array.
@@ -318,7 +317,7 @@ public abstract class StreamObject implements IFSSHTTPBSerializable {
* @param currentIndex The index special where to start.
* @param lengthOfItems The length of items.
*/
- protected abstract void DeserializeItemsFromByteArray(byte[] byteArray,
+ protected abstract void deserializeItemsFromByteArray(byte[] byteArray,
AtomicInteger currentIndex,
int lengthOfItems);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd16bit.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd16bit.java
index c0e0001..42df3e1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd16bit.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd16bit.java
@@ -37,8 +37,7 @@ public class StreamObjectHeaderEnd16bit extends StreamObjectHeaderEnd {
public StreamObjectHeaderEnd16bit(int type) {
this.type = StreamObjectTypeHeaderEnd.fromIntVal(type);
if (this.type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"The type value RuntimeException is not defined for the stream object end 16-bit header",
type));
}
@@ -66,10 +65,10 @@ public class StreamObjectHeaderEnd16bit extends StreamObjectHeaderEnd {
* @return Return the byte list which store the byte information of StreamObjectHeaderEnd16bit.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitFieldWriter = new BitWriter(2);
- bitFieldWriter.AppendInit32(0x3, 2);
- bitFieldWriter.AppendUInit32(this.type.getIntVal(), 14);
+ bitFieldWriter.appendInit32(0x3, 2);
+ bitFieldWriter.appendUInit32(this.type.getIntVal(), 14);
return bitFieldWriter.getByteList();
}
@@ -78,8 +77,8 @@ public class StreamObjectHeaderEnd16bit extends StreamObjectHeaderEnd {
*
* @return Return StreamObjectHeaderEnd8bit value represented by unsigned short integer.
*/
- public short ToUint16() {
- List<Byte> bytes = this.SerializeToByteList();
+ public short toUint16() {
+ List<Byte> bytes = this.serializeToByteList();
return LittleEndianBitConverter.ToUInt16(ByteUtil.toByteArray(bytes), 0);
}
@@ -92,23 +91,20 @@ public class StreamObjectHeaderEnd16bit extends StreamObjectHeaderEnd {
* @return Return the length in byte of the StreamObjectHeaderEnd16bit basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader reader = new BitReader(byteArray, startIndex);
- int headerType = reader.ReadInt32(2);
+ int headerType = reader.readInt32(2);
if (headerType != 0x3) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderEnd16bit header type value, expect value %d, " +
- "but actual value is %s",
- 0x3, headerType));
+ "but actual value is %s", 0x3, headerType));
}
- int typeValue = reader.ReadUInt32(14);
+ int typeValue = reader.readUInt32(14);
this.type = StreamObjectTypeHeaderEnd.fromIntVal(typeValue);
if (this.type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderEnd16bit type value, the value %d is not defined",
typeValue));
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd8bit.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd8bit.java
index 68a46d8..f825e0e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd8bit.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderEnd8bit.java
@@ -36,8 +36,7 @@ public class StreamObjectHeaderEnd8bit extends StreamObjectHeaderEnd {
this.type = StreamObjectTypeHeaderEnd.fromIntVal(type);
if (this.type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"The type value %s is not defined for the stream object end 8 bit header",
type));
}
@@ -65,10 +64,10 @@ public class StreamObjectHeaderEnd8bit extends StreamObjectHeaderEnd {
* @return Return the byte list which store the byte information of StreamObjectHeaderEnd8bit.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitFieldWriter = new BitWriter(1);
- bitFieldWriter.AppendInit32(0x1, 2);
- bitFieldWriter.AppendUInit32(this.type.getIntVal(), 6);
+ bitFieldWriter.appendInit32(0x1, 2);
+ bitFieldWriter.appendUInit32(this.type.getIntVal(), 6);
return bitFieldWriter.getByteList();
}
@@ -77,8 +76,8 @@ public class StreamObjectHeaderEnd8bit extends StreamObjectHeaderEnd {
*
* @return Return StreamObjectHeaderEnd8bit value represented by byte.
*/
- public byte ToByte() {
- List<Byte> bytes = this.SerializeToByteList();
+ public byte toByte() {
+ List<Byte> bytes = this.serializeToByteList();
if (bytes.size() != 1) {
throw new RuntimeException("The unexpected StreamObjectHeaderEnd8bit length");
@@ -96,23 +95,20 @@ public class StreamObjectHeaderEnd8bit extends StreamObjectHeaderEnd {
* @return Return the length in byte of the StreamObjectHeaderEnd8bit basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader reader = new BitReader(byteArray, startIndex);
- int headerType = reader.ReadInt32(2);
+ int headerType = reader.readInt32(2);
if (headerType != 0x1) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderEnd8bit header type value, " +
- "expect value %s, but actual value is %s",
- 0x1, headerType));
+ "expect value %s, but actual value is %s", 0x1, headerType));
}
- int typeValue = reader.ReadUInt32(6);
+ int typeValue = reader.readUInt32(6);
this.type = StreamObjectTypeHeaderEnd.fromIntVal(typeValue);
if (this.type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderEnd8bit type value, the value %s is not defined",
typeValue));
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart.java
index c0574dd..5f3acd0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart.java
@@ -72,7 +72,7 @@ public abstract class StreamObjectHeaderStart extends BasicObject {
* @param streamObjectHeader Specify the out value for the parse result.
* @return Return true if success, otherwise returns false.
*/
- public static int TryParse(byte[] byteArray, int startIndex,
+ public static int tryParse(byte[] byteArray, int startIndex,
AtomicReference<StreamObjectHeaderStart> streamObjectHeader) {
int headerType = byteArray[startIndex] & 0x03;
if (headerType == StreamObjectHeaderStart.StreamObjectHeaderStart16bit) {
@@ -86,7 +86,7 @@ public abstract class StreamObjectHeaderStart extends BasicObject {
}
try {
- return streamObjectHeader.get().DeserializeFromByteArray(byteArray, startIndex);
+ return streamObjectHeader.get().deserializeFromByteArray(byteArray, startIndex);
} catch (Exception e) {
return 0;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart16bit.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart16bit.java
index ec736fa..a20dbcf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart16bit.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart16bit.java
@@ -72,12 +72,12 @@ public class StreamObjectHeaderStart16bit extends StreamObjectHeaderStart {
* @return Return the byte list which store the byte information of StreamObjectHeaderStart16bit.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitField = new BitWriter(2);
- bitField.AppendInit32(this.headerType, 2);
- bitField.AppendInit32(this.compound, 1);
- bitField.AppendUInit32(this.type.getIntVal(), 6);
- bitField.AppendInit32(this.length, 7);
+ bitField.appendInit32(this.headerType, 2);
+ bitField.appendInit32(this.compound, 1);
+ bitField.appendUInit32(this.type.getIntVal(), 6);
+ bitField.appendInit32(this.length, 7);
List<Byte> result = new ArrayList<>();
ByteUtil.appendByteArrayToListOfByte(result, bitField.getBytes());
return result;
@@ -89,7 +89,7 @@ public class StreamObjectHeaderStart16bit extends StreamObjectHeaderStart {
* @return Return the ushort value.
*/
public short ToUint16() {
- return LittleEndianBitConverter.ToUInt16(ByteUtil.toByteArray(this.SerializeToByteList()),
+ return LittleEndianBitConverter.ToUInt16(ByteUtil.toByteArray(this.serializeToByteList()),
0);
}
@@ -102,35 +102,32 @@ public class StreamObjectHeaderStart16bit extends StreamObjectHeaderStart {
* @return Return the length in byte of the StreamObjectHeaderStart16bit basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.headerType = bitReader.ReadInt32(2);
+ this.headerType = bitReader.readInt32(2);
if (this.headerType != StreamObjectHeaderStart.StreamObjectHeaderStart16bit) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderStart16bit header type value, expect value %s, " +
- "but actual value is %s",
- StreamObjectHeaderStart16bit, this.headerType));
+ "but actual value is %s", StreamObjectHeaderStart16bit,
+ this.headerType));
}
- this.compound = bitReader.ReadInt32(1);
- int typeValue = bitReader.ReadInt32(6);
+ this.compound = bitReader.readInt32(1);
+ int typeValue = bitReader.readInt32(6);
this.type = StreamObjectTypeHeaderStart.fromIntVal(typeValue);
if (type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderStart16bit type value, the value %s is not defined",
typeValue));
}
if (StreamObject.getCompoundTypes().contains(type) && this.compound != 1) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to parse the StreamObjectHeaderStart16bit header. If the type value is %s then " +
"the compound value should 1, but actual value is 0", typeValue));
}
- this.length = bitReader.ReadInt32(7);
+ this.length = bitReader.readInt32(7);
if (this.length > 127) {
throw new RuntimeException(
"16-bit Stream Object Header Start, Length (7-bits): A 7-bit unsigned integer that " +
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart32bit.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart32bit.java
index 416cfd5..ce7e653 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart32bit.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/StreamObjectHeaderStart32bit.java
@@ -78,17 +78,17 @@ public class StreamObjectHeaderStart32bit extends StreamObjectHeaderStart {
* @return Return the byte list which store the byte information of StreamObjectHeaderStart32bit.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitFieldWriter = new BitWriter(4);
- bitFieldWriter.AppendInit32(this.headerType, 2);
- bitFieldWriter.AppendInit32(this.compound, 1);
- bitFieldWriter.AppendUInit32(this.type.getIntVal(), 14);
- bitFieldWriter.AppendInit32(this.length, 15);
+ bitFieldWriter.appendInit32(this.headerType, 2);
+ bitFieldWriter.appendInit32(this.compound, 1);
+ bitFieldWriter.appendUInit32(this.type.getIntVal(), 14);
+ bitFieldWriter.appendInit32(this.length, 15);
List<Byte> listByte = bitFieldWriter.getByteList();
if (this.largeLength != null) {
- listByte.addAll(this.largeLength.SerializeToByteList());
+ listByte.addAll(this.largeLength.serializeToByteList());
}
return listByte;
@@ -103,36 +103,32 @@ public class StreamObjectHeaderStart32bit extends StreamObjectHeaderStart {
* @return Return the length in byte of the StreamObjectHeaderStart32bit basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.headerType = bitReader.ReadInt32(2);
+ this.headerType = bitReader.readInt32(2);
if (this.headerType != StreamObjectHeaderStart.StreamObjectHeaderStart32bit) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderStart32bit header type value, expect " +
"value %s, but actual value is %s",
StreamObjectHeaderStart.StreamObjectHeaderStart32bit, this.headerType));
}
- this.compound = bitReader.ReadInt32(1);
- int typeValue = bitReader.ReadInt32(14);
+ this.compound = bitReader.readInt32(1);
+ int typeValue = bitReader.readInt32(14);
this.type = StreamObjectTypeHeaderStart.fromIntVal(typeValue);
if (type == null) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to get the StreamObjectHeaderStart32bit type value, the value %s is not defined",
typeValue));
}
if (StreamObject.getCompoundTypes().contains(this.type) && this.compound != 1) {
- throw new RuntimeException(String.format(
- Locale.US,
+ throw new RuntimeException(String.format(Locale.US,
"Failed to parse the StreamObjectHeaderStart32bit header. If the type value is %s " +
- "then the compound value should 1, but actual value is 0",
- typeValue));
+ "then the compound value should 1, but actual value is 0", typeValue));
}
- this.length = bitReader.ReadInt32(15);
+ this.length = bitReader.readInt32(15);
AtomicInteger index = new AtomicInteger(startIndex);
index.addAndGet(4);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AdapterHelper.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AdapterHelper.java
index 8701924..8effd7d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AdapterHelper.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AdapterHelper.java
@@ -34,7 +34,7 @@ public class AdapterHelper {
* @param startIndex The offset of the Guid value.
* @return Return the value of Guid.
*/
- public static UUID ReadGuid(byte[] byteArray, int startIndex) {
+ public static UUID readGuid(byte[] byteArray, int startIndex) {
byte[] bytes = Arrays.copyOfRange(byteArray, startIndex, startIndex + 16);
return UUID.nameUUIDFromBytes(bytes);
}
@@ -46,7 +46,7 @@ public class AdapterHelper {
* @param exGuid2 The second ExtendedGUID instance.
* @return Returns the result of XOR two ExtendedGUID instances.
*/
- public static ExGuid XORExtendedGUID(ExtendedGUID exGuid1, ExtendedGUID exGuid2) {
+ public static ExGuid xorExtendedGUID(ExtendedGUID exGuid1, ExtendedGUID exGuid2) {
List<Byte> exGuid1Buffer = exGuid1.SerializeToByteList();
List<Byte> exGuid2Buffer = exGuid2.SerializeToByteList();
List<Byte> resultBuffer = new ArrayList<>(exGuid1Buffer.size());
@@ -57,7 +57,7 @@ public class AdapterHelper {
resultBuffer.set(i, (byte) (fromExGuid1 ^ fromExGuid2));
}
ExGuid resultExGuid = new ExGuid();
- resultExGuid.DoDeserializeFromByteArray(ByteUtil.toByteArray(resultBuffer), 0);
+ resultExGuid.doDeserializeFromByteArray(ByteUtil.toByteArray(resultBuffer), 0);
return resultExGuid;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AlternativePackaging.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AlternativePackaging.java
index c2caf50..43681a5 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AlternativePackaging.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/AlternativePackaging.java
@@ -48,29 +48,29 @@ public class AlternativePackaging {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the Alternative Packaging object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
- this.guidFileType = AdapterHelper.ReadGuid(byteArray, index.get());
+ this.guidFileType = AdapterHelper.readGuid(byteArray, index.get());
index.addAndGet(16);
- this.guidFile = AdapterHelper.ReadGuid(byteArray, index.get());
+ this.guidFile = AdapterHelper.readGuid(byteArray, index.get());
index.addAndGet(16);
- this.guidLegacyFileVersion = AdapterHelper.ReadGuid(byteArray, index.get());
+ this.guidLegacyFileVersion = AdapterHelper.readGuid(byteArray, index.get());
index.addAndGet(16);
- this.guidFileFormat = AdapterHelper.ReadGuid(byteArray, index.get());
+ this.guidFileFormat = AdapterHelper.readGuid(byteArray, index.get());
index.addAndGet(16);
- this.rgbReserved = BitConverter.ToUInt32(byteArray, index.get());
+ this.rgbReserved = BitConverter.toUInt32(byteArray, index.get());
index.addAndGet(4);
this.packagingStart = new StreamObjectHeaderStart32bit();
- this.packagingStart.DeserializeFromByteArray(byteArray, index.get());
+ this.packagingStart.deserializeFromByteArray(byteArray, index.get());
index.addAndGet(4);
this.storageIndexExtendedGUID = BasicObject.parse(byteArray, index, ExGuid.class);
- this.guidCellSchemaId = AdapterHelper.ReadGuid(byteArray, index.get());
+ this.guidCellSchemaId = AdapterHelper.readGuid(byteArray, index.get());
index.addAndGet(16);
AtomicReference<DataElementPackage> pkg = new AtomicReference<>();
- StreamObject.TryGetCurrent(byteArray, index, pkg, DataElementPackage.class);
+ StreamObject.tryGetCurrent(byteArray, index, pkg, DataElementPackage.class);
this.dataElementPackage = pkg.get();
this.packagingEnd = new StreamObjectHeaderEnd16bit();
- this.packagingEnd.DeserializeFromByteArray(byteArray, index.get());
+ this.packagingEnd.deserializeFromByteArray(byteArray, index.get());
index.addAndGet(2);
return index.get() - startIndex;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BasicObject.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BasicObject.java
index b2ecd22..5e59aac 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BasicObject.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BasicObject.java
@@ -37,7 +37,7 @@ public abstract class BasicObject implements IFSSHTTPBSerializable {
Class<T> clazz) {
try {
T fsshttpbObject = clazz.newInstance();
- index.addAndGet(fsshttpbObject.DeserializeFromByteArray(byteArray, index.get()));
+ index.addAndGet(fsshttpbObject.deserializeFromByteArray(byteArray, index.get()));
return fsshttpbObject;
} catch (InstantiationException | IllegalAccessException e) {
@@ -52,8 +52,8 @@ public abstract class BasicObject implements IFSSHTTPBSerializable {
* @param startIndex The start position.
* @return The element length.
*/
- public int DeserializeFromByteArray(byte[] byteArray, int startIndex) {
- return this.DoDeserializeFromByteArray(byteArray, startIndex);
+ public int deserializeFromByteArray(byte[] byteArray, int startIndex) {
+ return this.doDeserializeFromByteArray(byteArray, startIndex);
}
/**
@@ -61,7 +61,7 @@ public abstract class BasicObject implements IFSSHTTPBSerializable {
*
* @return The byte list.
*/
- public abstract List<Byte> SerializeToByteList();
+ public abstract List<Byte> serializeToByteList();
/**
* Used to return the length of this element.
@@ -70,5 +70,5 @@ public abstract class BasicObject implements IFSSHTTPBSerializable {
* @param startIndex The start position.
* @return The element length
*/
- protected abstract int DoDeserializeFromByteArray(byte[] byteArray, int startIndex);
+ protected abstract int doDeserializeFromByteArray(byte[] byteArray, int startIndex);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BinaryItem.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BinaryItem.java
index 128ef3d..c999791 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BinaryItem.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/BinaryItem.java
@@ -52,11 +52,11 @@ public class BinaryItem extends BasicObject {
* @return Return the byte list which store the byte information of BinaryItem.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
this.Length.setDecodedValue(this.Content.size());
List<Byte> result = new ArrayList<>();
- result.addAll(this.Length.SerializeToByteList());
+ result.addAll(this.Length.serializeToByteList());
result.addAll(this.Content);
return result;
@@ -70,7 +70,7 @@ public class BinaryItem extends BasicObject {
* @return Return the length in byte of the BinaryItem basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
this.Length = BasicObject.parse(byteArray, index, Compact64bitInt.class);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellID.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellID.java
index b64a524..f7401fe 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellID.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellID.java
@@ -64,10 +64,10 @@ public class CellID extends BasicObject {
* @return Return the byte list which store the byte information of CellID.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
java.util.List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.ExtendGUID1.SerializeToByteList());
- byteList.addAll(this.ExtendGUID2.SerializeToByteList());
+ byteList.addAll(this.ExtendGUID1.serializeToByteList());
+ byteList.addAll(this.ExtendGUID2.serializeToByteList());
return byteList;
}
@@ -112,7 +112,7 @@ public class CellID extends BasicObject {
* @return Return the length in byte of the CellID basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
this.ExtendGUID1 = BasicObject.parse(byteArray, index, ExGuid.class);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellIDArray.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellIDArray.java
index 9b56ea1..1f0f372 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellIDArray.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CellIDArray.java
@@ -63,12 +63,12 @@ public class CellIDArray extends BasicObject {
* @return Return the byte list which store the byte information of CellIDArray.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<Byte>();
- byteList.addAll((new Compact64bitInt(this.Count)).SerializeToByteList());
+ byteList.addAll((new Compact64bitInt(this.Count)).serializeToByteList());
if (this.Content != null) {
for (CellID extendGuid : this.Content) {
- byteList.addAll(extendGuid.SerializeToByteList());
+ byteList.addAll(extendGuid.serializeToByteList());
}
}
@@ -83,7 +83,7 @@ public class CellIDArray extends BasicObject {
* @return Return the length in byte of the CellIDArray basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
AtomicInteger index = new AtomicInteger(startIndex);
this.Count = BasicObject.parse(byteArray, index, Compact64bitInt.class).getDecodedValue();
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/Compact64bitInt.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/Compact64bitInt.java
index 2824ee9..20ddd36 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/Compact64bitInt.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/Compact64bitInt.java
@@ -81,6 +81,7 @@ public class Compact64bitInt extends BasicObject {
public Compact64bitInt(long decodedValue) {
this.decodedValue = decodedValue;
}
+
/**
* Initializes a new instance of the Compact64bitInt class, this is the default constructor.
*/
@@ -94,35 +95,35 @@ public class Compact64bitInt extends BasicObject {
* @return Return the byte list which store the byte information of Compact64bitInt.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(9);
if (this.decodedValue == 0) {
- bitWriter.AppendUInt64(0, 8);
+ bitWriter.appendUInt64(0, 8);
} else if (this.decodedValue >= 0x01 && this.decodedValue <= 0x7F) {
- bitWriter.AppendUInt64(CompactUint7bitType, 1);
- bitWriter.AppendUInt64(this.decodedValue, 7);
+ bitWriter.appendUInt64(CompactUint7bitType, 1);
+ bitWriter.appendUInt64(this.decodedValue, 7);
} else if (this.decodedValue >= 0x0080 && this.decodedValue <= 0x3FFF) {
- bitWriter.AppendUInt64(CompactUint14bitType, 2);
- bitWriter.AppendUInt64(this.decodedValue, 14);
+ bitWriter.appendUInt64(CompactUint14bitType, 2);
+ bitWriter.appendUInt64(this.decodedValue, 14);
} else if (this.decodedValue >= 0x004000 && this.decodedValue <= 0x1FFFFF) {
- bitWriter.AppendUInt64(CompactUint21bitType, 3);
- bitWriter.AppendUInt64(this.decodedValue, 21);
+ bitWriter.appendUInt64(CompactUint21bitType, 3);
+ bitWriter.appendUInt64(this.decodedValue, 21);
} else if (this.decodedValue >= 0x0200000 && this.decodedValue <= 0xFFFFFFF) {
- bitWriter.AppendUInt64(CompactUint28bitType, 4);
- bitWriter.AppendUInt64(this.decodedValue, 28);
+ bitWriter.appendUInt64(CompactUint28bitType, 4);
+ bitWriter.appendUInt64(this.decodedValue, 28);
} else if (this.decodedValue >= 0x010000000 && this.decodedValue <= 0x7FFFFFFFFL) {
- bitWriter.AppendUInt64(CompactUint35bitType, 5);
- bitWriter.AppendUInt64(this.decodedValue, 35);
+ bitWriter.appendUInt64(CompactUint35bitType, 5);
+ bitWriter.appendUInt64(this.decodedValue, 35);
} else if (this.decodedValue >= 0x00800000000L && this.decodedValue <= 0x3FFFFFFFFFFL) {
- bitWriter.AppendUInt64(CompactUint42bitType, 6);
- bitWriter.AppendUInt64(this.decodedValue, 42);
+ bitWriter.appendUInt64(CompactUint42bitType, 6);
+ bitWriter.appendUInt64(this.decodedValue, 42);
} else if (this.decodedValue >= 0x0040000000000L && this.decodedValue <= 0x1FFFFFFFFFFFFL) {
- bitWriter.AppendUInt64(CompactUint49bitType, 7);
- bitWriter.AppendUInt64(this.decodedValue, 49);
+ bitWriter.appendUInt64(CompactUint49bitType, 7);
+ bitWriter.appendUInt64(this.decodedValue, 49);
} else if (this.decodedValue >= 0x0002000000000000L) {
- bitWriter.AppendUInt64(CompactUint64bitType, 8);
- bitWriter.AppendUInt64(this.decodedValue, 64);
+ bitWriter.appendUInt64(CompactUint64bitType, 8);
+ bitWriter.appendUInt64(this.decodedValue, 64);
}
return bitWriter.getByteList();
}
@@ -136,12 +137,12 @@ public class Compact64bitInt extends BasicObject {
* @return Return the length in byte of the Compact64bitInt basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray,
+ protected int doDeserializeFromByteArray(byte[] byteArray,
int startIndex) // return the length consumed
{
BitReader bitReader = new BitReader(byteArray, startIndex);
int numberOfContinousZeroBit = 0;
- while (numberOfContinousZeroBit < 8 && bitReader.MoveNext()) {
+ while (numberOfContinousZeroBit < 8 && bitReader.moveNext()) {
if (!bitReader.getCurrent()) {
numberOfContinousZeroBit++;
} else {
@@ -151,42 +152,42 @@ public class Compact64bitInt extends BasicObject {
switch (numberOfContinousZeroBit) {
case 0:
- this.decodedValue = bitReader.ReadUInt64(7);
+ this.decodedValue = bitReader.readUInt64(7);
this.type = CompactUint7bitType;
return 1;
case 1:
- this.decodedValue = bitReader.ReadUInt64(14);
+ this.decodedValue = bitReader.readUInt64(14);
this.type = CompactUint14bitType;
return 2;
case 2:
- this.decodedValue = bitReader.ReadUInt64(21);
+ this.decodedValue = bitReader.readUInt64(21);
this.type = CompactUint21bitType;
return 3;
case 3:
- this.decodedValue = bitReader.ReadUInt64(28);
+ this.decodedValue = bitReader.readUInt64(28);
this.type = CompactUint28bitType;
return 4;
case 4:
- this.decodedValue = bitReader.ReadUInt64(35);
+ this.decodedValue = bitReader.readUInt64(35);
this.type = CompactUint35bitType;
return 5;
case 5:
- this.decodedValue = bitReader.ReadUInt64(42);
+ this.decodedValue = bitReader.readUInt64(42);
this.type = CompactUint42bitType;
return 6;
case 6:
- this.decodedValue = bitReader.ReadUInt64(49);
+ this.decodedValue = bitReader.readUInt64(49);
this.type = CompactUint49bitType;
return 7;
case 7:
- this.decodedValue = bitReader.ReadUInt64(64);
+ this.decodedValue = bitReader.readUInt64(64);
this.type = CompactUint64bitType;
return 9;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CompactID.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CompactID.java
index ad95ed6..707751f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CompactID.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/CompactID.java
@@ -34,10 +34,10 @@ public class CompactID {
*
* @return Return the byte list which store the byte information of CompactID.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(4);
- bitWriter.AppendUInit32((int) this.N, 8);
- bitWriter.AppendUInit32((int) this.GuidIndex, 24);
+ bitWriter.appendUInit32((int) this.N, 8);
+ bitWriter.appendUInit32((int) this.GuidIndex, 24);
return bitWriter.getByteList();
}
@@ -49,10 +49,10 @@ public class CompactID {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the CompactID object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.N = bitReader.ReadUInt32(8);
- this.GuidIndex = bitReader.ReadUInt32(24);
+ this.N = bitReader.readUInt32(8);
+ this.GuidIndex = bitReader.readUInt32(24);
return 4;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGUIDArray.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGUIDArray.java
index 9d68430..0ac0f1a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGUIDArray.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGUIDArray.java
@@ -77,13 +77,13 @@ public class ExGUIDArray extends BasicObject {
* @return Return the byte list which store the byte information of ExGUIDArray.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
this.Count.setDecodedValue(this.Content.size());
List<Byte> result = new ArrayList<Byte>();
- result.addAll(this.Count.SerializeToByteList());
+ result.addAll(this.Count.serializeToByteList());
for (ExGuid extendGuid : this.Content) {
- result.addAll(extendGuid.SerializeToByteList());
+ result.addAll(extendGuid.serializeToByteList());
}
return result;
@@ -97,7 +97,7 @@ public class ExGUIDArray extends BasicObject {
* @return Return the length in byte of the ExGUIDArray basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray,
+ protected int doDeserializeFromByteArray(byte[] byteArray,
int startIndex) // return the length consumed
{
AtomicInteger index = new AtomicInteger(startIndex);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGuid.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGuid.java
index d0bfbfb..a859cda 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGuid.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ExGuid.java
@@ -90,27 +90,27 @@ public class ExGuid extends BasicObject {
* @return Return the byte list which store the byte information of ExGuid.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(21);
if (this.guid.equals(GuidUtil.emptyGuid())) {
- bitWriter.AppendUInit32(0, 8);
+ bitWriter.appendUInit32(0, 8);
} else if (this.value >= 0x00 && this.value <= 0x1F) {
- bitWriter.AppendUInit32(ExtendedGUID5BitUintType, 3);
- bitWriter.AppendUInit32(this.value, 5);
- bitWriter.AppendGUID(this.guid);
+ bitWriter.appendUInit32(ExtendedGUID5BitUintType, 3);
+ bitWriter.appendUInit32(this.value, 5);
+ bitWriter.appendGUID(this.guid);
} else if (this.value >= 0x20 && this.value <= 0x3FF) {
- bitWriter.AppendUInit32(ExtendedGUID10BitUintType, 6);
- bitWriter.AppendUInit32(this.value, 10);
- bitWriter.AppendGUID(this.guid);
+ bitWriter.appendUInit32(ExtendedGUID10BitUintType, 6);
+ bitWriter.appendUInit32(this.value, 10);
+ bitWriter.appendGUID(this.guid);
} else if (this.value >= 0x400 && this.value <= 0x1FFFF) {
- bitWriter.AppendUInit32(ExtendedGUID17BitUintType, 7);
- bitWriter.AppendUInit32(this.value, 17);
- bitWriter.AppendGUID(this.guid);
+ bitWriter.appendUInit32(ExtendedGUID17BitUintType, 7);
+ bitWriter.appendUInit32(this.value, 17);
+ bitWriter.appendGUID(this.guid);
} else if (this.value >= 0x20000) {
- bitWriter.AppendUInit32(ExtendedGUID32BitUintType, 8);
- bitWriter.AppendUInit32(this.value, 32);
- bitWriter.AppendGUID(this.guid);
+ bitWriter.appendUInit32(ExtendedGUID32BitUintType, 8);
+ bitWriter.appendUInit32(this.value, 32);
+ bitWriter.appendGUID(this.guid);
}
return bitWriter.getByteList();
@@ -152,10 +152,10 @@ public class ExGuid extends BasicObject {
* @return Return the length in byte of the ExGuid basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ protected int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
int numberOfContinousZeroBit = 0;
- while (numberOfContinousZeroBit < 8 && bitReader.MoveNext()) {
+ while (numberOfContinousZeroBit < 8 && bitReader.moveNext()) {
if (!bitReader.getCurrent()) {
numberOfContinousZeroBit++;
} else {
@@ -165,26 +165,26 @@ public class ExGuid extends BasicObject {
switch (numberOfContinousZeroBit) {
case 2:
- this.value = bitReader.ReadUInt32(5);
- this.guid = bitReader.ReadGuid();
+ this.value = bitReader.readUInt32(5);
+ this.guid = bitReader.readGuid();
this.type = ExtendedGUID5BitUintType;
return 17;
case 5:
- this.value = bitReader.ReadUInt32(10);
- this.guid = bitReader.ReadGuid();
+ this.value = bitReader.readUInt32(10);
+ this.guid = bitReader.readGuid();
this.type = ExtendedGUID10BitUintType;
return 18;
case 6:
- this.value = bitReader.ReadUInt32(17);
- this.guid = bitReader.ReadGuid();
+ this.value = bitReader.readUInt32(17);
+ this.guid = bitReader.readGuid();
this.type = ExtendedGUID17BitUintType;
return 19;
case 7:
- this.value = bitReader.ReadUInt32(32);
- this.guid = bitReader.ReadGuid();
+ this.value = bitReader.readUInt32(32);
+ this.guid = bitReader.readGuid();
this.type = ExtendedGUID32BitUintType;
return 21;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/HeaderCell.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/HeaderCell.java
index 8008e0c..4cae05c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/HeaderCell.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/HeaderCell.java
@@ -28,12 +28,12 @@ public class HeaderCell {
public ObjectSpaceObjectPropSet ObjectData;
/**
- * Create the instacne of Header Cell.
+ * Create the instance of Header Cell.
*
* @param objectElement The instance of ObjectGroupDataElementData.
* @return Returns the instacne of HeaderCell.
*/
- public static HeaderCell CreateInstance(ObjectGroupDataElementData objectElement) {
+ public static HeaderCell createInstance(ObjectGroupDataElementData objectElement) {
HeaderCell instance = new HeaderCell();
for (int i = 0; i < objectElement.ObjectGroupDeclarations.ObjectDeclarationList.size();
@@ -47,7 +47,7 @@ public class HeaderCell {
ObjectGroupObjectData objectData =
objectElement.ObjectGroupData.ObjectGroupObjectDataList.get(i);
instance.ObjectData = new ObjectSpaceObjectPropSet();
- instance.ObjectData.DoDeserializeFromByteArray(
+ instance.ObjectData.doDeserializeFromByteArray(
ByteUtil.toByteArray(objectData.Data.Content), 0);
break;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/JCID.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/JCID.java
index 3063f0c..702fc2a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/JCID.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/JCID.java
@@ -39,15 +39,15 @@ public class JCID {
*
* @return Return the byte list which store the byte information of JCID
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(4);
- bitWriter.AppendInit32(this.Index, 16);
- bitWriter.AppendInit32(this.IsBinary, 1);
- bitWriter.AppendInit32(this.IsPropertySet, 1);
- bitWriter.AppendInit32(this.IsGraphNode, 1);
- bitWriter.AppendInit32(this.IsFileData, 1);
- bitWriter.AppendInit32(this.IsReadOnly, 1);
- bitWriter.AppendInit32(this.Reserved, 11);
+ bitWriter.appendInit32(this.Index, 16);
+ bitWriter.appendInit32(this.IsBinary, 1);
+ bitWriter.appendInit32(this.IsPropertySet, 1);
+ bitWriter.appendInit32(this.IsGraphNode, 1);
+ bitWriter.appendInit32(this.IsFileData, 1);
+ bitWriter.appendInit32(this.IsReadOnly, 1);
+ bitWriter.appendInit32(this.Reserved, 11);
return bitWriter.getByteList();
}
@@ -59,15 +59,15 @@ public class JCID {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the JCID object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.Index = bitReader.ReadInt32(16);
- this.IsBinary = bitReader.ReadInt32(1);
- this.IsPropertySet = bitReader.ReadInt32(1);
- this.IsGraphNode = bitReader.ReadInt32(1);
- this.IsFileData = bitReader.ReadInt32(1);
- this.IsReadOnly = bitReader.ReadInt32(1);
- this.Reserved = bitReader.ReadInt32(11);
+ this.Index = bitReader.readInt32(16);
+ this.IsBinary = bitReader.readInt32(1);
+ this.IsPropertySet = bitReader.readInt32(1);
+ this.IsGraphNode = bitReader.readInt32(1);
+ this.IsFileData = bitReader.readInt32(1);
+ this.IsReadOnly = bitReader.readInt32(1);
+ this.Reserved = bitReader.readInt32(11);
return 4;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/PropertyID.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/PropertyID.java
index a6dadf7..19c408b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/PropertyID.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/PropertyID.java
@@ -37,11 +37,11 @@ public class PropertyID {
*
* @return Return the byte list which store the byte information of PropertyID.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(4);
- bitWriter.AppendUInit32(this.Id, 26);
- bitWriter.AppendUInit32(this.Type, 5);
- bitWriter.AppendInit32(this.BoolValue, 1);
+ bitWriter.appendUInit32(this.Id, 26);
+ bitWriter.appendUInit32(this.Type, 5);
+ bitWriter.appendInit32(this.BoolValue, 1);
return bitWriter.getByteList();
}
@@ -53,11 +53,11 @@ public class PropertyID {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the PropertyID object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.Id = bitReader.ReadUInt32(26);
- this.Type = bitReader.ReadUInt32(5);
- this.BoolValue = bitReader.ReadInt32(1);
+ this.Id = bitReader.readUInt32(26);
+ this.Type = bitReader.readUInt32(5);
+ this.BoolValue = bitReader.readInt32(1);
this.Value = BitConverter.toInt32(byteArray, startIndex);
return 4;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/SerialNumber.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/SerialNumber.java
index 65b8537..4e67fa6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/SerialNumber.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/SerialNumber.java
@@ -62,16 +62,16 @@ public class SerialNumber extends BasicObject {
* @return Return the byte list which store the byte information of SerialNumber.
*/
@Override
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = null;
if (this.guid.equals(GuidUtil.emptyGuid())) {
bitWriter = new BitWriter(1);
- bitWriter.AppendUInit32(0, 8);
+ bitWriter.appendUInit32(0, 8);
} else {
bitWriter = new BitWriter(25);
- bitWriter.AppendUInit32(128, 8);
- bitWriter.AppendGUID(this.guid);
- bitWriter.AppendUInt64(this.value, 64);
+ bitWriter.appendUInit32(128, 8);
+ bitWriter.appendGUID(this.guid);
+ bitWriter.appendUInt64(this.value, 64);
}
return bitWriter.getByteList();
@@ -85,11 +85,11 @@ public class SerialNumber extends BasicObject {
* @return Return the length in byte of the SerialNumber basic object.
*/
@Override
- protected int DoDeserializeFromByteArray(byte[] byteArray,
+ protected int doDeserializeFromByteArray(byte[] byteArray,
int startIndex) // return the length consumed
{
BitReader bitField = new BitReader(byteArray, startIndex);
- int type = bitField.ReadInt32(8);
+ int type = bitField.readInt32(8);
if (type == 0) {
this.guid = GuidUtil.emptyGuid();
@@ -97,8 +97,8 @@ public class SerialNumber extends BasicObject {
return 1;
} else if (type == 128) {
- this.guid = bitField.ReadGuid();
- this.value = bitField.ReadUInt64(64);
+ this.guid = bitField.readGuid();
+ this.value = bitField.readUInt64(64);
this.type = 128;
return 25;
} else {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ZipHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ZipHeader.java
index 9a91685..7c0d6f6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ZipHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/basic/ZipHeader.java
@@ -41,7 +41,7 @@ public class ZipHeader {
* @param index The index where to start.
* @return True if the input data is a local file header, otherwise false.
*/
- public static boolean IsFileHeader(byte[] byteArray, int index) {
+ public static boolean isFileHeader(byte[] byteArray, int index) {
return Arrays.equals(LocalFileHeader, Arrays.copyOfRange(byteArray, index, 4));
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/AbstractChunking.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/AbstractChunking.java
index 484fb90..26f9690 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/AbstractChunking.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/AbstractChunking.java
@@ -41,5 +41,5 @@ public abstract class AbstractChunking {
*
* @return A list of LeafNodeObjectData.
*/
- public abstract List<LeafNodeObject> Chunking();
+ public abstract List<LeafNodeObject> chunking();
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ChunkingFactory.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ChunkingFactory.java
index e6b0191..432b31b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ChunkingFactory.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ChunkingFactory.java
@@ -42,8 +42,8 @@ public class ChunkingFactory {
* @param fileContent The content of the file.
* @return The instance of AbstractChunking.
*/
- public static AbstractChunking CreateChunkingInstance(byte[] fileContent) {
- if (ZipHeader.IsFileHeader(fileContent, 0)) {
+ public static AbstractChunking createChunkingInstance(byte[] fileContent) {
+ if (ZipHeader.isFileHeader(fileContent, 0)) {
return new ZipFilesChunking(fileContent);
} else {
return new RDCAnalysisChunking(fileContent);
@@ -57,16 +57,16 @@ public class ChunkingFactory {
* @return The instance of AbstractChunking.
*/
- public static AbstractChunking CreateChunkingInstance(IntermediateNodeObject nodeObject) {
- byte[] fileContent = ByteUtil.toByteArray(nodeObject.GetContent());
- if (ZipHeader.IsFileHeader(fileContent, 0)) {
+ public static AbstractChunking createChunkingInstance(IntermediateNodeObject nodeObject) {
+ byte[] fileContent = ByteUtil.toByteArray(nodeObject.getContent());
+ if (ZipHeader.isFileHeader(fileContent, 0)) {
return new ZipFilesChunking(fileContent);
} else {
// For SharePoint Server 2013 compatible SUTs, always using the RDC Chunking method in
// the current test suite involved file resources.
AbstractChunking returnChunking = new SimpleChunking(fileContent);
- List<LeafNodeObject> nodes = returnChunking.Chunking();
+ List<LeafNodeObject> nodes = returnChunking.chunking();
if (nodeObject.IntermediateNodeObjectList.size() == nodes.size()) {
boolean isDataSizeMatching = true;
for (int i = 0; i < nodes.size(); i++) {
@@ -94,7 +94,7 @@ public class ChunkingFactory {
* @param chunkingMethod The type of chunking methods.
* @return The instance of AbstractChunking.
*/
- public static AbstractChunking CreateChunkingInstance(byte[] fileContent,
+ public static AbstractChunking createChunkingInstance(byte[] fileContent,
ChunkingMethod chunkingMethod) {
AbstractChunking chunking;
switch (chunkingMethod) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/RDCAnalysisChunking.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/RDCAnalysisChunking.java
index a254a6c..3516412 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/RDCAnalysisChunking.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/RDCAnalysisChunking.java
@@ -59,7 +59,7 @@ public class RDCAnalysisChunking extends AbstractChunking {
* @return A list of LeafNodeObjectData.
*/
@Override
- public List<LeafNodeObject> Chunking() {
+ public List<LeafNodeObject> chunking() {
int horizon = 16384;
List<LeafNodeObject> list = new ArrayList<>();
int inputLength = FileContent.length;
@@ -67,12 +67,12 @@ public class RDCAnalysisChunking extends AbstractChunking {
if (inputLength <= 0) {
throw new RuntimeException("Cannot support the length less than 0");
} else if (inputLength <= horizon) {
- list.add(this.GetChunk(0, inputLength));
+ list.add(this.getChunk(0, inputLength));
return list;
}
long chunkStart = 0;
- UInteger[] hashValues = this.GetHashValues();
+ UInteger[] hashValues = this.getHashValues();
while (chunkStart + 1 < inputLength) {
long chunkEndMax = Math.min(chunkStart + this.maxChunkSize, inputLength);
@@ -121,7 +121,7 @@ public class RDCAnalysisChunking extends AbstractChunking {
break;
}
- list.add(this.GetChunk(chunkStart, chunkEnd));
+ list.add(this.getChunk(chunkStart, chunkEnd));
chunkStart = chunkEnd;
}
@@ -135,7 +135,7 @@ public class RDCAnalysisChunking extends AbstractChunking {
* @param chunkEnd The end index of the chunk.
* @return An LeafNodeObjectData which contains a chunk.
*/
- private LeafNodeObject GetChunk(long chunkStart, long chunkEnd) {
+ private LeafNodeObject getChunk(long chunkStart, long chunkEnd) {
if (chunkEnd <= chunkStart || (chunkEnd - chunkStart > this.maxChunkSize) ||
chunkStart > Integer.MAX_VALUE) {
throw new RuntimeException("ChunkStart out of range");
@@ -162,10 +162,10 @@ public class RDCAnalysisChunking extends AbstractChunking {
*
* @return The array of hash value.
*/
- private UInteger[] GetHashValues() {
+ private UInteger[] getHashValues() {
int hashWindowSize = 48;
UInteger[] hashValues = new UInteger[this.FileContent.length];
- int shiftAmount = this.GetShiftAmount(hashWindowSize);
+ int shiftAmount = this.getShiftAmount(hashWindowSize);
int i = 0;
int[] lookupTable =
@@ -234,7 +234,7 @@ public class RDCAnalysisChunking extends AbstractChunking {
* @param hashWindowSize The value of hash window size.
* @return The value of shift amount.
*/
- private int GetShiftAmount(int hashWindowSize) {
+ private int getShiftAmount(int hashWindowSize) {
int shiftAmount = 1;
int i = 32;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/SimpleChunking.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/SimpleChunking.java
index bc02d0e..0ffcee0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/SimpleChunking.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/SimpleChunking.java
@@ -44,7 +44,7 @@ public class SimpleChunking extends AbstractChunking {
* @return A list of LeafNodeObjectData.
*/
@Override
- public List<LeafNodeObject> Chunking() {
+ public List<LeafNodeObject> chunking() {
int maxChunkSize = 1 * 1024 * 1024;
java.util.List<LeafNodeObject> list = new ArrayList<>();
LeafNodeObject.IntermediateNodeObjectBuilder builder =
@@ -52,7 +52,7 @@ public class SimpleChunking extends AbstractChunking {
int chunkStart = 0;
if (this.FileContent.length <= maxChunkSize) {
- list.add(builder.Build(this.FileContent, this.GetSignature(this.FileContent)));
+ list.add(builder.Build(this.FileContent, this.getSignature(this.FileContent)));
return list;
}
@@ -61,7 +61,7 @@ public class SimpleChunking extends AbstractChunking {
int chunkLength = chunkStart + maxChunkSize >= this.FileContent.length ?
this.FileContent.length - chunkStart : maxChunkSize;
byte[] temp = Arrays.copyOfRange(this.FileContent, chunkStart, chunkLength);
- list.add(builder.Build(temp, this.GetSignature(temp)));
+ list.add(builder.Build(temp, this.getSignature(temp)));
chunkStart += chunkLength;
}
@@ -74,7 +74,7 @@ public class SimpleChunking extends AbstractChunking {
* @param array The data of the chunk.
* @return The signature instance.
*/
- private SignatureObject GetSignature(byte[] array) {
+ private SignatureObject getSignature(byte[] array) {
if (this.FileContent.length <= 250 * 1024 * 1024) {
byte[] temp = DigestUtils.sha1(array);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ZipFilesChunking.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ZipFilesChunking.java
index c5d9bbb..c896edc 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ZipFilesChunking.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/chunking/ZipFilesChunking.java
@@ -52,34 +52,34 @@ public class ZipFilesChunking extends AbstractChunking {
* @return A list of LeafNodeObjectData.
*/
@Override
- public List<LeafNodeObject> Chunking() {
+ public List<LeafNodeObject> chunking() {
java.util.List<LeafNodeObject> list = new ArrayList<>();
LeafNodeObject.IntermediateNodeObjectBuilder builder =
new LeafNodeObject.IntermediateNodeObjectBuilder();
int index = 0;
- while (ZipHeader.IsFileHeader(this.FileContent, index)) {
+ while (ZipHeader.isFileHeader(this.FileContent, index)) {
AtomicReference<byte[]> dataFileSignatureBytes = new AtomicReference<>();
- byte[] header = this.AnalyzeFileHeader(this.FileContent, index, dataFileSignatureBytes);
+ byte[] header = this.analyzeFileHeader(this.FileContent, index, dataFileSignatureBytes);
int headerLength = header.length;
- int compressedSize = (int) this.GetCompressedSize(dataFileSignatureBytes.get());
+ int compressedSize = (int) this.getCompressedSize(dataFileSignatureBytes.get());
if (headerLength + compressedSize <= 4096) {
list.add(builder.Build(
Arrays.copyOfRange(this.FileContent, index, headerLength + compressedSize),
- this.GetSingleChunkSignature(header, dataFileSignatureBytes.get())));
+ this.getSingleChunkSignature(header, dataFileSignatureBytes.get())));
index += headerLength += compressedSize;
} else {
- list.add(builder.Build(header, this.GetSHA1Signature(header)));
+ list.add(builder.Build(header, this.getSHA1Signature(header)));
index += headerLength;
byte[] dataFile = Arrays.copyOfRange(this.FileContent, index, compressedSize);
if (dataFile.length <= 1048576) {
list.add(builder.Build(dataFile,
- this.GetDataFileSignature(dataFileSignatureBytes.get())));
+ this.getDataFileSignature(dataFileSignatureBytes.get())));
} else {
- list.addAll(this.GetSubChunkList(dataFile));
+ list.addAll(this.getSubChunkList(dataFile));
}
index += compressedSize;
@@ -94,7 +94,7 @@ public class ZipFilesChunking extends AbstractChunking {
Arrays.copyOfRange(this.FileContent, index, this.FileContent.length - index);
if (finalRes.length <= 1048576) {
- list.add(builder.Build(finalRes, this.GetSHA1Signature(finalRes)));
+ list.add(builder.Build(finalRes, this.getSHA1Signature(finalRes)));
} else {
// In current, it has no idea about how to compute the signature for final part larger than 1MB.
throw new RuntimeException(
@@ -110,14 +110,14 @@ public class ZipFilesChunking extends AbstractChunking {
* @param chunkData A byte array that contains the data.
* @return A list of LeafNodeObjectData.
*/
- private List<LeafNodeObject> GetSubChunkList(byte[] chunkData) {
+ private List<LeafNodeObject> getSubChunkList(byte[] chunkData) {
List<LeafNodeObject> subChunkList = new ArrayList<LeafNodeObject>();
int index = 0;
while (index < chunkData.length) {
int length = chunkData.length - index < 1048576 ? chunkData.length - index : 1048576;
byte[] temp = Arrays.copyOfRange(chunkData, index, length);
subChunkList.add(new LeafNodeObject.IntermediateNodeObjectBuilder().Build(temp,
- this.GetSubChunkSignature()));
+ this.getSubChunkSignature()));
index += length;
}
@@ -132,7 +132,7 @@ public class ZipFilesChunking extends AbstractChunking {
* @param dataFileSignature Specify the output value for the data file signature.
* @return Return the data file content.
*/
- private byte[] AnalyzeFileHeader(byte[] content, int index,
+ private byte[] analyzeFileHeader(byte[] content, int index,
AtomicReference<byte[]> dataFileSignature) {
int crc32 = BitConverter.toInt32(content, index + 14);
int compressedSize = BitConverter.toInt32(content, index + 18);
@@ -142,9 +142,9 @@ public class ZipFilesChunking extends AbstractChunking {
int headerLength = 30 + fileNameLength + extraFileldLength;
BitWriter writer = new BitWriter(20);
- writer.AppendInit32(crc32, 32);
- writer.AppendUInt64(compressedSize, 64);
- writer.AppendUInt64(uncompressedSize, 64);
+ writer.appendInit32(crc32, 32);
+ writer.appendUInt64(compressedSize, 64);
+ writer.appendUInt64(uncompressedSize, 64);
dataFileSignature.set(writer.getBytes());
return Arrays.copyOfRange(content, index, headerLength);
@@ -156,10 +156,10 @@ public class ZipFilesChunking extends AbstractChunking {
* @param dataFileSignature Specify the signature of the zip file content.
* @return Return the compressed size value.
*/
- private long GetCompressedSize(byte[] dataFileSignature) {
+ private long getCompressedSize(byte[] dataFileSignature) {
BitReader reader = new BitReader(dataFileSignature, 0);
- reader.ReadUInt32(32);
- return reader.ReadUInt64(64);
+ reader.readUInt32(32);
+ return reader.readUInt64(64);
}
/**
@@ -169,7 +169,7 @@ public class ZipFilesChunking extends AbstractChunking {
* @param dataFile The data of data file.
* @return An instance of SignatureObject.
*/
- private SignatureObject GetSingleChunkSignature(byte[] header, byte[] dataFile) {
+ private SignatureObject getSingleChunkSignature(byte[] header, byte[] dataFile) {
byte[] headerSignature = DigestUtils.sha1(header);
List<Byte> singleSignature = new ArrayList<>();
@@ -187,7 +187,7 @@ public class ZipFilesChunking extends AbstractChunking {
* @param array The input data.
* @return An instance of SignatureObject.
*/
- private SignatureObject GetSHA1Signature(byte[] array) {
+ private SignatureObject getSHA1Signature(byte[] array) {
byte[] temp = DigestUtils.sha1(array);
SignatureObject signature = new SignatureObject();
@@ -201,7 +201,7 @@ public class ZipFilesChunking extends AbstractChunking {
* @param array The input data.
* @return An instance of SignatureObject.
*/
- private SignatureObject GetDataFileSignature(byte[] array) {
+ private SignatureObject getDataFileSignature(byte[] array) {
SignatureObject signature = new SignatureObject();
signature.SignatureData = new BinaryItem(ByteUtil.toListOfByte(array));
@@ -213,7 +213,7 @@ public class ZipFilesChunking extends AbstractChunking {
*
* @return An instance of SignatureObject.
*/
- private SignatureObject GetSubChunkSignature() {
+ private SignatureObject getSubChunkSignature() {
// In current, it has no idea about how to compute the signature for sub chunk.
throw new RuntimeException("The Get sub chunk signature method is not implemented.");
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectPropSet.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectPropSet.java
index 46ac94d..64f13cd 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectPropSet.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectPropSet.java
@@ -39,24 +39,24 @@ public class ObjectSpaceObjectPropSet {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the ObjectSpaceObjectPropSet.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.OIDs = new ObjectSpaceObjectStreamOfOIDs();
- int len = this.OIDs.DoDeserializeFromByteArray(byteArray, index);
+ int len = this.OIDs.doDeserializeFromByteArray(byteArray, index);
index += len;
if (this.OIDs.Header.OsidStreamNotPresent == 0) {
this.OSIDs = new ObjectSpaceObjectStreamOfOSIDs();
- len = this.OSIDs.DoDeserializeFromByteArray(byteArray, index);
+ len = this.OSIDs.doDeserializeFromByteArray(byteArray, index);
index += len;
if (this.OSIDs.Header.ExtendedStreamsPresent == 1) {
this.ContextIDs = new ObjectSpaceObjectStreamOfContextIDs();
- len = this.ContextIDs.DoDeserializeFromByteArray(byteArray, index);
+ len = this.ContextIDs.doDeserializeFromByteArray(byteArray, index);
index += len;
}
}
this.Body = new PropertySet();
- len = this.Body.DoDeserializeFromByteArray(byteArray, index);
+ len = this.Body.doDeserializeFromByteArray(byteArray, index);
index += len;
int paddingLength = 8 - (index - startIndex) % 8;
@@ -72,12 +72,12 @@ public class ObjectSpaceObjectPropSet {
*
* @return Return the byte list which store the byte information of the ObjectSpaceObjectPropSet.
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.OIDs.SerializeToByteList());
- byteList.addAll(this.OSIDs.SerializeToByteList());
- byteList.addAll(this.ContextIDs.SerializeToByteList());
- byteList.addAll(this.Body.SerializeToByteList());
+ byteList.addAll(this.OIDs.serializeToByteList());
+ byteList.addAll(this.OSIDs.serializeToByteList());
+ byteList.addAll(this.ContextIDs.serializeToByteList());
+ byteList.addAll(this.Body.serializeToByteList());
for (byte b : this.Padding) {
byteList.add(b);
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamHeader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamHeader.java
index 1262b20..4efc555 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamHeader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamHeader.java
@@ -33,12 +33,12 @@ public class ObjectSpaceObjectStreamHeader {
*
* @return Return the byte list which store the byte information of ObjectSpaceObjectStreamHeader
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
BitWriter bitWriter = new BitWriter(4);
- bitWriter.AppendUInit32((int) this.Count, 24);
- bitWriter.AppendInit32(this.Reserved, 6);
- bitWriter.AppendInit32(this.ExtendedStreamsPresent, 1);
- bitWriter.AppendInit32(this.OsidStreamNotPresent, 1);
+ bitWriter.appendUInit32((int) this.Count, 24);
+ bitWriter.appendInit32(this.Reserved, 6);
+ bitWriter.appendInit32(this.ExtendedStreamsPresent, 1);
+ bitWriter.appendInit32(this.OsidStreamNotPresent, 1);
return bitWriter.getByteList();
}
@@ -53,10 +53,10 @@ public class ObjectSpaceObjectStreamHeader {
*/
public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
BitReader bitReader = new BitReader(byteArray, startIndex);
- this.Count = bitReader.ReadUInt32(24);
- this.Reserved = bitReader.ReadInt32(6);
- this.ExtendedStreamsPresent = bitReader.ReadInt32(1);
- this.OsidStreamNotPresent = bitReader.ReadInt32(1);
+ this.Count = bitReader.readUInt32(24);
+ this.Reserved = bitReader.readInt32(6);
+ this.ExtendedStreamsPresent = bitReader.readInt32(1);
+ this.OsidStreamNotPresent = bitReader.readInt32(1);
return 4;
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfContextIDs.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfContextIDs.java
index e735197..baf9a62 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfContextIDs.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfContextIDs.java
@@ -34,11 +34,11 @@ public class ObjectSpaceObjectStreamOfContextIDs {
*
* @return Return the byte list which store the byte information of ObjectSpaceObjectStreamOfContextIDs
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.Header.SerializeToByteList());
+ byteList.addAll(this.Header.serializeToByteList());
for (CompactID compactID : this.Body) {
- byteList.addAll(compactID.SerializeToByteList());
+ byteList.addAll(compactID.serializeToByteList());
}
return byteList;
@@ -52,7 +52,7 @@ public class ObjectSpaceObjectStreamOfContextIDs {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the ObjectSpaceObjectStreamOfContextIDs object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.Header = new ObjectSpaceObjectStreamHeader();
int headerCount = this.Header.DoDeserializeFromByteArray(byteArray, index);
@@ -61,7 +61,7 @@ public class ObjectSpaceObjectStreamOfContextIDs {
this.Body = new CompactID[(int) this.Header.Count];
for (int i = 0; i < this.Header.Count; i++) {
CompactID compactID = new CompactID();
- int count = compactID.DoDeserializeFromByteArray(byteArray, startIndex);
+ int count = compactID.doDeserializeFromByteArray(byteArray, startIndex);
this.Body[i] = compactID;
index += count;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOIDs.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOIDs.java
index ca5f3de..0a81a5a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOIDs.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOIDs.java
@@ -35,11 +35,11 @@ public class ObjectSpaceObjectStreamOfOIDs {
*
* @return Return the byte list which store the byte information of ObjectSpaceObjectStreamOfOIDs
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.Header.SerializeToByteList());
+ byteList.addAll(this.Header.serializeToByteList());
for (CompactID compactID : this.Body) {
- byteList.addAll(compactID.SerializeToByteList());
+ byteList.addAll(compactID.serializeToByteList());
}
return byteList;
@@ -53,7 +53,7 @@ public class ObjectSpaceObjectStreamOfOIDs {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the ObjectSpaceObjectStreamOfOIDs object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.Header = new ObjectSpaceObjectStreamHeader();
int headerCount = this.Header.DoDeserializeFromByteArray(byteArray, index);
@@ -62,7 +62,7 @@ public class ObjectSpaceObjectStreamOfOIDs {
this.Body = new CompactID[(int) this.Header.Count];
for (int i = 0; i < this.Header.Count; i++) {
CompactID compactID = new CompactID();
- int count = compactID.DoDeserializeFromByteArray(byteArray, startIndex);
+ int count = compactID.doDeserializeFromByteArray(byteArray, startIndex);
this.Body[i] = compactID;
index += count;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOSIDs.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOSIDs.java
index 099c6aa..70475ba 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOSIDs.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/streamobj/space/ObjectSpaceObjectStreamOfOSIDs.java
@@ -34,11 +34,11 @@ public class ObjectSpaceObjectStreamOfOSIDs {
*
* @return Return the byte list which store the byte information of ObjectSpaceObjectStreamOfOSIDs
*/
- public List<Byte> SerializeToByteList() {
+ public List<Byte> serializeToByteList() {
List<Byte> byteList = new ArrayList<>();
- byteList.addAll(this.Header.SerializeToByteList());
+ byteList.addAll(this.Header.serializeToByteList());
for (CompactID compactID : this.Body) {
- byteList.addAll(compactID.SerializeToByteList());
+ byteList.addAll(compactID.serializeToByteList());
}
return byteList;
@@ -52,7 +52,7 @@ public class ObjectSpaceObjectStreamOfOSIDs {
* @param startIndex Specify the start index from the byte array.
* @return Return the length in byte of the ObjectSpaceObjectStreamOfOSIDs object.
*/
- public int DoDeserializeFromByteArray(byte[] byteArray, int startIndex) {
+ public int doDeserializeFromByteArray(byte[] byteArray, int startIndex) {
int index = startIndex;
this.Header = new ObjectSpaceObjectStreamHeader();
int headerCount = this.Header.DoDeserializeFromByteArray(byteArray, index);
@@ -61,7 +61,7 @@ public class ObjectSpaceObjectStreamOfOSIDs {
this.Body = new CompactID[(int) this.Header.Count];
for (int i = 0; i < this.Header.Count; i++) {
CompactID compactID = new CompactID();
- int count = compactID.DoDeserializeFromByteArray(byteArray, index);
+ int count = compactID.doDeserializeFromByteArray(byteArray, index);
this.Body[i] = compactID;
index += count;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/UInteger.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/UInteger.java
index a0f9699..55393fe 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/UInteger.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/UInteger.java
@@ -48,6 +48,10 @@ public final class UInteger extends UNumber implements Comparable<UInteger> {
*/
private static final String PRECACHE_PROPERTY = CLASS_NAME + ".precacheSize";
/**
+ * Default size for the value cache.
+ */
+ private static final int DEFAULT_PRECACHE_SIZE = 256;
+ /**
* Cached values
*/
private static final UInteger[] VALUES = mkValues();
@@ -62,10 +66,6 @@ public final class UInteger extends UNumber implements Comparable<UInteger> {
*/
public static final UInteger MAX = valueOf(MAX_VALUE);
/**
- * Default size for the value cache.
- */
- private static final int DEFAULT_PRECACHE_SIZE = 256;
- /**
* Generated UID
*/
private static final long serialVersionUID = -6821055240959745390L;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/ULong.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/ULong.java
index c47c6b4..80d1f58 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/ULong.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/unsigned/ULong.java
@@ -125,7 +125,8 @@ public final class ULong extends UNumber implements Comparable<ULong> {
long result = first * 10 + second;
if (compare(result, first) < 0) {
throw new NumberFormatException(
- String.format(Locale.US, "String value %s exceeds range of unsigned long", value));
+ String.format(Locale.US, "String value %s exceeds range of unsigned long",
+ value));
}
this.value = result;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/Bit.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/Bit.java
index 91b786f..226383c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/Bit.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/Bit.java
@@ -28,7 +28,7 @@ public class Bit {
* @param bit Specify the bit position.
* @return Return the bit value in the specified bit position.
*/
- public static boolean IsBitSet(byte[] array, long bit) {
+ public static boolean isBitSet(byte[] array, long bit) {
return (array[(int) (bit / 8)] & (1 << (int) (bit % 8))) != 0;
}
@@ -38,7 +38,7 @@ public class Bit {
* @param array Specify the byte array.
* @param bit Specify the bit position.
*/
- public static void SetBit(byte[] array, long bit) {
+ public static void setBit(byte[] array, long bit) {
array[(int) (bit / 8)] |= (byte) (1 << (int) (bit % 8));
}
@@ -48,7 +48,7 @@ public class Bit {
* @param array Specify the byte array.
* @param bit Specify the bit position.
*/
- public static void ClearBit(byte[] array, long bit) {
+ public static void clearBit(byte[] array, long bit) {
array[(int) (bit / 8)] &= (byte) (~(1 << (int) (bit % 8)));
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitConverter.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitConverter.java
index c59c8fb..fa5779a 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitConverter.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitConverter.java
@@ -78,12 +78,12 @@ public class BitConverter {
"The length of the byte array must be at least 4 bytes long.");
}
byte[] int32Bytes = Arrays.copyOfRange(bytes, index, index + 4);
- return LittleEndianBitConverter.ToInt32(int32Bytes, 0);
+ return LittleEndianBitConverter.toInt32(int32Bytes, 0);
}
- public static long ToUInt32(byte[] bytes, int index) {
+ public static long toUInt32(byte[] bytes, int index) {
byte[] uint32Bytes = Arrays.copyOfRange(bytes, index, index + 4);
- return LittleEndianBitConverter.ToUInt32(uint32Bytes, 0);
+ return LittleEndianBitConverter.toUInt32(uint32Bytes, 0);
}
public static long toInt64(byte[] bytes, int index) {
@@ -92,7 +92,7 @@ public class BitConverter {
"The length of the byte array must be at least 8 bytes long.");
}
byte[] uint64Bytes = Arrays.copyOfRange(bytes, index, index + 8);
- return LittleEndianBitConverter.ToUInt64(uint64Bytes, 0);
+ return LittleEndianBitConverter.toUInt64(uint64Bytes, 0);
}
public static float toSingle(byte[] bytes, int index) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitReader.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitReader.java
index 6b358ff..e58c0a0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitReader.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitReader.java
@@ -78,9 +78,9 @@ public class BitReader {
* @param readingLength Specify the reading bit length.
* @return Return the UInt64 type value.
*/
- public long ReadUInt64(int readingLength) {
- byte[] uint64Bytes = this.GetBytes(readingLength, 8);
- return LittleEndianBitConverter.ToUInt64(uint64Bytes, 0);
+ public long readUInt64(int readingLength) {
+ byte[] uint64Bytes = this.getBytes(readingLength, 8);
+ return LittleEndianBitConverter.toUInt64(uint64Bytes, 0);
}
/**
@@ -89,13 +89,13 @@ public class BitReader {
* @param readingLength Specify the reading bit length.
* @return Return the UInt32 type value.
*/
- public int ReadUInt32(int readingLength) {
- byte[] uint32Bytes = this.GetBytes(readingLength, 4);
- return LittleEndianBitConverter.ToUInt32(uint32Bytes, 0);
+ public int readUInt32(int readingLength) {
+ byte[] uint32Bytes = this.getBytes(readingLength, 4);
+ return LittleEndianBitConverter.toUInt32(uint32Bytes, 0);
}
- public int ReadUInt16(int readingLength) {
- byte[] uint16Bytes = this.GetBytes(readingLength, 2);
+ public int readUInt16(int readingLength) {
+ byte[] uint16Bytes = this.getBytes(readingLength, 2);
return LittleEndianBitConverter.ToUInt16(uint16Bytes, 0);
}
@@ -105,8 +105,8 @@ public class BitReader {
* @param readingLength Specify the reading byte length.
* @return Return the read bytes array.
*/
- public byte[] ReadBytes(int readingLength) {
- return this.GetBytes(readingLength * 8, readingLength);
+ public byte[] readBytes(int readingLength) {
+ return this.getBytes(readingLength * 8, readingLength);
}
/**
@@ -115,9 +115,9 @@ public class BitReader {
* @param readingLength Specify the reading bit length.
* @return Return the UInt16 value.
*/
- public short ReadInt16(int readingLength) {
- byte[] uint16Bytes = this.GetBytes(readingLength, 2);
- return LittleEndianBitConverter.ToInt16(uint16Bytes, 0);
+ public short readInt16(int readingLength) {
+ byte[] uint16Bytes = this.getBytes(readingLength, 2);
+ return LittleEndianBitConverter.toInt16(uint16Bytes, 0);
}
/**
@@ -126,9 +126,9 @@ public class BitReader {
* @param readingLength Specify the reading bit length.
* @return Return the Int32 type value.
*/
- public int ReadInt32(int readingLength) {
- byte[] uint32Bytes = this.GetBytes(readingLength, 4);
- return LittleEndianBitConverter.ToInt32(uint32Bytes, 0);
+ public int readInt32(int readingLength) {
+ byte[] uint32Bytes = this.getBytes(readingLength, 4);
+ return LittleEndianBitConverter.toInt32(uint32Bytes, 0);
}
/**
@@ -136,8 +136,8 @@ public class BitReader {
*
* @return Return the GUID value.
*/
- public UUID ReadGuid() {
- return UUID.nameUUIDFromBytes(this.GetBytes(128, 16));
+ public UUID readGuid() {
+ return UUID.nameUUIDFromBytes(this.getBytes(128, 16));
}
/**
@@ -146,21 +146,21 @@ public class BitReader {
* @return true if the enumerator was successfully advanced to the next bit; false if the enumerator
* has passed the end of the byte array.
*/
- public boolean MoveNext() {
+ public boolean moveNext() {
return ++this.offset < this.length;
}
/**
* Assign the internal read buffer to null.
*/
- public void Dispose() {
+ public void dispose() {
this.bitSet = null;
}
/**
* Sets the enumerator to its initial position, which is before the first bit in the byte array.
*/
- public void Reset() {
+ public void reset() {
this.offset = this.startPosition;
}
@@ -171,11 +171,11 @@ public class BitReader {
* @param size Specify the byte array size.
* @return Returns the constructed byte array.
*/
- private byte[] GetBytes(int needReadlength, int size) {
+ private byte[] getBytes(int needReadlength, int size) {
BitSet retSet = new BitSet(size);
int i = 0;
while (i < needReadlength) {
- if (!this.MoveNext()) {
+ if (!this.moveNext()) {
throw new RuntimeException("Unexpected to meet the byte array end.");
}
if (getCurrent()) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitWriter.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitWriter.java
index 4d16bcc..30d408c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitWriter.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/BitWriter.java
@@ -70,9 +70,9 @@ public class BitWriter {
* @param value Specify the value which needs to be appended.
* @param length Specify the bit length which the value will occupy in the buffer.
*/
- public void AppendUInt64(long value, int length) {
- byte[] convertedBytes = LittleEndianBitConverter.GetBytes(value);
- this.SetBytes(convertedBytes, length);
+ public void appendUInt64(long value, int length) {
+ byte[] convertedBytes = LittleEndianBitConverter.getBytes(value);
+ this.setBytes(convertedBytes, length);
}
/**
@@ -81,9 +81,9 @@ public class BitWriter {
* @param value Specify the value which needs to be appended.
* @param length Specify the bit length which the value will occupy in the buffer.
*/
- public void AppendUInit32(int value, int length) {
- byte[] convertedBytes = LittleEndianBitConverter.GetBytes(value);
- this.SetBytes(convertedBytes, length);
+ public void appendUInit32(int value, int length) {
+ byte[] convertedBytes = LittleEndianBitConverter.getBytes(value);
+ this.setBytes(convertedBytes, length);
}
/**
@@ -92,9 +92,9 @@ public class BitWriter {
* @param value Specify the value which needs to be appended.
* @param length Specify the bit length which the value will occupy in the buffer.
*/
- public void AppendInit32(int value, int length) {
- byte[] convertedBytes = LittleEndianBitConverter.GetBytes(value);
- this.SetBytes(convertedBytes, length);
+ public void appendInit32(int value, int length) {
+ byte[] convertedBytes = LittleEndianBitConverter.getBytes(value);
+ this.setBytes(convertedBytes, length);
}
/**
@@ -102,8 +102,8 @@ public class BitWriter {
*
* @param value Specify the GUID value.
*/
- public void AppendGUID(UUID value) {
- this.SetBytes(UuidUtils.asBytes(value), 128);
+ public void appendGUID(UUID value) {
+ this.setBytes(UuidUtils.asBytes(value), 128);
}
/**
@@ -112,9 +112,9 @@ public class BitWriter {
* @param needWrittenBytes Specify the needed written byte array.
* @param length Specify the bit length which the byte array will occupy in the buffer.
*/
- private void SetBytes(byte[] needWrittenBytes, int length) {
+ private void setBytes(byte[] needWrittenBytes, int length) {
for (int i = 0; i < length; i++) {
- if (Bit.IsBitSet(needWrittenBytes, i)) {
+ if (Bit.isBitSet(needWrittenBytes, i)) {
bitSet.set(this.bitOffset++);
} else {
bitSet.clear(this.bitOffset++);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/DataElementUtils.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/DataElementUtils.java
index 0baeabf..4cb5ab0 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/DataElementUtils.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/DataElementUtils.java
@@ -61,26 +61,26 @@ public class DataElementUtils {
* @param storageIndexExGuid Reference set to the storage index ex guid.
* @return List of DataElement objects that are stored in the file content.
*/
- public static List<DataElement> BuildDataElements(byte[] fileContent,
+ public static List<DataElement> buildDataElements(byte[] fileContent,
AtomicReference<ExGuid> storageIndexExGuid) {
List<ExGuid> objectDataExGuidList = new ArrayList<>();
AtomicReference<ExGuid> rootNodeObjectExGuid = new AtomicReference<>();
List<DataElement> dataElementList =
- CreateObjectGroupDataElement(fileContent, rootNodeObjectExGuid,
+ createObjectGroupDataElement(fileContent, rootNodeObjectExGuid,
objectDataExGuidList);
ExGuid baseRevisionID = new ExGuid(0, GuidUtil.emptyGuid());
Map<ExGuid, ExGuid> revisionMapping = new HashMap<>();
AtomicReference<ExGuid> currentRevisionID = new AtomicReference<>();
dataElementList.add(
- CreateRevisionManifestDataElement(rootNodeObjectExGuid.get(), baseRevisionID,
+ createRevisionManifestDataElement(rootNodeObjectExGuid.get(), baseRevisionID,
objectDataExGuidList, revisionMapping, currentRevisionID));
Map<CellID, ExGuid> cellIDMapping = new HashMap<>();
- dataElementList.add(CreateCellMainifestDataElement(currentRevisionID.get(), cellIDMapping));
+ dataElementList.add(createCellMainifestDataElement(currentRevisionID.get(), cellIDMapping));
- dataElementList.add(CreateStorageManifestDataElement(cellIDMapping));
- dataElementList.add(CreateStorageIndexDataElement(
+ dataElementList.add(createStorageManifestDataElement(cellIDMapping));
+ dataElementList.add(createStorageIndexDataElement(
dataElementList.get(dataElementList.size() - 1).dataElementExGuid, cellIDMapping,
revisionMapping));
@@ -97,7 +97,7 @@ public class DataElementUtils {
* for the data object data.
* @return Return the list of data element which will represent the file content.
*/
- public static List<DataElement> CreateObjectGroupDataElement(byte[] fileContent,
+ public static List<DataElement> createObjectGroupDataElement(byte[] fileContent,
AtomicReference<ExGuid> rootNodeExGuid,
List<ExGuid> objectDataExGuidList) {
NodeObject rootNode = new IntermediateNodeObject.RootNodeObjectBuilder().Build(fileContent);
@@ -122,7 +122,7 @@ public class DataElementUtils {
* @param currentRevisionID Output parameter to represent the revision GUID.
* @return Return the revision manifest data element.
*/
- public static DataElement CreateRevisionManifestDataElement(ExGuid rootObjectExGuid,
+ public static DataElement createRevisionManifestDataElement(ExGuid rootObjectExGuid,
ExGuid baseRevisionID,
List<ExGuid> refferenceObjectDataExGuidList,
Map<ExGuid, ExGuid> revisionMapping,
@@ -140,7 +140,7 @@ public class DataElementUtils {
// Set all the reference object data
if (refferenceObjectDataExGuidList != null) {
for (ExGuid dataGuid : refferenceObjectDataExGuidList) {
- data.RevisionManifestObjectGroupReferencesList.add(
+ data.revisionManifestObjectGroupReferences.add(
new RevisionManifestObjectGroupReferences(dataGuid));
}
}
@@ -159,7 +159,7 @@ public class DataElementUtils {
* @param cellIDMapping Input/output parameter to represent the mapping of cell manifest.
* @return Return the cell manifest data element.
*/
- public static DataElement CreateCellMainifestDataElement(ExGuid revisionId,
+ public static DataElement createCellMainifestDataElement(ExGuid revisionId,
Map<CellID, ExGuid> cellIDMapping) {
CellManifestDataElementData data = new CellManifestDataElementData();
data.cellManifestCurrentRevision = new CellManifestCurrentRevision();
@@ -178,7 +178,7 @@ public class DataElementUtils {
* @param cellIDMapping Specify the mapping of cell manifest.
* @return The storage manifest data element.
*/
- public static DataElement CreateStorageManifestDataElement(Map<CellID, ExGuid> cellIDMapping) {
+ public static DataElement createStorageManifestDataElement(Map<CellID, ExGuid> cellIDMapping) {
StorageManifestDataElementData data = new StorageManifestDataElementData();
data.storageManifestSchemaGUID = new StorageManifestSchemaGUID();
data.storageManifestSchemaGUID.guid = SchemaGuid;
@@ -187,7 +187,7 @@ public class DataElementUtils {
StorageManifestRootDeclare manifestRootDeclare = new StorageManifestRootDeclare();
manifestRootDeclare.RootExGUID = new ExGuid(2, RootExGuid);
manifestRootDeclare.cellID = new CellID(kv.getKey());
- data.StorageManifestRootDeclareList.add(manifestRootDeclare);
+ data.storageManifestRootDeclareList.add(manifestRootDeclare);
}
return new DataElement(DataElementType.StorageManifestDataElementData, data);
@@ -201,7 +201,7 @@ public class DataElementUtils {
* @param revisionIDMappings Specify the mapping of revision manifest.
* @return The storage index data element.
*/
- public static DataElement CreateStorageIndexDataElement(ExGuid manifestExGuid,
+ public static DataElement createStorageIndexDataElement(ExGuid manifestExGuid,
Map<CellID, ExGuid> cellIDMappings,
Map<ExGuid, ExGuid> revisionIDMappings) {
StorageIndexDataElementData data = new StorageIndexDataElementData();
@@ -218,7 +218,7 @@ public class DataElementUtils {
cellMapping.CellMappingExGuid = kv.getValue();
cellMapping.CellMappingSerialNumber = new SerialNumber(UUID.randomUUID(),
SequenceNumberGenerator.GetCurrentSerialNumber());
- data.StorageIndexCellMappingList.add(cellMapping);
+ data.storageIndexCellMappingList.add(cellMapping);
}
for (Map.Entry<ExGuid, ExGuid> kv : revisionIDMappings.entrySet()) {
@@ -241,16 +241,16 @@ public class DataElementUtils {
* @param rootExGuid Output parameter to represent the root node object.
* @return Return the list of object group data elements.
*/
- public static List<ObjectGroupDataElementData> GetDataObjectDataElementData(
+ public static List<ObjectGroupDataElementData> getDataObjectDataElementData(
List<DataElement> dataElements, ExGuid storageIndexExGuid,
AtomicReference<ExGuid> rootExGuid) {
AtomicReference<ExGuid> manifestMappingGuid = new AtomicReference<>();
AtomicReference<HashMap<CellID, ExGuid>> cellIDMappings = new AtomicReference<>();
AtomicReference<HashMap<ExGuid, ExGuid>> revisionIDMappings = new AtomicReference<>();
- AnalyzeStorageIndexDataElement(dataElements, storageIndexExGuid, manifestMappingGuid,
+ analyzeStorageIndexDataElement(dataElements, storageIndexExGuid, manifestMappingGuid,
cellIDMappings, revisionIDMappings);
StorageManifestDataElementData manifestData =
- GetStorageManifestDataElementData(dataElements, manifestMappingGuid.get());
+ getStorageManifestDataElementData(dataElements, manifestMappingGuid.get());
if (manifestData == null) {
throw new InvalidOperationException(
"Cannot find the storage manifest data element with ExGuid " +
@@ -258,11 +258,11 @@ public class DataElementUtils {
}
CellManifestDataElementData cellData =
- GetCellManifestDataElementData(dataElements, manifestData, cellIDMappings.get());
+ getCellManifestDataElementData(dataElements, manifestData, cellIDMappings.get());
RevisionManifestDataElementData revisionData =
- GetRevisionManifestDataElementData(dataElements, cellData,
+ getRevisionManifestDataElementData(dataElements, cellData,
revisionIDMappings.get());
- return GetDataObjectDataElementData(dataElements, revisionData, rootExGuid);
+ return getDataObjectDataElementData(dataElements, revisionData, rootExGuid);
}
/**
@@ -273,12 +273,12 @@ public class DataElementUtils {
* @return If the data elements start with the specified storage index extended GUID are complete,
* return true. Otherwise return false.
*/
- public static boolean TryAnalyzeWhetherFullDataElementList(List<DataElement> dataElements,
+ public static boolean tryAnalyzeWhetherFullDataElementList(List<DataElement> dataElements,
ExGuid storageIndexExGuid) {
AtomicReference<ExGuid> manifestMappingGuid = new AtomicReference<>();
AtomicReference<HashMap<CellID, ExGuid>> cellIDMappings = new AtomicReference<>();
AtomicReference<HashMap<ExGuid, ExGuid>> revisionIDMappings = new AtomicReference<>();
- if (!AnalyzeStorageIndexDataElement(dataElements, storageIndexExGuid, manifestMappingGuid,
+ if (!analyzeStorageIndexDataElement(dataElements, storageIndexExGuid, manifestMappingGuid,
cellIDMappings, revisionIDMappings)) {
return false;
}
@@ -292,16 +292,15 @@ public class DataElementUtils {
}
StorageManifestDataElementData manifestData =
- GetStorageManifestDataElementData(dataElements, manifestMappingGuid.get());
+ getStorageManifestDataElementData(dataElements, manifestMappingGuid.get());
if (manifestData == null) {
return false;
}
- for (StorageManifestRootDeclare kv : manifestData.StorageManifestRootDeclareList) {
+ for (StorageManifestRootDeclare kv : manifestData.storageManifestRootDeclareList) {
if (!cellIDMappings.get().containsKey(kv.cellID)) {
- throw new InvalidOperationException(
- String.format(Locale.US, "Cannot find the Cell ID %s in the cell id mapping",
- kv.cellID.toString()));
+ throw new InvalidOperationException(String.format(Locale.US,
+ "Cannot find the Cell ID %s in the cell id mapping", kv.cellID.toString()));
}
ExGuid cellMappingID = cellIDMappings.get().get(kv.cellID);
@@ -313,13 +312,13 @@ public class DataElementUtils {
}
CellManifestDataElementData cellData =
- dataElement.GetData(CellManifestDataElementData.class);
+ dataElement.getData(CellManifestDataElementData.class);
ExGuid currentRevisionExGuid =
cellData.cellManifestCurrentRevision.cellManifestCurrentRevisionExGuid;
if (!revisionIDMappings.get().containsKey(currentRevisionExGuid)) {
- throw new InvalidOperationException(
- String.format(Locale.US, "Cannot find the revision id %s in the revisionMapping",
- currentRevisionExGuid.toString()));
+ throw new InvalidOperationException(String.format(Locale.US,
+ "Cannot find the revision id %s in the revisionMapping",
+ currentRevisionExGuid.toString()));
}
ExGuid revisionMapping = revisionIDMappings.get().get(currentRevisionExGuid);
@@ -331,12 +330,12 @@ public class DataElementUtils {
}
RevisionManifestDataElementData revisionData =
- dataElement.GetData(RevisionManifestDataElementData.class);
+ dataElement.getData(RevisionManifestDataElementData.class);
for (RevisionManifestObjectGroupReferences reference :
- revisionData.RevisionManifestObjectGroupReferencesList) {
+ revisionData.revisionManifestObjectGroupReferences) {
dataElement = dataElements.stream()
.filter(element -> element.dataElementExGuid.equals(
- reference.ObjectGroupExtendedGUID)).findAny().orElse(null);
+ reference.objectGroupExtendedGUID)).findAny().orElse(null);
if (dataElement == null) {
return false;
}
@@ -353,7 +352,7 @@ public class DataElementUtils {
* @param storageIndexExGuid Specify the storage index extended GUID.
* @return If the data elements confirms to the schema defined in the MS-FSSHTTPD returns true, otherwise false.
*/
- public static boolean TryAnalyzeWhetherConfirmSchema(List<DataElement> dataElements,
+ public static boolean tryAnalyzeWhetherConfirmSchema(List<DataElement> dataElements,
ExGuid storageIndexExGuid) {
DataElement storageIndexDataElement = dataElements.stream()
.filter(element -> element.dataElementExGuid.equals(storageIndexExGuid)).findAny()
@@ -363,7 +362,7 @@ public class DataElementUtils {
}
StorageIndexDataElementData storageIndexData =
- storageIndexDataElement.GetData(StorageIndexDataElementData.class);
+ storageIndexDataElement.getData(StorageIndexDataElementData.class);
ExGuid manifestMappingGuid =
storageIndexData.StorageIndexManifestMapping.ManifestMappingExGuid;
@@ -374,7 +373,7 @@ public class DataElementUtils {
return false;
}
- return SchemaGuid.equals(storageManifestDataElement.GetData(
+ return SchemaGuid.equals(storageManifestDataElement.getData(
StorageManifestDataElementData.class).storageManifestSchemaGUID.guid);
}
@@ -388,7 +387,7 @@ public class DataElementUtils {
* @param revisionIDMappings Output parameter to represent the revision id.
* @return Return true if analyze the storage index succeeds, otherwise return false.
*/
- public static boolean AnalyzeStorageIndexDataElement(List<DataElement> dataElements,
+ public static boolean analyzeStorageIndexDataElement(List<DataElement> dataElements,
ExGuid storageIndexExGuid,
AtomicReference<ExGuid> manifestMappingGuid,
AtomicReference<HashMap<CellID, ExGuid>> cellIDMappings,
@@ -405,11 +404,11 @@ public class DataElementUtils {
.filter(element -> element.dataElementExGuid.equals(storageIndexExGuid)).findAny()
.orElse(null);
StorageIndexDataElementData storageIndexData =
- storageIndexDataElement.GetData(StorageIndexDataElementData.class);
+ storageIndexDataElement.getData(StorageIndexDataElementData.class);
manifestMappingGuid.set(storageIndexData.StorageIndexManifestMapping.ManifestMappingExGuid);
cellIDMappings.set(new HashMap<>());
- for (StorageIndexCellMapping kv : storageIndexData.StorageIndexCellMappingList) {
+ for (StorageIndexCellMapping kv : storageIndexData.storageIndexCellMappingList) {
cellIDMappings.get().put(kv.CellID, kv.CellMappingExGuid);
}
@@ -428,7 +427,7 @@ public class DataElementUtils {
* @param manifestMapping Specify the manifest mapping GUID.
* @return Return the storage manifest data element.
*/
- public static StorageManifestDataElementData GetStorageManifestDataElementData(
+ public static StorageManifestDataElementData getStorageManifestDataElementData(
List<DataElement> dataElements, ExGuid manifestMapping) {
DataElement storageManifestDataElement = dataElements.stream()
.filter(element -> element.dataElementExGuid.equals(manifestMapping)).findAny()
@@ -437,7 +436,7 @@ public class DataElementUtils {
return null;
}
- return storageManifestDataElement.GetData(StorageManifestDataElementData.class);
+ return storageManifestDataElement.getData(StorageManifestDataElementData.class);
}
/**
@@ -448,16 +447,17 @@ public class DataElementUtils {
* @param cellIDMappings Specify mapping of cell id.
* @return Return the cell manifest data element.
*/
- public static CellManifestDataElementData GetCellManifestDataElementData(
+ public static CellManifestDataElementData getCellManifestDataElementData(
List<DataElement> dataElements, StorageManifestDataElementData manifestDataElementData,
HashMap<CellID, ExGuid> cellIDMappings) {
CellID cellID = new CellID(new ExGuid(1, RootExGuid), new ExGuid(1, CellSecondExGuid));
- for (StorageManifestRootDeclare kv : manifestDataElementData.StorageManifestRootDeclareList) {
+ for (StorageManifestRootDeclare kv :
+ manifestDataElementData.storageManifestRootDeclareList) {
if (kv.RootExGUID.equals(new ExGuid(2, RootExGuid)) && kv.cellID.equals(cellID)) {
if (!cellIDMappings.containsKey(kv.cellID)) {
- throw new InvalidOperationException(
- String.format(Locale.US, "Cannot fin the Cell ID %s in the cell id mapping", cellID));
+ throw new InvalidOperationException(String.format(Locale.US,
+ "Cannot fin the Cell ID %s in the cell id mapping", cellID));
}
ExGuid cellMappingID = cellIDMappings.get(kv.cellID);
@@ -471,7 +471,7 @@ public class DataElementUtils {
cellMappingID.guid.toString());
}
- return dataElement.GetData(CellManifestDataElementData.class);
+ return dataElement.getData(CellManifestDataElementData.class);
}
}
@@ -486,16 +486,16 @@ public class DataElementUtils {
* @param revisionIDMappings Specify mapping of revision id.
* @return Return the revision manifest data element.
*/
- public static RevisionManifestDataElementData GetRevisionManifestDataElementData(
+ public static RevisionManifestDataElementData getRevisionManifestDataElementData(
List<DataElement> dataElements, CellManifestDataElementData cellData,
HashMap<ExGuid, ExGuid> revisionIDMappings) {
ExGuid currentRevisionExGuid =
cellData.cellManifestCurrentRevision.cellManifestCurrentRevisionExGuid;
if (!revisionIDMappings.containsKey(currentRevisionExGuid)) {
- throw new InvalidOperationException(
- String.format(Locale.US, "Cannot find the revision id %s in the revisionMapping",
- currentRevisionExGuid.toString()));
+ throw new InvalidOperationException(String.format(Locale.US,
+ "Cannot find the revision id %s in the revisionMapping",
+ currentRevisionExGuid.toString()));
}
ExGuid revisionMapping = revisionIDMappings.get(currentRevisionExGuid);
@@ -508,7 +508,7 @@ public class DataElementUtils {
"Cannot find the revision data element with ExGuid " + revisionMapping.guid);
}
- return dataElement.GetData(RevisionManifestDataElementData.class);
+ return dataElement.getData(RevisionManifestDataElementData.class);
}
/**
@@ -519,7 +519,7 @@ public class DataElementUtils {
* @param rootExGuid Specify the root node object extended GUID.
* @return Return the list of object group data element.
*/
- public static List<ObjectGroupDataElementData> GetDataObjectDataElementData(
+ public static List<ObjectGroupDataElementData> getDataObjectDataElementData(
List<DataElement> dataElements, RevisionManifestDataElementData revisionData,
AtomicReference<ExGuid> rootExGuid) {
rootExGuid = null;
@@ -533,17 +533,17 @@ public class DataElementUtils {
List<ObjectGroupDataElementData> dataList = new ArrayList<>();
- for (RevisionManifestObjectGroupReferences kv : revisionData.RevisionManifestObjectGroupReferencesList) {
+ for (RevisionManifestObjectGroupReferences kv : revisionData.revisionManifestObjectGroupReferences) {
DataElement dataElement = dataElements.stream()
- .filter(element -> element.dataElementExGuid.equals(kv.ObjectGroupExtendedGUID))
+ .filter(element -> element.dataElementExGuid.equals(kv.objectGroupExtendedGUID))
.findAny().orElse(null);
if (dataElement == null) {
throw new InvalidOperationException(
"Cannot find the object group data element with ExGuid " +
- kv.ObjectGroupExtendedGUID.guid.toString());
+ kv.objectGroupExtendedGUID.guid.toString());
}
- dataList.add(dataElement.GetData(ObjectGroupDataElementData.class));
+ dataList.add(dataElement.getData(ObjectGroupDataElementData.class));
}
return dataList;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/LittleEndianBitConverter.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/LittleEndianBitConverter.java
index 135f521..9bb1477 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/LittleEndianBitConverter.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/util/LittleEndianBitConverter.java
@@ -38,8 +38,8 @@ public class LittleEndianBitConverter {
* @return Returns a 16-bit unsigned integer formed by two bytes beginning at startIndex.
*/
public static short ToUInt16(byte[] array, int index) {
- CheckByteArgument(array, index, 2);
- return (short) ConvertFromBytes(array, index, 2);
+ checkByteArgument(array, index, 2);
+ return (short) convertFromBytes(array, index, 2);
}
/**
@@ -49,9 +49,9 @@ public class LittleEndianBitConverter {
* @param index Specify the starting position.
* @return Returns a 32-bit unsigned integer formed by two bytes beginning at startIndex.
*/
- public static int ToUInt32(byte[] array, int index) {
- CheckByteArgument(array, index, 4);
- return (int) ConvertFromBytes(array, index, 4);
+ public static int toUInt32(byte[] array, int index) {
+ checkByteArgument(array, index, 4);
+ return (int) convertFromBytes(array, index, 4);
}
/**
@@ -61,9 +61,9 @@ public class LittleEndianBitConverter {
* @param index Specify the starting position.
* @return Returns a 32-bit signed integer formed by two bytes beginning at startIndex.
*/
- public static int ToInt32(byte[] array, int index) {
- CheckByteArgument(array, index, 4);
- return (int) ConvertFromBytes(array, index, 4);
+ public static int toInt32(byte[] array, int index) {
+ checkByteArgument(array, index, 4);
+ return (int) convertFromBytes(array, index, 4);
}
/**
@@ -73,9 +73,9 @@ public class LittleEndianBitConverter {
* @param index Specify the starting position.
* @return Returns a 16-bit signed integer formed by two bytes beginning at startIndex.
*/
- public static short ToInt16(byte[] array, int index) {
- CheckByteArgument(array, index, 4);
- return (short) ConvertFromBytes(array, index, 2);
+ public static short toInt16(byte[] array, int index) {
+ checkByteArgument(array, index, 4);
+ return (short) convertFromBytes(array, index, 2);
}
/**
@@ -85,9 +85,9 @@ public class LittleEndianBitConverter {
* @param index Specify the starting position.
* @return Returns a 64-bit unsigned integer formed by two bytes beginning at startIndex.
*/
- public static long ToUInt64(byte[] array, int index) {
- CheckByteArgument(array, index, 8);
- return ConvertFromBytes(array, index, 8);
+ public static long toUInt64(byte[] array, int index) {
+ checkByteArgument(array, index, 8);
+ return convertFromBytes(array, index, 8);
}
/**
@@ -96,9 +96,9 @@ public class LittleEndianBitConverter {
* @param value Specify the number to convert.
* @return Returns an array of bytes with length 8.
*/
- public static byte[] GetBytes(long value) {
+ public static byte[] getBytes(long value) {
byte[] buffer = new byte[8];
- ConvertToBytes(value, buffer);
+ convertToBytes(value, buffer);
return buffer;
}
@@ -108,9 +108,9 @@ public class LittleEndianBitConverter {
* @param value Specify the number to convert.
* @return Returns an array of bytes with length 4.
*/
- public static byte[] GetBytes(int value) {
+ public static byte[] getBytes(int value) {
byte[] buffer = new byte[4];
- ConvertToBytes(value, buffer);
+ convertToBytes(value, buffer);
return buffer;
}
@@ -124,7 +124,7 @@ public class LittleEndianBitConverter {
* @return Return the value built from the given bytes
*/
- private static long ConvertFromBytes(byte[] buffer, int startIndex, int bytesToConvert) {
+ private static long convertFromBytes(byte[] buffer, int startIndex, int bytesToConvert) {
long ret = 0;
int bitCount = 0;
for (int i = 0; i < bytesToConvert; i++) {
@@ -143,7 +143,7 @@ public class LittleEndianBitConverter {
* @param value Specify the value to convert.
* @param buffer Specify the buffer which copies the bytes into.
*/
- private static void ConvertToBytes(long value, byte[] buffer) {
+ private static void convertToBytes(long value, byte[] buffer) {
for (int i = 0; i < buffer.length; i++) {
buffer[i] = (byte) (value & 0xff);
value = value >> 8;
@@ -157,7 +157,7 @@ public class LittleEndianBitConverter {
* @param startIndex Specify the start index.
* @param bytesRequired Specify the number of bytes.
*/
- private static void CheckByteArgument(byte[] value, int startIndex, int bytesRequired) {
+ private static void checkByteArgument(byte[] value, int startIndex, int bytesRequired) {
if (value == null) {
throw new RuntimeException("value");
}