[hotfix] [core] Minor code cleanups in JavaSerializer and SerializerT…

…estBase
laubersder · May 11, 2017 · 70c48aa · 70c48aa
1 parent 6f8022e
commit 70c48aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...k-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/JavaSerializer.java b/...k-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/JavaSerializer.java
@@ -45,7 +45,7 @@ public class JavaSerializer<T> extends Serializer<T> {
 
  public JavaSerializer() {}
 
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
  @Override
  public void write(Kryo kryo, Output output, T o) {
  try {
@@ -62,7 +62,7 @@ public void write(Kryo kryo, Output output, T o) {
  }
  }
 
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
  @Override
  public T read(Kryo kryo, Input input, Class aClass) {
  try {

diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java
@@ -55,7 +55,13 @@
 public abstract class SerializerTestBase<T> extends TestLogger {
 
  protected abstract TypeSerializer<T> createSerializer();
-
+
+ /**
+ * Gets the expected length for the serializer's {@link TypeSerializer#getLength()} method.
+ * 
+ * <p>The expected length should be positive, for fix-length data types, or {@code -1} for
+ * variable-length types.
+ */
  protected abstract int getLength();
 
  protected abstract Class<T> getTypeClass();
@@ -124,9 +130,15 @@ public void testSnapshotConfigurationAndReconfigure() throws Exception {
 
  @Test
  public void testGetLength() {
+ final int len = getLength();
+
+ if (len == 0) {
+ fail("Broken serializer test base - zero length cannot be the expected length");
+ }
+
  try {
  TypeSerializer<T> serializer = getSerializer();
- assertEquals(getLength(), serializer.getLength());
+ assertEquals(len, serializer.getLength());
  }
  catch (Exception e) {
  System.err.println(e.getMessage());