relocate metadata outside of source package

apache · Jan 10, 2024 · 7afb2c5 · 7afb2c5
1 parent 6ccf31d
commit 7afb2c5
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 53 deletions.
diff --git a/...amic/source/metadata/ClusterMetadata.java → ...fka/dynamic/metadata/ClusterMetadata.java b/...amic/source/metadata/ClusterMetadata.java → ...fka/dynamic/metadata/ClusterMetadata.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.metadata;
 
 import org.apache.flink.annotation.Experimental;
 

diff --git a/...source/metadata/KafkaMetadataService.java → ...ynamic/metadata/KafkaMetadataService.java b/...source/metadata/KafkaMetadataService.java → ...ynamic/metadata/KafkaMetadataService.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.metadata;
 
 import org.apache.flink.annotation.Experimental;
 

diff --git a/.../dynamic/source/metadata/KafkaStream.java → ...r/kafka/dynamic/metadata/KafkaStream.java b/.../dynamic/source/metadata/KafkaStream.java → ...r/kafka/dynamic/metadata/KafkaStream.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.metadata;
 
 import org.apache.flink.annotation.Experimental;
 

diff --git a/...ta/SingleClusterTopicMetadataService.java → ...ta/SingleClusterTopicMetadataService.java b/...ta/SingleClusterTopicMetadataService.java → ...ta/SingleClusterTopicMetadataService.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.metadata;
 
 import org.apache.flink.annotation.Experimental;
 import org.apache.flink.connector.kafka.source.KafkaPropertiesUtil;

diff --git a/...fka/src/main/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSource.java b/...fka/src/main/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSource.java
@@ -29,11 +29,11 @@
 import org.apache.flink.api.connector.source.SplitEnumerator;
 import org.apache.flink.api.connector.source.SplitEnumeratorContext;
 import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.DynamicKafkaSourceEnumState;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.DynamicKafkaSourceEnumStateSerializer;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.DynamicKafkaSourceEnumerator;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.KafkaStreamSubscriber;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
 import org.apache.flink.connector.kafka.dynamic.source.reader.DynamicKafkaSourceReader;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplitSerializer;

diff --git a/.../main/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSourceBuilder.java b/.../main/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSourceBuilder.java
@@ -20,10 +20,10 @@
 
 import org.apache.flink.annotation.Experimental;
 import org.apache.flink.api.connector.source.Boundedness;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.KafkaStreamSetSubscriber;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.KafkaStreamSubscriber;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.StreamPatternSubscriber;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
 import org.apache.flink.connector.kafka.source.KafkaSourceOptions;
 import org.apache.flink.connector.kafka.source.enumerator.initializer.NoStoppingOffsetsInitializer;
 import org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsInitializer;

diff --git a/...urce/metadata/GetMetadataUpdateEvent.java → ...ynamic/source/GetMetadataUpdateEvent.java b/...urce/metadata/GetMetadataUpdateEvent.java → ...ynamic/source/GetMetadataUpdateEvent.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.source;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.connector.source.SourceEvent;

diff --git a/.../source/metadata/MetadataUpdateEvent.java → ...a/dynamic/source/MetadataUpdateEvent.java b/.../source/metadata/MetadataUpdateEvent.java → ...a/dynamic/source/MetadataUpdateEvent.java
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.connector.kafka.dynamic.source.metadata;
+package org.apache.flink.connector.kafka.dynamic.source;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.connector.source.SourceEvent;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.reader.DynamicKafkaSourceReader;
 
 import com.google.common.base.MoreObjects;

diff --git a/...g/apache/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumState.java b/...g/apache/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumState.java
@@ -19,7 +19,7 @@
 package org.apache.flink.connector.kafka.dynamic.source.enumerator;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.source.enumerator.KafkaSourceEnumState;
 
 import java.util.HashMap;

diff --git a/...link/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumStateSerializer.java b/...link/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumStateSerializer.java
@@ -19,8 +19,8 @@
 package org.apache.flink.connector.kafka.dynamic.source.enumerator;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.source.enumerator.KafkaSourceEnumState;
 import org.apache.flink.connector.kafka.source.enumerator.KafkaSourceEnumStateSerializer;
 import org.apache.flink.core.io.SimpleVersionedSerializer;

diff --git a/.../apache/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumerator.java b/.../apache/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumerator.java
@@ -24,13 +24,13 @@
 import org.apache.flink.api.connector.source.SourceEvent;
 import org.apache.flink.api.connector.source.SplitEnumerator;
 import org.apache.flink.api.connector.source.SplitEnumeratorContext;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.DynamicKafkaSourceOptions;
+import org.apache.flink.connector.kafka.dynamic.source.GetMetadataUpdateEvent;
+import org.apache.flink.connector.kafka.dynamic.source.MetadataUpdateEvent;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.KafkaStreamSubscriber;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.GetMetadataUpdateEvent;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.MetadataUpdateEvent;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.source.KafkaPropertiesUtil;
 import org.apache.flink.connector.kafka.source.enumerator.KafkaSourceEnumState;

diff --git a/...pache/flink/connector/kafka/dynamic/source/enumerator/StoppableKafkaEnumContextProxy.java b/...pache/flink/connector/kafka/dynamic/source/enumerator/StoppableKafkaEnumContextProxy.java
@@ -23,7 +23,7 @@
 import org.apache.flink.api.connector.source.SourceEvent;
 import org.apache.flink.api.connector.source.SplitEnumeratorContext;
 import org.apache.flink.api.connector.source.SplitsAssignment;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.source.split.KafkaPartitionSplit;
 import org.apache.flink.metrics.groups.SplitEnumeratorMetricGroup;

diff --git a/.../flink/connector/kafka/dynamic/source/enumerator/subscriber/KafkaStreamSetSubscriber.java b/.../flink/connector/kafka/dynamic/source/enumerator/subscriber/KafkaStreamSetSubscriber.java
@@ -19,8 +19,8 @@
 package org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...che/flink/connector/kafka/dynamic/source/enumerator/subscriber/KafkaStreamSubscriber.java b/...che/flink/connector/kafka/dynamic/source/enumerator/subscriber/KafkaStreamSubscriber.java
@@ -19,8 +19,8 @@
 package org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber;
 
 import org.apache.flink.annotation.Experimental;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import java.io.Serializable;
 import java.util.Set;

diff --git a/...e/flink/connector/kafka/dynamic/source/enumerator/subscriber/StreamPatternSubscriber.java b/...e/flink/connector/kafka/dynamic/source/enumerator/subscriber/StreamPatternSubscriber.java
@@ -19,8 +19,8 @@
 package org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import com.google.common.collect.ImmutableSet;
 

diff --git a/...java/org/apache/flink/connector/kafka/dynamic/source/reader/DynamicKafkaSourceReader.java b/...java/org/apache/flink/connector/kafka/dynamic/source/reader/DynamicKafkaSourceReader.java
@@ -28,10 +28,10 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
 import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.GetMetadataUpdateEvent;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.MetadataUpdateEvent;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.source.GetMetadataUpdateEvent;
+import org.apache.flink.connector.kafka.dynamic.source.MetadataUpdateEvent;
 import org.apache.flink.connector.kafka.dynamic.source.metrics.KafkaClusterMetricGroup;
 import org.apache.flink.connector.kafka.dynamic.source.metrics.KafkaClusterMetricGroupManager;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;

diff --git a/...c/test/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSourceITTest.java b/...c/test/java/org/apache/flink/connector/kafka/dynamic/source/DynamicKafkaSourceITTest.java
@@ -21,10 +21,10 @@
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
 import org.apache.flink.api.common.restartstrategy.RestartStrategies;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.SingleClusterTopicMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.SingleClusterTopicMetadataService;
 import org.apache.flink.connector.kafka.source.KafkaSourceOptions;
 import org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsInitializer;
 import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDeserializationSchema;

diff --git a/.../connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumStateSerializerTest.java b/.../connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumStateSerializerTest.java
@@ -18,8 +18,8 @@
 
 package org.apache.flink.connector.kafka.dynamic.source.enumerator;
 
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.source.enumerator.AssignmentStatus;
 import org.apache.flink.connector.kafka.source.enumerator.KafkaSourceEnumState;
 import org.apache.flink.connector.kafka.source.enumerator.TopicPartitionAndAssignmentStatus;

diff --git a/...che/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumeratorTest.java b/...che/flink/connector/kafka/dynamic/source/enumerator/DynamicKafkaSourceEnumeratorTest.java
@@ -24,12 +24,12 @@
 import org.apache.flink.api.connector.source.SplitEnumeratorContext;
 import org.apache.flink.api.connector.source.SplitsAssignment;
 import org.apache.flink.api.connector.source.mocks.MockSplitEnumeratorContext;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.DynamicKafkaSourceOptions;
+import org.apache.flink.connector.kafka.dynamic.source.GetMetadataUpdateEvent;
 import org.apache.flink.connector.kafka.dynamic.source.enumerator.subscriber.KafkaStreamSetSubscriber;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.GetMetadataUpdateEvent;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.source.KafkaSourceOptions;
 import org.apache.flink.connector.kafka.source.enumerator.initializer.NoStoppingOffsetsInitializer;

diff --git a/...e/flink/connector/kafka/dynamic/source/enumerator/StoppableKafkaEnumContextProxyTest.java b/...e/flink/connector/kafka/dynamic/source/enumerator/StoppableKafkaEnumContextProxyTest.java
@@ -20,8 +20,8 @@
 
 import org.apache.flink.api.connector.source.SplitEnumeratorContext;
 import org.apache.flink.api.connector.source.mocks.MockSplitEnumeratorContext;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.testutils.MockKafkaMetadataService;
 import org.apache.flink.core.testutils.CommonTestUtils;

diff --git a/.../flink/connector/kafka/dynamic/source/metadata/SingleClusterTopicMetadataServiceTest.java b/.../flink/connector/kafka/dynamic/source/metadata/SingleClusterTopicMetadataServiceTest.java
@@ -18,6 +18,10 @@
 
 package org.apache.flink.connector.kafka.dynamic.source.metadata;
 
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.SingleClusterTopicMetadataService;
 import org.apache.flink.streaming.connectors.kafka.DynamicKafkaSourceTestHelper;
 import org.apache.flink.streaming.connectors.kafka.KafkaTestBase;
 

diff --git a/.../org/apache/flink/connector/kafka/dynamic/source/reader/DynamicKafkaSourceReaderTest.java b/.../org/apache/flink/connector/kafka/dynamic/source/reader/DynamicKafkaSourceReaderTest.java
@@ -20,8 +20,8 @@
 
 import org.apache.flink.api.connector.source.Boundedness;
 import org.apache.flink.api.connector.source.SourceReader;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.MetadataUpdateEvent;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.source.MetadataUpdateEvent;
 import org.apache.flink.connector.kafka.dynamic.source.split.DynamicKafkaSourceSplit;
 import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDeserializationSchema;
 import org.apache.flink.connector.kafka.source.split.KafkaPartitionSplit;

diff --git a/...st/java/org/apache/flink/connector/kafka/testutils/DynamicKafkaSourceExternalContext.java b/...st/java/org/apache/flink/connector/kafka/testutils/DynamicKafkaSourceExternalContext.java
@@ -22,10 +22,10 @@
 import org.apache.flink.api.connector.source.Boundedness;
 import org.apache.flink.api.connector.source.Source;
 import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.dynamic.source.DynamicKafkaSource;
 import org.apache.flink.connector.kafka.dynamic.source.DynamicKafkaSourceBuilder;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
 import org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsInitializer;
 import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDeserializationSchema;
 import org.apache.flink.connector.testframe.external.ExternalSystemSplitDataWriter;

diff --git a/...ka/src/test/java/org/apache/flink/connector/kafka/testutils/MockKafkaMetadataService.java b/...ka/src/test/java/org/apache/flink/connector/kafka/testutils/MockKafkaMetadataService.java
@@ -18,8 +18,8 @@
 
 package org.apache.flink.connector.kafka.testutils;
 
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import com.google.common.collect.ImmutableMap;
 

diff --git a/...fka/src/test/java/org/apache/flink/connector/kafka/testutils/YamlFileMetadataService.java b/...fka/src/test/java/org/apache/flink/connector/kafka/testutils/YamlFileMetadataService.java
@@ -19,9 +19,9 @@
 package org.apache.flink.connector.kafka.testutils;
 
 import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaMetadataService;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaMetadataService;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import org.apache.flink.shaded.jackson2.org.yaml.snakeyaml.DumperOptions;
 import org.apache.flink.shaded.jackson2.org.yaml.snakeyaml.TypeDescription;

diff --git a/...src/test/java/org/apache/flink/connector/kafka/testutils/YamlFileMetadataServiceTest.java b/...src/test/java/org/apache/flink/connector/kafka/testutils/YamlFileMetadataServiceTest.java
@@ -18,8 +18,8 @@
 
 package org.apache.flink.connector.kafka.testutils;
 
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

diff --git a/...c/test/java/org/apache/flink/streaming/connectors/kafka/DynamicKafkaSourceTestHelper.java b/...c/test/java/org/apache/flink/streaming/connectors/kafka/DynamicKafkaSourceTestHelper.java
@@ -18,9 +18,9 @@
 
 package org.apache.flink.streaming.connectors.kafka;
 
-import org.apache.flink.connector.kafka.dynamic.source.metadata.ClusterMetadata;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.KafkaStream;
-import org.apache.flink.connector.kafka.dynamic.source.metadata.MetadataUpdateEvent;
+import org.apache.flink.connector.kafka.dynamic.metadata.ClusterMetadata;
+import org.apache.flink.connector.kafka.dynamic.metadata.KafkaStream;
+import org.apache.flink.connector.kafka.dynamic.source.MetadataUpdateEvent;
 
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.KafkaProducer;