YARN-11219. Fix CheckStyle.

apache · Aug 19, 2022 · ac69043 · ac69043
1 parent 2da6161
commit ac69043
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.../src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java b/.../src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
@@ -1130,7 +1130,8 @@ public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
       Set<String> allocationRequestIds, String groupBy, String limit,
       Set<String> actions, boolean summarize) {
 
-    // Only verify the app_id, because the specific subCluster needs to be found according to the app_id,
+    // Only verify the app_id,
+    // because the specific subCluster needs to be found according to the app_id,
     // and other verifications are directly handed over to the corresponding subCluster RM
     if (appId == null || appId.isEmpty()) {
       throw new IllegalArgumentException("Parameter error, the appId is empty or null.");

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
@@ -546,12 +546,13 @@ public static NodeToLabelsInfo mergeNodeToLabels(
   public static ApplicationStatisticsInfo mergeApplicationStatisticsInfo(
       Collection<ApplicationStatisticsInfo> appStatistics) {
     ApplicationStatisticsInfo result = new ApplicationStatisticsInfo();
-    HashMap<String, StatisticsItemInfo> statisticsItemMap = new HashMap();
+    Map<String, StatisticsItemInfo> statisticsItemMap = new HashMap<>();
 
     appStatistics.stream().forEach(appStatistic -> {
-        List<StatisticsItemInfo> statisticsItemInfos = appStatistic.getStatItems();
+      List<StatisticsItemInfo> statisticsItemInfos = appStatistic.getStatItems();
       for (StatisticsItemInfo statisticsItemInfo : statisticsItemInfos) {
-        String statisticsItemKey = statisticsItemInfo.getType() + "_" + statisticsItemInfo.getState().toString();
+        String statisticsItemKey =
+            statisticsItemInfo.getType() + "_" + statisticsItemInfo.getState().toString();
         StatisticsItemInfo statisticsItemValue =
             statisticsItemMap.getOrDefault(statisticsItemKey, null);
         if (statisticsItemValue != null) {

diff --git a/...t/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java b/...t/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
@@ -755,13 +755,13 @@ public AppActivitiesInfo getAppActivities(
     Mockito.doReturn(rmApps).when(rmContext).getRMApps();
 
     FiCaSchedulerNode node = (FiCaSchedulerNode) schedulerNode;
-    ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(applicationId,0);
+    ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(applicationId, 0);
     RMApp mockApp = Mockito.mock(RMApp.class);
     Mockito.doReturn(appAttemptId.getApplicationId()).when(mockApp).getApplicationId();
     Mockito.doReturn(FinalApplicationStatus.UNDEFINED).when(mockApp).getFinalApplicationStatus();
     rmApps.put(appAttemptId.getApplicationId(), mockApp);
     FiCaSchedulerApp app = new FiCaSchedulerApp(appAttemptId, "user", mockQueue,
-    mock(ActiveUsersManager.class), rmContext);
+        mock(ActiveUsersManager.class), rmContext);
 
     ActivitiesManager newActivitiesManager = new ActivitiesManager(rmContext);
     newActivitiesManager.turnOnAppActivitiesRecording(app.getApplicationId(), 3);
@@ -772,7 +772,8 @@ public AppActivitiesInfo getAppActivities(
           SystemClock.getInstance().getTime(), app);
       ActivitiesLogger.APP.recordAppActivityWithoutAllocation(newActivitiesManager, node, app,
           new SchedulerRequestKey(Priority.newInstance(0), 0, null),
-          ActivityDiagnosticConstant.NODE_IS_BLACKLISTED, ActivityState.REJECTED, ActivityLevel.NODE);
+          ActivityDiagnosticConstant.NODE_IS_BLACKLISTED, ActivityState.REJECTED,
+          ActivityLevel.NODE);
       ActivitiesLogger.APP.finishSkippedAppAllocationRecording(newActivitiesManager,
           app.getApplicationId(), ActivityState.SKIPPED, ActivityDiagnosticConstant.EMPTY);
     }

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
@@ -19,7 +19,6 @@
 package org.apache.hadoop.yarn.server.router.webapp;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
@@ -653,7 +652,7 @@ public void testMergeDiffApplicationStatisticsInfo() {
     Assert.assertEquals(3, mergeInfo.getStatItems().size());
     ArrayList<StatisticsItemInfo> mergeInfoStatItems = mergeInfo.getStatItems();
 
-    StatisticsItemInfo item1Result = null ;
+    StatisticsItemInfo item1Result = null;
     StatisticsItemInfo item2Result = null;
     StatisticsItemInfo item3Result = null;