updated tests

linkedin · Jan 30, 2025 · a6f1d10 · a6f1d10
1 parent d1a38f4
commit a6f1d10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/s3/S3BatchDeleteHandler.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/s3/S3BatchDeleteHandler.java
@@ -54,6 +54,7 @@ public S3BatchDeleteHandler(DeleteBlobHandler deleteBlobHandler, FrontendMetrics
     this.deleteBlobHandler = deleteBlobHandler;
     this.metrics = frontendMetrics;
     this.xmlMapper = new XmlMapper();
+    this.xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true);
   }
 
   /**
@@ -105,7 +106,7 @@ private Callback<Long> parseRequestBodyAndDeleteCallback(RetainingAsyncWritableC
       }
 
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      RequestPath requestPath = (RequestPath) restRequest.getArgs().get(InternalKeys.REQUEST_PATH)
+      RequestPath requestPath = (RequestPath) restRequest.getArgs().get(InternalKeys.REQUEST_PATH);
 
       // create objects for processing the request
       ConcurrentLinkedQueue<S3MessagePayload.S3ErrorObject> errors = new ConcurrentLinkedQueue<>();
@@ -142,9 +143,8 @@ else if (exception instanceof RestServiceException) {
       CompletableFuture.allOf(deleteFutures.toArray(new CompletableFuture[0]))
           .whenComplete((result, exception) -> {
             try {
-              // Add XML declaration at the top
+              // construct and serialize response
               S3MessagePayload.DeleteResult response = new S3MessagePayload.DeleteResult();
-              xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true);
               response.setDeleted(new ArrayList<>(deleted));
               response.setErrors(new ArrayList<>(errors));
               xmlMapper.writeValue(outputStream, response);

diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/S3DeleteHandlerTest.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/S3DeleteHandlerTest.java
@@ -77,7 +77,7 @@ public S3DeleteHandlerTest() throws Exception {
   @Test
   public void deleteObjectTest() throws Exception {
     // 1. Delete the object
-    String uri = String.format("/s3/%s/%s/%s", account.getName(), container.getName(), "hello2");
+    String uri = String.format("/s3/%s/%s/%s", account.getName(), container.getName(), KEY_NAME);
     RestRequest request =
         FrontendRestRequestServiceTest.createRestRequest(RestMethod.DELETE, uri, new JSONObject(), null);
     RestResponseChannel restResponseChannel = new MockRestResponseChannel();
@@ -120,7 +120,7 @@ private void setup() throws Exception {
   }
 
   private void putABlob() throws Exception {
-    String requestPath = String.format("/named/%s/%s/%s", account.getName(), container.getName(), "hello");
+    String requestPath = String.format("/named/%s/%s/%s", account.getName(), container.getName(), KEY_NAME);
     JSONObject headers = new JSONObject();
     FrontendRestRequestServiceTest.setAmbryHeadersForPut(headers, TestUtils.TTL_SECS, container.isCacheable(),
         "test-app", CONTENT_TYPE, "tester", null, null, null);

diff --git a/ambry-rest/src/main/java/com/github/ambry/rest/WrappedRestRequest.java b/ambry-rest/src/main/java/com/github/ambry/rest/WrappedRestRequest.java
@@ -71,7 +71,7 @@ public Object setArg(String key, Object value) {
   }
 
   @Override
-  public void removeArg(String key) { restRequest.removeArg(key); }
+  public void removeArg(String key) { map.remove(key); }
 
   @Override
   public SSLSession getSSLSession() {