Applied comments

Author: chiacyu

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java

@@ -402,7 +402,7 @@ private void checkKeyList(Iterator<? extends OzoneKey > ozoneKeyIterator,
   private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length)
       throws Exception {
 
-    byte[] input = createKey(ozoneBucket, key, length);
+    byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length);
     // Read the key with given key name.
     readKey(ozoneBucket, key, length, input);
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java

@@ -105,10 +105,9 @@ public static OzoneVolume createVolume(OzoneClient client,
 
   }
 
-  public static byte[] createKey(OzoneBucket bucket,
-                                 String keyName, int length) throws IOException {
-    byte[] content = RandomStringUtils.random(length, 0, 0,
-        true, true, null, new SecureRandom()).getBytes(UTF_8);
+  public static byte[] createStringKey(OzoneBucket bucket, String keyName, int length)
+      throws IOException {
+    byte[] content = RandomStringUtils.secure().nextAlphanumeric(length).getBytes(UTF_8);
     createKey(bucket, keyName, content);
     return content;
   }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java

@@ -372,7 +372,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey,
   private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
     for (String key : keys) {
-      byte[] input = createKey(ozoneBucket, key, 10);
+      byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10);
       // Read the key with given key name.
       readkey(ozoneBucket, key, 10, input);
     }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java

@@ -643,7 +643,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey,
   private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
     for (String key : keys) {
-      byte[] input = createKey(ozoneBucket, key, 10);
+      byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10);
       // Read the key with given key name.
       readkey(ozoneBucket, key, 10, input);
     }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java

@@ -560,7 +560,7 @@ private void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
 
     for (String key : keys) {
-      byte[] input = createKey(ozoneBucket, key, 10);
+      byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10);
       // Read the key with given key name.
       readKey(ozoneBucket, key, 10, input);
     }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java

@@ -33,6 +33,7 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hadoop.hdds.protocol.StorageType;
 import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.TestDataUtil;
 import org.apache.hadoop.ozone.client.BucketArgs;
 import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneBucket;
@@ -333,7 +334,7 @@ private void createKeys(ObjectStore objectStore, OzoneBucket ozoneBucket,
     String aclWorldAll = "world::a";
 
     for (String key : keys) {
-      createKey(ozoneBucket, key, 10);
+      TestDataUtil.createStringKey(ozoneBucket, key, 10);
       setKeyAcl(objectStore, ozoneBucket.getVolumeName(), ozoneBucket.getName(),
           key, aclWorldAll);
     }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java

@@ -357,7 +357,7 @@ private void createKeys(OzoneBucket ozoneBucket, List<String> keys)
   private void createKey(OzoneBucket ozoneBucket, String key, int length)
       throws Exception {
 
-    byte[] input = TestDataUtil.createKey(ozoneBucket, key, length);
+    byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length);
     // Read the key with given key name.
     readkey(ozoneBucket, key, length, input);
   }