From fb42275602f4a7c125e6e764a230ead1beec24c9 Mon Sep 17 00:00:00 2001
From: slfan1989 <louj1988@@>
Date: Tue, 9 Aug 2022 10:18:20 +0800
Subject: [PATCH] YARN-10885. Fix CheckStyle.

---
 .../utils/FederationStateStoreFacade.java     | 37 ++++++++-----------
 .../utils/TestFederationStateStoreFacade.java |  3 +-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
index cd516d6d90b9b..f545735373aa9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
@@ -380,13 +380,9 @@ public SubClusterId getApplicationHomeSubCluster(ApplicationId appId)
       throws YarnException {
     try {
       if (isCachingEnabled()) {
-        Object value =
-            cache.get(buildGetApplicationHomeSubClusterRequest(appId));
-        if (value instanceof SubClusterId) {
-          return (SubClusterId) value;
-        } else {
-          throw new YarnException("Cannot be converted to SubClusterId.");
-        }
+        SubClusterId value = SubClusterId.class.cast(
+            cache.get(buildGetApplicationHomeSubClusterRequest(appId)));
+        return value;
       } else {
         GetApplicationHomeSubClusterResponse response = stateStore.getApplicationHomeSubCluster(
             GetApplicationHomeSubClusterRequest.newInstance(appId));
@@ -531,20 +527,19 @@ public Map<String, SubClusterPolicyConfiguration> invoke(
   private Object buildGetApplicationHomeSubClusterRequest(ApplicationId applicationId) {
     final String cacheKey = buildCacheKey(getClass().getSimpleName(),
         GET_APPLICATION_HOME_SUBCLUSTER_CACHEID, applicationId.toString());
-    CacheRequest<String, SubClusterId> cacheRequest =
-        new CacheRequest<>(
-            cacheKey,
-            input -> {
-              GetApplicationHomeSubClusterResponse response =
-                  stateStore.getApplicationHomeSubCluster(
-                      GetApplicationHomeSubClusterRequest.newInstance(applicationId));
-
-              ApplicationHomeSubCluster applicationHomeSubCluster =
-                  response.getApplicationHomeSubCluster();
-              SubClusterId subClusterId = applicationHomeSubCluster.getHomeSubCluster();
-
-              return subClusterId;
-            });
+    CacheRequest<String, SubClusterId> cacheRequest = new CacheRequest<>(
+        cacheKey,
+        input -> {
+            GetApplicationHomeSubClusterResponse response =
+                stateStore.getApplicationHomeSubCluster(
+                    GetApplicationHomeSubClusterRequest.newInstance(applicationId));
+
+            ApplicationHomeSubCluster applicationHomeSubCluster =
+                response.getApplicationHomeSubCluster();
+            SubClusterId subClusterId = applicationHomeSubCluster.getHomeSubCluster();
+
+            return subClusterId;
+         });
     return cacheRequest;
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
index 8cd44a7bf91ff..0606f5c454081 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
@@ -217,8 +217,7 @@ public void testGetApplicationHomeSubClusterCache() throws YarnException {
 
     ApplicationHomeSubCluster appHomeSubCluster =
         ApplicationHomeSubCluster.newInstance(appId, subClusterId1);
-    SubClusterId subClusterIdAdd =
-        facade.addApplicationHomeSubCluster(appHomeSubCluster);
+    SubClusterId subClusterIdAdd = facade.addApplicationHomeSubCluster(appHomeSubCluster);
 
     SubClusterId subClusterIdByFacade = facade.getApplicationHomeSubCluster(appId);
     Assert.assertEquals(subClusterIdByFacade, subClusterIdAdd);