[FLINK-31676][Connector/Pulsar] Replace Shaded Guava from Flink with …

…Shaded Guava from Pulsar
apache · Mar 31, 2023 · 3910dad · 3910dad
1 parent 33526f5
commit 3910dad
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 42 deletions.
diff --git a/.../src/main/java/org/apache/flink/connector/pulsar/common/config/PulsarConfigValidator.java b/.../src/main/java/org/apache/flink/connector/pulsar/common/config/PulsarConfigValidator.java
@@ -22,8 +22,8 @@
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.Configuration;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableList;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableSet;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/...n/java/org/apache/flink/connector/pulsar/common/handler/PulsarAdminInvocationHandler.java b/...n/java/org/apache/flink/connector/pulsar/common/handler/PulsarAdminInvocationHandler.java
@@ -20,11 +20,10 @@
 
 import org.apache.flink.connector.pulsar.common.config.PulsarConfiguration;
 
-import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.RateLimiter;
-
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.PulsarAdminException.NotFoundException;
+import org.apache.pulsar.shade.com.google.common.util.concurrent.RateLimiter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +38,7 @@
 import static org.apache.flink.connector.pulsar.common.config.PulsarOptions.PULSAR_ADMIN_REQUEST_RATES;
 import static org.apache.flink.connector.pulsar.common.config.PulsarOptions.PULSAR_ADMIN_REQUEST_RETRIES;
 import static org.apache.flink.connector.pulsar.common.config.PulsarOptions.PULSAR_ADMIN_REQUEST_WAIT_MILLIS;
-import static org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+import static org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 
 /** A wrapper which wraps the {@link PulsarAdmin} with request retry and rate limit support. */
 public class PulsarAdminInvocationHandler implements InvocationHandler {

diff --git a/...ava/org/apache/flink/connector/pulsar/common/schema/factories/PrimitiveSchemaFactory.java b/...ava/org/apache/flink/connector/pulsar/common/schema/factories/PrimitiveSchemaFactory.java
@@ -21,11 +21,10 @@
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.connector.pulsar.common.schema.PulsarSchemaFactory;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
-
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.common.schema.SchemaInfo;
 import org.apache.pulsar.common.schema.SchemaType;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableSet;
 
 import static org.apache.flink.util.Preconditions.checkArgument;
 

diff --git a/...ctor-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/PulsarWriter.java b/...ctor-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/PulsarWriter.java
@@ -40,12 +40,11 @@
 import org.apache.flink.metrics.groups.SinkWriterMetricGroup;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.TypedMessageBuilder;
+import org.apache.pulsar.shade.com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...rc/main/java/org/apache/flink/connector/pulsar/sink/writer/router/KeyHashTopicRouter.java b/...rc/main/java/org/apache/flink/connector/pulsar/sink/writer/router/KeyHashTopicRouter.java
@@ -23,9 +23,8 @@
 import org.apache.flink.connector.pulsar.sink.writer.context.PulsarSinkContext;
 import org.apache.flink.connector.pulsar.source.enumerator.topic.TopicPartition;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-
 import org.apache.pulsar.client.impl.Hash;
+import org.apache.pulsar.shade.com.google.common.base.Strings;
 
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;

diff --git a/...r/src/main/java/org/apache/flink/connector/pulsar/sink/writer/topic/MetadataListener.java b/...r/src/main/java/org/apache/flink/connector/pulsar/sink/writer/topic/MetadataListener.java
@@ -28,17 +28,16 @@
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheLoader;
-import org.apache.flink.shaded.guava30.com.google.common.cache.LoadingCache;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.PulsarAdminException.NotFoundException;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
+import org.apache.pulsar.shade.com.google.common.cache.CacheBuilder;
+import org.apache.pulsar.shade.com.google.common.cache.CacheLoader;
+import org.apache.pulsar.shade.com.google.common.cache.LoadingCache;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...r/src/main/java/org/apache/flink/connector/pulsar/sink/writer/topic/ProducerRegister.java b/...r/src/main/java/org/apache/flink/connector/pulsar/sink/writer/topic/ProducerRegister.java
@@ -29,8 +29,6 @@
 import org.apache.flink.metrics.groups.SinkWriterMetricGroup;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import org.apache.flink.shaded.guava30.com.google.common.io.Closer;
-
 import org.apache.pulsar.client.api.CryptoKeyReader;
 import org.apache.pulsar.client.api.MessageCrypto;
 import org.apache.pulsar.client.api.Producer;
@@ -54,6 +52,7 @@
 import org.apache.pulsar.common.protocol.schema.SchemaHash;
 import org.apache.pulsar.common.schema.SchemaType;
 import org.apache.pulsar.shade.com.google.common.base.Strings;
+import org.apache.pulsar.shade.com.google.common.io.Closer;
 
 import javax.annotation.Nullable;
 

diff --git a/.../src/main/java/org/apache/flink/connector/pulsar/source/config/PulsarConsumerBuilder.java b/.../src/main/java/org/apache/flink/connector/pulsar/source/config/PulsarConsumerBuilder.java
@@ -18,8 +18,6 @@
 
 package org.apache.flink.connector.pulsar.source.config;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.ConsumerInterceptor;
 import org.apache.pulsar.client.api.DeadLetterPolicy;
@@ -30,6 +28,7 @@
 import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.shade.com.google.common.base.Strings;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

diff --git a/...c/main/java/org/apache/flink/connector/pulsar/source/enumerator/topic/TopicNameUtils.java b/...c/main/java/org/apache/flink/connector/pulsar/source/enumerator/topic/TopicNameUtils.java
@@ -20,9 +20,8 @@
 
 import org.apache.flink.annotation.Internal;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableList;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/...c/main/java/org/apache/flink/connector/pulsar/source/enumerator/topic/TopicPartition.java b/...c/main/java/org/apache/flink/connector/pulsar/source/enumerator/topic/TopicPartition.java
@@ -23,11 +23,10 @@
 import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
 import org.apache.flink.connector.pulsar.sink.writer.router.TopicRouter;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-
 import org.apache.pulsar.client.api.Range;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...main/java/org/apache/flink/connector/pulsar/source/reader/PulsarPartitionSplitReader.java b/...main/java/org/apache/flink/connector/pulsar/source/reader/PulsarPartitionSplitReader.java
@@ -38,8 +38,6 @@
 import org.apache.flink.util.FlinkRuntimeException;
 import org.apache.flink.util.Preconditions;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
@@ -54,6 +52,7 @@
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
+import org.apache.pulsar.shade.com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../java/org/apache/flink/connector/pulsar/sink/writer/router/RoundRobinTopicRouterTest.java b/.../java/org/apache/flink/connector/pulsar/sink/writer/router/RoundRobinTopicRouterTest.java
@@ -22,8 +22,7 @@
 import org.apache.flink.connector.pulsar.sink.config.SinkConfiguration;
 import org.apache.flink.connector.pulsar.source.enumerator.topic.TopicPartition;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;

diff --git a/.../apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumStateSerializerTest.java b/.../apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumStateSerializerTest.java
@@ -24,9 +24,8 @@
 import org.apache.flink.core.memory.DataOutputSerializer;
 import org.apache.flink.util.InstantiationUtil;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.Sets;
-
 import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.shade.com.google.common.collect.Sets;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

diff --git a/.../java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumeratorTest.java b/.../java/org/apache/flink/connector/pulsar/source/enumerator/PulsarSourceEnumeratorTest.java
@@ -31,9 +31,8 @@
 import org.apache.flink.connector.pulsar.source.split.PulsarPartitionSplit;
 import org.apache.flink.connector.pulsar.testutils.PulsarTestSuiteBase;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
-
 import org.apache.pulsar.client.api.RegexSubscriptionMode;
+import org.apache.pulsar.shade.com.google.common.collect.ImmutableSet;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
@@ -52,7 +51,7 @@
 import static org.apache.flink.connector.pulsar.source.enumerator.PulsarSourceEnumState.initialState;
 import static org.apache.flink.connector.pulsar.source.enumerator.subscriber.PulsarSubscriber.getTopicPatternSubscriber;
 import static org.apache.flink.connector.pulsar.testutils.runtime.PulsarRuntimeOperator.DEFAULT_PARTITIONS;
-import static org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+import static org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** Unit tests for {@link PulsarSourceEnumerator}. */

diff --git a/.../java/org/apache/flink/connector/pulsar/source/reader/PulsarPartitionSplitReaderTest.java b/.../java/org/apache/flink/connector/pulsar/source/reader/PulsarPartitionSplitReaderTest.java
@@ -54,8 +54,8 @@
 import static org.apache.flink.connector.pulsar.testutils.runtime.PulsarRuntimeOperator.NUM_RECORDS_PER_PARTITION;
 import static org.apache.flink.core.testutils.CommonTestUtils.waitUtil;
 import static org.apache.flink.metrics.groups.UnregisteredMetricsGroup.createSourceReaderMetricGroup;
-import static org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static org.apache.pulsar.client.api.Schema.STRING;
+import static org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

diff --git a/...src/test/java/org/apache/flink/connector/pulsar/source/reader/PulsarSourceReaderTest.java b/...src/test/java/org/apache/flink/connector/pulsar/source/reader/PulsarSourceReaderTest.java
@@ -69,7 +69,7 @@
 import static org.apache.flink.connector.pulsar.testutils.PulsarTestCommonUtils.createPartitionSplits;
 import static org.apache.flink.connector.pulsar.testutils.runtime.PulsarRuntimeOperator.DEFAULT_PARTITIONS;
 import static org.apache.flink.connector.pulsar.testutils.runtime.PulsarRuntimeOperator.NUM_RECORDS_PER_PARTITION;
-import static org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+import static org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.fail;

diff --git a/...sar/src/test/java/org/apache/flink/connector/pulsar/testutils/function/ControlSource.java b/...sar/src/test/java/org/apache/flink/connector/pulsar/testutils/function/ControlSource.java
@@ -29,13 +29,12 @@
 import org.apache.flink.testutils.junit.SharedObjectsExtension;
 import org.apache.flink.testutils.junit.SharedReference;
 
-import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles;
-
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../test/java/org/apache/flink/connector/pulsar/testutils/runtime/PulsarRuntimeOperator.java b/.../test/java/org/apache/flink/connector/pulsar/testutils/runtime/PulsarRuntimeOperator.java
@@ -23,8 +23,6 @@
 import org.apache.flink.connector.pulsar.common.config.PulsarConfiguration;
 import org.apache.flink.connector.pulsar.source.enumerator.topic.TopicPartition;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.PulsarAdminException.ConflictException;
@@ -42,6 +40,7 @@
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
 import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.shade.com.google.common.base.Strings;
 
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/...org/apache/flink/connector/pulsar/testutils/runtime/singleton/PulsarSingletonRuntime.java b/...org/apache/flink/connector/pulsar/testutils/runtime/singleton/PulsarSingletonRuntime.java
@@ -23,7 +23,7 @@
 import org.apache.flink.connector.pulsar.testutils.runtime.container.PulsarContainerRuntime;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import org.apache.flink.shaded.guava30.com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.pulsar.shade.com.google.common.util.concurrent.Uninterruptibles;
 
 import java.time.Duration;
 import java.util.Map;

diff --git a/...src/test/java/org/apache/flink/connector/pulsar/testutils/sink/PulsarSinkTestContext.java b/...src/test/java/org/apache/flink/connector/pulsar/testutils/sink/PulsarSinkTestContext.java
@@ -17,9 +17,8 @@
 import org.apache.flink.connector.testframe.external.sink.TestingSinkSettings;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import org.apache.flink.shaded.guava30.com.google.common.io.Closer;
-
 import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.shade.com.google.common.io.Closer;
 
 import java.util.ArrayList;
 import java.util.List;