From 12ed1bae3e38b1c5b822e50c687926beb1a318ba Mon Sep 17 00:00:00 2001 From: Hang Ruan Date: Mon, 4 Dec 2023 00:02:37 +0800 Subject: [PATCH] [cdc-common][hotfix] Remove useless flink imports (#2803) This closes #2803. --- .../cdc/common/data/binary/BinaryRecordData.java | 2 +- .../ververica/cdc/common/factories/FactoryHelper.java | 3 +-- .../ververica/cdc/runtime/serializer/EnumSerializer.java | 9 +++++---- .../cdc/runtime/serializer/LinkedListSerializer.java | 5 +++-- .../ververica/cdc/runtime/serializer/ListSerializer.java | 2 +- .../ververica/cdc/runtime/serializer/MapSerializer.java | 8 ++++---- .../serializer/NestedSerializersSnapshotDelegate.java | 4 ++-- .../cdc/runtime/serializer/data/ArrayDataSerializer.java | 2 +- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java b/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java index 6f490a3b871..81d39f2c0f3 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java +++ b/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java @@ -37,7 +37,7 @@ import java.nio.ByteOrder; import static com.ververica.cdc.common.types.DataTypeRoot.DECIMAL; -import static org.apache.flink.util.Preconditions.checkArgument; +import static com.ververica.cdc.common.utils.Preconditions.checkArgument; /** * An implementation of {@link RecordData} which is backed by {@link MemorySegment} instead of diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java b/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java index 1b65d604891..1d744da4cdb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java +++ b/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java @@ -16,8 +16,7 @@ package com.ververica.cdc.common.factories; -import org.apache.flink.annotation.PublicEvolving; - +import com.ververica.cdc.common.annotation.PublicEvolving; import com.ververica.cdc.common.configuration.Configuration; import java.util.Map; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java index 3a99e2ba88d..78c8d11b68c 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java @@ -16,7 +16,6 @@ package com.ververica.cdc.runtime.serializer; -import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; @@ -24,6 +23,8 @@ import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; +import com.ververica.cdc.common.annotation.VisibleForTesting; + import java.io.IOException; import java.io.ObjectInputStream; import java.lang.reflect.Array; @@ -33,9 +34,9 @@ import java.util.Map; import java.util.Set; -import static org.apache.flink.util.Preconditions.checkArgument; -import static org.apache.flink.util.Preconditions.checkNotNull; -import static org.apache.flink.util.Preconditions.checkState; +import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static com.ververica.cdc.common.utils.Preconditions.checkState; /** {@link TypeSerializer} for Java enums. */ public final class EnumSerializer> extends TypeSerializer { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java index 4713d8636fd..1e3e6cec375 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java @@ -16,7 +16,6 @@ package com.ververica.cdc.runtime.serializer; -import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; @@ -24,10 +23,12 @@ import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +import com.ververica.cdc.common.annotation.Internal; + import java.io.IOException; import java.util.LinkedList; -import static org.apache.flink.util.Preconditions.checkNotNull; +import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; /** * A serializer for {@link LinkedList}. The serializer relies on an element serializer for the diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java index 91f0f105d6e..43a1fb0a284 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.flink.util.Preconditions.checkNotNull; +import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; /** * A serializer for {@link List Lists}. The serializer relies on an element serializer for the diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java index 3f1010232e3..400444e02f3 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java @@ -21,12 +21,13 @@ import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import org.apache.flink.util.Preconditions; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; + /** * A serializer for {@link Map}. The serializer relies on a key serializer and a value serializer * for the serialization of the map's key-value pairs. @@ -56,10 +57,9 @@ public final class MapSerializer extends TypeSerializer> { * @param valueSerializer The serializer for the values in the map */ public MapSerializer(TypeSerializer keySerializer, TypeSerializer valueSerializer) { - this.keySerializer = - Preconditions.checkNotNull(keySerializer, "The key serializer cannot be null"); + this.keySerializer = checkNotNull(keySerializer, "The key serializer cannot be null"); this.valueSerializer = - Preconditions.checkNotNull(valueSerializer, "The value serializer cannot be null."); + checkNotNull(valueSerializer, "The value serializer cannot be null."); } // ------------------------------------------------------------------------ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java index 14f9d0f2554..c8b7034218d 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java @@ -27,8 +27,8 @@ import java.io.IOException; import java.util.Arrays; -import static org.apache.flink.util.Preconditions.checkArgument; -import static org.apache.flink.util.Preconditions.checkNotNull; +import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; /** * A NestedSerializersSnapshotDelegate represents the snapshots of multiple serializers that are diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java index fc744b32cf5..7b0841f8c7f 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java @@ -16,7 +16,6 @@ package com.ververica.cdc.runtime.serializer.data; -import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; @@ -25,6 +24,7 @@ import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +import com.ververica.cdc.common.annotation.VisibleForTesting; import com.ververica.cdc.common.data.ArrayData; import com.ververica.cdc.common.data.GenericArrayData; import com.ververica.cdc.common.types.DataType;