Skip to content

Commit 9da4655

Browse files
author
slfan1989
committed
YARN-11226. Fix CheckStyle.
1 parent af62145 commit 9da4655

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
8888
import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
8989
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
90-
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystemTestUtil;
9190
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
9291
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ActiveUsersManager;
9392
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
@@ -139,7 +138,6 @@
139138
import org.apache.hadoop.yarn.server.router.RouterServerUtil;
140139
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.PartitionInfo;
141140
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
142-
import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices;
143141
import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
144142
import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
145143
import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
@@ -177,13 +175,6 @@ public class MockDefaultRequestInterceptorREST
177175
private Map<ApplicationId, ApplicationReport> applicationMap = new HashMap<>();
178176
public static final String APP_STATE_RUNNING = "RUNNING";
179177

180-
private static final String QUEUE_DEFAULT = "default";
181-
private static final String QUEUE_DEFAULT_FULL = CapacitySchedulerConfiguration.ROOT +
182-
CapacitySchedulerConfiguration.DOT + QUEUE_DEFAULT;
183-
private static final String QUEUE_DEDICATED = "dedicated";
184-
public static final String QUEUE_DEDICATED_FULL = CapacitySchedulerConfiguration.ROOT +
185-
CapacitySchedulerConfiguration.DOT + QUEUE_DEDICATED;
186-
187178
// duration(milliseconds), 1mins
188179
public static final long DURATION = 60*1000;
189180

@@ -1114,7 +1105,7 @@ private MockRM setupResourceManager() throws Exception {
11141105
public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
11151106
String queueAclType, HttpServletRequest hsr) throws AuthorizationException {
11161107

1117-
ResourceManager mockRM = mock(ResourceManager.class);
1108+
ResourceManager mockResourceManager = mock(ResourceManager.class);
11181109
Configuration conf = new YarnConfiguration();
11191110

11201111
ResourceScheduler mockScheduler = new CapacityScheduler() {
@@ -1134,8 +1125,9 @@ public synchronized boolean checkAccess(UserGroupInformation callerUGI,
11341125
}
11351126
};
11361127

1137-
when(mockRM.getResourceScheduler()).thenReturn(mockScheduler);
1138-
MockRMWebServices webSvc = new MockRMWebServices(mockRM, conf, mock(HttpServletResponse.class));
1128+
when(mockResourceManager.getResourceScheduler()).thenReturn(mockScheduler);
1129+
MockRMWebServices webSvc = new MockRMWebServices(mockResourceManager, conf,
1130+
mock(HttpServletResponse.class));
11391131
return webSvc.checkUserAccessToQueue(queue, username, queueAclType, hsr);
11401132
}
11411133

0 commit comments

Comments
 (0)