Fixing required stylecheck

apache · Jul 21, 2022 · efa7813 · efa7813
1 parent 0b7f682
commit efa7813
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 33 deletions.
diff --git a/...org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java b/...org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
@@ -216,7 +216,8 @@ void testHostedUIs() throws Exception {
     } finally {
       historyServer.stop();
     }
-    assertEquals(diskFileStr, connFileStr, "Web file contents should be the same as on disk contents");
+    assertEquals(diskFileStr, connFileStr,
+        "Web file contents should be the same as on disk contents");
   }
   private String readInputStream(InputStream input) throws Exception {
     ByteArrayOutputStream data = new ByteArrayOutputStream();

diff --git a/...va/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/...va/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
@@ -196,8 +196,6 @@ protected Properties getConfiguration(String configPrefix,
     }
   }
 
-  private int round;
-
   public TestAHSWebServices() {
     super(new WebAppDescriptor.Builder(
         "org.apache.hadoop.yarn.server.applicationhistoryservice.webapp")
@@ -571,7 +569,6 @@ void testSingleContainer(int round) throws Exception {
   @ParameterizedTest
   @Timeout(10000)
   void testContainerLogsForFinishedApps(int round) throws Exception {
-
     String fileName = "syslog";
     String user = "user1";
     NodeId nodeId = NodeId.newInstance("test host", 100);
@@ -581,7 +578,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         appId, 1);
     ContainerId containerId1 = ContainerId.newContainerId(appAttemptId, 1);
     ContainerId containerId100 = ContainerId.newContainerId(appAttemptId, 100);
-
     TestContainerLogsUtils.createContainerLogFileInRemoteFS(conf, fs,
         rootLogDir, appId, Collections.singletonMap(containerId1,
             "Hello." + containerId1),
@@ -601,7 +597,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         .get(ClientResponse.class);
     String responseText = response.getEntity(String.class);
     assertTrue(responseText.contains("Hello." + containerId1));
-
     // Do the same test with new API
     r = resource();
     response = r.path("ws").path("v1")
@@ -612,7 +607,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         .get(ClientResponse.class);
     responseText = response.getEntity(String.class);
     assertTrue(responseText.contains("Hello." + containerId1));
-
     // test whether we can find container log from remote diretory if
     // the containerInfo for this container could not be fetched from AHS.
     r = resource();
@@ -624,7 +618,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         .get(ClientResponse.class);
     responseText = response.getEntity(String.class);
     assertTrue(responseText.contains("Hello." + containerId100));
-
     // Do the same test with new API
     r = resource();
     response = r.path("ws").path("v1")
@@ -635,14 +628,12 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         .get(ClientResponse.class);
     responseText = response.getEntity(String.class);
     assertTrue(responseText.contains("Hello." + containerId100));
-
     // create an application which can not be found from AHS
     ApplicationId appId100 = ApplicationId.newInstance(0, 100);
     ApplicationAttemptId appAttemptId100 = ApplicationAttemptId.newInstance(
         appId100, 1);
     ContainerId containerId1ForApp100 = ContainerId.newContainerId(
         appAttemptId100, 1);
-
     TestContainerLogsUtils.createContainerLogFileInRemoteFS(conf, fs,
         rootLogDir, appId100,
         Collections.singletonMap(containerId1ForApp100,
@@ -662,7 +653,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
         "End of LogType:syslog".length() + 50) + "\n\n";
     int tailTextSize = "\nEnd of LogType:syslog\n".getBytes().length
         + tailEndSeparator.getBytes().length;
-
     String logMessage = "Hello." + containerId1ForApp100;
     int fileContentSize = logMessage.getBytes().length;
     // specify how many bytes we should get from logs
@@ -683,7 +673,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
     assertEquals(new String(responseText.getBytes(),
             (fullTextSize - fileContentSize - tailTextSize), 5),
         new String(logMessage.getBytes(), 0, 5));
-
     // specify how many bytes we should get from logs
     // if we specify a negative number, it would get the last n bytes from
     // container log
@@ -702,7 +691,6 @@ void testContainerLogsForFinishedApps(int round) throws Exception {
     assertEquals(new String(responseText.getBytes(),
             (fullTextSize - fileContentSize - tailTextSize), 5),
         new String(logMessage.getBytes(), fileContentSize - 5, 5));
-
     // specify the bytes which is larger than the actual file size,
     // we would get the full logs
     r = resource();

diff --git a/...service/src/test/java/org/apache/hadoop/yarn/server/timeline/TestGenericObjectMapper.java b/...service/src/test/java/org/apache/hadoop/yarn/server/timeline/TestGenericObjectMapper.java
@@ -20,7 +20,6 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.io.WritableComparator;
-import org.apache.hadoop.yarn.server.timeline.GenericObjectMapper;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -39,11 +38,11 @@ public class TestGenericObjectMapper {
   void testEncoding() {
     testEncoding(Long.MAX_VALUE);
     testEncoding(Long.MIN_VALUE);
-    testEncoding(0l);
-    testEncoding(128l);
-    testEncoding(256l);
-    testEncoding(512l);
-    testEncoding(-256l);
+    testEncoding(0L);
+    testEncoding(128L);
+    testEncoding(256L);
+    testEncoding(512L);
+    testEncoding(-256L);
   }
 
   private static void testEncoding(long l) {
@@ -82,13 +81,13 @@ void testValueTypes() throws IOException {
         GenericObjectMapper.write((long) Integer.MAX_VALUE)));
     assertEquals(Integer.MIN_VALUE, GenericObjectMapper.read(
         GenericObjectMapper.write((long) Integer.MIN_VALUE)));
-    verify((long) Integer.MAX_VALUE + 1l);
-    verify((long) Integer.MIN_VALUE - 1l);
+    verify((long) Integer.MAX_VALUE + 1L);
+    verify((long) Integer.MIN_VALUE - 1L);
 
     verify(Long.MAX_VALUE);
     verify(Long.MIN_VALUE);
 
-    assertEquals(42, GenericObjectMapper.read(GenericObjectMapper.write(42l)));
+    assertEquals(42, GenericObjectMapper.read(GenericObjectMapper.write(42L)));
     verify(42);
     verify(1.23);
     verify("abc");

diff --git a/...rg/apache/hadoop/yarn/server/timeline/security/TestTimelineAuthenticationFilterForV1.java b/...rg/apache/hadoop/yarn/server/timeline/security/TestTimelineAuthenticationFilterForV1.java
@@ -95,8 +95,8 @@ public static Collection<Object[]> withSsl() {
   private static Configuration conf;
   private static boolean withSsl;
 
-  public void initTestTimelineAuthenticationFilterForV1(boolean withSsl) {
-    TestTimelineAuthenticationFilterForV1.withSsl = withSsl;
+  public void initTestTimelineAuthenticationFilterForV1(boolean isSslEnabled) {
+    TestTimelineAuthenticationFilterForV1.withSsl = isSslEnabled;
   }
 
   @BeforeAll
@@ -186,8 +186,8 @@ public static void tearDown() throws Exception {
 
   @MethodSource("withSsl")
   @ParameterizedTest
-  void testPutTimelineEntities(boolean withSsl) throws Exception {
-    initTestTimelineAuthenticationFilterForV1(withSsl);
+  void testPutTimelineEntities(boolean isSslEnabled) throws Exception {
+    initTestTimelineAuthenticationFilterForV1(isSslEnabled);
     KerberosTestUtils.doAs(PRINCIPAL, new Callable<Void>() {
       @Override
       public Void call() throws Exception {
@@ -215,8 +215,8 @@ public Void call() throws Exception {
 
   @MethodSource("withSsl")
   @ParameterizedTest
-  void testPutDomains(boolean withSsl) throws Exception {
-    initTestTimelineAuthenticationFilterForV1(withSsl);
+  void testPutDomains(boolean isSslEnabled) throws Exception {
+    initTestTimelineAuthenticationFilterForV1(isSslEnabled);
     KerberosTestUtils.doAs(PRINCIPAL, new Callable<Void>() {
       @Override
       public Void call() throws Exception {
@@ -239,8 +239,8 @@ public Void call() throws Exception {
 
   @MethodSource("withSsl")
   @ParameterizedTest
-  void testDelegationTokenOperations(boolean withSsl) throws Exception {
-    initTestTimelineAuthenticationFilterForV1(withSsl);
+  void testDelegationTokenOperations(boolean isSslEnabled) throws Exception {
+    initTestTimelineAuthenticationFilterForV1(isSslEnabled);
     TimelineClient httpUserClient =
         KerberosTestUtils.doAs(PRINCIPAL,
             new Callable<TimelineClient>() {
@@ -265,7 +265,8 @@ public UserGroupInformation call() throws Exception {
     TimelineDelegationTokenIdentifier tDT = token.decodeIdentifier();
     assertNotNull(tDT,
         "Delegation token identifier should not be null");
-    assertEquals(new Text(HTTP_USER), tDT.getOwner(), "Owner of delegation token identifier does not match");
+    assertEquals(new Text(HTTP_USER), tDT.getOwner(),
+        "Owner of delegation token identifier does not match");
 
     // Renew token
     assertFalse(token.getService().toString().isEmpty(),
@@ -313,8 +314,10 @@ public TimelineClient run() {
     tDT = token.decodeIdentifier();
     assertNotNull(tDT,
         "Delegation token identifier should not be null");
-    assertEquals(new Text(FOO_USER), tDT.getOwner(), "Owner of delegation token is not the expected");
-    assertEquals(new Text(HTTP_USER), tDT.getRealUser(), "Real user of delegation token is not the expected");
+    assertEquals(new Text(FOO_USER), tDT.getOwner(),
+        "Owner of delegation token is not the expected");
+    assertEquals(new Text(HTTP_USER), tDT.getRealUser(),
+        "Real user of delegation token is not the expected");
 
     // Renew token as the renewer
     final Token<TimelineDelegationTokenIdentifier> tokenToRenew = token;