Skip to content

Commit b9c56ad

Browse files
committed
YARN-10805. Replace Guava Lists usage by Hadoop's own Lists in hadoop-yarn-project
1 parent a2a0283 commit b9c56ad

File tree

52 files changed

+155
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+155
-98
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717

1818
package org.apache.hadoop.yarn.service.webapp;
1919

20-
import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
2220
import com.google.inject.Inject;
2321
import com.google.inject.Singleton;
2422

2523
import org.apache.hadoop.conf.Configuration;
2624
import org.apache.hadoop.security.AccessControlException;
2725
import org.apache.hadoop.security.UserGroupInformation;
26+
import org.apache.hadoop.util.Lists;
2827
import org.apache.hadoop.util.Sets;
2928
import org.apache.hadoop.util.VersionInfo;
3029
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -44,6 +43,8 @@
4443
import org.slf4j.Logger;
4544
import org.slf4j.LoggerFactory;
4645

46+
import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
47+
4748
import javax.servlet.http.HttpServletRequest;
4849
import javax.ws.rs.*;
4950
import javax.ws.rs.core.Context;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
import javax.servlet.http.HttpServletRequest;
2727
import javax.servlet.http.HttpServletResponse;
2828

29-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
30-
3129
import org.apache.hadoop.conf.Configuration;
30+
import org.apache.hadoop.util.Lists;
3231
import org.apache.hadoop.yarn.conf.YarnConfiguration;
3332
import org.apache.hadoop.yarn.exceptions.YarnException;
3433
import org.eclipse.jetty.server.Server;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.hadoop.yarn.service;
2020

2121
import java.util.function.Supplier;
22-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
2322
import org.apache.hadoop.fs.Path;
2423
import org.apache.hadoop.io.DataOutputBuffer;
2524
import org.apache.hadoop.registry.client.api.RegistryOperations;
@@ -29,6 +28,7 @@
2928
import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes;
3029
import org.apache.hadoop.security.Credentials;
3130
import org.apache.hadoop.test.GenericTestUtils;
31+
import org.apache.hadoop.util.Lists;
3232
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
3333
import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
3434
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.hadoop.yarn.service;
1919

20-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
20+
import org.apache.hadoop.util.Lists;
2121
import org.apache.hadoop.yarn.service.api.records.Component;
2222
import org.apache.hadoop.yarn.service.api.records.ConfigFile;
2323
import org.apache.hadoop.yarn.service.api.records.Configuration;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818

1919
package org.apache.hadoop.yarn.service;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
22-
import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
2321
import org.apache.commons.io.FileUtils;
2422
import org.apache.hadoop.fs.Path;
2523
import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
2624
import org.apache.hadoop.registry.client.binding.RegistryUtils;
2725
import org.apache.hadoop.security.UserGroupInformation;
2826
import org.apache.hadoop.test.GenericTestUtils;
27+
import org.apache.hadoop.util.Lists;
2928
import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
3029
import org.apache.hadoop.yarn.api.records.*;
3130
import org.apache.hadoop.yarn.client.api.YarnClient;
@@ -49,6 +48,7 @@
4948
import org.apache.hadoop.yarn.service.exceptions.SliderException;
5049
import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
5150
import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
51+
5252
import org.hamcrest.CoreMatchers;
5353
import org.junit.After;
5454
import org.junit.Assert;
@@ -59,6 +59,8 @@
5959
import org.slf4j.Logger;
6060
import org.slf4j.LoggerFactory;
6161

62+
import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
63+
6264
import java.io.File;
6365
import java.io.IOException;
6466
import java.util.*;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
package org.apache.hadoop.yarn.service.client;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
2221
import org.apache.hadoop.conf.Configuration;
22+
import org.apache.hadoop.util.Lists;
2323
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
2424
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
2525
import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/instance/TestComponentInstance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.service.component.instance;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
21+
import org.apache.hadoop.util.Lists;
2222
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
2323
import org.apache.hadoop.yarn.api.records.ApplicationId;
2424
import org.apache.hadoop.yarn.api.records.ContainerExitStatus;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestAbstractProviderService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
package org.apache.hadoop.yarn.service.provider;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
2221
import org.apache.commons.io.FileUtils;
2322
import org.apache.hadoop.fs.Path;
23+
import org.apache.hadoop.util.Lists;
2424
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
2525
import org.apache.hadoop.yarn.api.records.ApplicationId;
2626
import org.apache.hadoop.yarn.api.records.Container;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestFilterUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.service.utils;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
21+
import org.apache.hadoop.util.Lists;
2222
import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
2323
import org.apache.hadoop.yarn.service.MockRunningServiceContext;
2424
import org.apache.hadoop.yarn.service.ServiceContext;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import java.util.concurrent.ConcurrentMap;
2828
import java.util.concurrent.atomic.AtomicBoolean;
2929

30-
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
3130
import org.apache.hadoop.classification.InterfaceAudience.Private;
3231
import org.apache.hadoop.classification.InterfaceStability.Unstable;
3332
import org.apache.hadoop.conf.Configuration;
3433
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
34+
import org.apache.hadoop.util.Lists;
3535
import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
3636
import org.apache.hadoop.yarn.api.protocolrecords.ContainerUpdateRequest;
3737
import org.apache.hadoop.yarn.api.protocolrecords.ContainerUpdateResponse;

0 commit comments

Comments
 (0)