YARN-11219. Fix CheckStyle.

apache · Aug 23, 2022 · 9984ec9 · 9984ec9
1 parent 1fd2862
commit 9984ec9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/...outer/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java b/...outer/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java
@@ -556,7 +556,7 @@ public static ApplicationStatisticsInfo mergeApplicationStatisticsInfo(
             statisticsItemInfo.getType() + "_" + statisticsItemInfo.getState().toString();
 
         StatisticsItemInfo statisticsItemValue;
-        if(statisticsItemMap.containsKey(statisticsItemKey)) {
+        if (statisticsItemMap.containsKey(statisticsItemKey)) {
           statisticsItemValue = statisticsItemMap.get(statisticsItemKey);
           long statisticsItemValueCount = statisticsItemValue.getCount();
           long statisticsItemInfoCount = statisticsItemInfo.getCount();

diff --git a/.../test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java b/.../test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
@@ -999,7 +999,7 @@ public void testGetAppStatistics() throws IOException, InterruptedException, Yar
         interceptor.getAppStatistics(null, stateQueries, typeQueries);
 
     Assert.assertNotNull(response2);
-    Assert.assertTrue(!response2.getStatItems().isEmpty());
+    Assert.assertFalse(response2.getStatItems().isEmpty());
 
     StatisticsItemInfo result = response2.getStatItems().get(0);
     Assert.assertEquals(1, result.getCount());

diff --git a/...r/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java b/...r/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java
@@ -600,10 +600,8 @@ public void testMergeApplicationStatisticsInfo() {
     ApplicationStatisticsInfo infoA = new ApplicationStatisticsInfo();
     ApplicationStatisticsInfo infoB = new ApplicationStatisticsInfo();
 
-    StatisticsItemInfo item1 =
-        new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
-    StatisticsItemInfo item2 =
-        new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 20);
+    StatisticsItemInfo item1 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
+    StatisticsItemInfo item2 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 20);
 
     infoA.add(item1);
     infoB.add(item2);
@@ -629,8 +627,7 @@ public void testMergeApplicationStatisticsInfo() {
   @Test
   public void testMergeDiffApplicationStatisticsInfo() {
     ApplicationStatisticsInfo infoA = new ApplicationStatisticsInfo();
-    StatisticsItemInfo item1 =
-        new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
+    StatisticsItemInfo item1 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
     StatisticsItemInfo item2 =
         new StatisticsItemInfo(YarnApplicationState.NEW_SAVING, "test1", 20);
     infoA.add(item1);
@@ -639,8 +636,7 @@ public void testMergeDiffApplicationStatisticsInfo() {
     ApplicationStatisticsInfo infoB = new ApplicationStatisticsInfo();
     StatisticsItemInfo item3 =
         new StatisticsItemInfo(YarnApplicationState.NEW_SAVING, "test1", 30);
-    StatisticsItemInfo item4 =
-        new StatisticsItemInfo(YarnApplicationState.FINISHED, "test3", 40);
+    StatisticsItemInfo item4 = new StatisticsItemInfo(YarnApplicationState.FINISHED, "test3", 40);
     infoB.add(item3);
     infoB.add(item4);
 
@@ -652,7 +648,7 @@ public void testMergeDiffApplicationStatisticsInfo() {
         RouterWebServiceUtil.mergeApplicationStatisticsInfo(lists);
 
     Assert.assertEquals(3, mergeInfo.getStatItems().size());
-    ArrayList<StatisticsItemInfo> mergeInfoStatItems = mergeInfo.getStatItems();
+    List<StatisticsItemInfo> mergeInfoStatItems = mergeInfo.getStatItems();
 
     StatisticsItemInfo item1Result = null;
     StatisticsItemInfo item2Result = null;
@@ -675,11 +671,11 @@ public void testMergeDiffApplicationStatisticsInfo() {
       }
     }
 
-    Assert.assertEquals(item1.getType(), item1Result.getType());
+    Assert.assertEquals(YarnApplicationState.ACCEPTED, item1Result.getState());
     Assert.assertEquals(item1.getCount(), item1Result.getCount());
-    Assert.assertEquals(item2.getType(), item2Result.getType());
+    Assert.assertEquals(YarnApplicationState.NEW_SAVING, item2Result.getState());
     Assert.assertEquals((item2.getCount() + item3.getCount()), item2Result.getCount());
-    Assert.assertEquals(item4.getType(), item3Result.getType());
+    Assert.assertEquals(YarnApplicationState.FINISHED, item3Result.getState());
     Assert.assertEquals(item4.getCount(), item3Result.getCount());
   }
 }