Skip to content

Commit

Permalink
4117: Renamed new methods using naming convention getMd5ToHexString()…
Browse files Browse the repository at this point in the history 
…, getCrc32cToHexString()
  • Loading branch information
andrey-qlogic committed Jan 25, 2019
1 parent 8862ddf commit 85588a3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions ...e-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ public String getMd5() {
* @see <a href="https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI">Hashes and ETags:
* Best Practices</a>
*/
public String getMd5String() {
public String getMd5ToHexString() {
if (md5 == null) {
return null;
}
Expand Down Expand Up @@ -712,7 +712,7 @@ public String getCrc32c() {
* @see <a href="https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI">Hashes and ETags:
* Best Practices</a>
*/
public String getCrc32cString() {
public String getCrc32cToHexString() {
if (crc32c == null) {
return null;
}
Expand Down
16 changes: 8 additions & 8 deletions ...oud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ public void testBuilder() {
assertEquals(CONTENT_LANGUAGE, BLOB_INFO.getContentLanguage());
assertEquals(CUSTOMER_ENCRYPTION, BLOB_INFO.getCustomerEncryption());
assertEquals(CRC32, BLOB_INFO.getCrc32c());
assertEquals(CRC32_STRING, BLOB_INFO.getCrc32cString());
assertEquals(CRC32_STRING, BLOB_INFO.getCrc32cToHexString());
assertEquals(DELETE_TIME, BLOB_INFO.getDeleteTime());
assertEquals(ETAG, BLOB_INFO.getEtag());
assertEquals(GENERATION, BLOB_INFO.getGeneration());
assertEquals(GENERATED_ID, BLOB_INFO.getGeneratedId());
assertEquals(MD5, BLOB_INFO.getMd5());
assertEquals(MD5_STRING, BLOB_INFO.getMd5String());
assertEquals(MD5_STRING, BLOB_INFO.getMd5ToHexString());
assertEquals(MEDIA_LINK, BLOB_INFO.getMediaLink());
assertEquals(METADATA, BLOB_INFO.getMetadata());
assertEquals(META_GENERATION, BLOB_INFO.getMetageneration());
Expand All @@ -176,14 +176,14 @@ public void testBuilder() {
assertNull(DIRECTORY_INFO.getContentLanguage());
assertNull(DIRECTORY_INFO.getCustomerEncryption());
assertNull(DIRECTORY_INFO.getCrc32c());
assertNull(DIRECTORY_INFO.getCrc32cString());
assertNull(DIRECTORY_INFO.getCrc32cToHexString());
assertNull(DIRECTORY_INFO.getCreateTime());
assertNull(DIRECTORY_INFO.getDeleteTime());
assertNull(DIRECTORY_INFO.getEtag());
assertNull(DIRECTORY_INFO.getGeneration());
assertNull(DIRECTORY_INFO.getGeneratedId());
assertNull(DIRECTORY_INFO.getMd5());
assertNull(DIRECTORY_INFO.getMd5String());
assertNull(DIRECTORY_INFO.getMd5ToHexString());
assertNull(DIRECTORY_INFO.getMediaLink());
assertNull(DIRECTORY_INFO.getMetadata());
assertNull(DIRECTORY_INFO.getMetageneration());
Expand All @@ -207,14 +207,14 @@ private void compareBlobs(BlobInfo expected, BlobInfo value) {
assertEquals(expected.getContentLanguage(), value.getContentLanguage());
assertEquals(expected.getCustomerEncryption(), value.getCustomerEncryption());
assertEquals(expected.getCrc32c(), value.getCrc32c());
assertEquals(expected.getCrc32cString(), value.getCrc32cString());
assertEquals(expected.getCrc32cToHexString(), value.getCrc32cToHexString());
assertEquals(expected.getCreateTime(), value.getCreateTime());
assertEquals(expected.getDeleteTime(), value.getDeleteTime());
assertEquals(expected.getEtag(), value.getEtag());
assertEquals(expected.getGeneration(), value.getGeneration());
assertEquals(expected.getGeneratedId(), value.getGeneratedId());
assertEquals(expected.getMd5(), value.getMd5());
assertEquals(expected.getMd5String(), value.getMd5String());
assertEquals(expected.getMd5ToHexString(), value.getMd5ToHexString());
assertEquals(expected.getMediaLink(), value.getMediaLink());
assertEquals(expected.getMetadata(), value.getMetadata());
assertEquals(expected.getMetageneration(), value.getMetageneration());
Expand Down Expand Up @@ -261,14 +261,14 @@ public void testToPbAndFromPb() {
assertNull(blobInfo.getContentLanguage());
assertNull(blobInfo.getCustomerEncryption());
assertNull(blobInfo.getCrc32c());
assertNull(blobInfo.getCrc32cString());
assertNull(blobInfo.getCrc32cToHexString());
assertNull(blobInfo.getCreateTime());
assertNull(blobInfo.getDeleteTime());
assertNull(blobInfo.getEtag());
assertNull(blobInfo.getGeneration());
assertNull(blobInfo.getGeneratedId());
assertNull(blobInfo.getMd5());
assertNull(blobInfo.getMd5String());
assertNull(blobInfo.getMd5ToHexString());
assertNull(blobInfo.getMediaLink());
assertNull(blobInfo.getMetadata());
assertNull(blobInfo.getMetageneration());
Expand Down
8 changes: 4 additions & 4 deletions ...e-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ public void testBuilder() {
assertEquals(CONTENT_ENCODING, blob.getContentEncoding());
assertEquals(CONTENT_LANGUAGE, blob.getContentLanguage());
assertEquals(CRC32, blob.getCrc32c());
assertEquals(CRC32_STRING, blob.getCrc32cString());
assertEquals(CRC32_STRING, blob.getCrc32cToHexString());
assertEquals(CREATE_TIME, blob.getCreateTime());
assertEquals(CUSTOMER_ENCRYPTION, blob.getCustomerEncryption());
assertEquals(KMS_KEY_NAME, blob.getKmsKeyName());
Expand All @@ -519,7 +519,7 @@ public void testBuilder() {
assertEquals(ETAG, blob.getEtag());
assertEquals(GENERATED_ID, blob.getGeneratedId());
assertEquals(MD5, blob.getMd5());
assertEquals(MD5_STRING, blob.getMd5String());
assertEquals(MD5_STRING, blob.getMd5ToHexString());
assertEquals(MEDIA_LINK, blob.getMediaLink());
assertEquals(METADATA, blob.getMetadata());
assertEquals(META_GENERATION, blob.getMetageneration());
Expand All @@ -541,7 +541,7 @@ public void testBuilder() {
assertNull(blob.getContentEncoding());
assertNull(blob.getContentLanguage());
assertNull(blob.getCrc32c());
assertNull(blob.getCrc32cString());
assertNull(blob.getCrc32cToHexString());
assertNull(blob.getCreateTime());
assertNull(blob.getCustomerEncryption());
assertNull(blob.getKmsKeyName());
Expand All @@ -552,7 +552,7 @@ public void testBuilder() {
assertNull(blob.getEtag());
assertNull(blob.getGeneratedId());
assertNull(blob.getMd5());
assertNull(blob.getMd5String());
assertNull(blob.getMd5ToHexString());
assertNull(blob.getMediaLink());
assertNull(blob.getMetadata());
assertNull(blob.getMetageneration());
Expand Down
4 changes: 2 additions & 2 deletions ...ud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,13 +1136,13 @@ public void getBlobMetadata(String bucketName, String blobName) throws StorageEx
System.out.println("ContentLanguage: " + blob.getContentLanguage());
System.out.println("ContentType: " + blob.getContentType());
System.out.println("Crc32c: " + blob.getCrc32c());
System.out.println("Crc32cString: " + blob.getCrc32cString());
System.out.println("Crc32cString: " + blob.getCrc32cToHexString());
System.out.println("ETag: " + blob.getEtag());
System.out.println("Generation: " + blob.getGeneration());
System.out.println("Id: " + blob.getBlobId());
System.out.println("KmsKeyName: " + blob.getKmsKeyName());
System.out.println("Md5Hash: " + blob.getMd5());
System.out.println("Md5String: " + blob.getMd5String());
System.out.println("Md5String: " + blob.getMd5ToHexString());
System.out.println("MediaLink: " + blob.getMediaLink());
System.out.println("Metageneration: " + blob.getMetageneration());
System.out.println("Name: " + blob.getName());
Expand Down
4 changes: 2 additions & 2 deletions ...-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,13 +458,13 @@ public void testGetBlobMetadata() {
assertTrue(snippetOutput.contains("ContentLanguage: " + remoteBlob.getContentLanguage()));
assertTrue(snippetOutput.contains("ContentType: " + remoteBlob.getContentType()));
assertTrue(snippetOutput.contains("Crc32c: " + remoteBlob.getCrc32c()));
assertTrue(snippetOutput.contains("Crc32cString: " + remoteBlob.getCrc32cString()));
assertTrue(snippetOutput.contains("Crc32cString: " + remoteBlob.getCrc32cToHexString()));
assertTrue(snippetOutput.contains("ETag: " + remoteBlob.getEtag()));
assertTrue(snippetOutput.contains("Generation: " + remoteBlob.getGeneration()));
assertTrue(snippetOutput.contains("Id: " + remoteBlob.getBlobId()));
assertTrue(snippetOutput.contains("KmsKeyName: " + remoteBlob.getKmsKeyName()));
assertTrue(snippetOutput.contains("Md5Hash: " + remoteBlob.getMd5()));
assertTrue(snippetOutput.contains("Md5HashString: " + remoteBlob.getMd5String()));
assertTrue(snippetOutput.contains("Md5HashString: " + remoteBlob.getMd5ToHexString()));
assertTrue(snippetOutput.contains("MediaLink: " + remoteBlob.getMediaLink()));
assertTrue(snippetOutput.contains("Metageneration: " + remoteBlob.getMetageneration()));
assertTrue(snippetOutput.contains("Name: " + remoteBlob.getName()));
Expand Down

0 comments on commit 85588a3

Please sign in to comment.