Skip to content

Commit 21be71a

Browse files
committed
[FLINK-36207] Testing that the @public API change still is caught
1 parent ad9c4f6 commit 21be71a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

flink-annotations/src/main/java/org/apache/flink/FlinkVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public String toString() {
7171
return versionStr;
7272
}
7373

74-
public boolean isNewerVersionThan(FlinkVersion otherVersion) {
74+
public boolean isNewerVersionThanChangedName(FlinkVersion otherVersion) {
7575
return this.ordinal() > otherVersion.ordinal();
7676
}
7777

flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ private static <T> void writeSerializerSnapshot(
528528
DataOutputView out, TypeSerializer<T> serializer, FlinkVersion flinkVersion)
529529
throws IOException {
530530

531-
if (flinkVersion.isNewerVersionThan(FlinkVersion.v1_6)) {
531+
if (flinkVersion.isNewerVersionThanChangedName(FlinkVersion.v1_6)) {
532532
writeSerializerSnapshotCurrentFormat(out, serializer);
533533
} else {
534534
throw new UnsupportedOperationException(
@@ -547,7 +547,7 @@ private static <T> TypeSerializerSnapshot<T> readSerializerSnapshot(
547547
DataInputView in, FlinkVersion flinkVersion) throws IOException {
548548

549549
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
550-
checkState(flinkVersion.isNewerVersionThan(FlinkVersion.v1_6));
550+
checkState(flinkVersion.isNewerVersionThanChangedName(FlinkVersion.v1_6));
551551
return readSerializerSnapshotCurrentFormat(in, classLoader);
552552
}
553553

flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerUpgradeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public Condition<Row> testDataCondition() {
126126
@Override
127127
public Condition<TypeSerializerSchemaCompatibility<Row>> schemaCompatibilityCondition(
128128
FlinkVersion version) {
129-
if (version.isNewerVersionThan(FlinkVersion.v1_10)) {
129+
if (version.isNewerVersionThanChangedName(FlinkVersion.v1_10)) {
130130
return TypeSerializerConditions.isCompatibleAsIs();
131131
}
132132
return TypeSerializerConditions.isCompatibleAfterMigration();

flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/NFASerializerUpgradeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public Condition<NFAState> testDataCondition() {
367367
@Override
368368
public Condition<TypeSerializerSchemaCompatibility<NFAState>> schemaCompatibilityCondition(
369369
FlinkVersion version) {
370-
if (version.isNewerVersionThan(FlinkVersion.v1_15)) {
370+
if (version.isNewerVersionThanChangedName(FlinkVersion.v1_15)) {
371371
return TypeSerializerConditions.isCompatibleAsIs();
372372
}
373373
return TypeSerializerConditions.isCompatibleAfterMigration();

flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkStateSerializerUpgradeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public Condition<TwoPhaseCommitSinkFunction.State<Integer, String>> testDataCond
122122
TypeSerializerSchemaCompatibility<
123123
TwoPhaseCommitSinkFunction.State<Integer, String>>>
124124
schemaCompatibilityCondition(FlinkVersion version) {
125-
if (version.isNewerVersionThan(FlinkVersion.v1_13)) {
125+
if (version.isNewerVersionThanChangedName(FlinkVersion.v1_13)) {
126126
return TypeSerializerConditions.isCompatibleAsIs();
127127
} else {
128128
return TypeSerializerConditions.isCompatibleAfterMigration();

flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerUpgradeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public Condition<LinkedList<Long>> testDataCondition() {
112112
@Override
113113
public Condition<TypeSerializerSchemaCompatibility<LinkedList<Long>>>
114114
schemaCompatibilityCondition(FlinkVersion version) {
115-
if (version.isNewerVersionThan(FlinkVersion.v1_13)) {
115+
if (version.isNewerVersionThanChangedName(FlinkVersion.v1_13)) {
116116
return TypeSerializerConditions.isCompatibleAsIs();
117117
} else {
118118
return TypeSerializerConditions.isCompatibleAfterMigration();

0 commit comments

Comments
 (0)