diff --git a/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextHeaders.java b/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextHeaders.java index fee151ba2..7015e8cc4 100644 --- a/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextHeaders.java +++ b/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextHeaders.java @@ -503,7 +503,6 @@ private int parseComplete(final byte[] b, final int off) throws ParseException { return 0; } - /** * Deserialize the provided bytes starting at the specified offset to construct an instance of * this class. Uses the default value for maxEncryptedDataKeys, which results in no limit. @@ -520,20 +519,20 @@ public int deserialize(final byte[] b, final int off) throws ParseException { return deserialize(b, off, NO_MAX_ENCRYPTED_DATA_KEYS); } - /** - * Deserialize the provided bytes starting at the specified offset to construct an instance of - * this class. - * - *
This method parses the provided bytes for the individual fields in this class. This method - * also supports partial parsing where not all the bytes required for parsing the fields - * successfully are available. - * - * @param b the byte array to deserialize. - * @param off the offset in the byte array to use for deserialization. - * @param maxEncryptedDataKeys the maximum number of EDKs to deserialize; zero indicates no - * maximum - * @return the number of bytes consumed in deserialization. - */ + /** + * Deserialize the provided bytes starting at the specified offset to construct an instance of + * this class. + * + *
This method parses the provided bytes for the individual fields in this class. This method + * also supports partial parsing where not all the bytes required for parsing the fields + * successfully are available. + * + * @param b the byte array to deserialize. + * @param off the offset in the byte array to use for deserialization. + * @param maxEncryptedDataKeys the maximum number of EDKs to deserialize; zero indicates no + * maximum + * @return the number of bytes consumed in deserialization. + */ public int deserialize(final byte[] b, final int off, int maxEncryptedDataKeys) throws ParseException { if (b == null) { @@ -853,8 +852,7 @@ public void setSuiteData(byte[] suiteData) { } /** - * Return max encrypted data keys - * Package scope for unit testing. + * Return max encrypted data keys. Package scope for unit testing. * * @return int */ diff --git a/src/test/java/com/amazonaws/encryptionsdk/model/CiphertextHeadersTest.java b/src/test/java/com/amazonaws/encryptionsdk/model/CiphertextHeadersTest.java index 13c20a42b..58ef933c4 100644 --- a/src/test/java/com/amazonaws/encryptionsdk/model/CiphertextHeadersTest.java +++ b/src/test/java/com/amazonaws/encryptionsdk/model/CiphertextHeadersTest.java @@ -61,8 +61,7 @@ public void serializeDeserialize() { final byte[] headerBytes = ciphertextHeaders.toByteArray(); final CiphertextHeaders reconstructedHeaders = new CiphertextHeaders(); - reconstructedHeaders.deserialize( - headerBytes, 0, maxEncryptedDataKeys); + reconstructedHeaders.deserialize(headerBytes, 0, maxEncryptedDataKeys); final byte[] reconstructedHeaderBytes = reconstructedHeaders.toByteArray(); assertEquals(reconstructedHeaders.getMaxEncryptedDataKeys(), maxEncryptedDataKeys); @@ -83,7 +82,9 @@ public void serializeDeserializeDefaultMaxEncryptedDataKeys() { reconstructedHeaders.deserialize(headerBytes, 0); final byte[] reconstructedHeaderBytes = reconstructedHeaders.toByteArray(); - assertEquals(reconstructedHeaders.getMaxEncryptedDataKeys(), CiphertextHeaders.NO_MAX_ENCRYPTED_DATA_KEYS); + assertEquals( + reconstructedHeaders.getMaxEncryptedDataKeys(), + CiphertextHeaders.NO_MAX_ENCRYPTED_DATA_KEYS); assertArrayEquals(headerBytes, reconstructedHeaderBytes); } }