Skip to content

Commit c7ec189

Browse files
authored
HADOOP-18018. unguava: remove Preconditions from hadoop-tools modules (#3688)
1 parent 0ed817b commit c7ec189

File tree

107 files changed

+115
-115
lines changed

Some content is hidden

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

107 files changed

+115
-115
lines changed

hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.net.URI;
2424

2525
import com.aliyun.oss.common.auth.CredentialsProvider;
26-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
26+
import org.apache.hadoop.util.Preconditions;
2727
import org.apache.commons.lang3.StringUtils;
2828
import org.apache.hadoop.conf.Configuration;
2929
import org.apache.hadoop.fs.LocalDirAllocator;

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/AWSClientIOException.java

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

2121
import com.amazonaws.AmazonClientException;
2222
import com.amazonaws.SdkBaseException;
23-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
23+
import org.apache.hadoop.util.Preconditions;
2424

2525
import java.io.IOException;
2626

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/AWSCredentialProviderList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.amazonaws.auth.AWSCredentialsProvider;
3333
import com.amazonaws.auth.AnonymousAWSCredentials;
3434
import org.apache.hadoop.classification.VisibleForTesting;
35-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
35+
import org.apache.hadoop.util.Preconditions;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import com.amazonaws.services.s3.model.KMSEncryptionMaterialsProvider;
4242
import com.amazonaws.util.AwsHostNameUtils;
4343
import com.amazonaws.util.RuntimeHttpUtils;
44-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
44+
import org.apache.hadoop.util.Preconditions;
4545
import org.apache.hadoop.classification.VisibleForTesting;
4646
import org.slf4j.Logger;
4747
import org.slf4j.LoggerFactory;

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/FailureInjectionPolicy.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.fs.s3a;
2020

21-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
21+
import org.apache.hadoop.util.Preconditions;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/InconsistentAmazonS3Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import com.amazonaws.services.s3.model.S3ObjectSummary;
5454
import com.amazonaws.services.s3.model.UploadPartRequest;
5555
import com.amazonaws.services.s3.model.UploadPartResult;
56-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
56+
import org.apache.hadoop.util.Preconditions;
5757
import org.slf4j.Logger;
5858
import org.slf4j.LoggerFactory;
5959

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Invoker.java

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

2626
import com.amazonaws.AmazonClientException;
2727
import com.amazonaws.SdkBaseException;
28-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
28+
import org.apache.hadoop.util.Preconditions;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.amazonaws.services.s3.model.PutObjectResult;
4141
import com.amazonaws.services.s3.model.UploadPartRequest;
4242

43-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
43+
import org.apache.hadoop.util.Preconditions;
4444
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
4545
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
4646
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.concurrent.atomic.AtomicBoolean;
3333
import java.util.concurrent.atomic.AtomicInteger;
3434

35-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
35+
import org.apache.hadoop.util.Preconditions;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
import org.apache.hadoop.fs.statistics.impl.IOStatisticsStore;
8686
import org.apache.hadoop.fs.store.audit.ActiveThreadSpanSource;
8787
import org.apache.hadoop.classification.VisibleForTesting;
88-
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
88+
import org.apache.hadoop.util.Preconditions;
8989
import org.slf4j.Logger;
9090
import org.slf4j.LoggerFactory;
9191

0 commit comments

Comments
 (0)