various PR fixes (checkstyle, spotbugs)

Author: abstractdog

tez-api/findbugs-exclude.xml

@@ -131,4 +131,16 @@
     <Bug pattern="IS2_INCONSISTENT_SYNC" />
   </Match>
 
+  <!-- TEZ-4008 -->
+  <Match>
+    <Class name="org.apache.tez.client.registry.AMRecord" />
+    <Method name="&lt;init&gt;" params="org.apache.hadoop.registry.client.types.ServiceRecord"/>
+    <Bug pattern="CT_CONSTRUCTOR_THROW" />
+  </Match>
+
+  <Match>
+    <Class name="org.apache.tez.client.registry.AMRecord" />
+    <Method name="&lt;init&gt;" params="org.apache.hadoop.yarn.api.records.ApplicationId,java.lang.String,java.lang.Integer,java.lang.String"/>
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
 </FindBugsFilter>

tez-api/src/main/java/org/apache/tez/client/registry/AMRecord.java

@@ -22,25 +22,23 @@
 import org.apache.hadoop.registry.client.types.ServiceRecord;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 
-import com.google.common.base.Preconditions;
 
 /**
- * Represents an instance of an AM (DAGClientServer) in the AM registry
+ * Represents an instance of an AM (DAGClientServer) in the AM registry.
  */
 @InterfaceAudience.Public
 public class AMRecord {
-  private ApplicationId appId;
-  private String host;
-  private int port;
-  private String id;
-  private final static String APP_ID_RECORD_KEY = "appId";
-  private final static String HOST_RECORD_KEY = "host";
-  private final static String PORT_RECORD_KEY = "port";
-  private final static String OPAQUE_ID_KEY = "id";
+  private static final String APP_ID_RECORD_KEY = "appId";
+  private static final String HOST_RECORD_KEY = "host";
+  private static final String PORT_RECORD_KEY = "port";
+  private static final String OPAQUE_ID_KEY = "id";
+
+  private final ApplicationId appId;
+  private final String host;
+  private final int port;
+  private final String id;
 
   public AMRecord(ApplicationId appId, String host, int port, String id) {
-    Preconditions.checkNotNull(appId);
-    Preconditions.checkNotNull(host);
     this.appId = appId;
     this.host = host;
     this.port = port;
@@ -49,29 +47,21 @@ public AMRecord(ApplicationId appId, String host, int port, String id) {
   }
 
   public AMRecord(AMRecord other) {
-    Preconditions.checkNotNull(other);
-    this.appId = other.getApplicationId();
+    this.appId = ApplicationId.fromString(other.getApplicationId());
     this.host = other.getHost();
     this.port = other.getPort();
     this.id = other.getId();
   }
 
   public AMRecord(ServiceRecord serviceRecord) {
-    String serviceAppId = serviceRecord.get(APP_ID_RECORD_KEY);
-    Preconditions.checkNotNull(serviceAppId);
-    this.appId = ApplicationId.fromString(serviceAppId);
-    String serviceHost = serviceRecord.get(HOST_RECORD_KEY);
-    Preconditions.checkNotNull(serviceHost);
-    this.host = serviceHost;
-    String servicePort = serviceRecord.get(PORT_RECORD_KEY);
-    this.port = Integer.parseInt(servicePort);
-    String serviceId = serviceRecord.get(OPAQUE_ID_KEY);
-    Preconditions.checkNotNull(serviceId);
-    this.id = serviceId;
+    this.appId = ApplicationId.fromString(serviceRecord.get(APP_ID_RECORD_KEY));
+    this.host = serviceRecord.get(HOST_RECORD_KEY);
+    this.port = Integer.parseInt(serviceRecord.get(PORT_RECORD_KEY));
+    this.id = serviceRecord.get(OPAQUE_ID_KEY);
   }
 
-  public ApplicationId getApplicationId() {
-    return appId;
+  public String getApplicationId() {
+    return appId.toString();
   }
 
   public String getHost() {
@@ -82,12 +72,13 @@ public int getPort() {
     return port;
   }
 
-  public String getId() { return id; }
+  public String getId() {
+    return id;
+  }
 
   @Override
   public boolean equals(Object other) {
-    if(other instanceof AMRecord) {
-      AMRecord otherRecord = (AMRecord) other;
+    if (other instanceof AMRecord otherRecord) {
       return appId.equals(otherRecord.appId)
           && host.equals(otherRecord.host)
           && port == otherRecord.port
@@ -97,11 +88,6 @@ public boolean equals(Object other) {
     }
   }
 
-  @Override
-  public int hashCode() {
-    return appId.hashCode() * host.hashCode() * id.hashCode() + port;
-  }
-
   public ServiceRecord toServiceRecord() {
     ServiceRecord serviceRecord = new ServiceRecord();
     serviceRecord.set(APP_ID_RECORD_KEY, appId);
@@ -111,4 +97,8 @@ public ServiceRecord toServiceRecord() {
     return serviceRecord;
   }
 
+  @Override
+  public int hashCode() {
+    return appId.hashCode() * host.hashCode() * id.hashCode() + port;
+  }
 }

tez-api/src/main/java/org/apache/tez/client/registry/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
+ *
+ *     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.
+ */
+
+@Public
+@Evolving
+package org.apache.tez.client.registry;
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;

tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java

@@ -2353,7 +2353,7 @@ static Set<String> getPropertySet() {
   /**
   * String value. The class to be used for the AM registry.
   */
- @ConfigurationScope(Scope.AM)
- @ConfigurationProperty
- public static final String TEZ_AM_REGISTRY_CLASS = TEZ_AM_PREFIX + "registry.class";
+  @ConfigurationScope(Scope.AM)
+  @ConfigurationProperty
+  public static final String TEZ_AM_REGISTRY_CLASS = TEZ_AM_PREFIX + "registry.class";
 }

tez-dag/src/main/java/org/apache/tez/dag/api/client/registry/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
+ *
+ *     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.
+ */
+
+@Public
+@Evolving
+package org.apache.tez.dag.api.client.registry;
+
+import org.apache.hadoop.classification.InterfaceAudience.Public;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;

tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java

@@ -670,14 +670,12 @@ protected void initClientRpcServer() {
   }
 
   @VisibleForTesting
-  public static void initAmRegistry(ApplicationId appId, String amUUID, AMRegistry amRegistry, DAGClientServer dagClientServer) throws Exception {
+  public static void initAmRegistry(ApplicationId appId, String amUUID, AMRegistry amRegistry,
+      DAGClientServer dagClientServer) {
     if(amRegistry != null) {
       dagClientServer.registerServiceListener((service) -> {
         if (service.isInState(STATE.STARTED)) {
-          AMRecord amRecord = AMRegistryUtils.recordForDAGClientServer(
-              appId,
-              amUUID,
-              dagClientServer);
+          AMRecord amRecord = AMRegistryUtils.recordForDAGClientServer(appId, amUUID, dagClientServer);
           try {
             amRegistry.add(amRecord);
           } catch (Exception e) {

tez-dag/src/main/java/org/apache/tez/dag/utils/AMRegistryUtils.java

@@ -28,19 +28,18 @@
 import org.apache.tez.dag.api.client.DAGClientServer;
 import org.apache.tez.dag.api.client.registry.AMRegistry;
 
-public class AMRegistryUtils {
-  public static AMRecord recordForDAGClientServer(ApplicationId appId, String opaqueId, DAGClientServer dagClientServer) {
+public final class AMRegistryUtils {
+
+  private AMRegistryUtils() {}
+
+  public static AMRecord recordForDAGClientServer(ApplicationId appId, String opaqueId,
+      DAGClientServer dagClientServer) {
     InetSocketAddress address = dagClientServer.getBindAddress();
     return new AMRecord(appId, address.getHostName(), address.getPort(), opaqueId);
   }
 
   public static AMRegistry createAMRegistry(Configuration conf) throws Exception {
     String tezAMRegistryClass = conf.get(TezConfiguration.TEZ_AM_REGISTRY_CLASS);
-    if(tezAMRegistryClass == null) {
-      return null;
-    } else {
-      AMRegistry amRegistry = ReflectionUtils.createClazzInstance(tezAMRegistryClass);
-      return amRegistry;
-    }
+    return tezAMRegistryClass == null ? null : ReflectionUtils.createClazzInstance(tezAMRegistryClass);
   }
 }

tez-dag/src/test/java/org/apache/tez/dag/api/client/registry/TestAMRegistry.java

@@ -48,7 +48,7 @@ public void testAMRegistryFactory() throws Exception {
     String className = "org.apache.tez.dag.api.client.registry.TestAMRegistry$SkeletonAMRegistry";
     conf.set(TezConfiguration.TEZ_AM_REGISTRY_CLASS, className);
     amRegistry = AMRegistryUtils.createAMRegistry(conf);
-    assertEquals(amRegistry.getClass().getName(), className);
+    assertEquals(className, amRegistry.getClass().getName());
   }
 
   @Test(timeout = 5000)
@@ -57,14 +57,10 @@ public void testRecordForDagServer() {
     when(dagClientServer.getBindAddress()).thenReturn(new InetSocketAddress("testhost", 1000));
     ApplicationId appId = ApplicationId.newInstance(0, 1);
     String id = UUID.randomUUID().toString();
-    AMRecord record = AMRegistryUtils.recordForDAGClientServer(
-        appId,
-        id,
-        dagClientServer
-    );
-    assertEquals(record.getApplicationId(), appId);
-    assertEquals(record.getHost(), "testhost");
-    assertEquals(record.getPort(), 1000);
+    AMRecord record = AMRegistryUtils.recordForDAGClientServer(appId, id, dagClientServer);
+    assertEquals(appId.toString(), record.getApplicationId());
+    assertEquals("testhost", record.getHost());
+    assertEquals(1000, record.getPort());
     assertEquals(record.getId(), id);
   }