Repository: hadoop Updated Branches: refs/heads/branch-3 fe5fcc084 -> 692260754
HADOOP-15223. Replace Collections.EMPTY* with empty* when available. Contributed by fang zhenyi. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/69226075 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/69226075 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/69226075 Branch: refs/heads/branch-3 Commit: 692260754c08029d3f58f5c9bc1787661677a131 Parents: fe5fcc0 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Feb 23 14:14:38 2018 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Feb 23 14:14:38 2018 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/crypto/key/KeyProvider.java | 6 ++---- .../lib/service/security/DummyGroupMapping.java | 3 +-- .../main/java/org/apache/hadoop/fs/s3a/Listing.java | 2 +- .../java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 2 +- .../apache/hadoop/tools/mapred/TestCopyCommitter.java | 2 +- .../hadoop/yarn/sls/scheduler/RMNodeWrapper.java | 6 ++---- .../server/resourcemanager/DefaultAMSProcessor.java | 4 ++-- .../ProportionalCapacityPreemptionPolicy.java | 14 ++++++-------- .../rmapp/attempt/RMAppAttemptImpl.java | 2 +- .../server/resourcemanager/rmnode/RMNodeImpl.java | 2 +- .../resourcemanager/rmnode/RMNodeStatusEvent.java | 3 +-- .../resourcemanager/TestResourceTrackerService.java | 5 ++--- ...ortionalCapacityPreemptionPolicyMockFramework.java | 2 +- 13 files changed, 22 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java index c1c371b..62cc381 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java @@ -199,9 +199,8 @@ public abstract class KeyProvider { return cipher; } - @SuppressWarnings("unchecked") public Map<String, String> getAttributes() { - return (attributes == null) ? Collections.EMPTY_MAP : attributes; + return (attributes == null) ? Collections.emptyMap() : attributes; } /** @@ -370,9 +369,8 @@ public abstract class KeyProvider { return description; } - @SuppressWarnings("unchecked") public Map<String, String> getAttributes() { - return (attributes == null) ? Collections.EMPTY_MAP : attributes; + return (attributes == null) ? Collections.emptyMap() : attributes; } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java index 1676909..9ef786d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java @@ -28,7 +28,6 @@ import org.apache.hadoop.test.HadoopUsersConfTestHelper; public class DummyGroupMapping implements GroupMappingServiceProvider { @Override - @SuppressWarnings("unchecked") public List<String> getGroups(String user) throws IOException { if (user.equals("root")) { return Arrays.asList("admin"); @@ -37,7 +36,7 @@ public class DummyGroupMapping implements GroupMappingServiceProvider { return Arrays.asList("nobody"); } else { String[] groups = HadoopUsersConfTestHelper.getHadoopUserGroups(user); - return (groups != null) ? Arrays.asList(groups) : Collections.EMPTY_LIST; + return (groups != null) ? Arrays.asList(groups) : Collections.emptyList(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java index d9f059b..dc8e90d 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java @@ -713,7 +713,7 @@ public class Listing { if (tombstones != null) { this.tombstones = tombstones; } else { - this.tombstones = Collections.EMPTY_SET; + this.tombstones = Collections.emptySet(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java index 2171957..a0793a7 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java @@ -1810,7 +1810,7 @@ public class S3AFileSystem extends FileSystem { // Check MetadataStore, if any. PathMetadata pm = metadataStore.get(path, needEmptyDirectoryFlag); - Set<Path> tombstones = Collections.EMPTY_SET; + Set<Path> tombstones = Collections.emptySet(); if (pm != null) { if (pm.isDeleted()) { throw new FileNotFoundException("Path " + f + " is recorded as " + http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java index 6ee37cc..bf151cd 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java @@ -415,7 +415,7 @@ public class TestCopyCommitter { @Override public List getSplits(JobContext context) throws IOException, InterruptedException { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java index 6b7ac3c..e003ccc 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java @@ -143,9 +143,8 @@ public class RMNodeWrapper implements RMNode { } @Override - @SuppressWarnings("unchecked") public List<UpdatedContainerInfo> pullContainerUpdates() { - List<UpdatedContainerInfo> list = Collections.EMPTY_LIST; + List<UpdatedContainerInfo> list = Collections.emptyList(); if (! pulled) { list = updates; pulled = true; @@ -173,11 +172,10 @@ public class RMNodeWrapper implements RMNode { // TODO Auto-generated method stub } - @SuppressWarnings("unchecked") @Override public List<Container> pullNewlyIncreasedContainers() { // TODO Auto-generated method stub - return Collections.EMPTY_LIST; + return Collections.emptyList(); } public OpportunisticContainersStatus getOpportunisticContainersStatus() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java index 6874338..6da8107 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java @@ -197,10 +197,10 @@ final class DefaultAMSProcessor implements ApplicationMasterServiceProcessor { request.getResourceBlacklistRequest(); List<String> blacklistAdditions = (blacklistRequest != null) ? - blacklistRequest.getBlacklistAdditions() : Collections.EMPTY_LIST; + blacklistRequest.getBlacklistAdditions() : Collections.emptyList(); List<String> blacklistRemovals = (blacklistRequest != null) ? - blacklistRequest.getBlacklistRemovals() : Collections.EMPTY_LIST; + blacklistRequest.getBlacklistRemovals() : Collections.emptyList(); RMApp app = getRmContext().getRMApps().get(appAttemptId.getApplicationId()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java index 2c072d2..a719b8f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java @@ -132,23 +132,21 @@ public class ProportionalCapacityPreemptionPolicy private Map<String, PreemptableQueue> preemptableQueues; private Set<ContainerId> killableContainers; - @SuppressWarnings("unchecked") public ProportionalCapacityPreemptionPolicy() { clock = SystemClock.getInstance(); - allPartitions = Collections.EMPTY_SET; - leafQueueNames = Collections.EMPTY_SET; - preemptableQueues = Collections.EMPTY_MAP; + allPartitions = Collections.emptySet(); + leafQueueNames = Collections.emptySet(); + preemptableQueues = Collections.emptyMap(); } - @SuppressWarnings("unchecked") @VisibleForTesting public ProportionalCapacityPreemptionPolicy(RMContext context, CapacityScheduler scheduler, Clock clock) { init(context.getYarnConfiguration(), context, scheduler); this.clock = clock; - allPartitions = Collections.EMPTY_SET; - leafQueueNames = Collections.EMPTY_SET; - preemptableQueues = Collections.EMPTY_MAP; + allPartitions = Collections.emptySet(); + leafQueueNames = Collections.emptySet(); + preemptableQueues = Collections.emptyMap(); } public void init(Configuration config, RMContext context, http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 57837f9..4585ae1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -2269,7 +2269,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { return attempt.getBlacklistedNodes(); } } - return Collections.EMPTY_SET; + return Collections.emptySet(); } protected void onInvalidTranstion(RMAppAttemptEventType rmAppAttemptEventType, http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java index 2b013a0..db2d849 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java @@ -1500,7 +1500,7 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> { writeLock.lock(); if (nmReportedIncreasedContainers.isEmpty()) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } else { List<Container> container = new ArrayList<Container>(nmReportedIncreasedContainers.values()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java index f9fe159..e0b2383 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeStatusEvent.java @@ -89,10 +89,9 @@ public class RMNodeStatusEvent extends RMNodeEvent { this.logAggregationReportsForApps = logAggregationReportsForApps; } - @SuppressWarnings("unchecked") public List<Container> getNMReportedIncreasedContainers() { return this.nodeStatus.getIncreasedContainers() == null ? - Collections.EMPTY_LIST : this.nodeStatus.getIncreasedContainers(); + Collections.emptyList() : this.nodeStatus.getIncreasedContainers(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java index 5cd574e..4e1ac4a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java @@ -725,13 +725,12 @@ public class TestResourceTrackerService extends NodeLabelTestBase { } } - @SuppressWarnings("unchecked") private NodeStatus getNodeStatusObject(NodeId nodeId) { NodeStatus status = Records.newRecord(NodeStatus.class); status.setNodeId(nodeId); status.setResponseId(0); - status.setContainersStatuses(Collections.EMPTY_LIST); - status.setKeepAliveApplications(Collections.EMPTY_LIST); + status.setContainersStatuses(Collections.emptyList()); + status.setKeepAliveApplications(Collections.emptyList()); return status; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java index 0bc5cb5..0ac5f15 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java @@ -754,7 +754,7 @@ public class ProportionalCapacityPreemptionPolicyMockFramework { } } - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
