Refactor BucketEndpoint.get() into helper methods

Author: rich7420

hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java

@@ -132,17 +132,17 @@ public Response get(
 
       // Actual bucket processing starts here
       // Validate and prepare parameters
-      BucketListingContext context = validateAndPrepareParameters(
+      BucketListingContext listingContext = validateAndPrepareParameters(
           bucketName, delimiter, encodingType, marker, maxKeys, prefix, 
           continueToken, startAfter);
 
       // Initialize response object
       ListObjectResponse response = initializeListObjectResponse(
-          bucketName, delimiter, encodingType, marker, maxKeys, prefix, 
+          bucketName, delimiter, encodingType, marker, listingContext.getMaxKeys(), prefix, 
           continueToken, startAfter);
 
       // Process key listing
-      processKeyListing(context, response);
+      processKeyListing(listingContext, response);
 
       // Build final response
       return buildFinalResponse(response, s3GAction, startNanos, perf);
@@ -172,7 +172,6 @@ public Response get(
 
     // Log audit entry for empty response to align with previous behavior
     long opLatencyNs = getMetrics().updateGetBucketSuccessStats(startNanos);
-    PerformanceStringBuilder perf = new PerformanceStringBuilder();
     perf.appendCount(0);
     perf.appendOpLatencyNanos(opLatencyNs);
     auditReadSuccess(s3GAction, perf);
@@ -281,20 +280,6 @@ public ContinueToken getDecodedToken() {
     }
   }
 
-  /**
-   * Handle GetBucketAcl request.
-   * Implements the GetBucketAcl API operation.
-   * @see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketAcl.html">GetBucketAcl</a>
-   */
-  Response handleGetBucketAcl(String bucketName, long startNanos) 
-      throws OS3Exception, IOException {
-    S3GAction s3GAction = S3GAction.GET_ACL;
-    S3BucketAcl result = getAcl(bucketName);
-    getMetrics().updateGetAclSuccessStats(startNanos);
-    auditReadSuccess(s3GAction);
-    return Response.ok(result, MediaType.APPLICATION_XML_TYPE).build();
-  }
-
   /**
    * Validate and prepare parameters for bucket listing.
    */
@@ -306,20 +291,13 @@ BucketListingContext validateAndPrepareParameters(
 
     // If you specify the encoding-type request parameter, should return encoded key name values 
     // in the following response elements: Delimiter, Prefix, Key, and StartAfter.
-    // For detail refer: https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html#AmazonS3-ListObjectsV2-response-EncodingType
+    // For detail refer: 
+    // https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html#AmazonS3-ListObjectsV2-response-EncodingType
 
     // Validate encoding type
     if (encodingType != null && !encodingType.equals(ENCODING_TYPE)) {
       throw S3ErrorTable.newError(S3ErrorTable.INVALID_ARGUMENT, encodingType);
     }
-    // If you specify the encoding-type request parameter,should return
-    // encoded key name values in the following response elements:
-    //   Delimiter, Prefix, Key, and StartAfter.
-    //
-    // For detail refer:
-    // https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
-    // #AmazonS3-ListObjectsV2-response-EncodingType
-    //
     maxKeys = validateMaxKeys(maxKeys);
 
     if (prefix == null) {
@@ -459,7 +437,8 @@ void processKeyListing(BucketListingContext context, ListObjectResponse response
   /**
    * Build final response with metrics and audit logging.
    */
-  Response buildFinalResponse(ListObjectResponse response, S3GAction s3GAction, long startNanos, PerformanceStringBuilder perf) {
+  Response buildFinalResponse(ListObjectResponse response, S3GAction s3GAction,
+      long startNanos, PerformanceStringBuilder perf) {
     int keyCount = response.getCommonPrefixes().size() + response.getContents().size();
     long opLatencyNs = getMetrics().updateGetBucketSuccessStats(startNanos);
     getMetrics().incListKeyCount(keyCount);

hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketEndpoint.java

@@ -22,9 +22,11 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
+import javax.ws.rs.core.Response;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
+import org.apache.hadoop.ozone.s3.util.S3Consts.QueryParams;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -135,4 +137,17 @@ public void testValidateAndPrepareParametersWithNonexistentBucket() {
 
     assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), exception.getCode());
   }
+
+  @Test
+  public void testGetDelegatesToAclHandler() throws Exception {
+    // When ?acl is present, BucketEndpoint should delegate to BucketAclHandler.
+    bucketEndpoint.queryParamsForTest().set(QueryParams.ACL, "");
+
+    Response response = bucketEndpoint.get(TEST_BUCKET_NAME);
+
+    assertNotNull(response);
+    assertEquals(200, response.getStatus());
+    assertNotNull(response.getEntity());
+    assertEquals("S3BucketAcl", response.getEntity().getClass().getSimpleName());
+  }
 }