From c1efc5e0667db52502e90a51c80145f47b001a64 Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 10:48:13 -0700 Subject: [PATCH 01/21] minor change to create a PR for triggering CI run --- release/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/install.sh b/release/install.sh index aac854b..93c57b5 100755 --- a/release/install.sh +++ b/release/install.sh @@ -9,8 +9,8 @@ elif [ -f $OUTDIR ]; then rm -f $OUTDIR fi -cd $DIR # Protocol buffer compilation +cd $DIR mkdir generated protoc -I=$DIR --python_out=$OUTDIR $DIR/template_release_info.proto $DIR/template_ui_metadata.proto $DIR/templates.proto From a152890e5cdfc275e21618b33adc0df6af1ca6bd Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 11:20:00 -0700 Subject: [PATCH 02/21] add installing pip3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1de7c7a..2f0de3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ jdk: - oraclejdk8 install: + - sudo apt install python3-pip - pip3 install protobuf - pip3 install tensorflow From 87bf132ff3dd5b72f2d4e3a133fd2ce52a8ea86e Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 11:39:51 -0700 Subject: [PATCH 03/21] fixing installation of pip3 --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f0de3b..6fdffc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,14 @@ language: java jdk: - oraclejdk8 -install: - - sudo apt install python3-pip +sudo: false +dist: "trusty" +addons: + apt: + packages: + - "python3-pip" + +before_install: - pip3 install protobuf - pip3 install tensorflow From a349c6984a8367e6887c3887d48c52b2476dface Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 12:10:02 -0700 Subject: [PATCH 04/21] fix a perm issue --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fdffc5..418415d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ addons: packages: - "python3-pip" -before_install: - - pip3 install protobuf - - pip3 install tensorflow +sudo: required + - sudo pip3 install protobuf + - sudo pip3 install tensorflow script: - mvn clean compile test From 3e8c627e66e60c9196bc1545662dd2fbccb63f68 Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 12:24:52 -0700 Subject: [PATCH 05/21] removal of test from build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 418415d..5567c0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ sudo: required - sudo pip3 install tensorflow script: - - mvn clean compile test + - mvn clean compile - mvn package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true - release/install.sh From 9d69d7838e802e9c13ccc14e65d76be817455a27 Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 13:27:38 -0700 Subject: [PATCH 06/21] polish of mvn build --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5567c0c..f0a0b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,5 @@ sudo: required - sudo pip3 install tensorflow script: - - mvn clean compile - - mvn package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true + - mvn clean package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true - release/install.sh From 7b94d5313c2c9ded722c014042cfeb55f335a3bc Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 16:43:43 -0700 Subject: [PATCH 07/21] fix vendored Gauva error --- .../avro/AvroPubsubMessageRecord.java | 2 +- .../teleport/bigtable/AvroToBigtable.java | 2 +- .../cloud/teleport/io/DynamicJdbcIO.java | 10 +++---- .../kafka/connector/ConsumerSpEL.java | 6 ++--- ...CustomTimestampPolicyWithLimitedDelay.java | 2 +- .../kafka/connector/KafkaCheckpointMark.java | 2 +- .../kafka/connector/KafkaExactlyOnceSink.java | 26 +++++++++---------- .../teleport/kafka/connector/KafkaIO.java | 14 +++++----- .../teleport/kafka/connector/KafkaRecord.java | 2 +- .../kafka/connector/KafkaUnboundedReader.java | 10 +++---- .../kafka/connector/KafkaUnboundedSource.java | 6 ++--- .../kafka/connector/ProducerSpEL.java | 2 +- .../connector/TimestampPolicyFactory.java | 2 +- .../teleport/spanner/AvroRecordConverter.java | 2 +- .../spanner/AvroSchemaToDdlConverter.java | 4 +-- .../spanner/AvroTableFileAsMutations.java | 2 +- .../teleport/spanner/ExportTransform.java | 6 ++--- .../cloud/teleport/spanner/FileChecksum.java | 4 +-- .../cloud/teleport/spanner/FileShard.java | 4 +-- .../teleport/spanner/ImportTransform.java | 10 +++---- .../spanner/SpannerRecordConverter.java | 2 +- .../teleport/spanner/SplitIntoRangesFn.java | 2 +- .../teleport/spanner/TextImportTransform.java | 4 +-- .../teleport/spanner/TextRowToMutation.java | 2 +- .../cloud/teleport/spanner/ddl/Column.java | 2 +- .../cloud/teleport/spanner/ddl/Ddl.java | 18 ++++++------- .../cloud/teleport/spanner/ddl/Index.java | 2 +- .../teleport/spanner/ddl/IndexColumn.java | 2 +- .../spanner/ddl/InformationSchemaScanner.java | 10 +++---- .../cloud/teleport/spanner/ddl/Table.java | 4 +-- .../teleport/templates/BulkCompressor.java | 4 +-- .../teleport/templates/BulkDecompressor.java | 8 +++--- .../templates/DLPTextToBigQueryStreaming.java | 2 +- .../teleport/templates/PubSubToBigQuery.java | 2 +- .../templates/TextToBigQueryStreaming.java | 6 ++--- .../templates/common/BigQueryConverters.java | 2 +- .../templates/common/ErrorConverters.java | 2 +- .../common/JavascriptTextTransformer.java | 8 +++--- .../templates/common/SpannerConverters.java | 6 ++--- .../util/DualInputNestedValueProvider.java | 2 +- .../cloud/teleport/util/DurationUtils.java | 4 +-- .../cloud/teleport/util/ResourceUtils.java | 2 +- .../teleport/values/FailsafeElement.java | 2 +- .../teleport/bigtable/AvroToBigtableTest.java | 2 +- .../teleport/bigtable/BigtableToAvroTest.java | 2 +- ...omTimestampPolicyWithLimitedDelayTest.java | 2 +- .../spanner/AvroTableFileAsMutationsTest.java | 4 +-- .../teleport/spanner/CompareDatabases.java | 2 +- .../cloud/teleport/spanner/CopyDbTest.java | 4 +-- .../teleport/spanner/ExportTransformTest.java | 4 +-- .../teleport/spanner/ImportFromAvroTest.java | 2 +- .../teleport/spanner/ImportTransformTest.java | 2 +- .../spanner/SpannerRecordConverterTest.java | 2 +- .../ddl/InformationSchemaScannerTest.java | 4 +-- .../spanner/ddl/RandomDdlGenerator.java | 4 +-- .../ddl/RandomInsertMutationGenerator.java | 2 +- .../templates/BulkCompressorTest.java | 2 +- .../templates/BulkDecompressorTest.java | 2 +- .../DLPTextToBigQueryStreamingTest.java | 2 +- .../templates/KafkaToBigQueryTest.java | 2 +- .../teleport/templates/PubsubToAvroTest.java | 2 +- .../templates/PubsubToBigQueryTest.java | 4 +-- .../templates/PubsubToPubsubTest.java | 2 +- .../teleport/templates/WordCountTest.java | 2 +- .../common/BigQueryConvertersTest.java | 4 +-- .../templates/common/ErrorConvertersTest.java | 6 ++--- .../common/JavascriptTextTransformerTest.java | 4 +-- .../common/SpannerConverterTest.java | 2 +- .../google/cloud/teleport/util/TestUtils.java | 2 +- 69 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java b/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java index 513cf75..aab3156 100644 --- a/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java +++ b/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.avro; -import com.google.common.base.MoreObjects; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; import java.util.Map; import java.util.Objects; import org.apache.beam.sdk.coders.AvroCoder; diff --git a/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java b/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java index 8cefd5f..eff8ff0 100644 --- a/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java +++ b/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java @@ -18,7 +18,7 @@ import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.Mutation.SetCell; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import java.nio.ByteBuffer; import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions; diff --git a/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java b/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java index 788677a..83d85cb 100644 --- a/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java +++ b/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java @@ -16,13 +16,13 @@ package com.google.cloud.teleport.io; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Splitter; -import com.google.common.io.ByteStreams; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Splitter; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java b/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java index 3c07e91..999bded 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java @@ -17,10 +17,10 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterables; import java.util.Collection; import java.util.Map; import org.apache.kafka.clients.consumer.Consumer; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java b/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java index c90c3ea..ff7b160 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; import java.util.Optional; import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java index 9e5786e..5bcb2b4 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import com.google.common.base.Joiner; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; import java.io.Serializable; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java index 476047e..718fad7 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java @@ -17,23 +17,23 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.cloud.teleport.kafka.connector.KafkaIO.Write; -import com.google.common.base.MoreObjects; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.cache.RemovalCause; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; +import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.Cache; +import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.CacheBuilder; +import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.CacheLoader; +import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.LoadingCache; +import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.RemovalCause; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterators; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java index fba8816..7ae4a1f 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java @@ -17,15 +17,15 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.ParameterizedType; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java index d8d1689..1dda45e 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import com.google.common.base.Objects; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Objects; import java.io.Serializable; import java.util.Arrays; import javax.annotation.Nullable; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java index f2b1665..53ccd63 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java @@ -16,14 +16,14 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; import com.google.cloud.teleport.kafka.connector.KafkaCheckpointMark.PartitionMark; import com.google.cloud.teleport.kafka.connector.KafkaIO.Read; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; -import com.google.common.io.Closeables; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterators; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Closeables; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java index ceb5c62..490426c 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java @@ -17,11 +17,11 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; import com.google.cloud.teleport.kafka.connector.KafkaIO.Read; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java b/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java index e36aa14..3ae17a4 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java b/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java index 3a7fa3a..40ce84c 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java @@ -16,7 +16,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; import com.google.cloud.teleport.kafka.connector.TimestampPolicy.PartitionContext; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java b/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java index 1c111cc..d67231a 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java @@ -22,7 +22,7 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; import java.nio.ByteBuffer; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java b/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java index bdf0c1d..272114d 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java @@ -22,8 +22,8 @@ import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.util.Collection; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java b/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java index 0e2223a..8bc7f96 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java @@ -19,7 +19,7 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.Map; import org.apache.avro.generic.GenericRecord; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java index 821fc59..1df19e4 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java @@ -20,9 +20,9 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.base.Strings; -import com.google.common.base.Supplier; -import com.google.common.collect.Iterables; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Supplier; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterables; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java b/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java index bcef11d..2d8d8e3 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java +++ b/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java @@ -16,8 +16,8 @@ package com.google.cloud.teleport.spanner; -import com.google.common.hash.Hashing; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.hash.Hashing; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/spanner/FileShard.java b/src/main/java/com/google/cloud/teleport/spanner/FileShard.java index fd8209a..ada031d 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/FileShard.java +++ b/src/main/java/com/google/cloud/teleport/spanner/FileShard.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.spanner; import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java index c017761..432e47f 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java @@ -23,11 +23,11 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Strings; -import com.google.common.base.Verify; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Verify; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import com.google.protobuf.util.JsonFormat; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java b/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java index b458cf2..195006c 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner; import com.google.cloud.spanner.Struct; -import com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; import java.nio.ByteBuffer; import java.util.List; import java.util.regex.Pattern; diff --git a/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java b/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java index 6fbbf59..7e13caa 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java +++ b/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.spanner; -import com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; import java.io.FileNotFoundException; import java.util.Map; import org.apache.beam.sdk.io.FileIO.ReadableFile; diff --git a/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java index dd28a31..1741648 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java @@ -23,8 +23,8 @@ import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.HashMultimap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; import com.google.protobuf.util.JsonFormat; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java b/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java index 096a066..525913e 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java +++ b/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java @@ -22,7 +22,7 @@ import com.google.cloud.teleport.spanner.TextImportProtos.ImportManifest.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; import java.io.IOException; import java.io.Reader; import java.io.StringReader; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java index 33c22b1..a34a50f 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import com.google.cloud.spanner.Type; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.util.stream.Collectors; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java index d9cd1b6..e6aad81 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java @@ -16,15 +16,15 @@ package com.google.cloud.teleport.spanner.ddl; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSortedMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.common.collect.TreeMultimap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Function; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Collections2; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableSortedMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Sets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.TreeMultimap; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java index cc9c7da..9bb0154 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.util.stream.Collectors; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java index 7cf93b3..0e6a67b 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java index bc5a9ad..6ccb03f 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java @@ -19,11 +19,11 @@ import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; -import com.google.common.escape.Escaper; -import com.google.common.escape.Escapers; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; +import org.apache.beam.vendor.guava.v20_0.com.google.common.escape.Escaper; +import org.apache.beam.vendor.guava.v20_0.com.google.common.escape.Escapers; import java.util.Map; import java.util.NavigableMap; import org.apache.beam.sdk.values.KV; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java index ca122b1..5f5dc20 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; import java.io.IOException; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java b/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java index ca1dbfa..3ec763a 100644 --- a/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java +++ b/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java @@ -16,8 +16,8 @@ package com.google.cloud.teleport.templates; -import com.google.common.collect.ImmutableList; -import com.google.common.io.ByteStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; diff --git a/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java b/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java index 339a6a1..727b8b0 100644 --- a/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java +++ b/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java @@ -16,10 +16,10 @@ package com.google.cloud.teleport.templates; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.io.ByteStreams; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import java.io.IOException; import java.io.StringWriter; import java.nio.channels.ReadableByteChannel; diff --git a/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java b/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java index b21b5f0..eddd23a 100644 --- a/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java +++ b/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java @@ -21,7 +21,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.api.services.bigquery.model.TableSchema; import com.google.cloud.dlp.v2.DlpServiceClient; -import com.google.common.base.Charsets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; import com.google.privacy.dlp.v2.ContentItem; import com.google.privacy.dlp.v2.DeidentifyContentRequest; import com.google.privacy.dlp.v2.DeidentifyContentRequest.Builder; diff --git a/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java b/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java index 857ada3..b6739cb 100644 --- a/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java +++ b/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java @@ -29,7 +29,7 @@ import com.google.cloud.teleport.util.ResourceUtils; import com.google.cloud.teleport.util.ValueProviderUtils; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.nio.charset.StandardCharsets; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; diff --git a/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java b/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java index 23a9caf..e4c342a 100644 --- a/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java +++ b/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java @@ -24,9 +24,9 @@ import com.google.cloud.teleport.util.ResourceUtils; import com.google.cloud.teleport.util.ValueProviderUtils; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.base.Charsets; -import com.google.common.collect.ImmutableList; -import com.google.common.io.ByteStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.channels.Channels; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java index 4386827..8ace36c 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java @@ -21,7 +21,7 @@ import com.google.auto.value.AutoValue; import com.google.cloud.teleport.templates.common.DatastoreConverters.CheckNoKey; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.base.Throwables; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Throwables; import com.google.datastore.v1.Entity; import com.google.datastore.v1.Key; import com.google.datastore.v1.Key.PathElement; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java index 38918eb..5b0469a 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java @@ -25,7 +25,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.auto.value.AutoValue; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java b/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java index f37d724..128be23 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java @@ -16,13 +16,13 @@ package com.google.cloud.teleport.templates.common; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; import com.google.auto.value.AutoValue; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.base.Strings; -import com.google.common.base.Throwables; -import com.google.common.io.CharStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Throwables; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.CharStreams; import java.io.IOException; import java.io.Reader; import java.io.UncheckedIOException; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java index 5dfa9a9..50a2620 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java @@ -28,9 +28,9 @@ import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.Code; import com.google.cloud.spanner.Type.StructField; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java b/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java index 048ef63..7b65f55 100644 --- a/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java +++ b/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java @@ -15,7 +15,7 @@ */ package com.google.cloud.teleport.util; -import com.google.common.base.MoreObjects; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; import java.io.Serializable; import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/src/main/java/com/google/cloud/teleport/util/DurationUtils.java b/src/main/java/com/google/cloud/teleport/util/DurationUtils.java index 34be961..6093de8 100644 --- a/src/main/java/com/google/cloud/teleport/util/DurationUtils.java +++ b/src/main/java/com/google/cloud/teleport/util/DurationUtils.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.util; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; import java.util.Locale; import org.joda.time.DateTime; diff --git a/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java b/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java index 183cff4..610359a 100644 --- a/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java +++ b/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.util; -import com.google.common.io.Resources; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; import java.nio.charset.StandardCharsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java b/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java index 5cc30b6..1369cef 100644 --- a/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java +++ b/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.values; import com.google.cloud.teleport.coders.FailsafeElementCoder; -import com.google.common.base.MoreObjects; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; import java.util.Objects; import org.apache.avro.reflect.Nullable; import org.apache.beam.sdk.coders.DefaultCoder; diff --git a/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java b/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java index 48baefa..4d1fc16 100644 --- a/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java +++ b/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java @@ -23,7 +23,7 @@ import static com.google.cloud.teleport.bigtable.TestUtils.createBigtableRowMutations; import com.google.bigtable.v2.Mutation; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import java.util.List; import org.apache.beam.sdk.testing.PAssert; diff --git a/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java b/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java index d110947..b93d2f6 100644 --- a/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java @@ -23,7 +23,7 @@ import static com.google.cloud.teleport.bigtable.TestUtils.upsertBigtableCell; import com.google.bigtable.v2.Row; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.util.List; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; diff --git a/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java b/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java index eb11197..8ed7ee1 100644 --- a/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java +++ b/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java b/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java index 432c786..e02494d 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java @@ -23,8 +23,8 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.ddl.Ddl; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java b/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java index f528a7e..ecea432 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java +++ b/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java @@ -21,7 +21,7 @@ import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.IndexColumn; import com.google.cloud.teleport.spanner.ddl.Table; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Base64; import org.apache.beam.sdk.io.gcp.spanner.ReadOperation; diff --git a/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java b/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java index f3b99ca..50b2f1e 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java @@ -36,8 +36,8 @@ import com.google.cloud.teleport.spanner.ddl.InformationSchemaScanner; import com.google.cloud.teleport.spanner.ddl.RandomDdlGenerator; import com.google.cloud.teleport.spanner.ddl.RandomInsertMutationGenerator; -import com.google.common.collect.Lists; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.io.IOException; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java b/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java index b785605..42a614b 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java @@ -25,8 +25,8 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ExportTransform.BuildTableManifests; import com.google.cloud.teleport.spanner.ExportTransform.CreateDatabaseManifest; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import java.nio.file.Files; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java b/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java index ba646bb..d61f2d3 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java @@ -22,7 +22,7 @@ import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import com.google.protobuf.util.JsonFormat; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.io.File; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java b/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java index 7c0ab20..9158bbe 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java @@ -18,7 +18,7 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ImportTransform.ValidateInputFiles; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java b/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java index 6cc2e89..7c68863 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java @@ -26,7 +26,7 @@ import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.ddl.Ddl; -import com.google.common.collect.Lists; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; import java.util.Arrays; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java index dce4c71..9e263c1 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java @@ -36,8 +36,8 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.IntegrationTest; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java index bac9e89..ce7cc6a 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.cloud.spanner.Type; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Sets; import java.util.Random; import java.util.Set; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java index cd7126b..511e325 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.spanner.ddl; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; import com.google.cloud.ByteArray; import com.google.cloud.Date; diff --git a/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java b/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java index e9390ff..5d27f47 100644 --- a/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java @@ -18,7 +18,7 @@ import com.google.cloud.teleport.templates.BulkCompressor.Compressor; import com.google.cloud.teleport.util.TestUtils; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.io.IOException; import java.nio.file.Path; import java.util.List; diff --git a/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java b/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java index 3527e78..2f77e4a 100644 --- a/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java @@ -26,7 +26,7 @@ import com.google.cloud.teleport.templates.BulkDecompressor.Decompress; import com.google.cloud.teleport.util.TestUtils; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import java.io.IOException; import java.nio.file.Path; import java.util.Arrays; diff --git a/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java b/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java index 293054c..3df502d 100644 --- a/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java @@ -22,7 +22,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.templates.DLPTextToBigQueryStreaming.CSVReader; import com.google.cloud.teleport.templates.DLPTextToBigQueryStreaming.TableRowProcessorDoFn; -import com.google.common.base.Charsets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; import com.google.privacy.dlp.v2.Table; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java b/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java index 0e7e136..d997517 100644 --- a/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java @@ -23,7 +23,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.coders.FailsafeElementCoder; import com.google.cloud.teleport.templates.KafkaToBigQuery.MessageToTableRow; -import com.google.common.io.Resources; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.KvCoder; import org.apache.beam.sdk.coders.StringUtf8Coder; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java index 582a6b6..45a2d63 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java @@ -19,7 +19,7 @@ import com.google.cloud.teleport.avro.AvroPubsubMessageRecord; import com.google.cloud.teleport.templates.PubsubToAvro.PubsubMessageToArchiveDoFn; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.beam.sdk.io.gcp.pubsub.PubsubMessage; import org.apache.beam.sdk.testing.NeedsRunner; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java index 7a687fa..a583f2c 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java @@ -23,8 +23,8 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.coders.FailsafeElementCoder; import com.google.cloud.teleport.templates.PubSubToBigQuery.PubsubMessageToTableRow; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Resources; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.io.gcp.pubsub.PubsubMessage; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java index 38b1e38..0e66c46 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.templates; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java b/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java index 4174478..c3a2a81 100644 --- a/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import com.google.cloud.teleport.templates.WordCount.CountWords; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java b/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java index 2ff6129..08d0b9b 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java @@ -31,8 +31,8 @@ import com.google.cloud.teleport.templates.common.BigQueryConverters.AvroToEntity; import com.google.cloud.teleport.templates.common.BigQueryConverters.FailsafeJsonToTableRow; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; import com.google.datastore.v1.Entity; import com.google.datastore.v1.Value; import com.google.protobuf.NullValue; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java b/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java index fe4299a..03cbe0a 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java @@ -28,9 +28,9 @@ import com.google.cloud.teleport.templates.common.ErrorConverters.FailedPubsubMessageToTableRowFn; import com.google.cloud.teleport.templates.common.ErrorConverters.FailedStringToTableRowFn; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.base.Charsets; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Files; +import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java b/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java index af9c2ae..ef5ec43 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java @@ -29,8 +29,8 @@ import com.google.cloud.teleport.templates.common.JavascriptTextTransformer.JavascriptRuntime; import com.google.cloud.teleport.templates.common.JavascriptTextTransformer.TransformTextViaJavascript; import com.google.cloud.teleport.values.FailsafeElement; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Resources; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java b/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java index c64554a..5345222 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java @@ -31,7 +31,7 @@ import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Value; -import com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.nio.channels.ReadableByteChannel; diff --git a/src/test/java/com/google/cloud/teleport/util/TestUtils.java b/src/test/java/com/google/cloud/teleport/util/TestUtils.java index 538266e..a88cf2e 100644 --- a/src/test/java/com/google/cloud/teleport/util/TestUtils.java +++ b/src/test/java/com/google/cloud/teleport/util/TestUtils.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.util; -import com.google.common.io.ByteStreams; +import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.channels.Channels; From be5ac2ee989fdf198af40920775e7b68c115c834 Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 16:55:21 -0700 Subject: [PATCH 08/21] Revert "fix vendored Gauva error" This reverts commit 7b94d5313c2c9ded722c014042cfeb55f335a3bc. --- .../avro/AvroPubsubMessageRecord.java | 2 +- .../teleport/bigtable/AvroToBigtable.java | 2 +- .../cloud/teleport/io/DynamicJdbcIO.java | 10 +++---- .../kafka/connector/ConsumerSpEL.java | 6 ++--- ...CustomTimestampPolicyWithLimitedDelay.java | 2 +- .../kafka/connector/KafkaCheckpointMark.java | 2 +- .../kafka/connector/KafkaExactlyOnceSink.java | 26 +++++++++---------- .../teleport/kafka/connector/KafkaIO.java | 14 +++++----- .../teleport/kafka/connector/KafkaRecord.java | 2 +- .../kafka/connector/KafkaUnboundedReader.java | 10 +++---- .../kafka/connector/KafkaUnboundedSource.java | 6 ++--- .../kafka/connector/ProducerSpEL.java | 2 +- .../connector/TimestampPolicyFactory.java | 2 +- .../teleport/spanner/AvroRecordConverter.java | 2 +- .../spanner/AvroSchemaToDdlConverter.java | 4 +-- .../spanner/AvroTableFileAsMutations.java | 2 +- .../teleport/spanner/ExportTransform.java | 6 ++--- .../cloud/teleport/spanner/FileChecksum.java | 4 +-- .../cloud/teleport/spanner/FileShard.java | 4 +-- .../teleport/spanner/ImportTransform.java | 10 +++---- .../spanner/SpannerRecordConverter.java | 2 +- .../teleport/spanner/SplitIntoRangesFn.java | 2 +- .../teleport/spanner/TextImportTransform.java | 4 +-- .../teleport/spanner/TextRowToMutation.java | 2 +- .../cloud/teleport/spanner/ddl/Column.java | 2 +- .../cloud/teleport/spanner/ddl/Ddl.java | 18 ++++++------- .../cloud/teleport/spanner/ddl/Index.java | 2 +- .../teleport/spanner/ddl/IndexColumn.java | 2 +- .../spanner/ddl/InformationSchemaScanner.java | 10 +++---- .../cloud/teleport/spanner/ddl/Table.java | 4 +-- .../teleport/templates/BulkCompressor.java | 4 +-- .../teleport/templates/BulkDecompressor.java | 8 +++--- .../templates/DLPTextToBigQueryStreaming.java | 2 +- .../teleport/templates/PubSubToBigQuery.java | 2 +- .../templates/TextToBigQueryStreaming.java | 6 ++--- .../templates/common/BigQueryConverters.java | 2 +- .../templates/common/ErrorConverters.java | 2 +- .../common/JavascriptTextTransformer.java | 8 +++--- .../templates/common/SpannerConverters.java | 6 ++--- .../util/DualInputNestedValueProvider.java | 2 +- .../cloud/teleport/util/DurationUtils.java | 4 +-- .../cloud/teleport/util/ResourceUtils.java | 2 +- .../teleport/values/FailsafeElement.java | 2 +- .../teleport/bigtable/AvroToBigtableTest.java | 2 +- .../teleport/bigtable/BigtableToAvroTest.java | 2 +- ...omTimestampPolicyWithLimitedDelayTest.java | 2 +- .../spanner/AvroTableFileAsMutationsTest.java | 4 +-- .../teleport/spanner/CompareDatabases.java | 2 +- .../cloud/teleport/spanner/CopyDbTest.java | 4 +-- .../teleport/spanner/ExportTransformTest.java | 4 +-- .../teleport/spanner/ImportFromAvroTest.java | 2 +- .../teleport/spanner/ImportTransformTest.java | 2 +- .../spanner/SpannerRecordConverterTest.java | 2 +- .../ddl/InformationSchemaScannerTest.java | 4 +-- .../spanner/ddl/RandomDdlGenerator.java | 4 +-- .../ddl/RandomInsertMutationGenerator.java | 2 +- .../templates/BulkCompressorTest.java | 2 +- .../templates/BulkDecompressorTest.java | 2 +- .../DLPTextToBigQueryStreamingTest.java | 2 +- .../templates/KafkaToBigQueryTest.java | 2 +- .../teleport/templates/PubsubToAvroTest.java | 2 +- .../templates/PubsubToBigQueryTest.java | 4 +-- .../templates/PubsubToPubsubTest.java | 2 +- .../teleport/templates/WordCountTest.java | 2 +- .../common/BigQueryConvertersTest.java | 4 +-- .../templates/common/ErrorConvertersTest.java | 6 ++--- .../common/JavascriptTextTransformerTest.java | 4 +-- .../common/SpannerConverterTest.java | 2 +- .../google/cloud/teleport/util/TestUtils.java | 2 +- 69 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java b/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java index aab3156..513cf75 100644 --- a/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java +++ b/src/main/java/com/google/cloud/teleport/avro/AvroPubsubMessageRecord.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.avro; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; import java.util.Map; import java.util.Objects; import org.apache.beam.sdk.coders.AvroCoder; diff --git a/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java b/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java index eff8ff0..8cefd5f 100644 --- a/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java +++ b/src/main/java/com/google/cloud/teleport/bigtable/AvroToBigtable.java @@ -18,7 +18,7 @@ import com.google.bigtable.v2.Mutation; import com.google.bigtable.v2.Mutation.SetCell; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import java.nio.ByteBuffer; import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions; diff --git a/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java b/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java index 83d85cb..788677a 100644 --- a/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java +++ b/src/main/java/com/google/cloud/teleport/io/DynamicJdbcIO.java @@ -16,13 +16,13 @@ package com.google.cloud.teleport.io; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Splitter; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Splitter; +import com.google.common.io.ByteStreams; +import com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java b/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java index 999bded..3c07e91 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/ConsumerSpEL.java @@ -17,10 +17,10 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterables; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import java.util.Collection; import java.util.Map; import org.apache.kafka.clients.consumer.Consumer; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java b/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java index ff7b160..c90c3ea 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelay.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.util.Optional; import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java index 5bcb2b4..9e5786e 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaCheckpointMark.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; +import com.google.common.base.Joiner; import java.io.Serializable; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java index 718fad7..476047e 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaExactlyOnceSink.java @@ -17,23 +17,23 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.cloud.teleport.kafka.connector.KafkaIO.Write; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; -import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.Cache; -import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.CacheBuilder; -import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.CacheLoader; -import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.LoadingCache; -import org.apache.beam.vendor.guava.v20_0.com.google.common.cache.RemovalCause; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterators; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.base.MoreObjects; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalCause; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java index 7ae4a1f..fba8816 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaIO.java @@ -17,15 +17,15 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.ParameterizedType; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java index 1dda45e..d8d1689 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaRecord.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Objects; +import com.google.common.base.Objects; import java.io.Serializable; import java.util.Arrays; import javax.annotation.Nullable; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java index 53ccd63..f2b1665 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedReader.java @@ -16,14 +16,14 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; import com.google.cloud.teleport.kafka.connector.KafkaCheckpointMark.PartitionMark; import com.google.cloud.teleport.kafka.connector.KafkaIO.Read; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterators; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Closeables; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; +import com.google.common.io.Closeables; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java index 490426c..ceb5c62 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/KafkaUnboundedSource.java @@ -17,11 +17,11 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; import com.google.cloud.teleport.kafka.connector.KafkaIO.Read; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Joiner; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java b/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java index 3ae17a4..e36aa14 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/ProducerSpEL.java @@ -17,7 +17,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java b/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java index 40ce84c..3a7fa3a 100644 --- a/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java +++ b/src/main/java/com/google/cloud/teleport/kafka/connector/TimestampPolicyFactory.java @@ -16,7 +16,7 @@ */ package com.google.cloud.teleport.kafka.connector; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import com.google.cloud.teleport.kafka.connector.TimestampPolicy.PartitionContext; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java b/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java index d67231a..1c111cc 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroRecordConverter.java @@ -22,7 +22,7 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.nio.ByteBuffer; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java b/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java index 272114d..bdf0c1d 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroSchemaToDdlConverter.java @@ -22,8 +22,8 @@ import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import java.util.Collection; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; diff --git a/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java b/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java index 8bc7f96..0e2223a 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java +++ b/src/main/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutations.java @@ -19,7 +19,7 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.Map; import org.apache.avro.generic.GenericRecord; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java index 1df19e4..821fc59 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ExportTransform.java @@ -20,9 +20,9 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Supplier; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Iterables; +import com.google.common.base.Strings; +import com.google.common.base.Supplier; +import com.google.common.collect.Iterables; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java b/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java index 2d8d8e3..bcef11d 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java +++ b/src/main/java/com/google/cloud/teleport/spanner/FileChecksum.java @@ -16,8 +16,8 @@ package com.google.cloud.teleport.spanner; -import org.apache.beam.vendor.guava.v20_0.com.google.common.hash.Hashing; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.hash.Hashing; +import com.google.common.io.Files; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/spanner/FileShard.java b/src/main/java/com/google/cloud/teleport/spanner/FileShard.java index ada031d..fd8209a 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/FileShard.java +++ b/src/main/java/com/google/cloud/teleport/spanner/FileShard.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.spanner; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java index 432e47f..c017761 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ImportTransform.java @@ -23,11 +23,11 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Verify; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; +import com.google.common.base.Verify; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Lists; import com.google.protobuf.util.JsonFormat; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java b/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java index 195006c..b458cf2 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java +++ b/src/main/java/com/google/cloud/teleport/spanner/SpannerRecordConverter.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner; import com.google.cloud.spanner.Struct; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import com.google.common.base.Strings; import java.nio.ByteBuffer; import java.util.List; import java.util.regex.Pattern; diff --git a/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java b/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java index 7e13caa..6fbbf59 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java +++ b/src/main/java/com/google/cloud/teleport/spanner/SplitIntoRangesFn.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.spanner; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.io.FileNotFoundException; import java.util.Map; import org.apache.beam.sdk.io.FileIO.ReadableFile; diff --git a/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java b/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java index 1741648..dd28a31 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java +++ b/src/main/java/com/google/cloud/teleport/spanner/TextImportTransform.java @@ -23,8 +23,8 @@ import com.google.cloud.teleport.spanner.ddl.Column; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.HashMultimap; import com.google.protobuf.util.JsonFormat; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java b/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java index 525913e..096a066 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java +++ b/src/main/java/com/google/cloud/teleport/spanner/TextRowToMutation.java @@ -22,7 +22,7 @@ import com.google.cloud.teleport.spanner.TextImportProtos.ImportManifest.TableManifest; import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; +import com.google.common.base.Strings; import java.io.IOException; import java.io.Reader; import java.io.StringReader; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java index a34a50f..33c22b1 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Column.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import com.google.cloud.spanner.Type; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.util.stream.Collectors; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java index e6aad81..d9cd1b6 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Ddl.java @@ -16,15 +16,15 @@ package com.google.cloud.teleport.spanner.ddl; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Function; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Collections2; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableSortedMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Sets; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.TreeMultimap; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.google.common.collect.TreeMultimap; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java index 9bb0154..cc9c7da 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Index.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.util.stream.Collectors; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java index 0e6a67b..7cf93b3 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/IndexColumn.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java index 6ccb03f..bc5a9ad 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScanner.java @@ -19,11 +19,11 @@ import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; -import org.apache.beam.vendor.guava.v20_0.com.google.common.escape.Escaper; -import org.apache.beam.vendor.guava.v20_0.com.google.common.escape.Escapers; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; +import com.google.common.escape.Escaper; +import com.google.common.escape.Escapers; import java.util.Map; import java.util.NavigableMap; import org.apache.beam.sdk.values.KV; diff --git a/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java b/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java index 5f5dc20..ca122b1 100644 --- a/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java +++ b/src/main/java/com/google/cloud/teleport/spanner/ddl/Table.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.spanner.ddl; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import java.io.IOException; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java b/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java index 3ec763a..ca1dbfa 100644 --- a/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java +++ b/src/main/java/com/google/cloud/teleport/templates/BulkCompressor.java @@ -16,8 +16,8 @@ package com.google.cloud.teleport.templates; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; +import com.google.common.collect.ImmutableList; +import com.google.common.io.ByteStreams; import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; diff --git a/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java b/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java index 727b8b0..339a6a1 100644 --- a/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java +++ b/src/main/java/com/google/cloud/teleport/templates/BulkDecompressor.java @@ -16,10 +16,10 @@ package com.google.cloud.teleport.templates; -import org.apache.beam.vendor.guava.v20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; +import com.google.common.io.ByteStreams; +import com.google.common.io.Files; import java.io.IOException; import java.io.StringWriter; import java.nio.channels.ReadableByteChannel; diff --git a/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java b/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java index eddd23a..b21b5f0 100644 --- a/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java +++ b/src/main/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreaming.java @@ -21,7 +21,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.api.services.bigquery.model.TableSchema; import com.google.cloud.dlp.v2.DlpServiceClient; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import com.google.privacy.dlp.v2.ContentItem; import com.google.privacy.dlp.v2.DeidentifyContentRequest; import com.google.privacy.dlp.v2.DeidentifyContentRequest.Builder; diff --git a/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java b/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java index b6739cb..857ada3 100644 --- a/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java +++ b/src/main/java/com/google/cloud/teleport/templates/PubSubToBigQuery.java @@ -29,7 +29,7 @@ import com.google.cloud.teleport.util.ResourceUtils; import com.google.cloud.teleport.util.ValueProviderUtils; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.nio.charset.StandardCharsets; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; diff --git a/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java b/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java index e4c342a..23a9caf 100644 --- a/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java +++ b/src/main/java/com/google/cloud/teleport/templates/TextToBigQueryStreaming.java @@ -24,9 +24,9 @@ import com.google.cloud.teleport.util.ResourceUtils; import com.google.cloud.teleport.util.ValueProviderUtils; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableList; +import com.google.common.io.ByteStreams; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.channels.Channels; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java index 8ace36c..4386827 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/BigQueryConverters.java @@ -21,7 +21,7 @@ import com.google.auto.value.AutoValue; import com.google.cloud.teleport.templates.common.DatastoreConverters.CheckNoKey; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.google.datastore.v1.Entity; import com.google.datastore.v1.Key; import com.google.datastore.v1.Key.PathElement; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java index 5b0469a..38918eb 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/ErrorConverters.java @@ -25,7 +25,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.auto.value.AutoValue; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java b/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java index 128be23..f37d724 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformer.java @@ -16,13 +16,13 @@ package com.google.cloud.teleport.templates.common; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import com.google.auto.value.AutoValue; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Throwables; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.CharStreams; +import com.google.common.base.Strings; +import com.google.common.base.Throwables; +import com.google.common.io.CharStreams; import java.io.IOException; import java.io.Reader; import java.io.UncheckedIOException; diff --git a/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java b/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java index 50a2620..5dfa9a9 100644 --- a/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java +++ b/src/main/java/com/google/cloud/teleport/templates/common/SpannerConverters.java @@ -28,9 +28,9 @@ import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.Code; import com.google.cloud.spanner.Type.StructField; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.io.IOException; diff --git a/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java b/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java index 7b65f55..048ef63 100644 --- a/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java +++ b/src/main/java/com/google/cloud/teleport/util/DualInputNestedValueProvider.java @@ -15,7 +15,7 @@ */ package com.google.cloud.teleport.util; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; import java.io.Serializable; import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.transforms.SerializableFunction; diff --git a/src/main/java/com/google/cloud/teleport/util/DurationUtils.java b/src/main/java/com/google/cloud/teleport/util/DurationUtils.java index 6093de8..34be961 100644 --- a/src/main/java/com/google/cloud/teleport/util/DurationUtils.java +++ b/src/main/java/com/google/cloud/teleport/util/DurationUtils.java @@ -17,8 +17,8 @@ package com.google.cloud.teleport.util; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkArgument; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Locale; import org.joda.time.DateTime; diff --git a/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java b/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java index 610359a..183cff4 100644 --- a/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java +++ b/src/main/java/com/google/cloud/teleport/util/ResourceUtils.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.util; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; +import com.google.common.io.Resources; import java.nio.charset.StandardCharsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java b/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java index 1369cef..5cc30b6 100644 --- a/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java +++ b/src/main/java/com/google/cloud/teleport/values/FailsafeElement.java @@ -17,7 +17,7 @@ package com.google.cloud.teleport.values; import com.google.cloud.teleport.coders.FailsafeElementCoder; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; import java.util.Objects; import org.apache.avro.reflect.Nullable; import org.apache.beam.sdk.coders.DefaultCoder; diff --git a/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java b/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java index 4d1fc16..48baefa 100644 --- a/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java +++ b/src/test/java/com/google/cloud/teleport/bigtable/AvroToBigtableTest.java @@ -23,7 +23,7 @@ import static com.google.cloud.teleport.bigtable.TestUtils.createBigtableRowMutations; import com.google.bigtable.v2.Mutation; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import java.util.List; import org.apache.beam.sdk.testing.PAssert; diff --git a/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java b/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java index b93d2f6..d110947 100644 --- a/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/bigtable/BigtableToAvroTest.java @@ -23,7 +23,7 @@ import static com.google.cloud.teleport.bigtable.TestUtils.upsertBigtableCell; import com.google.bigtable.v2.Row; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.testing.TestPipeline; diff --git a/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java b/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java index 8ed7ee1..eb11197 100644 --- a/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java +++ b/src/test/java/com/google/cloud/teleport/kafka/connector/CustomTimestampPolicyWithLimitedDelayTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java b/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java index e02494d..432c786 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/AvroTableFileAsMutationsTest.java @@ -23,8 +23,8 @@ import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.ddl.Ddl; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java b/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java index ecea432..f528a7e 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java +++ b/src/test/java/com/google/cloud/teleport/spanner/CompareDatabases.java @@ -21,7 +21,7 @@ import com.google.cloud.teleport.spanner.ddl.Ddl; import com.google.cloud.teleport.spanner.ddl.IndexColumn; import com.google.cloud.teleport.spanner.ddl.Table; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Base64; import org.apache.beam.sdk.io.gcp.spanner.ReadOperation; diff --git a/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java b/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java index 50b2f1e..f3b99ca 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java @@ -36,8 +36,8 @@ import com.google.cloud.teleport.spanner.ddl.InformationSchemaScanner; import com.google.cloud.teleport.spanner.ddl.RandomDdlGenerator; import com.google.cloud.teleport.spanner.ddl.RandomInsertMutationGenerator; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.collect.Lists; +import com.google.common.io.Files; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.io.IOException; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java b/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java index 42a614b..b785605 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ExportTransformTest.java @@ -25,8 +25,8 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ExportTransform.BuildTableManifests; import com.google.cloud.teleport.spanner.ExportTransform.CreateDatabaseManifest; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import java.nio.file.Files; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java b/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java index d61f2d3..ba646bb 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ImportFromAvroTest.java @@ -22,7 +22,7 @@ import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.io.Files; import com.google.protobuf.util.JsonFormat; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.io.File; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java b/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java index 9158bbe..7c0ab20 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ImportTransformTest.java @@ -18,7 +18,7 @@ import com.google.cloud.teleport.spanner.ExportProtos.TableManifest; import com.google.cloud.teleport.spanner.ImportTransform.ValidateInputFiles; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java b/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java index 7c68863..6cc2e89 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/SpannerRecordConverterTest.java @@ -26,7 +26,7 @@ import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.ddl.Ddl; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.Arrays; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java index 9e263c1..dce4c71 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/InformationSchemaScannerTest.java @@ -36,8 +36,8 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; import com.google.cloud.teleport.spanner.IntegrationTest; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.HashMultimap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java index ce7cc6a..bac9e89 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.cloud.spanner.Type; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; import java.util.Random; import java.util.Set; diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java index 511e325..cd7126b 100644 --- a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java +++ b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomInsertMutationGenerator.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.spanner.ddl; -import static org.apache.beam.vendor.guava.v20_0.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.cloud.ByteArray; import com.google.cloud.Date; diff --git a/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java b/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java index 5d27f47..e9390ff 100644 --- a/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/BulkCompressorTest.java @@ -18,7 +18,7 @@ import com.google.cloud.teleport.templates.BulkCompressor.Compressor; import com.google.cloud.teleport.util.TestUtils; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.nio.file.Path; import java.util.List; diff --git a/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java b/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java index 2f77e4a..3527e78 100644 --- a/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/BulkDecompressorTest.java @@ -26,7 +26,7 @@ import com.google.cloud.teleport.templates.BulkDecompressor.Decompress; import com.google.cloud.teleport.util.TestUtils; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.io.Files; import java.io.IOException; import java.nio.file.Path; import java.util.Arrays; diff --git a/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java b/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java index 3df502d..293054c 100644 --- a/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/DLPTextToBigQueryStreamingTest.java @@ -22,7 +22,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.templates.DLPTextToBigQueryStreaming.CSVReader; import com.google.cloud.teleport.templates.DLPTextToBigQueryStreaming.TableRowProcessorDoFn; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import com.google.privacy.dlp.v2.Table; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java b/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java index d997517..0e7e136 100644 --- a/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/KafkaToBigQueryTest.java @@ -23,7 +23,7 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.coders.FailsafeElementCoder; import com.google.cloud.teleport.templates.KafkaToBigQuery.MessageToTableRow; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.KvCoder; import org.apache.beam.sdk.coders.StringUtf8Coder; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java index 45a2d63..582a6b6 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToAvroTest.java @@ -19,7 +19,7 @@ import com.google.cloud.teleport.avro.AvroPubsubMessageRecord; import com.google.cloud.teleport.templates.PubsubToAvro.PubsubMessageToArchiveDoFn; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.beam.sdk.io.gcp.pubsub.PubsubMessage; import org.apache.beam.sdk.testing.NeedsRunner; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java index a583f2c..7a687fa 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToBigQueryTest.java @@ -23,8 +23,8 @@ import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.teleport.coders.FailsafeElementCoder; import com.google.cloud.teleport.templates.PubSubToBigQuery.PubsubMessageToTableRow; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Resources; import org.apache.beam.sdk.coders.CoderRegistry; import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.io.gcp.pubsub.PubsubMessage; diff --git a/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java b/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java index 0e66c46..38b1e38 100644 --- a/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/PubsubToPubsubTest.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.templates; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java b/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java index c3a2a81..4174478 100644 --- a/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/WordCountTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import com.google.cloud.teleport.templates.WordCount.CountWords; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java b/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java index 08d0b9b..2ff6129 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/BigQueryConvertersTest.java @@ -31,8 +31,8 @@ import com.google.cloud.teleport.templates.common.BigQueryConverters.AvroToEntity; import com.google.cloud.teleport.templates.common.BigQueryConverters.FailsafeJsonToTableRow; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; import com.google.datastore.v1.Entity; import com.google.datastore.v1.Value; import com.google.protobuf.NullValue; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java b/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java index 03cbe0a..fe4299a 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/ErrorConvertersTest.java @@ -28,9 +28,9 @@ import com.google.cloud.teleport.templates.common.ErrorConverters.FailedPubsubMessageToTableRowFn; import com.google.cloud.teleport.templates.common.ErrorConverters.FailedStringToTableRowFn; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.base.Charsets; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java b/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java index ef5ec43..af9c2ae 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/JavascriptTextTransformerTest.java @@ -29,8 +29,8 @@ import com.google.cloud.teleport.templates.common.JavascriptTextTransformer.JavascriptRuntime; import com.google.cloud.teleport.templates.common.JavascriptTextTransformer.TransformTextViaJavascript; import com.google.cloud.teleport.values.FailsafeElement; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.Resources; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Resources; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java b/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java index 5345222..c64554a 100644 --- a/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java +++ b/src/test/java/com/google/cloud/teleport/templates/common/SpannerConverterTest.java @@ -31,7 +31,7 @@ import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Value; -import org.apache.beam.vendor.guava.v20_0.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.Serializable; import java.nio.channels.ReadableByteChannel; diff --git a/src/test/java/com/google/cloud/teleport/util/TestUtils.java b/src/test/java/com/google/cloud/teleport/util/TestUtils.java index a88cf2e..538266e 100644 --- a/src/test/java/com/google/cloud/teleport/util/TestUtils.java +++ b/src/test/java/com/google/cloud/teleport/util/TestUtils.java @@ -16,7 +16,7 @@ package com.google.cloud.teleport.util; -import org.apache.beam.vendor.guava.v20_0.com.google.common.io.ByteStreams; +import com.google.common.io.ByteStreams; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.channels.Channels; From d41d4cf0a9823756a4595ac5cf60caf75c077f5e Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 16:58:42 -0700 Subject: [PATCH 09/21] add checkstyle.skip to compilation --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0a0b91..f96202d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,6 @@ sudo: required - sudo pip3 install tensorflow script: - - mvn clean package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true + - mvn clean compile -Dcheckstyle.skip=true + - mvn package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true - release/install.sh From 95b67c292955f49ddc47d72e52ea4bb2fd9b82ff Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 17:08:23 -0700 Subject: [PATCH 10/21] Revert "add checkstyle.skip to compilation" This reverts commit d41d4cf0a9823756a4595ac5cf60caf75c077f5e. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f96202d..f0a0b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,5 @@ sudo: required - sudo pip3 install tensorflow script: - - mvn clean compile -Dcheckstyle.skip=true - - mvn package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true + - mvn clean package -Dcheckstyle.skip=true -DskipTests=true -Dmaven.javadoc.skip=true - release/install.sh From 1380ed1fdb40772dcaec3a210a3afbb21c8427df Mon Sep 17 00:00:00 2001 From: Yan Zhou Date: Tue, 4 Jun 2019 17:28:17 -0700 Subject: [PATCH 11/21] add stylecheck skip --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f4c11ac..c850add 100644 --- a/pom.xml +++ b/pom.xml @@ -545,6 +545,7 @@ true false true + true