diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
index 58a6408b7fc7..0618d4a354b6 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
@@ -38,6 +38,10 @@
  */
 public class SelectorOutputStream<OUT extends OutputStream>
     extends OutputStream implements Syncable, StreamCapabilities {
+
+  private final ByteArrayBuffer buffer;
+  private final Underlying underlying;
+
   /** A buffer backed by a byte[]. */
   static final class ByteArrayBuffer {
     private byte[] array;
@@ -108,9 +112,6 @@ private OUT select(int outstandingBytes, boolean force) throws IOException {
     }
   }
 
-  private final ByteArrayBuffer buffer;
-  private final Underlying underlying;
-
   /**
    * Construct a {@link SelectorOutputStream} which first writes to a buffer.
    * Once the buffer has become full, select an {@link OutputStream}.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
index c64f727300cb..85ac9290c60d 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
@@ -48,10 +48,6 @@ public final class OmBucketInfo extends WithObjectID implements Auditable, CopyO
       OmBucketInfo::getProtobuf,
       OmBucketInfo.class);
 
-  public static Codec<OmBucketInfo> getCodec() {
-    return CODEC;
-  }
-
   /**
    * Name of the volume in which the bucket belongs to.
    */
@@ -129,6 +125,10 @@ private OmBucketInfo(Builder b) {
     this.defaultReplicationConfig = b.defaultReplicationConfig;
   }
 
+  public static Codec<OmBucketInfo> getCodec() {
+    return CODEC;
+  }
+
   /**
    * Returns the Volume Name.
    * @return String.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
index e7feb2564c56..0d2ecc083436 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
@@ -36,10 +36,6 @@ public final class OmDBAccessIdInfo {
       OmDBAccessIdInfo.class,
       DelegatedCodec.CopyType.SHALLOW);
 
-  public static Codec<OmDBAccessIdInfo> getCodec() {
-    return CODEC;
-  }
-
   /**
    * Name of the tenant.
    */
@@ -66,6 +62,10 @@ public OmDBAccessIdInfo(String tenantId, String userPrincipal,
     this.isDelegatedAdmin = isDelegatedAdmin;
   }
 
+  public static Codec<OmDBAccessIdInfo> getCodec() {
+    return CODEC;
+  }
+
   public String getTenantId() {
     return tenantId;
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
index ca1b6e2aea5e..70b744e103d5 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
@@ -36,10 +36,6 @@ public final class OmDBTenantState implements Comparable<OmDBTenantState> {
       OmDBTenantState.class,
       DelegatedCodec.CopyType.SHALLOW);
 
-  public static Codec<OmDBTenantState> getCodec() {
-    return CODEC;
-  }
-
   /**
    * Name of the tenant.
    */
@@ -76,6 +72,10 @@ public OmDBTenantState(String tenantId, String bucketNamespaceName,
     this.bucketPolicyName = bucketPolicyName;
   }
 
+  public static Codec<OmDBTenantState> getCodec() {
+    return CODEC;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
index cf3d61e06b21..5c7ebdfc67ae 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
@@ -38,10 +38,6 @@ public final class OmDBUserPrincipalInfo {
       OmDBUserPrincipalInfo::getProtobuf,
       OmDBUserPrincipalInfo.class);
 
-  public static Codec<OmDBUserPrincipalInfo> getCodec() {
-    return CODEC;
-  }
-
   /**
    * A set of accessIds.
    */
@@ -51,6 +47,10 @@ public OmDBUserPrincipalInfo(Set<String> accessIds) {
     this.accessIds = new HashSet<>(accessIds);
   }
 
+  public static Codec<OmDBUserPrincipalInfo> getCodec() {
+    return CODEC;
+  }
+
   public Set<String> getAccessIds() {
     return accessIds;
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
index 51158df37788..fcd5f4a76008 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
@@ -42,10 +42,6 @@ public class OmDirectoryInfo extends WithParentObjectId
       OmDirectoryInfo::getProtobuf,
       OmDirectoryInfo.class);
 
-  public static Codec<OmDirectoryInfo> getCodec() {
-    return CODEC;
-  }
-
   private final String name; // directory name
   private String owner;
 
@@ -63,6 +59,10 @@ public OmDirectoryInfo(Builder builder) {
     this.modificationTime = builder.modificationTime;
   }
 
+  public static Codec<OmDirectoryInfo> getCodec() {
+    return CODEC;
+  }
+
   /**
    * Returns new builder class that builds a OmPrefixInfo.
    *
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index f6301797a6fa..6da0f57d787b 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -59,19 +59,6 @@ public final class OmKeyInfo extends WithParentObjectId
   private static final Codec<OmKeyInfo> CODEC_TRUE = newCodec(true);
   private static final Codec<OmKeyInfo> CODEC_FALSE = newCodec(false);
 
-  private static Codec<OmKeyInfo> newCodec(boolean ignorePipeline) {
-    return new DelegatedCodec<>(
-        Proto2Codec.get(KeyInfo.getDefaultInstance()),
-        OmKeyInfo::getFromProtobuf,
-        k -> k.getProtobuf(ignorePipeline, ClientVersion.CURRENT_VERSION),
-        OmKeyInfo.class);
-  }
-
-  public static Codec<OmKeyInfo> getCodec(boolean ignorePipeline) {
-    LOG.debug("OmKeyInfo.getCodec ignorePipeline = {}", ignorePipeline);
-    return ignorePipeline ? CODEC_TRUE : CODEC_FALSE;
-  }
-
   private final String volumeName;
   private final String bucketName;
   // name of key client specified
@@ -134,6 +121,19 @@ private OmKeyInfo(Builder b) {
     this.expectedDataGeneration = b.expectedDataGeneration;
   }
 
+  private static Codec<OmKeyInfo> newCodec(boolean ignorePipeline) {
+    return new DelegatedCodec<>(
+        Proto2Codec.get(KeyInfo.getDefaultInstance()),
+        OmKeyInfo::getFromProtobuf,
+        k -> k.getProtobuf(ignorePipeline, ClientVersion.CURRENT_VERSION),
+        OmKeyInfo.class);
+  }
+
+  public static Codec<OmKeyInfo> getCodec(boolean ignorePipeline) {
+    LOG.debug("OmKeyInfo.getCodec ignorePipeline = {}", ignorePipeline);
+    return ignorePipeline ? CODEC_TRUE : CODEC_FALSE;
+  }
+
   public String getVolumeName() {
     return volumeName;
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
index 1f61cd39bf1f..30bd28647595 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
@@ -45,6 +45,35 @@ public final class OmMultipartKeyInfo extends WithObjectID implements CopyObject
       OmMultipartKeyInfo::getProto,
       OmMultipartKeyInfo.class);
 
+  private final String uploadID;
+  private final long creationTime;
+  private final ReplicationConfig replicationConfig;
+  private PartKeyInfoMap partKeyInfoMap;
+
+  /**
+   * A pointer to parent directory used for path traversal. ParentID will be
+   * used only when the multipart key is created into a FileSystemOptimized(FSO)
+   * bucket.
+   * <p>
+   * For example, if a key "a/b/multiKey1" created into a FSOBucket then each
+   * path component will be assigned an ObjectId and linked to its parent path
+   * component using parent's objectID.
+   * <p>
+   * Say, Bucket's ObjectID = 512, which is the parent for its immediate child
+   * element.
+   * <p>
+   * ------------------------------------------|
+   * PathComponent |   ObjectID   |   ParentID |
+   * ------------------------------------------|
+   *      a        |     1024     |     512    |
+   * ------------------------------------------|
+   *      b        |     1025     |     1024   |
+   * ------------------------------------------|
+   *   multiKey1   |     1026     |     1025   |
+   * ------------------------------------------|
+   */
+  private final long parentID;
+
   public static Codec<OmMultipartKeyInfo> getCodec() {
     return CODEC;
   }
@@ -63,6 +92,8 @@ public static class PartKeyInfoMap implements Iterable<PartKeyInfo> {
       return Integer.compare(partNumber1, partNumber2);
     };
 
+    private final List<PartKeyInfo> sorted;
+
     /**
      * Adds a PartKeyInfo to sortedPartKeyInfoList.
      * If a partKeyInfo with the same PartNumber is in the array, the old value
@@ -93,8 +124,6 @@ static PartKeyInfoMap put(PartKeyInfo partKeyInfo,
       return new PartKeyInfoMap(list);
     }
 
-    private final List<PartKeyInfo> sorted;
-
     PartKeyInfoMap(List<PartKeyInfo> sorted) {
       this.sorted = Collections.unmodifiableList(sorted);
     }
@@ -130,35 +159,6 @@ public PartKeyInfo lastEntry() {
     }
   }
 
-  private final String uploadID;
-  private final long creationTime;
-  private final ReplicationConfig replicationConfig;
-  private PartKeyInfoMap partKeyInfoMap;
-
-  /**
-   * A pointer to parent directory used for path traversal. ParentID will be
-   * used only when the multipart key is created into a FileSystemOptimized(FSO)
-   * bucket.
-   * <p>
-   * For example, if a key "a/b/multiKey1" created into a FSOBucket then each
-   * path component will be assigned an ObjectId and linked to its parent path
-   * component using parent's objectID.
-   * <p>
-   * Say, Bucket's ObjectID = 512, which is the parent for its immediate child
-   * element.
-   * <p>
-   * ------------------------------------------|
-   * PathComponent |   ObjectID   |   ParentID |
-   * ------------------------------------------|
-   *      a        |     1024     |     512    |
-   * ------------------------------------------|
-   *      b        |     1025     |     1024   |
-   * ------------------------------------------|
-   *   multiKey1   |     1026     |     1025   |
-   * ------------------------------------------|
-   */
-  private final long parentID;
-
   /**
    * Construct OmMultipartKeyInfo object which holds multipart upload
    * information for a key.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
index 1a36379bc724..435543d87177 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
@@ -46,10 +46,6 @@ public final class OmVolumeArgs extends WithObjectID
       OmVolumeArgs::getProtobuf,
       OmVolumeArgs.class);
 
-  public static Codec<OmVolumeArgs> getCodec() {
-    return CODEC;
-  }
-
   private final String adminName;
   private String ownerName;
   private final String volume;
@@ -87,6 +83,10 @@ private OmVolumeArgs(Builder b) {
     this.refCount = b.refCount;
   }
 
+  public static Codec<OmVolumeArgs> getCodec() {
+    return CODEC;
+  }
+
   public long getRefCount() {
     Preconditions.checkState(refCount >= 0L, "refCount should not be negative");
     return refCount;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
index d9d9d23dc8a3..f3af4f73da98 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneAclUtil.java
@@ -46,12 +46,12 @@
 public final class OzoneAclUtil {
   static final Logger LOG = LoggerFactory.getLogger(OzoneAclUtil.class);
 
-  private OzoneAclUtil() {
-  }
-
   private static ACLType[] userRights;
   private static ACLType[] groupRights;
 
+  private OzoneAclUtil() {
+  }
+
   /**
    * Helper function to get default access acl list for current user.
    *
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index 5461786838e5..8817729a1e0c 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -41,6 +41,8 @@ public class RepeatedOmKeyInfo implements CopyObject<RepeatedOmKeyInfo> {
   private static final Codec<RepeatedOmKeyInfo> CODEC_TRUE = newCodec(true);
   private static final Codec<RepeatedOmKeyInfo> CODEC_FALSE = newCodec(false);
 
+  private final List<OmKeyInfo> omKeyInfoList;
+
   private static Codec<RepeatedOmKeyInfo> newCodec(boolean ignorePipeline) {
     return new DelegatedCodec<>(
         Proto2Codec.get(RepeatedKeyInfo.getDefaultInstance()),
@@ -53,8 +55,6 @@ public static Codec<RepeatedOmKeyInfo> getCodec(boolean ignorePipeline) {
     return ignorePipeline ? CODEC_TRUE : CODEC_FALSE;
   }
 
-  private final List<OmKeyInfo> omKeyInfoList;
-
   public RepeatedOmKeyInfo() {
     this.omKeyInfoList = new ArrayList<>();
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
index 79936039265c..c27498af8f61 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
@@ -33,16 +33,16 @@ public final class S3SecretValue {
       S3SecretValue::getProtobuf,
       S3SecretValue.class);
 
-  public static Codec<S3SecretValue> getCodec() {
-    return CODEC;
-  }
-
   // TODO: This field should be renamed to accessId for generalization.
   private final String kerberosID;
   private final String awsSecret;
   private final boolean isDeleted;
   private final long transactionLogIndex;
 
+  public static Codec<S3SecretValue> getCodec() {
+    return CODEC;
+  }
+
   public static S3SecretValue of(String kerberosID, String awsSecret) {
     return of(kerberosID, awsSecret, 0);
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotDiffJob.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotDiffJob.java
index 30db0815aa9f..2024f9a822a4 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotDiffJob.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotDiffJob.java
@@ -36,10 +36,6 @@ public class SnapshotDiffJob {
   private static final Codec<SnapshotDiffJob> CODEC =
       new SnapshotDiffJobCodec();
 
-  public static Codec<SnapshotDiffJob> getCodec() {
-    return CODEC;
-  }
-
   private long creationTime;
   private String jobId;
   private JobStatus status;
@@ -95,6 +91,10 @@ public SnapshotDiffJob(long creationTime,
     this.keysProcessedPct = keysProcessedPct;
   }
 
+  public static Codec<SnapshotDiffJob> getCodec() {
+    return CODEC;
+  }
+
   public String getJobId() {
     return jobId;
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
index 6dcb64026a97..ab542a141be9 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
@@ -57,44 +57,6 @@ public final class SnapshotInfo implements Auditable, CopyObject<SnapshotInfo> {
       SnapshotInfo::getProtobuf,
       SnapshotInfo.class);
 
-  public static Codec<SnapshotInfo> getCodec() {
-    return CODEC;
-  }
-
-  /**
-   * SnapshotStatus enum composed of active and deleted statuses.
-   */
-  public enum SnapshotStatus {
-    SNAPSHOT_ACTIVE,
-    SNAPSHOT_DELETED;
-
-    public static final SnapshotStatus DEFAULT = SNAPSHOT_ACTIVE;
-
-    public SnapshotStatusProto toProto() {
-      switch (this) {
-      case SNAPSHOT_ACTIVE:
-        return SnapshotStatusProto.SNAPSHOT_ACTIVE;
-      case SNAPSHOT_DELETED:
-        return SnapshotStatusProto.SNAPSHOT_DELETED;
-      default:
-        throw new IllegalStateException(
-            "BUG: missing valid SnapshotStatus, found status=" + this);
-      }
-    }
-
-    public static SnapshotStatus valueOf(SnapshotStatusProto status) {
-      switch (status) {
-      case SNAPSHOT_ACTIVE:
-        return SNAPSHOT_ACTIVE;
-      case SNAPSHOT_DELETED:
-        return SNAPSHOT_DELETED;
-      default:
-        throw new IllegalStateException(
-            "BUG: missing valid SnapshotStatus, found status=" + status);
-      }
-    }
-  }
-
   private static final String SEPARATOR = "-";
   private static final long INVALID_TIMESTAMP = -1;
   private static final UUID INITIAL_SNAPSHOT_ID = UUID.randomUUID();
@@ -146,6 +108,10 @@ private SnapshotInfo(Builder b) {
     this.lastTransactionInfo = b.lastTransactionInfo;
   }
 
+  public static Codec<SnapshotInfo> getCodec() {
+    return CODEC;
+  }
+
   public void setName(String name) {
     this.name = name;
   }
@@ -745,4 +711,38 @@ public String toString() {
         ", lastTransactionInfo: '" + lastTransactionInfo + '\'' +
         '}';
   }
+
+  /**
+   * SnapshotStatus enum composed of active and deleted statuses.
+   */
+  public enum SnapshotStatus {
+    SNAPSHOT_ACTIVE,
+    SNAPSHOT_DELETED;
+
+    public static final SnapshotStatus DEFAULT = SNAPSHOT_ACTIVE;
+
+    public SnapshotStatusProto toProto() {
+      switch (this) {
+      case SNAPSHOT_ACTIVE:
+        return SnapshotStatusProto.SNAPSHOT_ACTIVE;
+      case SNAPSHOT_DELETED:
+        return SnapshotStatusProto.SNAPSHOT_DELETED;
+      default:
+        throw new IllegalStateException(
+            "BUG: missing valid SnapshotStatus, found status=" + this);
+      }
+    }
+
+    public static SnapshotStatus valueOf(SnapshotStatusProto status) {
+      switch (status) {
+      case SNAPSHOT_ACTIVE:
+        return SNAPSHOT_ACTIVE;
+      case SNAPSHOT_DELETED:
+        return SNAPSHOT_DELETED;
+      default:
+        throw new IllegalStateException(
+            "BUG: missing valid SnapshotStatus, found status=" + status);
+      }
+    }
+  }
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java
index 3eaedb8753ba..c4791b68131b 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java
@@ -85,15 +85,15 @@ public class GrpcOmTransport implements OmTransport {
   private final int maxSize;
   private SecurityConfig secConfig;
 
-  public static void setCaCerts(List<X509Certificate> x509Certificates) {
-    caCerts = x509Certificates;
-  }
-
   private RetryPolicy retryPolicy;
   private int failoverCount = 0;
   private GrpcOMFailoverProxyProvider<OzoneManagerProtocolPB>
       omFailoverProxyProvider;
 
+  public static void setCaCerts(List<X509Certificate> x509Certificates) {
+    caCerts = x509Certificates;
+  }
+
   public GrpcOmTransport(ConfigurationSource conf,
                           UserGroupInformation ugi, String omServiceId)
       throws IOException {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/grpc/GrpcClientConstants.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/grpc/GrpcClientConstants.java
index a1da81997cb0..e59ec98ec784 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/grpc/GrpcClientConstants.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/grpc/GrpcClientConstants.java
@@ -24,10 +24,6 @@
  * Constants to store grpc-client specific header values.
  */
 public final class GrpcClientConstants {
-
-  private GrpcClientConstants() {
-  }
-
   public static final Context.Key<String> CLIENT_HOSTNAME_CTX_KEY =
       Context.key("CLIENT_HOSTNAME");
 
@@ -40,4 +36,6 @@ private GrpcClientConstants() {
   public static final Metadata.Key<String> CLIENT_IP_ADDRESS_METADATA_KEY =
       Metadata.Key.of("CLIENT_IP_ADDRESS", Metadata.ASCII_STRING_MARSHALLER);
 
+  private GrpcClientConstants() {
+  }
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/GDPRSymmetricKey.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/GDPRSymmetricKey.java
index a27782f2ccb0..83146d3aaed1 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/GDPRSymmetricKey.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/GDPRSymmetricKey.java
@@ -34,6 +34,11 @@ public class GDPRSymmetricKey {
   private static final ThreadLocal<SecureRandom> RANDOM
       = ThreadLocal.withInitial(SecureRandom::new);
 
+  private final SecretKeySpec secretKey;
+  private final Cipher cipher;
+  private final String algorithm;
+  private final String secret;
+
   /** @return a new instance with default parameters. */
   public static GDPRSymmetricKey newDefaultInstance() {
     try {
@@ -50,11 +55,6 @@ static String randomSecret(SecureRandom secureRandom) {
         0, 0, true, true, null, secureRandom);
   }
 
-  private final SecretKeySpec secretKey;
-  private final Cipher cipher;
-  private final String algorithm;
-  private final String secret;
-
   public SecretKeySpec getSecretKey() {
     return secretKey;
   }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSelector.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSelector.java
index 70db28261705..9be00204914f 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSelector.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSelector.java
@@ -33,13 +33,12 @@
 public class OzoneDelegationTokenSelector
     extends AbstractDelegationTokenSelector<OzoneTokenIdentifier> {
 
+  private static final Logger LOG = LoggerFactory.getLogger(OzoneDelegationTokenSelector.class);
+
   public OzoneDelegationTokenSelector() {
     super(OzoneTokenIdentifier.KIND_NAME);
   }
 
-  private static final Logger LOG = LoggerFactory
-      .getLogger(OzoneDelegationTokenSelector.class);
-
   @Override
   public Token<OzoneTokenIdentifier> selectToken(Text service,
       Collection<Token<? extends TokenIdentifier>> tokens) {
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
index 735169175798..7922d3efce0b 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
@@ -41,6 +41,8 @@
 public class SnapshotDiffReportOzone
     extends org.apache.hadoop.hdfs.protocol.SnapshotDiffReport {
 
+  private static final String LINE_SEPARATOR = System.getProperty("line.separator", "\n");
+
   private static final Codec<DiffReportEntry> CODEC = new DelegatedCodec<>(
       Proto2Codec.get(DiffReportEntryProto.getDefaultInstance()),
       SnapshotDiffReportOzone::fromProtobufDiffReportEntry,
@@ -48,13 +50,6 @@ public class SnapshotDiffReportOzone
       DiffReportEntry.class,
       DelegatedCodec.CopyType.SHALLOW);
 
-  public static Codec<DiffReportEntry> getDiffReportEntryCodec() {
-    return CODEC;
-  }
-
-  private static final String LINE_SEPARATOR = System.getProperty(
-      "line.separator", "\n");
-
   /**
    * Volume name to which the snapshot bucket belongs.
    */
@@ -82,6 +77,10 @@ public SnapshotDiffReportOzone(final String snapshotRoot,
     this.token = token;
   }
 
+  public static Codec<DiffReportEntry> getDiffReportEntryCodec() {
+    return CODEC;
+  }
+
   @Override
   public List<DiffReportEntry> getDiffList() {
     return super.getDiffList();
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixNode.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixNode.java
index 6d0bea510ba6..67b5ac0bcb25 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixNode.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixNode.java
@@ -25,6 +25,13 @@
  */
 public class RadixNode<T> {
 
+  private HashMap<String, RadixNode> children;
+
+  private String name;
+
+  // TODO: k/v pairs for more metadata as needed
+  private T value;
+
   public RadixNode(String name) {
     this.name = name;
     this.children = new HashMap<>();
@@ -49,11 +56,4 @@ public void setValue(T v) {
   public T getValue() {
     return value;
   }
-
-  private HashMap<String, RadixNode> children;
-
-  private String name;
-
-  // TODO: k/v pairs for more metadata as needed
-  private T value;
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
index 81ecd89ced0a..89aba42511da 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/RadixTree.java
@@ -31,6 +31,11 @@
  */
 public class RadixTree<T> {
 
+  private static final String PATH_DELIMITER = OzoneConsts.OZONE_URI_DELIMITER;
+
+  // root of a radix tree has a name of "/" and may optionally has it value.
+  private RadixNode root;
+
   /**
    * create a empty radix tree with root only.
    */
@@ -211,9 +216,4 @@ public String getLongestPrefix(String path) {
       return root.getName();
     }
   }
-
-  // root of a radix tree has a name of "/" and may optionally has it value.
-  private RadixNode root;
-
-  private static final String PATH_DELIMITER = OzoneConsts.OZONE_URI_DELIMITER;
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java
index 9121489cc358..18a280563d83 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java
@@ -42,10 +42,6 @@ public final class OzoneUtils {
 
   public static final Charset ENCODING = StandardCharsets.UTF_8;
 
-  private OzoneUtils() {
-    // Never constructed
-  }
-
   /**
    * Date format that used in ozone. Here the format is thread safe to use.
    */
@@ -61,6 +57,10 @@ protected SimpleDateFormat initialValue() {
         }
       };
 
+  private OzoneUtils() {
+    // Never constructed
+  }
+
   /**
    * Verifies that max key length is a valid value.
    *