Fix UTs for TestCombinedSystemMetricsPublisher

Author: ASHISH-RANJAN59

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestCombinedSystemMetricsPublisher.java

@@ -447,7 +447,7 @@ private static RMAppAttempt createRMAppAttempt(boolean unmanagedAMAttempt) {
     RMAppAttempt appAttempt = mock(RMAppAttempt.class);
     when(appAttempt.getAppAttemptId()).thenReturn(appAttemptId);
     when(appAttempt.getHost()).thenReturn("test host");
-    when(appAttempt.getRpcPort()).thenReturn(Integer.valueOf(-100));
+    when(appAttempt.getRpcPort()).thenReturn(-100);
     if (!unmanagedAMAttempt) {
       Container container = mock(Container.class);
       when(container.getId())
@@ -468,9 +468,9 @@ private static RMApp createRMApp(ApplicationId appId) {
     when(rmApp.getApplicationType()).thenReturn("test app type");
     when(rmApp.getUser()).thenReturn("testUser");
     when(rmApp.getQueue()).thenReturn("test queue");
-    when(rmApp.getSubmitTime()).thenReturn(Long.valueOf(Integer.MAX_VALUE + 1L));
-    when(rmApp.getStartTime()).thenReturn(Long.valueOf(Integer.MAX_VALUE + 2L));
-    when(rmApp.getFinishTime()).thenReturn(Long.valueOf(Integer.MAX_VALUE + 3L));
+    when(rmApp.getSubmitTime()).thenReturn(Integer.MAX_VALUE + 1L);
+    when(rmApp.getStartTime()).thenReturn(Integer.MAX_VALUE + 2L);
+    when(rmApp.getFinishTime()).thenReturn(Integer.MAX_VALUE + 3L);
     when(rmApp.getDiagnostics()).thenReturn(
         new StringBuilder("test diagnostics info"));
     RMAppAttempt appAttempt = mock(RMAppAttempt.class);
@@ -481,12 +481,12 @@ private static RMApp createRMApp(ApplicationId appId) {
         FinalApplicationStatus.UNDEFINED);
     Map<String, Long> resourceMap = new HashMap<>();
     resourceMap
-        .put(ResourceInformation.MEMORY_MB.getName(), Long.valueOf((long) Integer.MAX_VALUE));
-    resourceMap.put(ResourceInformation.VCORES.getName(), Long.valueOf(Long.MAX_VALUE));
+        .put(ResourceInformation.MEMORY_MB.getName(), (long) Integer.MAX_VALUE);
+    resourceMap.put(ResourceInformation.VCORES.getName(), Long.MAX_VALUE);
     Map<String, Long> preemptedMap = new HashMap<>();
     preemptedMap
-        .put(ResourceInformation.MEMORY_MB.getName(), Long.valueOf((long) Integer.MAX_VALUE));
-    preemptedMap.put(ResourceInformation.VCORES.getName(), Long.valueOf(Long.MAX_VALUE));
+        .put(ResourceInformation.MEMORY_MB.getName(), (long) Integer.MAX_VALUE);
+    preemptedMap.put(ResourceInformation.VCORES.getName(), Long.MAX_VALUE);
     when(rmApp.getRMAppMetrics()).thenReturn(
         new RMAppMetrics(Resource.newInstance(0, 0), 0, 0, resourceMap,
             preemptedMap, 0));