From e4554db1683151bf9eb6f6764f99cd7b2f6dcad6 Mon Sep 17 00:00:00 2001
From: amaliujia <amaliujia@163.com>
Date: Mon, 14 Sep 2020 23:20:18 -0700
Subject: [PATCH 1/2] HDDS-4236. Move "Om*Codec.java" to new project
 hadoop-ozone/interface-storage

---
 hadoop-ozone/interface-storage/pom.xml        | 66 +++++++++++++++++++
 .../hadoop/ozone/om/OMMetadataManager.java    |  0
 .../om/codec/OMTransactionInfoCodec.java      |  5 +-
 .../ozone/om/codec/OmBucketInfoCodec.java     |  0
 .../hadoop/ozone/om/codec/OmKeyInfoCodec.java |  0
 .../om/codec/OmMultipartKeyInfoCodec.java     |  0
 .../ozone/om/codec/OmPrefixInfoCodec.java     |  0
 .../ozone/om/codec/OmVolumeArgsCodec.java     |  0
 .../om/codec/RepeatedOmKeyInfoCodec.java      |  0
 .../ozone/om/codec/S3SecretValueCodec.java    |  0
 .../ozone/om/codec/TokenIdentifierCodec.java  |  0
 .../ozone/om/codec/UserVolumeInfoCodec.java   |  0
 .../hadoop/ozone/om/codec/package-info.java   | 24 +++++++
 .../ozone/om/ratis/OMTransactionInfo.java     |  2 +-
 .../om/codec/TestOMTransactionInfoCodec.java  |  2 +-
 .../ozone/om/codec/TestOmKeyInfoCodec.java    |  9 +--
 .../om/codec/TestOmMultipartKeyInfoCodec.java |  0
 .../ozone/om/codec/TestOmPrefixInfoCodec.java |  8 ++-
 .../om/codec/TestRepeatedOmKeyInfoCodec.java  |  9 +--
 .../om/codec/TestS3SecretValueCodec.java      |  2 +-
 .../hadoop/ozone/om/codec/package-info.java   |  0
 hadoop-ozone/ozone-manager/pom.xml            |  5 ++
 .../hadoop/ozone/om/codec/package-info.java   |  3 +
 hadoop-ozone/pom.xml                          |  6 ++
 24 files changed, 125 insertions(+), 16 deletions(-)
 create mode 100644 hadoop-ozone/interface-storage/pom.xml
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java (88%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OmBucketInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OmMultipartKeyInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OmPrefixInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/OmVolumeArgsCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/RepeatedOmKeyInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/S3SecretValueCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/TokenIdentifierCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java (100%)
 create mode 100644 hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java (97%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java (94%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmMultipartKeyInfoCodec.java (100%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java (92%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java (94%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java (97%)
 rename hadoop-ozone/{ozone-manager => interface-storage}/src/test/java/org/apache/hadoop/ozone/om/codec/package-info.java (100%)

diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
new file mode 100644
index 000000000000..43ba408dcba6
--- /dev/null
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+    https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-ozone</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>hadoop-ozone-interface-storage</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <description>Apache Hadoop Ozone Storage Interface</description>
+  <name>Apache Hadoop Ozone Storage Interface</name>
+  <packaging>jar</packaging>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-ozone-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-ozone-interface-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-framework</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-hadoop-dependency-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
similarity index 88%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
index 2cca2208dd01..d8b6609566a8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
@@ -17,6 +17,7 @@
 
 package org.apache.hadoop.ozone.om.codec;
 
+import com.google.common.base.Preconditions;
 import org.apache.hadoop.hdds.utils.db.Codec;
 import org.apache.hadoop.ozone.om.ratis.OMTransactionInfo;
 
@@ -31,14 +32,14 @@
 public class OMTransactionInfoCodec implements Codec<OMTransactionInfo> {
   @Override
   public byte[] toPersistedFormat(OMTransactionInfo object) throws IOException {
-    checkNotNull(object, "Null object can't be converted to byte array.");
+    Preconditions.checkNotNull(object, "Null object can't be converted to byte array.");
     return object.convertToByteArray();
   }
 
   @Override
   public OMTransactionInfo fromPersistedFormat(byte[] rawData)
       throws IOException {
-    checkNotNull(rawData, "Null byte array can't be converted to " +
+    Preconditions.checkNotNull(rawData, "Null byte array can't be converted to " +
         "real object.");
     return OMTransactionInfo.getFromByteArray(rawData);
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmBucketInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmBucketInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmBucketInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmBucketInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmMultipartKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmMultipartKeyInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmMultipartKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmMultipartKeyInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmPrefixInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmPrefixInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmPrefixInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmPrefixInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmVolumeArgsCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmVolumeArgsCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmVolumeArgsCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmVolumeArgsCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/RepeatedOmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/RepeatedOmKeyInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/RepeatedOmKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/RepeatedOmKeyInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/S3SecretValueCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/S3SecretValueCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/S3SecretValueCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/S3SecretValueCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/TokenIdentifierCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/TokenIdentifierCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/TokenIdentifierCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/TokenIdentifierCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
new file mode 100644
index 000000000000..df6ed9c54147
--- /dev/null
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p>
+ * Utility classes to encode/decode DTO objects to/from byte array.
+ */
+
+/**
+ * Utility classes to encode/decode DTO objects to/from byte array.
+ */
+package org.apache.hadoop.ozone.om.codec;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java
rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java
index 9b225c82a819..c0db0db74366 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/OMTransactionInfo.java
@@ -20,10 +20,10 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.hdds.StringUtils;
-import org.apache.hadoop.ozone.om.OMMetadataManager;
 
 import java.io.IOException;
 import java.util.Objects;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.ratis.server.protocol.TermIndex;
 
 import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
similarity index 97%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
index a8ffd00a81e4..0cd3aa812a59 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
@@ -73,7 +73,7 @@ public void testCodecWithNullDataFromUser() throws Exception {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      fail("testCodecWithIncorrectValues failed");
+      Assert.fail("testCodecWithIncorrectValues failed");
     } catch (IllegalStateException ex) {
       GenericTestUtils.assertExceptionContains("Incorrect TransactionInfo " +
           "value", ex);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
index 39c35f675e6f..dc89791adeac 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
@@ -26,6 +26,7 @@
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.util.Time;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -91,10 +92,10 @@ public void testOmKeyInfoCodecWithoutPipeline(int chunkNum) {
       OmKeyInfo key = codec.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size without pipeline = " + rawData.length);
-      assertNull(key.getLatestVersionLocations().getLocationList().get(0)
+      Assert.assertNull(key.getLatestVersionLocations().getLocationList().get(0)
           .getPipeline());
     } catch (IOException e) {
-      fail("Should success");
+      Assert.fail("Should success");
     }
   }
 
@@ -107,10 +108,10 @@ public void testOmKeyInfoCodecCompatibility(int chunkNum) {
       OmKeyInfo key = codecWithoutPipeline.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size with pipeline = " + rawData.length);
-      assertNotNull(key.getLatestVersionLocations().getLocationList().get(0)
+      Assert.assertNotNull(key.getLatestVersionLocations().getLocationList().get(0)
           .getPipeline());
     } catch (IOException e) {
-      fail("Should success");
+      Assert.fail("Should success");
     }
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmMultipartKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmMultipartKeyInfoCodec.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmMultipartKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmMultipartKeyInfoCodec.java
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
similarity index 92%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
index f06bf3835128..df09a7b45484 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
@@ -18,11 +18,13 @@
 package org.apache.hadoop.ozone.om.codec;
 
 import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.OzoneAcl.AclScope;
 import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
 
 import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -57,7 +59,7 @@ public void setUp() {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      fail("testCodecWithIncorrectValues failed");
+      Assert.fail("testCodecWithIncorrectValues failed");
     } catch (IllegalArgumentException ex) {
       GenericTestUtils.assertExceptionContains("Can't encode the the raw " +
           "data from the byte array", ex);
@@ -82,7 +84,7 @@ public void testToAndFromPersistedFormat() throws IOException {
 
     List<OzoneAcl> acls = new LinkedList<>();
     OzoneAcl ozoneAcl = new OzoneAcl(ACLIdentityType.USER,
-        "hive", ACLType.ALL, ACCESS);
+        "hive", ACLType.ALL, AclScope.ACCESS);
     acls.add(ozoneAcl);
     OmPrefixInfo opiSave = OmPrefixInfo.newBuilder()
         .setName("/user/hive/warehouse")
@@ -93,7 +95,7 @@ public void testToAndFromPersistedFormat() throws IOException {
     OmPrefixInfo opiLoad = codec.fromPersistedFormat(
         codec.toPersistedFormat(opiSave));
 
-    assertTrue("Load saved prefix info should match",
+    Assert.assertTrue("Load saved prefix info should match",
         opiLoad.equals(opiSave));
   }
 }
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
similarity index 94%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
index 0eb87b8cfa2c..27a194170f29 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
@@ -27,6 +27,7 @@
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
 import org.apache.hadoop.util.Time;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -93,10 +94,10 @@ public void testWithoutPipeline(int chunkNum) {
       RepeatedOmKeyInfo key = codec.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size without pipeline = " + rawData.length);
-      assertNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
+      Assert.assertNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
           .getLocationList().get(0).getPipeline());
     } catch (IOException e) {
-      fail("Should success");
+      Assert.fail("Should success");
     }
   }
 
@@ -112,10 +113,10 @@ public void testCompatibility(int chunkNum) {
       RepeatedOmKeyInfo key = codecWithoutPipeline.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size with pipeline = " + rawData.length);
-      assertNotNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
+      Assert.assertNotNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
           .getLocationList().get(0).getPipeline());
     } catch (IOException e) {
-      fail("Should success");
+      Assert.fail("Should success");
     }
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
similarity index 97%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
index 549c374a91dc..6bc70c1f49c3 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
@@ -66,7 +66,7 @@ public void testCodecWithCorrectData() throws Exception {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      fail("testCodecWithIncorrectValues failed");
+      Assert.fail("testCodecWithIncorrectValues failed");
     } catch (IllegalArgumentException ex) {
       GenericTestUtils.assertExceptionContains("Can't encode the the raw " +
           "data from the byte array", ex);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/package-info.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/package-info.java
similarity index 100%
rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/codec/package-info.java
rename to hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/package-info.java
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index d01569ae0987..0d239d07fdda 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -52,6 +52,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>hadoop-hdds-interface-client</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-ozone-interface-storage</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdds-test-utils</artifactId>
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
index df6ed9c54147..030d48445e21 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
@@ -21,4 +21,7 @@
 /**
  * Utility classes to encode/decode DTO objects to/from byte array.
  */
+/**
+ * OM DB definitions.
+ */
 package org.apache.hadoop.ozone.om.codec;
\ No newline at end of file
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index f5dccb6eced5..240c74ca30f8 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -31,6 +31,7 @@
   </properties>
   <modules>
     <module>interface-client</module>
+    <module>interface-storage</module>
     <module>common</module>
     <module>client</module>
     <module>ozone-manager</module>
@@ -71,6 +72,11 @@
         <artifactId>hadoop-ozone-interface-client</artifactId>
         <version>${ozone.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-ozone-interface-storage</artifactId>
+        <version>${ozone.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-ozone-ozone-manager</artifactId>

From d182dc6a77b794a9eb8a6151d3fe0b00e55e689c Mon Sep 17 00:00:00 2001
From: amaliujia <amaliujia@163.com>
Date: Mon, 14 Sep 2020 23:36:38 -0700
Subject: [PATCH 2/2] fixup! fix checkstyle

---
 .../om/codec/OMTransactionInfoCodec.java      |  5 ++--
 .../hadoop/ozone/om/codec/package-info.java   |  2 +-
 .../apache/hadoop/ozone/om/package-info.java  | 24 +++++++++++++++++++
 .../hadoop/ozone/om/ratis/package-info.java   | 24 +++++++++++++++++++
 .../om/codec/TestOMTransactionInfoCodec.java  |  2 +-
 .../ozone/om/codec/TestOmKeyInfoCodec.java    |  9 ++++---
 .../ozone/om/codec/TestOmPrefixInfoCodec.java |  8 +++----
 .../om/codec/TestRepeatedOmKeyInfoCodec.java  |  9 ++++---
 .../om/codec/TestS3SecretValueCodec.java      |  2 +-
 9 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/package-info.java
 create mode 100644 hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/package-info.java

diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
index d8b6609566a8..2cca2208dd01 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OMTransactionInfoCodec.java
@@ -17,7 +17,6 @@
 
 package org.apache.hadoop.ozone.om.codec;
 
-import com.google.common.base.Preconditions;
 import org.apache.hadoop.hdds.utils.db.Codec;
 import org.apache.hadoop.ozone.om.ratis.OMTransactionInfo;
 
@@ -32,14 +31,14 @@
 public class OMTransactionInfoCodec implements Codec<OMTransactionInfo> {
   @Override
   public byte[] toPersistedFormat(OMTransactionInfo object) throws IOException {
-    Preconditions.checkNotNull(object, "Null object can't be converted to byte array.");
+    checkNotNull(object, "Null object can't be converted to byte array.");
     return object.convertToByteArray();
   }
 
   @Override
   public OMTransactionInfo fromPersistedFormat(byte[] rawData)
       throws IOException {
-    Preconditions.checkNotNull(rawData, "Null byte array can't be converted to " +
+    checkNotNull(rawData, "Null byte array can't be converted to " +
         "real object.");
     return OMTransactionInfo.getFromByteArray(rawData);
   }
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
index df6ed9c54147..904e6f0168b4 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/package-info.java
@@ -21,4 +21,4 @@
 /**
  * Utility classes to encode/decode DTO objects to/from byte array.
  */
-package org.apache.hadoop.ozone.om.codec;
\ No newline at end of file
+package org.apache.hadoop.ozone.om.codec;
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/package-info.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/package-info.java
new file mode 100644
index 000000000000..df494638ec02
--- /dev/null
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/package-info.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p>
+ * Utility classes to encode/decode DTO objects to/from byte array.
+ */
+
+/**
+ * OMMetadataManager.
+ */
+package org.apache.hadoop.ozone.om;
\ No newline at end of file
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/package-info.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/package-info.java
new file mode 100644
index 000000000000..4b28d470e006
--- /dev/null
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/ratis/package-info.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * <p>
+ * Utility classes to encode/decode DTO objects to/from byte array.
+ */
+
+/**
+ * OMTransactionInfo.
+ */
+package org.apache.hadoop.ozone.om.ratis;
\ No newline at end of file
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
index 0cd3aa812a59..a8ffd00a81e4 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOMTransactionInfoCodec.java
@@ -73,7 +73,7 @@ public void testCodecWithNullDataFromUser() throws Exception {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      Assert.fail("testCodecWithIncorrectValues failed");
+      fail("testCodecWithIncorrectValues failed");
     } catch (IllegalStateException ex) {
       GenericTestUtils.assertExceptionContains("Incorrect TransactionInfo " +
           "value", ex);
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
index dc89791adeac..39c35f675e6f 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmKeyInfoCodec.java
@@ -26,7 +26,6 @@
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.util.Time;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -92,10 +91,10 @@ public void testOmKeyInfoCodecWithoutPipeline(int chunkNum) {
       OmKeyInfo key = codec.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size without pipeline = " + rawData.length);
-      Assert.assertNull(key.getLatestVersionLocations().getLocationList().get(0)
+      assertNull(key.getLatestVersionLocations().getLocationList().get(0)
           .getPipeline());
     } catch (IOException e) {
-      Assert.fail("Should success");
+      fail("Should success");
     }
   }
 
@@ -108,10 +107,10 @@ public void testOmKeyInfoCodecCompatibility(int chunkNum) {
       OmKeyInfo key = codecWithoutPipeline.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size with pipeline = " + rawData.length);
-      Assert.assertNotNull(key.getLatestVersionLocations().getLocationList().get(0)
+      assertNotNull(key.getLatestVersionLocations().getLocationList().get(0)
           .getPipeline());
     } catch (IOException e) {
-      Assert.fail("Should success");
+      fail("Should success");
     }
   }
 }
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
index df09a7b45484..f06bf3835128 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestOmPrefixInfoCodec.java
@@ -18,13 +18,11 @@
 package org.apache.hadoop.ozone.om.codec;
 
 import org.apache.hadoop.ozone.OzoneAcl;
-import org.apache.hadoop.ozone.OzoneAcl.AclScope;
 import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
 
 import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -59,7 +57,7 @@ public void setUp() {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      Assert.fail("testCodecWithIncorrectValues failed");
+      fail("testCodecWithIncorrectValues failed");
     } catch (IllegalArgumentException ex) {
       GenericTestUtils.assertExceptionContains("Can't encode the the raw " +
           "data from the byte array", ex);
@@ -84,7 +82,7 @@ public void testToAndFromPersistedFormat() throws IOException {
 
     List<OzoneAcl> acls = new LinkedList<>();
     OzoneAcl ozoneAcl = new OzoneAcl(ACLIdentityType.USER,
-        "hive", ACLType.ALL, AclScope.ACCESS);
+        "hive", ACLType.ALL, ACCESS);
     acls.add(ozoneAcl);
     OmPrefixInfo opiSave = OmPrefixInfo.newBuilder()
         .setName("/user/hive/warehouse")
@@ -95,7 +93,7 @@ public void testToAndFromPersistedFormat() throws IOException {
     OmPrefixInfo opiLoad = codec.fromPersistedFormat(
         codec.toPersistedFormat(opiSave));
 
-    Assert.assertTrue("Load saved prefix info should match",
+    assertTrue("Load saved prefix info should match",
         opiLoad.equals(opiSave));
   }
 }
\ No newline at end of file
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
index 27a194170f29..0eb87b8cfa2c 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestRepeatedOmKeyInfoCodec.java
@@ -27,7 +27,6 @@
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
 import org.apache.hadoop.util.Time;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -94,10 +93,10 @@ public void testWithoutPipeline(int chunkNum) {
       RepeatedOmKeyInfo key = codec.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size without pipeline = " + rawData.length);
-      Assert.assertNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
+      assertNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
           .getLocationList().get(0).getPipeline());
     } catch (IOException e) {
-      Assert.fail("Should success");
+      fail("Should success");
     }
   }
 
@@ -113,10 +112,10 @@ public void testCompatibility(int chunkNum) {
       RepeatedOmKeyInfo key = codecWithoutPipeline.fromPersistedFormat(rawData);
       System.out.println("Chunk number = " + chunkNum +
           ", Serialized key size with pipeline = " + rawData.length);
-      Assert.assertNotNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
+      assertNotNull(key.getOmKeyInfoList().get(0).getLatestVersionLocations()
           .getLocationList().get(0).getPipeline());
     } catch (IOException e) {
-      Assert.fail("Should success");
+      fail("Should success");
     }
   }
 }
diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
index 6bc70c1f49c3..549c374a91dc 100644
--- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
+++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/codec/TestS3SecretValueCodec.java
@@ -66,7 +66,7 @@ public void testCodecWithCorrectData() throws Exception {
   public void testCodecWithIncorrectValues() throws Exception {
     try {
       codec.fromPersistedFormat("random".getBytes(StandardCharsets.UTF_8));
-      Assert.fail("testCodecWithIncorrectValues failed");
+      fail("testCodecWithIncorrectValues failed");
     } catch (IllegalArgumentException ex) {
       GenericTestUtils.assertExceptionContains("Can't encode the the raw " +
           "data from the byte array", ex);