You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2020/06/04 04:57:41 UTC

[flink] branch release-1.11 updated: [FLINK-18069] [scala, docs] Scaladocs 2.12 fails to recognize inner interfaces

This is an automated email from the ASF dual-hosted git repository.

tzulitai pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.11 by this push:
     new b949384  [FLINK-18069] [scala, docs] Scaladocs 2.12 fails to recognize inner interfaces
b949384 is described below

commit b9493846a39f2dd0edb274f6c63b9029d4fef4c0
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
AuthorDate: Tue Jun 2 20:29:54 2020 +0800

    [FLINK-18069] [scala, docs] Scaladocs 2.12 fails to recognize inner interfaces
    
    This is a similar issue as reported here:
    https://github.com/scala/bug/issues/10509.
    
    This seems to be a problem with Scala 2.12.x. The only workaround is to
    redundantly add the full-length qualifiers for such interfaces.
---
 .../flink/api/scala/typeutils/ScalaCaseClassSerializerSnapshot.java     | 2 +-
 .../apache/flink/api/scala/typeutils/TraversableSerializerSnapshot.java | 2 +-
 .../flink/api/scala/typeutils/Tuple2CaseClassSerializerSnapshot.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/ScalaCaseClassSerializerSnapshot.java b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/ScalaCaseClassSerializerSnapshot.java
index 0145d2a..ec7b0cb 100644
--- a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/ScalaCaseClassSerializerSnapshot.java
+++ b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/ScalaCaseClassSerializerSnapshot.java
@@ -103,7 +103,7 @@ public final class ScalaCaseClassSerializerSnapshot<T extends scala.Product>
 	}
 
 	@Override
-	protected OuterSchemaCompatibility resolveOuterSchemaCompatibility(ScalaCaseClassSerializer<T> newSerializer) {
+	protected CompositeTypeSerializerSnapshot.OuterSchemaCompatibility resolveOuterSchemaCompatibility(ScalaCaseClassSerializer<T> newSerializer) {
 		return (Objects.equals(type, newSerializer.getTupleClass()))
 			? OuterSchemaCompatibility.COMPATIBLE_AS_IS
 			: OuterSchemaCompatibility.INCOMPATIBLE;
diff --git a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/TraversableSerializerSnapshot.java b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/TraversableSerializerSnapshot.java
index 08d7ad6..37f94ed 100644
--- a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/TraversableSerializerSnapshot.java
+++ b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/TraversableSerializerSnapshot.java
@@ -98,7 +98,7 @@ public class TraversableSerializerSnapshot<T extends TraversableOnce<E>, E>
 	}
 
 	@Override
-	protected OuterSchemaCompatibility resolveOuterSchemaCompatibility(TraversableSerializer<T, E> newSerializer) {
+	protected CompositeTypeSerializerSnapshot.OuterSchemaCompatibility resolveOuterSchemaCompatibility(TraversableSerializer<T, E> newSerializer) {
 		return (cbfCode.equals(newSerializer.cbfCode()))
 			? OuterSchemaCompatibility.COMPATIBLE_AS_IS
 			: OuterSchemaCompatibility.INCOMPATIBLE;
diff --git a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/Tuple2CaseClassSerializerSnapshot.java b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/Tuple2CaseClassSerializerSnapshot.java
index 9591663..971f200 100644
--- a/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/Tuple2CaseClassSerializerSnapshot.java
+++ b/flink-scala/src/main/java/org/apache/flink/api/scala/typeutils/Tuple2CaseClassSerializerSnapshot.java
@@ -95,7 +95,7 @@ public final class Tuple2CaseClassSerializerSnapshot<T1, T2>
 	}
 
 	@Override
-	protected OuterSchemaCompatibility resolveOuterSchemaCompatibility(ScalaCaseClassSerializer<Tuple2<T1, T2>> newSerializer) {
+	protected CompositeTypeSerializerSnapshot.OuterSchemaCompatibility resolveOuterSchemaCompatibility(ScalaCaseClassSerializer<Tuple2<T1, T2>> newSerializer) {
 		return (Objects.equals(type, newSerializer.getTupleClass()))
 			? OuterSchemaCompatibility.COMPATIBLE_AS_IS
 			: OuterSchemaCompatibility.INCOMPATIBLE;