Fix RequestIdentifier NPE in endpoints testing

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

@@ -23,6 +23,7 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
 
@@ -58,6 +59,7 @@ public void testAbortMultipartUpload() throws Exception {
     rest.setHeaders(headers);
     rest.setClient(client);
     rest.setOzoneConfiguration(new OzoneConfiguration());
+    rest.setRequestIdentifier(new RequestIdentifier());
 
     Response response = rest.initializeMultipartUpload(bucket, key);
 

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

@@ -24,6 +24,7 @@
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.client.OzoneVolume;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
 
@@ -73,6 +74,7 @@ public void setup() throws IOException {
 
     bucketEndpoint = new BucketEndpoint();
     bucketEndpoint.setClient(client);
+    bucketEndpoint.setRequestIdentifier(new RequestIdentifier());
   }
 
   @AfterEach

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

@@ -27,6 +27,7 @@
 import org.apache.hadoop.ozone.client.ObjectStoreStub;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
 
@@ -59,6 +60,7 @@ public void setup() throws Exception {
     // Create HeadBucket and setClient to OzoneClientStub
     bucketEndpoint = new BucketEndpoint();
     bucketEndpoint.setClient(clientStub);
+    bucketEndpoint.setRequestIdentifier(new RequestIdentifier());
 
 
   }

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

@@ -25,6 +25,7 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -51,6 +52,7 @@ public void setup() throws Exception {
     // Create HeadBucket and setClient to OzoneClientStub
     bucketEndpoint = new BucketEndpoint();
     bucketEndpoint.setClient(clientStub);
+    bucketEndpoint.setRequestIdentifier(new RequestIdentifier());
   }
 
   @Test

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

@@ -24,6 +24,7 @@
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.commontypes.EncodingTypeObject;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
@@ -54,6 +55,7 @@ public void listRoot() throws OS3Exception, IOException {
     OzoneClient client = createClientWithKeys("file1", "dir1/file2");
 
     getBucket.setClient(client);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100, "",
@@ -78,6 +80,7 @@ public void listDir() throws OS3Exception, IOException {
     OzoneClient client = createClientWithKeys("dir1/file2", "dir1/dir2/file2");
 
     getBucket.setClient(client);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
@@ -101,7 +104,7 @@ public void listSubDir() throws OS3Exception, IOException {
             "dir1bha/file2");
 
     getBucket.setClient(ozoneClient);
-
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket
             .get("b1", "/", null, null, 100, "dir1/", null,
@@ -138,6 +141,7 @@ public void listObjectOwner() throws OS3Exception, IOException {
     bucket.createKey("key2", 0).close();
 
     getBucket.setClient(client);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
             "key", null, null, null, null, null).getEntity();
@@ -160,6 +164,7 @@ public void listWithPrefixAndDelimiter() throws OS3Exception, IOException {
             "dir1bha/file2", "file2");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
@@ -179,6 +184,7 @@ public void listWithPrefixAndDelimiter1() throws OS3Exception, IOException {
             "dir1bha/file2", "file2");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
@@ -200,7 +206,7 @@ public void listWithPrefixAndDelimiter2() throws OS3Exception, IOException {
             "dir1bha/file2", "file2");
 
     getBucket.setClient(ozoneClient);
-
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "/", null, null, 100, "dir1bh",
             null, "dir1/dir2/file2", null, null, null).getEntity();
@@ -219,7 +225,7 @@ public void listWithPrefixAndEmptyStrDelimiter()
           "dir1/dir2/file2");
 
     getBucket.setClient(ozoneClient);
-
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     // Should behave the same if delimiter is null
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", "", null, null, 100, "dir1/",
@@ -248,7 +254,7 @@ public void listWithContinuationToken() throws OS3Exception, IOException {
             "dir1bha/file2", "file2");
 
     getBucket.setClient(ozoneClient);
-
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     int maxKeys = 2;
     // As we have 5 keys, with max keys 2 we should call list 3 times.
 
@@ -299,6 +305,7 @@ public void listWithContinuationTokenDirBreak()
             "test/file8");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     int maxKeys = 2;
 
@@ -342,6 +349,7 @@ public void listWithContinuationToken1() throws OS3Exception, IOException {
             "dir1bha/file1", "dir0/file1", "dir2/file1");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     int maxKeys = 2;
     // As we have 5 keys, with max keys 2 we should call list 3 times.
@@ -383,6 +391,7 @@ public void listWithContinuationTokenFail() throws IOException {
             "dir1bha/file2", "dir1", "dir2", "dir3");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     OS3Exception e = assertThrows(OS3Exception.class, () -> getBucket.get("b1",
         "/", null, null, 2, "dir", "random", null, null, null, null)
@@ -401,6 +410,7 @@ public void testStartAfter() throws IOException, OS3Exception {
             "dir1bha/file1", "dir0/file1", "dir2/file1");
 
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     ListObjectResponse getBucketResponse =
         (ListObjectResponse) getBucket.get("b1", null, null, null, 1000,
@@ -460,6 +470,7 @@ public void testEncodingType() throws IOException, OS3Exception {
     OzoneClient ozoneClient =
         createClientWithKeys("data=1970", "data==1970");
     getBucket.setClient(ozoneClient);
+    getBucket.setRequestIdentifier(new RequestIdentifier());
 
     String delimiter = "=";
     String prefix = "data=";
@@ -508,7 +519,7 @@ public void testEncodingTypeException() throws IOException {
     OzoneClient client = new OzoneClientStub();
     client.getObjectStore().createS3Bucket("b1");
     getBucket.setClient(client);
-
+    getBucket.setRequestIdentifier(new RequestIdentifier());
     OS3Exception e = assertThrows(OS3Exception.class, () -> getBucket.get(
         "b1", null, "unSupportType", null, 1000, null,
         null, null, null, null, null).getEntity());

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

@@ -26,6 +26,7 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
 import static java.net.HttpURLConnection.HTTP_CONFLICT;
@@ -58,6 +59,7 @@ public void setup() throws Exception {
     // Create HeadBucket and setClient to OzoneClientStub
     bucketEndpoint = new BucketEndpoint();
     bucketEndpoint.setClient(clientStub);
+    bucketEndpoint.setRequestIdentifier(new RequestIdentifier());
   }
 
   @Test

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

@@ -25,6 +25,8 @@
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
+
 import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 
@@ -99,6 +101,7 @@ private ObjectEndpoint getObjectEndpoint(OzoneClient client,
     rest.setHeaders(headers);
     rest.setClient(client);
     rest.setOzoneConfiguration(new OzoneConfiguration());
+    rest.setRequestIdentifier(new RequestIdentifier());
     return rest;
   }
 }

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

@@ -42,6 +42,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.endpoint.CompleteMultipartUploadRequest.Part;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -74,6 +76,7 @@ public static void setUp() throws Exception {
     REST.setHeaders(HEADERS);
     REST.setClient(CLIENT);
     REST.setOzoneConfiguration(new OzoneConfiguration());
+    REST.setRequestIdentifier(new RequestIdentifier());
   }
 
   private String initiateMultipartUpload(String key) throws IOException,

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

@@ -42,6 +42,7 @@
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.client.OzoneMultipartUploadPartListParts;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.endpoint.CompleteMultipartUploadRequest.Part;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
@@ -127,6 +128,7 @@ public static void setUp() throws Exception {
     REST.setHeaders(headers);
     REST.setClient(CLIENT);
     REST.setOzoneConfiguration(new OzoneConfiguration());
+    REST.setRequestIdentifier(new RequestIdentifier());
   }
 
   @Test

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

@@ -26,6 +26,7 @@
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
 import org.junit.jupiter.api.Test;
@@ -48,6 +49,7 @@ public void delete() throws IOException, OS3Exception {
 
     ObjectEndpoint rest = new ObjectEndpoint();
     rest.setClient(client);
+    rest.setRequestIdentifier(new RequestIdentifier());
     rest.setOzoneConfiguration(new OzoneConfiguration());
 
     //WHEN

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

@@ -34,6 +34,7 @@
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
 import org.apache.commons.io.IOUtils;
@@ -92,6 +93,7 @@ public void init() throws OS3Exception, IOException {
     rest.setOzoneConfiguration(new OzoneConfiguration());
     headers = mock(HttpHeaders.class);
     rest.setHeaders(headers);
+    rest.setRequestIdentifier(new RequestIdentifier());
 
     ByteArrayInputStream body = new ByteArrayInputStream(CONTENT.getBytes(UTF_8));
     rest.put(BUCKET_NAME, KEY_NAME, CONTENT.length(),

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

@@ -32,6 +32,7 @@
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -66,6 +67,7 @@ public void setup() throws IOException {
     // Create HeadBucket and setClient to OzoneClientStub
     keyEndpoint = new ObjectEndpoint();
     keyEndpoint.setClient(clientStub);
+    keyEndpoint.setRequestIdentifier(new RequestIdentifier());
     keyEndpoint.setOzoneConfiguration(new OzoneConfiguration());
   }
 

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

@@ -29,6 +29,7 @@
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
 import org.apache.hadoop.ozone.client.OzoneKey;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.endpoint.MultiDeleteRequest.DeleteObject;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 
@@ -51,6 +52,7 @@ public void delete() throws IOException, OS3Exception, JAXBException {
 
     BucketEndpoint rest = new BucketEndpoint();
     rest.setClient(client);
+    rest.setRequestIdentifier(new RequestIdentifier());
 
     MultiDeleteRequest mdr = new MultiDeleteRequest();
     mdr.getObjects().add(new DeleteObject("key1"));
@@ -82,6 +84,7 @@ public void deleteQuiet() throws IOException, OS3Exception, JAXBException {
 
     BucketEndpoint rest = new BucketEndpoint();
     rest.setClient(client);
+    rest.setRequestIdentifier(new RequestIdentifier());
 
     MultiDeleteRequest mdr = new MultiDeleteRequest();
     mdr.setQuiet(true);

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

@@ -50,6 +50,7 @@
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
 import org.apache.http.HttpStatus;
@@ -134,6 +135,7 @@ void setup() throws IOException {
     objectEndpoint = spy(new ObjectEndpoint());
     objectEndpoint.setClient(clientStub);
     objectEndpoint.setOzoneConfiguration(config);
+    objectEndpoint.setRequestIdentifier(new RequestIdentifier());
 
     headers = mock(HttpHeaders.class);
     objectEndpoint.setHeaders(headers);

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

@@ -25,6 +25,7 @@
 import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -77,6 +78,7 @@ public void init() throws OS3Exception, IOException {
     rest = new ObjectEndpoint();
     rest.setClient(client);
     rest.setOzoneConfiguration(config);
+    rest.setRequestIdentifier(new RequestIdentifier());
     headers = Mockito.mock(HttpHeaders.class);
     rest.setHeaders(headers);
     body = new ByteArrayInputStream(CONTENT.getBytes(UTF_8));
@@ -137,7 +139,7 @@ public void testDeleteObjectTaggingNotImplemented() throws Exception {
 
     ObjectEndpoint endpoint = new ObjectEndpoint();
     endpoint.setClient(mockClient);
-
+    endpoint.setRequestIdentifier(new RequestIdentifier());
     doThrow(new OMException("DeleteObjectTagging is not currently supported for FSO directory",
         ResultCodes.NOT_SUPPORTED_OPERATION)).when(mockBucket).deleteObjectTagging("dir/");
 

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

@@ -20,6 +20,7 @@
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientStub;
+import org.apache.hadoop.ozone.s3.RequestIdentifier;
 import org.apache.hadoop.ozone.s3.endpoint.S3Tagging.Tag;
 import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.junit.jupiter.api.BeforeEach;
@@ -64,6 +65,7 @@ public void init() throws OS3Exception, IOException {
     rest = new ObjectEndpoint();
     rest.setClient(client);
     rest.setOzoneConfiguration(config);
+    rest.setRequestIdentifier(new RequestIdentifier());
     HttpHeaders headers = Mockito.mock(HttpHeaders.class);
     rest.setHeaders(headers);
     ByteArrayInputStream body = new ByteArrayInputStream(CONTENT.getBytes(UTF_8));