Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.0][hotfix] Remove useless flink import #2803

Merged
merged 1 commit into from
Dec 3, 2023
Merged

[3.0][hotfix] Remove useless flink import #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@

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;
import org.apache.flink.core.memory.DataInputView;
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;
Expand All @@ -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<T extends Enum<T>> extends TypeSerializer<T> {
Expand Down
5 changes: 3 additions & 2 deletions ...-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@

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;
import org.apache.flink.api.java.typeutils.runtime.MaskUtils;
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
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -56,10 +57,9 @@ public final class MapSerializer<K, V> extends TypeSerializer<Map<K, V>> {
* @param valueSerializer The serializer for the values in the map
*/
public MapSerializer(TypeSerializer<K> keySerializer, TypeSerializer<V> 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.");
}

// ------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading