Address review comments

Author: mladjan-gadzic

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/debug/TestFindContainerKeys.java

@@ -19,8 +19,8 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.hadoop.hdds.client.BlockID;
+import org.apache.hadoop.hdds.client.RatisReplicationConfig;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.utils.db.DBStore;
 import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
 import org.apache.hadoop.hdds.utils.db.Table;
@@ -32,6 +32,7 @@
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -50,6 +51,7 @@
 import java.util.Map;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
 import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
@@ -244,12 +246,12 @@ private static OmKeyInfo getOmKeyInfo(String volumeName, String bucketName,
                                         long objectId,
                                         long parentId) {
     return OMRequestTestUtils.createOmKeyInfo(volumeName, bucketName,
-        keyName, HddsProtos.ReplicationType.STAND_ALONE,
-        HddsProtos.ReplicationFactor.ONE, objectId, parentId, 1, 1, 1, false,
-        new ArrayList<>(
-            Collections.singletonList(
-                new OmKeyLocationInfo.Builder().setBlockID(
-                    new BlockID(containerId, 1)).build())));
+        keyName, RatisReplicationConfig.getInstance(ONE), objectId, parentId,
+        new OmKeyLocationInfoGroup(0L, Collections.singletonList(
+            new OmKeyLocationInfo.Builder()
+                .setBlockID(new BlockID(containerId, 1))
+                .build())))
+        .build();
   }
 
 }

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/OMRequestTestUtils.java

@@ -28,6 +28,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.client.BlockID;
+import org.apache.hadoop.hdds.client.RatisReplicationConfig;
 import org.apache.hadoop.hdds.client.ReplicationConfig;
 import org.apache.hadoop.hdds.client.ReplicationConfigValidator;
 import org.apache.hadoop.hdds.conf.ConfigurationSource;
@@ -559,6 +560,23 @@ public static OmKeyInfo.Builder createOmKeyInfo(String volumeName, String bucket
         new OmKeyLocationInfoGroup(0L, new ArrayList<>(), false));
   }
 
+  public static OmKeyInfo.Builder createOmKeyInfo(String volumeName, String bucketName, String keyName,
+                                                  RatisReplicationConfig replicationConfig, long objectId,
+                                                  long parentId, OmKeyLocationInfoGroup omKeyLocationInfoGroup) {
+    return new OmKeyInfo.Builder()
+        .setVolumeName(volumeName)
+        .setBucketName(bucketName)
+        .setKeyName(keyName)
+        .setFileName(OzoneFSUtils.getFileName(keyName))
+        .setReplicationConfig(replicationConfig)
+        .setParentObjectID(parentId)
+        .setObjectID(objectId)
+        .setUpdateID(0L)
+        .setCreationTime(Time.now())
+        .addOmKeyLocationInfoGroup(omKeyLocationInfoGroup)
+        .setDataSize(1000L);
+  }
+
   /**
    * Create OmDirectoryInfo.
    */