Skip to content

Commit 85588a3

Browse files
author
andrey-qlogic
committed
4117: Renamed new methods using naming convention getMd5ToHexString(), getCrc32cToHexString()
1 parent 8862ddf commit 85588a3

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ public String getMd5() {
680680
* @see <a href="https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI">Hashes and ETags:
681681
* Best Practices</a>
682682
*/
683-
public String getMd5String() {
683+
public String getMd5ToHexString() {
684684
if (md5 == null) {
685685
return null;
686686
}
@@ -712,7 +712,7 @@ public String getCrc32c() {
712712
* @see <a href="https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI">Hashes and ETags:
713713
* Best Practices</a>
714714
*/
715-
public String getCrc32cString() {
715+
public String getCrc32cToHexString() {
716716
if (crc32c == null) {
717717
return null;
718718
}

‎google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ public void testBuilder() {
144144
assertEquals(CONTENT_LANGUAGE, BLOB_INFO.getContentLanguage());
145145
assertEquals(CUSTOMER_ENCRYPTION, BLOB_INFO.getCustomerEncryption());
146146
assertEquals(CRC32, BLOB_INFO.getCrc32c());
147-
assertEquals(CRC32_STRING, BLOB_INFO.getCrc32cString());
147+
assertEquals(CRC32_STRING, BLOB_INFO.getCrc32cToHexString());
148148
assertEquals(DELETE_TIME, BLOB_INFO.getDeleteTime());
149149
assertEquals(ETAG, BLOB_INFO.getEtag());
150150
assertEquals(GENERATION, BLOB_INFO.getGeneration());
151151
assertEquals(GENERATED_ID, BLOB_INFO.getGeneratedId());
152152
assertEquals(MD5, BLOB_INFO.getMd5());
153-
assertEquals(MD5_STRING, BLOB_INFO.getMd5String());
153+
assertEquals(MD5_STRING, BLOB_INFO.getMd5ToHexString());
154154
assertEquals(MEDIA_LINK, BLOB_INFO.getMediaLink());
155155
assertEquals(METADATA, BLOB_INFO.getMetadata());
156156
assertEquals(META_GENERATION, BLOB_INFO.getMetageneration());
@@ -176,14 +176,14 @@ public void testBuilder() {
176176
assertNull(DIRECTORY_INFO.getContentLanguage());
177177
assertNull(DIRECTORY_INFO.getCustomerEncryption());
178178
assertNull(DIRECTORY_INFO.getCrc32c());
179-
assertNull(DIRECTORY_INFO.getCrc32cString());
179+
assertNull(DIRECTORY_INFO.getCrc32cToHexString());
180180
assertNull(DIRECTORY_INFO.getCreateTime());
181181
assertNull(DIRECTORY_INFO.getDeleteTime());
182182
assertNull(DIRECTORY_INFO.getEtag());
183183
assertNull(DIRECTORY_INFO.getGeneration());
184184
assertNull(DIRECTORY_INFO.getGeneratedId());
185185
assertNull(DIRECTORY_INFO.getMd5());
186-
assertNull(DIRECTORY_INFO.getMd5String());
186+
assertNull(DIRECTORY_INFO.getMd5ToHexString());
187187
assertNull(DIRECTORY_INFO.getMediaLink());
188188
assertNull(DIRECTORY_INFO.getMetadata());
189189
assertNull(DIRECTORY_INFO.getMetageneration());
@@ -207,14 +207,14 @@ private void compareBlobs(BlobInfo expected, BlobInfo value) {
207207
assertEquals(expected.getContentLanguage(), value.getContentLanguage());
208208
assertEquals(expected.getCustomerEncryption(), value.getCustomerEncryption());
209209
assertEquals(expected.getCrc32c(), value.getCrc32c());
210-
assertEquals(expected.getCrc32cString(), value.getCrc32cString());
210+
assertEquals(expected.getCrc32cToHexString(), value.getCrc32cToHexString());
211211
assertEquals(expected.getCreateTime(), value.getCreateTime());
212212
assertEquals(expected.getDeleteTime(), value.getDeleteTime());
213213
assertEquals(expected.getEtag(), value.getEtag());
214214
assertEquals(expected.getGeneration(), value.getGeneration());
215215
assertEquals(expected.getGeneratedId(), value.getGeneratedId());
216216
assertEquals(expected.getMd5(), value.getMd5());
217-
assertEquals(expected.getMd5String(), value.getMd5String());
217+
assertEquals(expected.getMd5ToHexString(), value.getMd5ToHexString());
218218
assertEquals(expected.getMediaLink(), value.getMediaLink());
219219
assertEquals(expected.getMetadata(), value.getMetadata());
220220
assertEquals(expected.getMetageneration(), value.getMetageneration());
@@ -261,14 +261,14 @@ public void testToPbAndFromPb() {
261261
assertNull(blobInfo.getContentLanguage());
262262
assertNull(blobInfo.getCustomerEncryption());
263263
assertNull(blobInfo.getCrc32c());
264-
assertNull(blobInfo.getCrc32cString());
264+
assertNull(blobInfo.getCrc32cToHexString());
265265
assertNull(blobInfo.getCreateTime());
266266
assertNull(blobInfo.getDeleteTime());
267267
assertNull(blobInfo.getEtag());
268268
assertNull(blobInfo.getGeneration());
269269
assertNull(blobInfo.getGeneratedId());
270270
assertNull(blobInfo.getMd5());
271-
assertNull(blobInfo.getMd5String());
271+
assertNull(blobInfo.getMd5ToHexString());
272272
assertNull(blobInfo.getMediaLink());
273273
assertNull(blobInfo.getMetadata());
274274
assertNull(blobInfo.getMetageneration());

‎google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public void testBuilder() {
508508
assertEquals(CONTENT_ENCODING, blob.getContentEncoding());
509509
assertEquals(CONTENT_LANGUAGE, blob.getContentLanguage());
510510
assertEquals(CRC32, blob.getCrc32c());
511-
assertEquals(CRC32_STRING, blob.getCrc32cString());
511+
assertEquals(CRC32_STRING, blob.getCrc32cToHexString());
512512
assertEquals(CREATE_TIME, blob.getCreateTime());
513513
assertEquals(CUSTOMER_ENCRYPTION, blob.getCustomerEncryption());
514514
assertEquals(KMS_KEY_NAME, blob.getKmsKeyName());
@@ -519,7 +519,7 @@ public void testBuilder() {
519519
assertEquals(ETAG, blob.getEtag());
520520
assertEquals(GENERATED_ID, blob.getGeneratedId());
521521
assertEquals(MD5, blob.getMd5());
522-
assertEquals(MD5_STRING, blob.getMd5String());
522+
assertEquals(MD5_STRING, blob.getMd5ToHexString());
523523
assertEquals(MEDIA_LINK, blob.getMediaLink());
524524
assertEquals(METADATA, blob.getMetadata());
525525
assertEquals(META_GENERATION, blob.getMetageneration());
@@ -541,7 +541,7 @@ public void testBuilder() {
541541
assertNull(blob.getContentEncoding());
542542
assertNull(blob.getContentLanguage());
543543
assertNull(blob.getCrc32c());
544-
assertNull(blob.getCrc32cString());
544+
assertNull(blob.getCrc32cToHexString());
545545
assertNull(blob.getCreateTime());
546546
assertNull(blob.getCustomerEncryption());
547547
assertNull(blob.getKmsKeyName());
@@ -552,7 +552,7 @@ public void testBuilder() {
552552
assertNull(blob.getEtag());
553553
assertNull(blob.getGeneratedId());
554554
assertNull(blob.getMd5());
555-
assertNull(blob.getMd5String());
555+
assertNull(blob.getMd5ToHexString());
556556
assertNull(blob.getMediaLink());
557557
assertNull(blob.getMetadata());
558558
assertNull(blob.getMetageneration());

‎google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,13 +1136,13 @@ public void getBlobMetadata(String bucketName, String blobName) throws StorageEx
11361136
System.out.println("ContentLanguage: " + blob.getContentLanguage());
11371137
System.out.println("ContentType: " + blob.getContentType());
11381138
System.out.println("Crc32c: " + blob.getCrc32c());
1139-
System.out.println("Crc32cString: " + blob.getCrc32cString());
1139+
System.out.println("Crc32cString: " + blob.getCrc32cToHexString());
11401140
System.out.println("ETag: " + blob.getEtag());
11411141
System.out.println("Generation: " + blob.getGeneration());
11421142
System.out.println("Id: " + blob.getBlobId());
11431143
System.out.println("KmsKeyName: " + blob.getKmsKeyName());
11441144
System.out.println("Md5Hash: " + blob.getMd5());
1145-
System.out.println("Md5String: " + blob.getMd5String());
1145+
System.out.println("Md5String: " + blob.getMd5ToHexString());
11461146
System.out.println("MediaLink: " + blob.getMediaLink());
11471147
System.out.println("Metageneration: " + blob.getMetageneration());
11481148
System.out.println("Name: " + blob.getName());

‎google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,13 +458,13 @@ public void testGetBlobMetadata() {
458458
assertTrue(snippetOutput.contains("ContentLanguage: " + remoteBlob.getContentLanguage()));
459459
assertTrue(snippetOutput.contains("ContentType: " + remoteBlob.getContentType()));
460460
assertTrue(snippetOutput.contains("Crc32c: " + remoteBlob.getCrc32c()));
461-
assertTrue(snippetOutput.contains("Crc32cString: " + remoteBlob.getCrc32cString()));
461+
assertTrue(snippetOutput.contains("Crc32cString: " + remoteBlob.getCrc32cToHexString()));
462462
assertTrue(snippetOutput.contains("ETag: " + remoteBlob.getEtag()));
463463
assertTrue(snippetOutput.contains("Generation: " + remoteBlob.getGeneration()));
464464
assertTrue(snippetOutput.contains("Id: " + remoteBlob.getBlobId()));
465465
assertTrue(snippetOutput.contains("KmsKeyName: " + remoteBlob.getKmsKeyName()));
466466
assertTrue(snippetOutput.contains("Md5Hash: " + remoteBlob.getMd5()));
467-
assertTrue(snippetOutput.contains("Md5HashString: " + remoteBlob.getMd5String()));
467+
assertTrue(snippetOutput.contains("Md5HashString: " + remoteBlob.getMd5ToHexString()));
468468
assertTrue(snippetOutput.contains("MediaLink: " + remoteBlob.getMediaLink()));
469469
assertTrue(snippetOutput.contains("Metageneration: " + remoteBlob.getMetageneration()));
470470
assertTrue(snippetOutput.contains("Name: " + remoteBlob.getName()));

0 commit comments

Comments
 (0)