YARN-11290. Fix CodeStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/impl/MemoryFederationStateStore.java

@@ -269,7 +269,7 @@ public GetApplicationsHomeSubClusterResponse getApplicationsHomeSubCluster(
     SubClusterId requestSC = request.getSubClusterId();
     List<ApplicationHomeSubCluster> result = applications.keySet().stream()
         .map(applicationId -> generateAppHomeSC(applicationId))
-        .filter(appHomeSC -> judgeAdd(requestSC, appHomeSC.getHomeSubCluster()))
+        .filter(appHomeSC -> filterHomeSubCluster(requestSC, appHomeSC.getHomeSubCluster()))
         .limit(maxAppsInStateStore)
         .collect(Collectors.toList());
 
@@ -282,12 +282,21 @@ private ApplicationHomeSubCluster generateAppHomeSC(ApplicationId applicationId)
     return ApplicationHomeSubCluster.newInstance(applicationId, subClusterId);
   }
 
-  private boolean judgeAdd(SubClusterId filterSubCluster, SubClusterId homeSubCluster) {
+  private boolean filterHomeSubCluster(SubClusterId filterSubCluster,
+      SubClusterId homeSubCluster) {
+
+    // If the filter condition is empty,
+    // it means that homeSubCluster needs to be added
     if (filterSubCluster == null) {
       return true;
-    } else if (filterSubCluster.equals(homeSubCluster)) {
+    }
+
+    // If the filter condition filterSubCluster is not empty,
+    // and filterSubCluster is equal to homeSubCluster, it needs to be added
+    if (filterSubCluster.equals(homeSubCluster)) {
       return true;
     }
+
     return false;
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/impl/ZookeeperFederationStateStore.java

@@ -272,7 +272,7 @@ public GetApplicationsHomeSubClusterResponse getApplicationsHomeSubCluster(
       List<String> children = zkManager.getChildren(appsZNode);
       List<ApplicationHomeSubCluster> result =
           children.stream().map(child -> generateAppHomeSC(child))
-          .filter(appHomeSC -> judgeAdd(requestSC, appHomeSC.getHomeSubCluster()))
+          .filter(appHomeSC -> filterHomeSubCluster(requestSC, appHomeSC.getHomeSubCluster()))
           .limit(maxAppsInStateStore)
           .collect(Collectors.toList());
       long end = clock.getTime();
@@ -300,7 +300,8 @@ private ApplicationHomeSubCluster generateAppHomeSC(String appId) {
     return null;
   }
 
-  private boolean judgeAdd(SubClusterId filterSubCluster, SubClusterId homeSubCluster) {
+  private boolean filterHomeSubCluster(SubClusterId filterSubCluster,
+      SubClusterId homeSubCluster) {
     if (filterSubCluster == null) {
       return true;
     } else if (filterSubCluster.equals(homeSubCluster)) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/records/GetApplicationsHomeSubClusterRequest.java

@@ -18,6 +18,7 @@
 package org.apache.hadoop.yarn.server.federation.store.records;
 
 import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.util.Records;
@@ -54,7 +55,7 @@ public static GetApplicationsHomeSubClusterRequest newInstance() {
    *
    * @return the subcluster identifier
    */
-  @InterfaceAudience.Public
+  @Public
   @Unstable
   public abstract SubClusterId getSubClusterId();
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/impl/FederationStateStoreBaseTest.java

@@ -83,6 +83,8 @@ public abstract class FederationStateStoreBaseTest {
 
   private static final MonotonicClock CLOCK = new MonotonicClock();
   private FederationStateStore stateStore;
+  private static final int TEN_ROUNDS = 10;
+  private static final int TWENTY_ROUNDS = 20;
 
   protected abstract FederationStateStore createStateStore();
 
@@ -426,7 +428,7 @@ public void testGetApplicationsHomeSubClusterFilter() throws Exception {
 
     Set<ApplicationHomeSubCluster> appHomeSubClusters = new HashSet<>();
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < TEN_ROUNDS; i++) {
       ApplicationId appId = ApplicationId.newInstance(now, i);
       SubClusterId subClusterId = SubClusterId.newInstance("SC1");
       addApplicationHomeSC(appId, subClusterId);
@@ -436,7 +438,7 @@ public void testGetApplicationsHomeSubClusterFilter() throws Exception {
     }
 
     // Add ApplicationHomeSC - SC2
-    for (int i = 10; i < 20; i++) {
+    for (int i = TEN_ROUNDS; i < TWENTY_ROUNDS; i++) {
       ApplicationId appId = ApplicationId.newInstance(now, i);
       SubClusterId subClusterId = SubClusterId.newInstance("SC2");
       addApplicationHomeSC(appId, subClusterId);