Skip to content

Commit df8e854

Browse files
slfan1989slfan1989
committed
YARN-11266. Fix CheckStyle.
1 parent 35a22f7 commit df8e854

File tree

7 files changed

+106
-92
lines changed

7 files changed

+106
-92
lines changed

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.junit.jupiter.api.Assertions.assertEquals;
2222
import static org.junit.jupiter.api.Assertions.assertNotNull;
2323
import static org.junit.jupiter.api.Assertions.assertTrue;
24+
import static org.junit.jupiter.api.Assertions.fail;
2425

2526
import javax.ws.rs.client.Client;
2627
import javax.ws.rs.client.ClientBuilder;
@@ -43,7 +44,6 @@
4344
import org.apache.hadoop.yarn.server.timelineservice.storage.DataGeneratorForTest;
4445
import org.glassfish.jersey.client.ClientConfig;
4546
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
46-
import org.junit.jupiter.api.Assertions;
4747

4848
/**
4949
* Test Base for TimelineReaderServer HBase tests.
@@ -101,7 +101,7 @@ protected void addFilters(Configuration conf) {
101101
server.start();
102102
serverPort = server.getWebServerPort();
103103
} catch (Exception e) {
104-
Assertions.fail("Web server failed to start");
104+
fail("Web server failed to start");
105105
}
106106
}
107107

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java‎

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,13 @@ public void testGetFlowRuns() throws Exception {
506506
assertEquals(2, entities.size());
507507
for (FlowRunEntity entity : entities) {
508508
assertTrue(
509-
((entity.getId().equals("user1@flow_name/1002345678919")) &&
509+
((entity.getId().equals("user1@flow_name/1002345678919")) &&
510510
(entity.getRunId() == 1002345678919L) &&
511511
(entity.getStartTime() == 1425016501000L)) ||
512512
((entity.getId().equals("user1@flow_name/1002345678920")) &&
513513
(entity.getRunId() == 1002345678920L) &&
514-
(entity.getStartTime() == 1425016501034L)), "Id, run id or start time does not match.");
514+
(entity.getStartTime() == 1425016501034L)),
515+
"Id, run id or start time does not match.");
515516
assertEquals(0, entity.getMetrics().size());
516517
}
517518

@@ -526,9 +527,10 @@ public void testGetFlowRuns() throws Exception {
526527
assertEquals(1, entities.size());
527528
for (FlowRunEntity entity : entities) {
528529
assertTrue(
529-
entity.getId().equals("user1@flow_name/1002345678920") &&
530+
entity.getId().equals("user1@flow_name/1002345678920") &&
530531
entity.getRunId() == 1002345678920L &&
531-
entity.getStartTime() == 1425016501034L, "Id, run id or start time does not match.");
532+
entity.getStartTime() == 1425016501034L,
533+
"Id, run id or start time does not match.");
532534
assertEquals(0, entity.getMetrics().size());
533535
}
534536

@@ -543,9 +545,10 @@ public void testGetFlowRuns() throws Exception {
543545
assertEquals(1, entities.size());
544546
for (FlowRunEntity entity : entities) {
545547
assertTrue(
546-
entity.getId().equals("user1@flow_name/1002345678920") &&
548+
entity.getId().equals("user1@flow_name/1002345678920") &&
547549
entity.getRunId() == 1002345678920L &&
548-
entity.getStartTime() == 1425016501034L, "Id, run id or start time does not match.");
550+
entity.getStartTime() == 1425016501034L,
551+
"Id, run id or start time does not match.");
549552
assertEquals(0, entity.getMetrics().size());
550553
}
551554

@@ -560,12 +563,13 @@ public void testGetFlowRuns() throws Exception {
560563
assertEquals(2, entities.size());
561564
for (FlowRunEntity entity : entities) {
562565
assertTrue(
563-
((entity.getId().equals("user1@flow_name/1002345678919")) &&
566+
((entity.getId().equals("user1@flow_name/1002345678919")) &&
564567
(entity.getRunId() == 1002345678919L) &&
565568
(entity.getStartTime() == 1425016501000L)) ||
566569
((entity.getId().equals("user1@flow_name/1002345678920")) &&
567570
(entity.getRunId() == 1002345678920L) &&
568-
(entity.getStartTime() == 1425016501034L)), "Id, run id or start time does not match.");
571+
(entity.getStartTime() == 1425016501034L)),
572+
"Id, run id or start time does not match.");
569573
assertEquals(0, entity.getMetrics().size());
570574
}
571575

@@ -580,9 +584,10 @@ public void testGetFlowRuns() throws Exception {
580584
assertEquals(1, entities.size());
581585
for (FlowRunEntity entity : entities) {
582586
assertTrue(
583-
entity.getId().equals("user1@flow_name/1002345678919") &&
587+
entity.getId().equals("user1@flow_name/1002345678919") &&
584588
entity.getRunId() == 1002345678919L &&
585-
entity.getStartTime() == 1425016501000L, "Id, run id or start time does not match.");
589+
entity.getStartTime() == 1425016501000L,
590+
"Id, run id or start time does not match.");
586591
assertEquals(0, entity.getMetrics().size());
587592
}
588593

@@ -597,14 +602,15 @@ public void testGetFlowRuns() throws Exception {
597602
assertEquals(2, entities.size());
598603
for (FlowRunEntity entity : entities) {
599604
assertTrue(
600-
((entity.getId().equals("user1@flow_name/1002345678919")) &&
605+
((entity.getId().equals("user1@flow_name/1002345678919")) &&
601606
(entity.getRunId() == 1002345678919L) &&
602607
(entity.getStartTime() == 1425016501000L) &&
603608
(entity.getMetrics().size() == 3)) ||
604609
((entity.getId().equals("user1@flow_name/1002345678920")) &&
605610
(entity.getRunId() == 1002345678920L) &&
606611
(entity.getStartTime() == 1425016501034L) &&
607-
(entity.getMetrics().size() == 1)), "Id, run id or start time does not match.");
612+
(entity.getMetrics().size() == 1)),
613+
"Id, run id or start time does not match.");
608614
}
609615

610616
// fields as CONFIGS will lead to a HTTP 400 as it makes no sense for
@@ -2000,10 +2006,11 @@ public void testGetFlowRunApps() throws Exception {
20002006
assertEquals(2, entities.size());
20012007
for (TimelineEntity entity : entities) {
20022008
assertTrue(
2003-
(entity.getId().equals("application_1111111111_1111") &&
2009+
(entity.getId().equals("application_1111111111_1111") &&
20042010
entity.getMetrics().size() == 3) ||
20052011
(entity.getId().equals("application_1111111111_2222") &&
2006-
entity.getMetrics().size() == 1), "Unexpected app in result");
2012+
entity.getMetrics().size() == 1),
2013+
"Unexpected app in result");
20072014
for (TimelineMetric metric : entity.getMetrics()) {
20082015
assertEquals(TimelineMetric.Type.SINGLE_VALUE, metric.getType());
20092016
assertEquals(1, metric.getValues().size());
@@ -2019,10 +2026,11 @@ public void testGetFlowRunApps() throws Exception {
20192026
assertEquals(2, entities.size());
20202027
for (TimelineEntity entity : entities) {
20212028
assertTrue(
2022-
(entity.getId().equals("application_1111111111_1111") &&
2029+
(entity.getId().equals("application_1111111111_1111") &&
20232030
entity.getMetrics().size() == 3) ||
20242031
(entity.getId().equals("application_1111111111_2222") &&
2025-
entity.getMetrics().size() == 1), "Unexpected app in result");
2032+
entity.getMetrics().size() == 1),
2033+
"Unexpected app in result");
20262034
for (TimelineMetric metric : entity.getMetrics()) {
20272035
assertTrue(metric.getValues().size() <= 2);
20282036
assertEquals(TimelineMetric.Type.TIME_SERIES, metric.getType());
@@ -2063,14 +2071,15 @@ public void testGetFlowApps() throws Exception {
20632071
assertEquals(3, entities.size());
20642072
for (TimelineEntity entity : entities) {
20652073
assertTrue(
2066-
(entity.getId().equals("application_1111111111_1111") &&
2074+
(entity.getId().equals("application_1111111111_1111") &&
20672075
entity.getConfigs().size() == 1 &&
20682076
entity.getConfigs().equals(ImmutableMap.of("cfg2", "value1"))) ||
20692077
(entity.getId().equals("application_1111111111_2222") &&
20702078
entity.getConfigs().size() == 1 &&
20712079
entity.getConfigs().equals(ImmutableMap.of("cfg1", "value1"))) ||
20722080
(entity.getId().equals("application_1111111111_2224") &&
2073-
entity.getConfigs().size() == 0), "Unexpected app in result");
2081+
entity.getConfigs().size() == 0),
2082+
"Unexpected app in result");
20742083
for (TimelineMetric metric : entity.getMetrics()) {
20752084
if (entity.getId().equals("application_1111111111_1111")) {
20762085
TimelineMetric m1 = newMetric(TimelineMetric.Type.SINGLE_VALUE,
@@ -2101,14 +2110,15 @@ public void testGetFlowApps() throws Exception {
21012110
assertEquals(3, entities.size());
21022111
for (TimelineEntity entity : entities) {
21032112
assertTrue(
2104-
(entity.getId().equals("application_1111111111_1111") &&
2113+
(entity.getId().equals("application_1111111111_1111") &&
21052114
entity.getConfigs().size() == 1 &&
21062115
entity.getConfigs().equals(ImmutableMap.of("cfg2", "value1"))) ||
21072116
(entity.getId().equals("application_1111111111_2222") &&
21082117
entity.getConfigs().size() == 1 &&
21092118
entity.getConfigs().equals(ImmutableMap.of("cfg1", "value1"))) ||
21102119
(entity.getId().equals("application_1111111111_2224") &&
2111-
entity.getConfigs().size() == 0), "Unexpected app in result");
2120+
entity.getConfigs().size() == 0),
2121+
"Unexpected app in result");
21122122
for (TimelineMetric metric : entity.getMetrics()) {
21132123
if (entity.getId().equals("application_1111111111_1111")) {
21142124
TimelineMetric m1 = newMetric(TimelineMetric.Type.TIME_SERIES,
@@ -2168,7 +2178,8 @@ public void testGetFlowAppsFilters() throws Exception {
21682178
assertNotNull(entities);
21692179
assertEquals(1, entities.size());
21702180
assertTrue(entities.contains(
2171-
newEntity(entityType, "application_1111111111_1111")), "Unexpected app in result");
2181+
newEntity(entityType, "application_1111111111_1111")),
2182+
"Unexpected app in result");
21722183

21732184
uri = URI.create("http://localhost:" + getServerPort() + "/ws/v2/" +
21742185
"timeline/clusters/cluster1/users/user1/flows/flow_name/apps?" +
@@ -2178,7 +2189,8 @@ public void testGetFlowAppsFilters() throws Exception {
21782189
assertNotNull(entities);
21792190
assertEquals(1, entities.size());
21802191
assertTrue(entities.contains(
2181-
newEntity(entityType, "application_1111111111_1111")), "Unexpected app in result");
2192+
newEntity(entityType, "application_1111111111_1111")),
2193+
"Unexpected app in result");
21822194

21832195
uri = URI.create("http://localhost:" + getServerPort() + "/ws/v2/" +
21842196
"timeline/clusters/cluster1/users/user1/flows/flow_name/apps?" +
@@ -2188,7 +2200,8 @@ public void testGetFlowAppsFilters() throws Exception {
21882200
assertNotNull(entities);
21892201
assertEquals(1, entities.size());
21902202
assertTrue(entities.contains(
2191-
newEntity(entityType, "application_1111111111_2222")), "Unexpected app in result");
2203+
newEntity(entityType, "application_1111111111_2222")),
2204+
"Unexpected app in result");
21922205
} finally {
21932206
client.close();
21942207
}

0 commit comments

Comments
 (0)