Added refactoring changes

ShreyasSinha · ShreyasSinha · commit 8784dfa2850c · 2025-09-10T07:47:09.000Z
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUpload.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUpload.java
@@ -14,21 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader;
+package com.google.cloud.storage;
 
-import com.google.cloud.storage.multipartuploader.data.CompleteMultipartRequest;
-import com.google.cloud.storage.multipartuploader.data.CompleteMultipartResponse;
-import com.google.cloud.storage.multipartuploader.data.CreateMultipartUploadRequest;
-import com.google.cloud.storage.multipartuploader.data.CreateMultipartUploadResponse;
-import com.google.cloud.storage.multipartuploader.data.RequestBody;
-import com.google.cloud.storage.multipartuploader.data.UploadPartRequest;
-import com.google.cloud.storage.multipartuploader.data.UploadPartResponse;
+import com.google.cloud.storage.multipartupload.model.CompleteMultipartRequest;
+import com.google.cloud.storage.multipartupload.model.CompleteMultipartResponse;
+import com.google.cloud.storage.multipartupload.model.CreateMultipartUploadRequest;
+import com.google.cloud.storage.multipartupload.model.CreateMultipartUploadResponse;
+import com.google.cloud.storage.multipartupload.model.UploadPartRequest;
+import com.google.cloud.storage.multipartupload.model.UploadPartResponse;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.security.NoSuchAlgorithmException;
 
-public interface MultipartUploader {
+public interface MultipartUpload {
 
   CreateMultipartUploadResponse createMultipartUpload(CreateMultipartUploadRequest request)
       throws IOException;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadConfig.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadConfig.java
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.storage.multipartuploader;
+package com.google.cloud.storage;
 
-public class MultipartUploaderConfig {
+public class MultipartUploadConfig {
 
 }
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadImpl.java
@@ -13,40 +13,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.storage.multipartuploader;
-
-import static com.google.cloud.storage.multipartuploader.MultipartUploaderUtility.getRfc1123Date;
-import static com.google.cloud.storage.multipartuploader.MultipartUploaderUtility.readStream;
-import static com.google.cloud.storage.multipartuploader.MultipartUploaderUtility.signRequest;
-
-import com.google.cloud.storage.multipartuploader.data.CompleteMultipartRequest;
-import com.google.cloud.storage.multipartuploader.data.CompleteMultipartResponse;
-import com.google.cloud.storage.multipartuploader.data.CompletedPart;
-import com.google.cloud.storage.multipartuploader.data.CreateMultipartUploadRequest;
-import com.google.cloud.storage.multipartuploader.data.CreateMultipartUploadResponse;
-import com.google.cloud.storage.multipartuploader.data.RequestBody;
-import com.google.cloud.storage.multipartuploader.data.UploadPartRequest;
-import com.google.cloud.storage.multipartuploader.data.UploadPartResponse;
+package com.google.cloud.storage;
+
+import static com.google.cloud.storage.MultipartUploadUtility.getRfc1123Date;
+import static com.google.cloud.storage.MultipartUploadUtility.readStream;
+import static com.google.cloud.storage.MultipartUploadUtility.signRequest;
+
+import com.google.cloud.storage.multipartupload.model.CompleteMultipartRequest;
+import com.google.cloud.storage.multipartupload.model.CompleteMultipartResponse;
+import com.google.cloud.storage.multipartupload.model.CompletedPart;
+import com.google.cloud.storage.multipartupload.model.CreateMultipartUploadRequest;
+import com.google.cloud.storage.multipartupload.model.CreateMultipartUploadResponse;
+import com.google.cloud.storage.multipartupload.model.UploadPartRequest;
+import com.google.cloud.storage.multipartupload.model.UploadPartResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 
-public class MultipartUploaderImpl implements MultipartUploader {
+public class MultipartUploadImpl implements MultipartUpload {
 
   private static final String BUCKET_NAME = "shreyassinha";
   private static final String OBJECT_NAME = "5mb"; // The name for the object in GCS
   private static final String FILE_PATH = "5mb-examplefile-com.txt"; // The local file to upload
 
   // Add HMAC keys from GCS Settings > Interoperability
 
-
   // --- End Configuration ---
   private static final String GCS_ENDPOINT = "https://storage.googleapis.com";
 
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadUtility.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadUtility.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.storage.multipartuploader;
+package com.google.cloud.storage;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,7 +29,7 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-public class MultipartUploaderUtility {
+public class MultipartUploadUtility {
   public static String readStream(InputStream inputStream) throws IOException {
     if (inputStream == null) return "";
     StringBuilder response = new StringBuilder();
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage;
 
 import java.nio.ByteBuffer;
 
-public class RequestBody {
+public final class RequestBody {
   private byte[] partDate;
 
   public static RequestBody fromByteBuffer(ByteBuffer b) {
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
 
-public class CompleteMultipartRequest {
+public final class CompleteMultipartRequest {
 
   private final String bucket;
   private final String key;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 public class CompleteMultipartResponse {
 
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.List;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
-public class CompletedPart {
+public final class CompletedPart {
 
   private final int partNumber;
 
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
 
-public class UploadPartRequest {
+public final class UploadPartRequest {
 
   private final String bucket;
   private final String key;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.multipartuploader.data;
+package com.google.cloud.storage.multipartupload.model;
 
 import com.google.common.base.MoreObjects;
 import java.util.Objects;
 
-public class UploadPartResponse {
+public final class UploadPartResponse {
 
   private final String etag;
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`* See the License for the specific language governing permissions and`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`		`-package com.google.cloud.storage.multipartuploader;`
	`16`	`+package com.google.cloud.storage;`
`17`	`17`
`18`		`-public class MultipartUploaderConfig {`
	`18`	`+public class MultipartUploadConfig {`
`19`	`19`
`20`	`20`	`}`