Skip to content

Commit 1e99166

Browse files
author
slfan1989
committed
YARN-11326. Fix CheckStyle.
1 parent fe0c056 commit 1e99166

File tree

2 files changed

+73
-75
lines changed

2 files changed

+73
-75
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationClientMethod.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* Class to define client method,params and arguments.
3131
*/
32-
public class FederationClientMethod {
32+
public class FederationClientMethod<R> {
3333

3434
public static final Logger LOG =
3535
LoggerFactory.getLogger(FederationClientMethod.class);
@@ -96,16 +96,14 @@ public Class<?>[] getTypes() {
9696
/**
9797
* We will use the invoke method to call the method in FederationStateStoreService.
9898
*
99-
* @param clazz response class. like GetSubClusterPolicyConfigurationResponse.class.
100-
* @param <R> return object Class like GetSubClusterPolicyConfigurationResponse.
10199
* @return The result returned after calling the interface.
102100
* @throws YarnException yarn exception.
103101
*/
104-
protected <R> R invoke(Class<R> clazz) throws YarnException {
102+
protected R invoke() throws YarnException {
105103
try {
106104
long startTime = clock.getTime();
107105
Method method = FederationStateStore.class.getMethod(methodName, types);
108-
R result = clazz.cast(method.invoke(stateStoreClient, params));
106+
R result = (R)(method.invoke(stateStoreClient, params));
109107
long stopTime = clock.getTime();
110108
FederationStateStoreServiceMetrics.succeededStateStoreServiceCall(
111109
methodName, stopTime - startTime);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -290,229 +290,229 @@ public void checkVersion() throws Exception {
290290
@Override
291291
public GetSubClusterPolicyConfigurationResponse getPolicyConfiguration(
292292
GetSubClusterPolicyConfigurationRequest request) throws YarnException {
293-
FederationClientMethod clientMethod = new FederationClientMethod(
293+
FederationClientMethod<GetSubClusterPolicyConfigurationResponse> clientMethod = new FederationClientMethod(
294294
"getPolicyConfiguration", GetSubClusterPolicyConfigurationRequest.class, request,
295295
stateStoreClient, clock);
296-
return clientMethod.invoke(GetSubClusterPolicyConfigurationResponse.class);
296+
return clientMethod.invoke();
297297
}
298298

299299
@Override
300300
public SetSubClusterPolicyConfigurationResponse setPolicyConfiguration(
301301
SetSubClusterPolicyConfigurationRequest request) throws YarnException {
302-
FederationClientMethod clientMethod = new FederationClientMethod(
302+
FederationClientMethod<SetSubClusterPolicyConfigurationResponse> clientMethod = new FederationClientMethod(
303303
"setPolicyConfiguration", SetSubClusterPolicyConfigurationRequest.class, request,
304304
stateStoreClient, clock);
305-
return clientMethod.invoke(SetSubClusterPolicyConfigurationResponse.class);
305+
return clientMethod.invoke();
306306
}
307307

308308
@Override
309309
public GetSubClusterPoliciesConfigurationsResponse getPoliciesConfigurations(
310310
GetSubClusterPoliciesConfigurationsRequest request) throws YarnException {
311-
FederationClientMethod clientMethod = new FederationClientMethod(
312-
"getPoliciesConfigurations", GetSubClusterPoliciesConfigurationsRequest.class, request,
313-
stateStoreClient, clock);
314-
return clientMethod.invoke(GetSubClusterPoliciesConfigurationsResponse.class);
311+
FederationClientMethod<GetSubClusterPoliciesConfigurationsResponse> clientMethod =
312+
new FederationClientMethod("getPoliciesConfigurations",
313+
GetSubClusterPoliciesConfigurationsRequest.class, request, stateStoreClient, clock);
314+
return clientMethod.invoke();
315315
}
316316

317317
@Override
318318
public SubClusterRegisterResponse registerSubCluster(
319319
SubClusterRegisterRequest registerSubClusterRequest)
320320
throws YarnException {
321-
FederationClientMethod clientMethod = new FederationClientMethod(
321+
FederationClientMethod<SubClusterRegisterResponse> clientMethod = new FederationClientMethod(
322322
"registerSubCluster", SubClusterRegisterRequest.class, registerSubClusterRequest,
323323
stateStoreClient, clock);
324-
return clientMethod.invoke(SubClusterRegisterResponse.class);
324+
return clientMethod.invoke();
325325
}
326326

327327
@Override
328328
public SubClusterDeregisterResponse deregisterSubCluster(
329329
SubClusterDeregisterRequest subClusterDeregisterRequest)
330330
throws YarnException {
331-
FederationClientMethod clientMethod = new FederationClientMethod(
331+
FederationClientMethod<SubClusterDeregisterResponse> clientMethod = new FederationClientMethod(
332332
"deregisterSubCluster", SubClusterDeregisterRequest.class, subClusterDeregisterRequest,
333333
stateStoreClient, clock);
334-
return clientMethod.invoke(SubClusterDeregisterResponse.class);
334+
return clientMethod.invoke();
335335
}
336336

337337
@Override
338338
public SubClusterHeartbeatResponse subClusterHeartbeat(
339339
SubClusterHeartbeatRequest subClusterHeartbeatRequest)
340340
throws YarnException {
341-
FederationClientMethod clientMethod = new FederationClientMethod(
341+
FederationClientMethod<SubClusterHeartbeatResponse> clientMethod = new FederationClientMethod(
342342
"subClusterHeartbeat", SubClusterHeartbeatRequest.class, subClusterHeartbeatRequest,
343343
stateStoreClient, clock);
344-
return clientMethod.invoke(SubClusterHeartbeatResponse.class);
344+
return clientMethod.invoke();
345345
}
346346

347347
@Override
348348
public GetSubClusterInfoResponse getSubCluster(
349349
GetSubClusterInfoRequest subClusterRequest) throws YarnException {
350-
FederationClientMethod clientMethod = new FederationClientMethod(
350+
FederationClientMethod<GetSubClusterInfoResponse> clientMethod = new FederationClientMethod(
351351
"getSubCluster", GetSubClusterInfoRequest.class, subClusterRequest,
352352
stateStoreClient, clock);
353-
return clientMethod.invoke(GetSubClusterInfoResponse.class);
353+
return clientMethod.invoke();
354354
}
355355

356356
@Override
357357
public GetSubClustersInfoResponse getSubClusters(
358358
GetSubClustersInfoRequest subClustersRequest) throws YarnException {
359-
FederationClientMethod clientMethod = new FederationClientMethod(
359+
FederationClientMethod<GetSubClustersInfoResponse> clientMethod = new FederationClientMethod(
360360
"getSubClusters", GetSubClustersInfoRequest.class, subClustersRequest,
361361
stateStoreClient, clock);
362-
return clientMethod.invoke(GetSubClustersInfoResponse.class);
362+
return clientMethod.invoke();
363363
}
364364

365365
@Override
366366
public AddApplicationHomeSubClusterResponse addApplicationHomeSubCluster(
367367
AddApplicationHomeSubClusterRequest request) throws YarnException {
368-
FederationClientMethod clientMethod = new FederationClientMethod(
369-
"addApplicationHomeSubCluster", AddApplicationHomeSubClusterRequest.class, request,
370-
stateStoreClient, clock);
371-
return clientMethod.invoke(AddApplicationHomeSubClusterResponse.class);
368+
FederationClientMethod<AddApplicationHomeSubClusterResponse> clientMethod =
369+
new FederationClientMethod("addApplicationHomeSubCluster",
370+
AddApplicationHomeSubClusterRequest.class, request, stateStoreClient, clock);
371+
return clientMethod.invoke();
372372
}
373373

374374
@Override
375375
public UpdateApplicationHomeSubClusterResponse updateApplicationHomeSubCluster(
376376
UpdateApplicationHomeSubClusterRequest request) throws YarnException {
377-
FederationClientMethod clientMethod = new FederationClientMethod(
378-
"updateApplicationHomeSubCluster", UpdateApplicationHomeSubClusterRequest.class, request,
379-
stateStoreClient, clock);
380-
return clientMethod.invoke(UpdateApplicationHomeSubClusterResponse.class);
377+
FederationClientMethod<UpdateApplicationHomeSubClusterResponse> clientMethod =
378+
new FederationClientMethod("updateApplicationHomeSubCluster",
379+
UpdateApplicationHomeSubClusterRequest.class, request, stateStoreClient, clock);
380+
return clientMethod.invoke();
381381
}
382382

383383
@Override
384384
public GetApplicationHomeSubClusterResponse getApplicationHomeSubCluster(
385385
GetApplicationHomeSubClusterRequest request) throws YarnException {
386-
FederationClientMethod clientMethod = new FederationClientMethod(
387-
"getApplicationHomeSubCluster", GetApplicationHomeSubClusterRequest.class, request,
388-
stateStoreClient, clock);
389-
return clientMethod.invoke(GetApplicationHomeSubClusterResponse.class);
386+
FederationClientMethod<GetApplicationHomeSubClusterResponse> clientMethod =
387+
new FederationClientMethod("getApplicationHomeSubCluster",
388+
GetApplicationHomeSubClusterRequest.class, request, stateStoreClient, clock);
389+
return clientMethod.invoke();
390390
}
391391

392392
@Override
393393
public GetApplicationsHomeSubClusterResponse getApplicationsHomeSubCluster(
394394
GetApplicationsHomeSubClusterRequest request) throws YarnException {
395-
FederationClientMethod clientMethod = new FederationClientMethod(
396-
"getApplicationsHomeSubCluster", GetApplicationsHomeSubClusterRequest.class, request,
397-
stateStoreClient, clock);
398-
return clientMethod.invoke(GetApplicationsHomeSubClusterResponse.class);
395+
FederationClientMethod<GetApplicationsHomeSubClusterResponse> clientMethod =
396+
new FederationClientMethod("getApplicationsHomeSubCluster",
397+
GetApplicationsHomeSubClusterRequest.class, request, stateStoreClient, clock);
398+
return clientMethod.invoke();
399399
}
400400

401401
@Override
402402
public DeleteApplicationHomeSubClusterResponse deleteApplicationHomeSubCluster(
403403
DeleteApplicationHomeSubClusterRequest request) throws YarnException {
404-
FederationClientMethod clientMethod = new FederationClientMethod(
405-
"deleteApplicationHomeSubCluster", DeleteApplicationHomeSubClusterRequest.class, request,
406-
stateStoreClient, clock);
407-
return clientMethod.invoke(DeleteApplicationHomeSubClusterResponse.class);
404+
FederationClientMethod<DeleteApplicationHomeSubClusterResponse> clientMethod =
405+
new FederationClientMethod("deleteApplicationHomeSubCluster",
406+
DeleteApplicationHomeSubClusterRequest.class, request, stateStoreClient, clock);
407+
return clientMethod.invoke();
408408
}
409409

410410
@Override
411411
public AddReservationHomeSubClusterResponse addReservationHomeSubCluster(
412412
AddReservationHomeSubClusterRequest request) throws YarnException {
413-
FederationClientMethod clientMethod = new FederationClientMethod(
414-
"addReservationHomeSubCluster", AddReservationHomeSubClusterRequest.class, request,
415-
stateStoreClient, clock);
416-
return clientMethod.invoke(AddReservationHomeSubClusterResponse.class);
413+
FederationClientMethod<AddReservationHomeSubClusterResponse> clientMethod =
414+
new FederationClientMethod("addReservationHomeSubCluster",
415+
AddReservationHomeSubClusterRequest.class, request, stateStoreClient, clock);
416+
return clientMethod.invoke();
417417
}
418418

419419
@Override
420420
public GetReservationHomeSubClusterResponse getReservationHomeSubCluster(
421421
GetReservationHomeSubClusterRequest request) throws YarnException {
422-
FederationClientMethod clientMethod = new FederationClientMethod(
423-
"getReservationHomeSubCluster", GetReservationHomeSubClusterRequest.class, request,
424-
stateStoreClient, clock);
425-
return clientMethod.invoke(GetReservationHomeSubClusterResponse.class);
422+
FederationClientMethod<GetReservationHomeSubClusterResponse> clientMethod =
423+
new FederationClientMethod("getReservationHomeSubCluster",
424+
GetReservationHomeSubClusterRequest.class, request, stateStoreClient, clock);
425+
return clientMethod.invoke();
426426
}
427427

428428
@Override
429429
public GetReservationsHomeSubClusterResponse getReservationsHomeSubCluster(
430430
GetReservationsHomeSubClusterRequest request) throws YarnException {
431-
FederationClientMethod clientMethod = new FederationClientMethod(
431+
FederationClientMethod<GetReservationsHomeSubClusterResponse> clientMethod = new FederationClientMethod(
432432
"getReservationsHomeSubCluster", GetReservationsHomeSubClusterRequest.class, request,
433433
stateStoreClient, clock);
434-
return clientMethod.invoke(GetReservationsHomeSubClusterResponse.class);
434+
return clientMethod.invoke();
435435
}
436436

437437
@Override
438438
public UpdateReservationHomeSubClusterResponse updateReservationHomeSubCluster(
439439
UpdateReservationHomeSubClusterRequest request) throws YarnException {
440-
FederationClientMethod clientMethod = new FederationClientMethod(
441-
"updateReservationHomeSubCluster", UpdateReservationHomeSubClusterRequest.class, request,
442-
stateStoreClient, clock);
443-
return clientMethod.invoke(UpdateReservationHomeSubClusterResponse.class);
440+
FederationClientMethod<UpdateReservationHomeSubClusterResponse> clientMethod =
441+
new FederationClientMethod("updateReservationHomeSubCluster",
442+
UpdateReservationHomeSubClusterRequest.class, request, stateStoreClient, clock);
443+
return clientMethod.invoke();
444444
}
445445

446446
@Override
447447
public DeleteReservationHomeSubClusterResponse deleteReservationHomeSubCluster(
448448
DeleteReservationHomeSubClusterRequest request) throws YarnException {
449-
FederationClientMethod clientMethod = new FederationClientMethod(
450-
"deleteReservationHomeSubCluster", DeleteReservationHomeSubClusterRequest.class, request,
451-
stateStoreClient, clock);
452-
return clientMethod.invoke(DeleteReservationHomeSubClusterResponse.class);
449+
FederationClientMethod<DeleteReservationHomeSubClusterResponse> clientMethod =
450+
new FederationClientMethod("deleteReservationHomeSubCluster",
451+
DeleteReservationHomeSubClusterRequest.class, request, stateStoreClient, clock);
452+
return clientMethod.invoke();
453453
}
454454

455455
@Override
456456
public RouterMasterKeyResponse storeNewMasterKey(RouterMasterKeyRequest request)
457457
throws YarnException, IOException {
458-
FederationClientMethod clientMethod = new FederationClientMethod(
458+
FederationClientMethod<RouterMasterKeyResponse> clientMethod = new FederationClientMethod(
459459
"storeNewMasterKey", RouterMasterKeyRequest.class, request,
460460
stateStoreClient, clock);
461-
return clientMethod.invoke(RouterMasterKeyResponse.class);
461+
return clientMethod.invoke();
462462
}
463463

464464
@Override
465465
public RouterMasterKeyResponse removeStoredMasterKey(RouterMasterKeyRequest request)
466466
throws YarnException, IOException {
467-
FederationClientMethod clientMethod = new FederationClientMethod(
467+
FederationClientMethod<RouterMasterKeyResponse> clientMethod = new FederationClientMethod(
468468
"removeStoredMasterKey", RouterMasterKeyRequest.class, request,
469469
stateStoreClient, clock);
470-
return clientMethod.invoke(RouterMasterKeyResponse.class);
470+
return clientMethod.invoke();
471471
}
472472

473473
@Override
474474
public RouterMasterKeyResponse getMasterKeyByDelegationKey(RouterMasterKeyRequest request)
475475
throws YarnException, IOException {
476-
FederationClientMethod clientMethod = new FederationClientMethod(
476+
FederationClientMethod<RouterMasterKeyResponse> clientMethod = new FederationClientMethod(
477477
"getMasterKeyByDelegationKey", RouterMasterKeyRequest.class, request,
478478
stateStoreClient, clock);
479-
return clientMethod.invoke(RouterMasterKeyResponse.class);
479+
return clientMethod.invoke();
480480
}
481481

482482
@Override
483483
public RouterRMTokenResponse storeNewToken(RouterRMTokenRequest request)
484484
throws YarnException, IOException {
485-
FederationClientMethod clientMethod = new FederationClientMethod(
485+
FederationClientMethod<RouterRMTokenResponse> clientMethod = new FederationClientMethod(
486486
"storeNewToken", RouterRMTokenRequest.class, request,
487487
stateStoreClient, clock);
488-
return clientMethod.invoke(RouterRMTokenResponse.class);
488+
return clientMethod.invoke();
489489
}
490490

491491
@Override
492492
public RouterRMTokenResponse updateStoredToken(RouterRMTokenRequest request)
493493
throws YarnException, IOException {
494-
FederationClientMethod clientMethod = new FederationClientMethod(
494+
FederationClientMethod<RouterRMTokenResponse> clientMethod = new FederationClientMethod(
495495
"updateStoredToken", RouterRMTokenRequest.class, request,
496496
stateStoreClient, clock);
497-
return clientMethod.invoke(RouterRMTokenResponse.class);
497+
return clientMethod.invoke();
498498
}
499499

500500
@Override
501501
public RouterRMTokenResponse removeStoredToken(RouterRMTokenRequest request)
502502
throws YarnException, IOException {
503-
FederationClientMethod clientMethod = new FederationClientMethod(
503+
FederationClientMethod<RouterRMTokenResponse> clientMethod = new FederationClientMethod(
504504
"removeStoredToken", RouterRMTokenRequest.class, request,
505505
stateStoreClient, clock);
506-
return clientMethod.invoke(RouterRMTokenResponse.class);
506+
return clientMethod.invoke();
507507
}
508508

509509
@Override
510510
public RouterRMTokenResponse getTokenByRouterStoreToken(RouterRMTokenRequest request)
511511
throws YarnException, IOException {
512-
FederationClientMethod clientMethod = new FederationClientMethod(
512+
FederationClientMethod<RouterRMTokenResponse> clientMethod = new FederationClientMethod(
513513
"getTokenByRouterStoreToken", RouterRMTokenRequest.class, request,
514514
stateStoreClient, clock);
515-
return clientMethod.invoke(RouterRMTokenResponse.class);
515+
return clientMethod.invoke();
516516
}
517517

518518
@Override

0 commit comments

Comments
 (0)