diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java index c9b9618..d48b11f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ContainerId.java @@ -165,13 +165,12 @@ public boolean equals(Object obj) { @Override public int compareTo(ContainerId other) { - if (this.getApplicationAttemptId().compareTo( - other.getApplicationAttemptId()) == 0) { - return Long.valueOf(getContainerId()) - .compareTo(Long.valueOf(other.getContainerId())); + int result = this.getApplicationAttemptId().compareTo( + other.getApplicationAttemptId()) == 0; + if (result == 0) { + return Long.compare(getContainerId(), other.getContainerId()); } else { - return this.getApplicationAttemptId().compareTo( - other.getApplicationAttemptId()); + return result; } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java index 1c66475..211f5e8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/TopCLI.java @@ -241,7 +241,7 @@ public ColumnInformation(String header, String format, boolean display, @Override public int compare(ApplicationInformation a1, ApplicationInformation a2) { - return Long.valueOf(a1.usedMemory).compareTo(a2.usedMemory); + return Long.compare(a1.usedMemory, a2.usedMemory); } }; public static final Comparator ReservedMemoryComparator = @@ -249,7 +249,7 @@ public ColumnInformation(String header, String format, boolean display, @Override public int compare(ApplicationInformation a1, ApplicationInformation a2) { - return Long.valueOf(a1.reservedMemory).compareTo(a2.reservedMemory); + return Long.compare(a1.reservedMemory, a2.reservedMemory); } }; public static final Comparator UsedVCoresComparator = @@ -273,7 +273,7 @@ public ColumnInformation(String header, String format, boolean display, @Override public int compare(ApplicationInformation a1, ApplicationInformation a2) { - return Long.valueOf(a1.vcoreSeconds).compareTo(a2.vcoreSeconds); + return Long.compare(a1.vcoreSeconds, a2.vcoreSeconds); } }; public static final Comparator MemorySecondsComparator = @@ -281,7 +281,7 @@ public ColumnInformation(String header, String format, boolean display, @Override public int compare(ApplicationInformation a1, ApplicationInformation a2) { - return Long.valueOf(a1.memorySeconds).compareTo(a2.memorySeconds); + return Long.compare(a1.memorySeconds, a2.memorySeconds); } }; public static final Comparator ProgressComparator = @@ -297,7 +297,7 @@ public ColumnInformation(String header, String format, boolean display, @Override public int compare(ApplicationInformation a1, ApplicationInformation a2) { - return Long.valueOf(a1.runningTime).compareTo(a2.runningTime); + return Long.compare(a1.runningTime, a2.runningTime); } }; public static final Comparator AppNameComparator = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java index 1f10810..2e76865 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java @@ -54,7 +54,7 @@ public void testRMWebUrlSpecified() throws Exception { String rmWebUrl = WebAppUtils.getRMWebAppURLWithScheme(conf); String[] parts = rmWebUrl.split(":"); Assert.assertEquals("RM Web URL Port is incrrect", 24543, - Integer.valueOf(parts[parts.length - 1]).intValue()); + Integer.parseInt(parts[parts.length - 1])); Assert.assertNotSame( "RM Web Url not resolved correctly. Should not be rmtesting", "http://rmtesting:24543", rmWebUrl); @@ -178,7 +178,7 @@ public void testUpdateConnectAddr() throws Exception { conf.set(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS, "yo.yo.yo"); serverAddress = new InetSocketAddress( YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[0], - Integer.valueOf(YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[1])); + Integer.parseInt(YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[1])); resourceTrackerConnectAddress = conf.updateConnectAddr( YarnConfiguration.RM_BIND_HOST, @@ -194,7 +194,7 @@ public void testUpdateConnectAddr() throws Exception { conf.set(YarnConfiguration.RM_BIND_HOST, "0.0.0.0"); serverAddress = new InetSocketAddress( YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[0], - Integer.valueOf(YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[1])); + Integer.parseInt(YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS.split(":")[1])); resourceTrackerConnectAddress = conf.updateConnectAddr( YarnConfiguration.RM_BIND_HOST, @@ -213,7 +213,7 @@ public void testUpdateConnectAddr() throws Exception { serverAddress = new InetSocketAddress( YarnConfiguration.DEFAULT_NM_LOCALIZER_ADDRESS.split(":")[0], - Integer.valueOf(YarnConfiguration.DEFAULT_NM_LOCALIZER_ADDRESS.split(":")[1])); + Integer.parseInt(YarnConfiguration.DEFAULT_NM_LOCALIZER_ADDRESS.split(":")[1])); InetSocketAddress localizerAddress = conf.updateConnectAddr( YarnConfiguration.NM_BIND_HOST, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/NodeLabelTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/NodeLabelTestBase.java index 1f64e50..28b9497 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/NodeLabelTestBase.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/NodeLabelTestBase.java @@ -140,7 +140,7 @@ public NodeId toNodeId(String str) { int idx = str.indexOf(':'); NodeId id = NodeId.newInstance(str.substring(0, idx), - Integer.valueOf(str.substring(idx + 1))); + Integer.parseInt(str.substring(idx + 1))); return id; } else { return NodeId.newInstance(str, CommonNodeLabelsManager.WILDCARD_PORT); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java index a2efb6b..376b27d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java @@ -431,7 +431,7 @@ public void testDownload() throws IOException, URISyntaxException, try { for (Map.Entry> p : pending.entrySet()) { Path localized = p.getValue().get(); - assertEquals(sizes[Integer.valueOf(localized.getName())], p.getKey() + assertEquals(sizes[Integer.parseInt(localized.getName())], p.getKey() .getSize()); FileStatus status = files.getFileStatus(localized.getParent()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index 1c75e43..fc61460 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -772,7 +772,7 @@ public static void disableZookeeperClientSASL() { * @return true if the SASL client system property is set. */ public static boolean isClientSASLEnabled() { - return Boolean.valueOf(System.getProperty( + return Boolean.parseBoolean(System.getProperty( ZookeeperConfigOptions.PROP_ZK_ENABLE_SASL_CLIENT, "true")); } @@ -862,7 +862,7 @@ public String buildSecurityDiagnostics() { String sasl = System.getProperty(PROP_ZK_ENABLE_SASL_CLIENT, DEFAULT_ZK_ENABLE_SASL_CLIENT); - boolean saslEnabled = Boolean.valueOf(sasl); + boolean saslEnabled = Boolean.parseBoolean(sasl); builder.append(describeProperty(PROP_ZK_ENABLE_SASL_CLIENT, DEFAULT_ZK_ENABLE_SASL_CLIENT)); if (saslEnabled) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java index 64689dd..76ee90e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java @@ -1017,7 +1017,7 @@ public void sanitizeEnv(Map environment, Path pwd, //variable can be set to indicate that distcache entries should come //first - boolean preferLocalizedJars = Boolean.valueOf( + boolean preferLocalizedJars = Boolean.parseBoolean( environment.get(Environment.CLASSPATH_PREPEND_DISTCACHE.name()) ); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/ProcessIdFileReader.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/ProcessIdFileReader.java index 52fcdec..80d4db2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/ProcessIdFileReader.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/ProcessIdFileReader.java @@ -79,7 +79,7 @@ public static String getProcessId(Path path) throws IOException { else { // Otherwise, find first line containing a numeric pid. try { - Long pid = Long.valueOf(temp); + long pid = Long.parseLong(temp); if (pid > 0) { processId = temp; break; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/FairOrderingPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/FairOrderingPolicy.java index ea14b42..04cd53a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/FairOrderingPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/FairOrderingPolicy.java @@ -89,7 +89,8 @@ public void setSizeBasedWeight(boolean sizeBasedWeight) { @Override public void configure(Map conf) { if (conf.containsKey(ENABLE_SIZE_BASED_WEIGHT)) { - sizeBasedWeight = Boolean.valueOf(conf.get(ENABLE_SIZE_BASED_WEIGHT)); + sizeBasedWeight = + Boolean.parseBoolean(conf.get(ENABLE_SIZE_BASED_WEIGHT)); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java index 3db4782..499a3d0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicy.java @@ -1032,10 +1032,10 @@ ParentQueue buildMockRootQueue(Random r, String[][] resData, for (int i = 0; i < resData.length; i++) { String[] resource = resData[i].split(":"); if (resource.length == 1) { - resourceList.add(Resource.newInstance(Integer.valueOf(resource[0]), 0)); + resourceList.add(Resource.newInstance(Integer.parseInt(resource[0]), 0)); } else { - resourceList.add(Resource.newInstance(Integer.valueOf(resource[0]), - Integer.valueOf(resource[1]))); + resourceList.add(Resource.newInstance(Integer.parseInt(resource[0]), + Integer.parseInt(resource[1]))); } } return resourceList.toArray(new Resource[resourceList.size()]); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyForNodePartitions.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyForNodePartitions.java index b266665..5ffae6e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyForNodePartitions.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyForNodePartitions.java @@ -929,12 +929,12 @@ private void mockContainers(String containersConfig, ApplicationAttemptId attemp throw new IllegalArgumentException("Format to define container is:" + "(priority,resource,host,expression,repeat,reserved)"); } - Priority pri = Priority.newInstance(Integer.valueOf(values[0])); + Priority pri = Priority.newInstance(Integer.parseInt(values[0])); Resource res = parseResourceFromString(values[1]); NodeId host = NodeId.newInstance(values[2], 1); String exp = values[3]; - int repeat = Integer.valueOf(values[4]); - boolean reserved = Boolean.valueOf(values[5]); + int repeat = Integer.parseInt(values[4]); + boolean reserved = Boolean.parseBoolean(values[5]); for (int i = 0; i < repeat; i++) { Container c = mock(Container.class); @@ -1068,7 +1068,7 @@ private void mockNodeLabelsManager(String nodeLabelsConfigStr) throws IOExceptio Resource res = parseResourceFromString(p.substring(p.indexOf("=") + 1, p.indexOf(","))); boolean exclusivity = - Boolean.valueOf(p.substring(p.indexOf(",") + 1, p.length())); + Boolean.parseBoolean(p.substring(p.indexOf(",") + 1, p.length())); when(nlm.getResourceByLabel(eq(partitionName), any(Resource.class))) .thenReturn(res); when(nlm.isExclusiveNodeLabel(eq(partitionName))).thenReturn(exclusivity); @@ -1088,10 +1088,10 @@ private Resource parseResourceFromString(String p) { String[] resource = p.split(":"); Resource res = Resources.createResource(0); if (resource.length == 1) { - res = Resources.createResource(Integer.valueOf(resource[0])); + res = Resources.createResource(Integer.parseInt(resource[0])); } else { - res = Resources.createResource(Integer.valueOf(resource[0]), - Integer.valueOf(resource[1])); + res = Resources.createResource(Integer.parseInt(resource[0]), + Integer.parseInt(resource[1])); } return res; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java index ab4b295..9d64667 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java @@ -310,7 +310,7 @@ private void methodAction(final HttpServletRequest req, String userApprovedParamS = req.getParameter(ProxyUriUtils.PROXY_APPROVAL_PARAM); boolean userWasWarned = false; - boolean userApproved = Boolean.valueOf(userApprovedParamS); + boolean userApproved = Boolean.parseBoolean(userApprovedParamS); boolean securityEnabled = isSecurityEnabled(); final String remoteUser = req.getRemoteUser(); final String pathInfo = req.getPathInfo(); @@ -342,7 +342,7 @@ private void methodAction(final HttpServletRequest req, for (Cookie c : cookies) { if (cookieName.equals(c.getName())) { userWasWarned = true; - userApproved = userApproved || Boolean.valueOf(c.getValue()); + userApproved = userApproved || Boolean.parseBoolean(c.getValue()); break; } }