Skip to content

Commit 5089f3d

Browse files
Remove failing CI test: a null serializer cannot happen (#269)
* Clean defensive code against a missing serializer: this cannot happen * Remove failing CI test: a null serializer cannot happen
1 parent 891fe85 commit 5089f3d

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

modules/flink-1-api/src/main/scala/org/apache/flinkx/api/serializer/CoproductSerializer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.apache.flinkx.api.serializer.CoproductSerializer.CoproductSerializerS
88
class CoproductSerializer[T](subtypeClasses: Array[Class[_]], subtypeSerializers: Array[TypeSerializer[_]])
99
extends MutableSerializer[T] {
1010

11-
override val isImmutableType: Boolean = subtypeSerializers.forall(Option(_).exists(_.isImmutableType))
12-
val isImmutableSerializer: Boolean = subtypeSerializers.forall(Option(_).forall(s => s.duplicate().eq(s)))
11+
override val isImmutableType: Boolean = subtypeSerializers.forall(_.isImmutableType)
12+
val isImmutableSerializer: Boolean = subtypeSerializers.forall(s => s.duplicate().eq(s))
1313

1414
override def copy(from: T): T = {
1515
if (from == null || isImmutableType) {

modules/flink-2-api/src/main/scala/org/apache/flinkx/api/serializer/CoproductSerializer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.apache.flinkx.api.serializer.CoproductSerializer.CoproductSerializerS
88
class CoproductSerializer[T](subtypeClasses: Array[Class[_]], subtypeSerializers: Array[TypeSerializer[_]])
99
extends MutableSerializer[T] {
1010

11-
override val isImmutableType: Boolean = subtypeSerializers.forall(Option(_).exists(_.isImmutableType))
12-
val isImmutableSerializer: Boolean = subtypeSerializers.forall(Option(_).forall(s => s.duplicate().eq(s)))
11+
override val isImmutableType: Boolean = subtypeSerializers.forall(_.isImmutableType)
12+
val isImmutableSerializer: Boolean = subtypeSerializers.forall(s => s.duplicate().eq(s))
1313

1414
override def copy(from: T): T = {
1515
if (from == null || isImmutableType) {

modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/CaseClassSerializer.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ class CaseClassSerializer[T <: Product](
4242

4343
private val nullPadding: Array[Byte] = if (super.getLength > 0) new Array(super.getLength) else EmptyByteArray
4444

45-
override val isImmutableType: Boolean = isCaseClassImmutable &&
46-
fieldSerializers.forall(Option(_).exists(_.isImmutableType))
47-
val isImmutableSerializer: Boolean =
48-
fieldSerializers.forall(Option(_).forall(s => s.duplicate().eq(s)))
45+
override val isImmutableType: Boolean = isCaseClassImmutable && fieldSerializers.forall(_.isImmutableType)
46+
val isImmutableSerializer: Boolean = fieldSerializers.forall(s => s.duplicate().eq(s))
4947

5048
// In Flink, serializers & serializer snapshotters have strict ser/de requirements.
5149
// Both need to be capable of creating one another.

modules/flink-common-api/src/test/scala/org/apache/flinkx/api/serializer/CaseClassSerializerTest.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ class CaseClassSerializerTest extends AnyFlatSpec with Matchers {
2121
it should "be false when the content of one parameter is mutable" in {
2222
val mutableSerializer = new CaseClassSerializer[Mutable](classOf[Mutable], Array(StringSerializer.INSTANCE), false)
2323
val serializer = new CaseClassSerializer[OuterImmutable](classOf[OuterImmutable], Array(mutableSerializer), true)
24-
mutableSerializer.isImmutableType should be(false)
25-
}
26-
27-
it should "be false when missing information about one parameter" in {
28-
val serializer = new CaseClassSerializer[Immutable](classOf[Immutable], Array(null), true)
2924
serializer.isImmutableType should be(false)
3025
}
3126

0 commit comments

Comments
 (0)