checkstyle + findbugs

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java

@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
-import java.net.URI;
 import java.util.Map;
 import java.util.Arrays;
 import java.util.HashSet;

hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java

@@ -204,13 +204,11 @@ public BasicOzoneClientAdapterImpl(String omHost, int omPort,
           OzoneClientUtils.resolveLinkBucketLayout(bucket, objectStore, new HashSet<>());
 
       OzoneFSUtils.validateBucketLayout(bucket.getName(), resolvedBucketLayout);
-    } catch (IOException | IllegalArgumentException exception){
+    } catch (IOException | IllegalArgumentException exception) {
       // in case of exception, the adapter object will not be
       // initialised making the client object unreachable, close the client
       // to release resources in this case and rethrow.
-      if (ozoneClient != null) {
-        ozoneClient.close();
-      }
+      ozoneClient.close();
       throw exception;
     }
 

hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java

@@ -223,13 +223,11 @@ public BasicRootedOzoneClientAdapterImpl(String omHost, int omPort,
       // Fetches the bucket layout to be used by OFS.
       try {
         initDefaultFsBucketLayout(conf);
-      } catch (OMException ome){
+      } catch (OMException ome) {
         // in case of exception, the adapter object will not be
         // initialised making the client object unreachable, close the client
         // to release resources in this case and rethrow.
-        if (ozoneClient != null) {
-          ozoneClient.close();
-        }
+        ozoneClient.close();
         throw ome;
       }