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 2018/10/30 13:57:14 UTC

[flink] 07/16: [hotfix] Various code cleanup in serializers

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

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

commit 0e89d42bfab455940d20e2c5af47ace4484c1438
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Thu Oct 25 21:28:45 2018 +0200

    [hotfix] Various code cleanup in serializers
---
 .../common/typeutils/base/BooleanSerializer.java   | 22 +++++++++++++---------
 .../api/common/typeutils/base/ByteSerializer.java  | 22 +++++++++++++---------
 .../api/common/typeutils/base/CharSerializer.java  | 22 +++++++++++++---------
 .../common/typeutils/base/DoubleSerializer.java    | 22 +++++++++++++---------
 .../api/common/typeutils/base/FloatSerializer.java | 22 +++++++++++++---------
 .../api/common/typeutils/base/IntSerializer.java   | 22 +++++++++++++---------
 .../api/common/typeutils/base/ListSerializer.java  | 10 +++++-----
 .../api/common/typeutils/base/LongSerializer.java  | 12 ++++++++----
 .../api/common/typeutils/base/ShortSerializer.java | 22 +++++++++++++---------
 .../common/typeutils/base/StringSerializer.java    | 16 ++++++++++------
 .../api/common/typeutils/base/VoidSerializer.java  | 15 +++++++++------
 .../common/typeutils/base/IntSerializerTest.java   | 22 ++++++++++------------
 .../common/typeutils/base/LongSerializerTest.java  | 22 ++++++++++------------
 13 files changed, 143 insertions(+), 108 deletions(-)

diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java
index f275807..e728945 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java
@@ -18,19 +18,23 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Boolean}.
+ */
 @Internal
 public final class BooleanSerializer extends TypeSerializerSingleton<Boolean> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the BooleanSerializer. */
 	public static final BooleanSerializer INSTANCE = new BooleanSerializer();
-	
+
 	private static final Boolean FALSE = Boolean.FALSE;
 
 	@Override
@@ -47,7 +51,7 @@ public final class BooleanSerializer extends TypeSerializerSingleton<Boolean> {
 	public Boolean copy(Boolean from) {
 		return from;
 	}
-	
+
 	@Override
 	public Boolean copy(Boolean from, Boolean reuse) {
 		return from;
@@ -60,17 +64,17 @@ public final class BooleanSerializer extends TypeSerializerSingleton<Boolean> {
 
 	@Override
 	public void serialize(Boolean record, DataOutputView target) throws IOException {
-		target.writeBoolean(record.booleanValue());
+		target.writeBoolean(record);
 	}
 
 	@Override
 	public Boolean deserialize(DataInputView source) throws IOException {
-		return Boolean.valueOf(source.readBoolean());
+		return source.readBoolean();
 	}
-	
+
 	@Override
 	public Boolean deserialize(Boolean reuse, DataInputView source) throws IOException {
-		return Boolean.valueOf(source.readBoolean());
+		return source.readBoolean();
 	}
 
 	@Override
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java
index bf2baf5..4d0f30d 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Byte}.
+ */
 @Internal
 public final class ByteSerializer extends TypeSerializerSingleton<Byte> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the ByteSerializer. */
 	public static final ByteSerializer INSTANCE = new ByteSerializer();
-	
-	private static final Byte ZERO = Byte.valueOf((byte) 0);
+
+	private static final Byte ZERO = (byte) 0;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class ByteSerializer extends TypeSerializerSingleton<Byte> {
 	public Byte copy(Byte from) {
 		return from;
 	}
-	
+
 	@Override
 	public Byte copy(Byte from, Byte reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class ByteSerializer extends TypeSerializerSingleton<Byte> {
 
 	@Override
 	public void serialize(Byte record, DataOutputView target) throws IOException {
-		target.writeByte(record.byteValue());
+		target.writeByte(record);
 	}
 
 	@Override
 	public Byte deserialize(DataInputView source) throws IOException {
-		return Byte.valueOf(source.readByte());
+		return source.readByte();
 	}
-	
+
 	@Override
 	public Byte deserialize(Byte reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java
index dda3543..92f0775 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Character}.
+ */
 @Internal
 public final class CharSerializer extends TypeSerializerSingleton<Character> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the CharSerializer. */
 	public static final CharSerializer INSTANCE = new CharSerializer();
-	
-	private static final Character ZERO = Character.valueOf((char)0);
+
+	private static final Character ZERO = (char) 0;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class CharSerializer extends TypeSerializerSingleton<Character> {
 	public Character copy(Character from) {
 		return from;
 	}
-	
+
 	@Override
 	public Character copy(Character from, Character reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class CharSerializer extends TypeSerializerSingleton<Character> {
 
 	@Override
 	public void serialize(Character record, DataOutputView target) throws IOException {
-		target.writeChar(record.charValue());
+		target.writeChar(record);
 	}
 
 	@Override
 	public Character deserialize(DataInputView source) throws IOException {
-		return Character.valueOf(source.readChar());
+		return source.readChar();
 	}
-	
+
 	@Override
 	public Character deserialize(Character reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java
index 92fe71d..e307ec6 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Double}.
+ */
 @Internal
 public final class DoubleSerializer extends TypeSerializerSingleton<Double> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the DoubleSerializer. */
 	public static final DoubleSerializer INSTANCE = new DoubleSerializer();
-	
-	private static final Double ZERO = Double.valueOf(0);
+
+	private static final Double ZERO = 0.0;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class DoubleSerializer extends TypeSerializerSingleton<Double> {
 	public Double copy(Double from) {
 		return from;
 	}
-	
+
 	@Override
 	public Double copy(Double from, Double reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class DoubleSerializer extends TypeSerializerSingleton<Double> {
 
 	@Override
 	public void serialize(Double record, DataOutputView target) throws IOException {
-		target.writeDouble(record.doubleValue());
+		target.writeDouble(record);
 	}
 
 	@Override
 	public Double deserialize(DataInputView source) throws IOException {
-		return Double.valueOf(source.readDouble());
+		return source.readDouble();
 	}
-	
+
 	@Override
 	public Double deserialize(Double reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java
index 953c4fa..cb7bb75 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Float}.
+ */
 @Internal
 public final class FloatSerializer extends TypeSerializerSingleton<Float> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the FloatSerializer. */
 	public static final FloatSerializer INSTANCE = new FloatSerializer();
-	
-	private static final Float ZERO = Float.valueOf(0);
+
+	private static final Float ZERO = 0f;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class FloatSerializer extends TypeSerializerSingleton<Float> {
 	public Float copy(Float from) {
 		return from;
 	}
-	
+
 	@Override
 	public Float copy(Float from, Float reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class FloatSerializer extends TypeSerializerSingleton<Float> {
 
 	@Override
 	public void serialize(Float record, DataOutputView target) throws IOException {
-		target.writeFloat(record.floatValue());
+		target.writeFloat(record);
 	}
 
 	@Override
 	public Float deserialize(DataInputView source) throws IOException {
-		return Float.valueOf(source.readFloat());
+		return source.readFloat();
 	}
-	
+
 	@Override
 	public Float deserialize(Float reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java
index e046e8e..335688b2 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Integer} (and {@code int}, via auto-boxing).
+ */
 @Internal
 public final class IntSerializer extends TypeSerializerSingleton<Integer> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the IntSerializer. */
 	public static final IntSerializer INSTANCE = new IntSerializer();
-	
-	private static final Integer ZERO = Integer.valueOf(0);
+
+	private static final Integer ZERO = 0;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class IntSerializer extends TypeSerializerSingleton<Integer> {
 	public Integer copy(Integer from) {
 		return from;
 	}
-	
+
 	@Override
 	public Integer copy(Integer from, Integer reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class IntSerializer extends TypeSerializerSingleton<Integer> {
 
 	@Override
 	public void serialize(Integer record, DataOutputView target) throws IOException {
-		target.writeInt(record.intValue());
+		target.writeInt(record);
 	}
 
 	@Override
 	public Integer deserialize(DataInputView source) throws IOException {
-		return Integer.valueOf(source.readInt());
+		return source.readInt();
 	}
-	
+
 	@Override
 	public Integer deserialize(Integer reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java
index 67de6e0..6d576fd 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java
@@ -31,18 +31,18 @@ import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
 /**
  * A serializer for {@link List Lists}. The serializer relies on an element serializer
  * for teh serialization of the list's elements.
- * 
+ *
  * <p>The serialization format for the list is as follows: four bytes for the length of the lost,
  * followed by the serialized representation of each element.
- * 
+ *
  * @param <T> The type of element in the list.
  */
 @Internal
@@ -50,12 +50,12 @@ public final class ListSerializer<T> extends TypeSerializer<List<T>> {
 
 	private static final long serialVersionUID = 1119562170939152304L;
 
-	/** The serializer for the elements of the list */
+	/** The serializer for the elements of the list. */
 	private final TypeSerializer<T> elementSerializer;
 
 	/**
 	 * Creates a list serializer that uses the given serializer to serialize the list's elements.
-	 * 
+	 *
 	 * @param elementSerializer The serializer for the elements of the list
 	 */
 	public ListSerializer(TypeSerializer<T> elementSerializer) {
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java
index 2ed2cec..9171f0c 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java
@@ -24,13 +24,17 @@ import org.apache.flink.core.memory.DataOutputView;
 
 import java.io.IOException;
 
+/**
+ * Type serializer for {@code Long}.
+ */
 @Internal
 public final class LongSerializer extends TypeSerializerSingleton<Long> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the LongSerializer. */
 	public static final LongSerializer INSTANCE = new LongSerializer();
-	
+
 	private static final Long ZERO = 0L;
 
 	@Override
@@ -47,7 +51,7 @@ public final class LongSerializer extends TypeSerializerSingleton<Long> {
 	public Long copy(Long from) {
 		return from;
 	}
-	
+
 	@Override
 	public Long copy(Long from, Long reuse) {
 		return from;
@@ -67,7 +71,7 @@ public final class LongSerializer extends TypeSerializerSingleton<Long> {
 	public Long deserialize(DataInputView source) throws IOException {
 		return source.readLong();
 	}
-	
+
 	@Override
 	public Long deserialize(Long reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java
index 322591d..d4840fe 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code Byte}.
+ */
 @Internal
 public final class ShortSerializer extends TypeSerializerSingleton<Short> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the ShortSerializer. */
 	public static final ShortSerializer INSTANCE = new ShortSerializer();
-	
-	private static final Short ZERO = Short.valueOf((short)0);
+
+	private static final Short ZERO = (short) 0;
 
 	@Override
 	public boolean isImmutableType() {
@@ -47,7 +51,7 @@ public final class ShortSerializer extends TypeSerializerSingleton<Short> {
 	public Short copy(Short from) {
 		return from;
 	}
-	
+
 	@Override
 	public Short copy(Short from, Short reuse) {
 		return from;
@@ -60,14 +64,14 @@ public final class ShortSerializer extends TypeSerializerSingleton<Short> {
 
 	@Override
 	public void serialize(Short record, DataOutputView target) throws IOException {
-		target.writeShort(record.shortValue());
+		target.writeShort(record);
 	}
 
 	@Override
 	public Short deserialize(DataInputView source) throws IOException {
-		return Short.valueOf(source.readShort());
+		return source.readShort();
 	}
-	
+
 	@Override
 	public Short deserialize(Short reuse, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java
index f2cd54f..dc17b40 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java
@@ -18,20 +18,24 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.types.StringValue;
 
+import java.io.IOException;
+
+/**
+ * Type serializer for {@code String}.
+ */
 @Internal
 public final class StringSerializer extends TypeSerializerSingleton<String> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the StringSerializer. */
 	public static final StringSerializer INSTANCE = new StringSerializer();
-	
+
 	private static final String EMPTY = "";
 
 	@Override
@@ -48,7 +52,7 @@ public final class StringSerializer extends TypeSerializerSingleton<String> {
 	public String copy(String from) {
 		return from;
 	}
-	
+
 	@Override
 	public String copy(String from, String reuse) {
 		return from;
@@ -68,7 +72,7 @@ public final class StringSerializer extends TypeSerializerSingleton<String> {
 	public String deserialize(DataInputView source) throws IOException {
 		return StringValue.readString(source);
 	}
-	
+
 	@Override
 	public String deserialize(String record, DataInputView source) throws IOException {
 		return deserialize(source);
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java
index 5773009..57d00be 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java
@@ -18,17 +18,21 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 
+import java.io.IOException;
+
+/**
+ * Serializer for {@code Void}.
+ */
 @Internal
 public final class VoidSerializer extends TypeSerializerSingleton<Void> {
 
 	private static final long serialVersionUID = 1L;
-	
+
+	/** Sharable instance of the VoidSerializer. */
 	public static final VoidSerializer INSTANCE = new VoidSerializer();
 
 	@Override
@@ -45,7 +49,7 @@ public final class VoidSerializer extends TypeSerializerSingleton<Void> {
 	public Void copy(Void from) {
 		return null;
 	}
-	
+
 	@Override
 	public Void copy(Void from, Void reuse) {
 		return null;
@@ -60,7 +64,6 @@ public final class VoidSerializer extends TypeSerializerSingleton<Void> {
 	public void serialize(Void record, DataOutputView target) throws IOException {
 		// make progress in the stream, write one byte
 		target.write(0);
-		
 	}
 
 	@Override
@@ -68,7 +71,7 @@ public final class VoidSerializer extends TypeSerializerSingleton<Void> {
 		source.readByte();
 		return null;
 	}
-	
+
 	@Override
 	public Void deserialize(Void reuse, DataInputView source) throws IOException {
 		source.readByte();
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
index e829a4b..41c5d67 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
@@ -18,38 +18,36 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.util.Random;
-
 import org.apache.flink.api.common.typeutils.SerializerTestBase;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.api.common.typeutils.base.IntSerializer;
+
+import java.util.Random;
+
 /**
  * A test for the {@link IntSerializer}.
  */
 public class IntSerializerTest extends SerializerTestBase<Integer> {
-	
+
 	@Override
 	protected TypeSerializer<Integer> createSerializer() {
 		return new IntSerializer();
 	}
-	
+
 	@Override
 	protected int getLength() {
 		return 4;
 	}
-	
+
 	@Override
 	protected Class<Integer> getTypeClass() {
 		return Integer.class;
 	}
-	
+
 	@Override
 	protected Integer[] getTestData() {
 		Random rnd = new Random(874597969123412341L);
 		int rndInt = rnd.nextInt();
-		
-		return new Integer[] {Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(-1),
-							Integer.valueOf(Integer.MAX_VALUE), Integer.valueOf(Integer.MIN_VALUE),
-							Integer.valueOf(rndInt), Integer.valueOf(-rndInt)};
+
+		return new Integer[] {0, 1, -1, Integer.MAX_VALUE, Integer.MIN_VALUE, rndInt, -rndInt};
 	}
-}	
+}
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
index 4587f84..c12d12e 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
@@ -18,38 +18,36 @@
 
 package org.apache.flink.api.common.typeutils.base;
 
-import java.util.Random;
-
 import org.apache.flink.api.common.typeutils.SerializerTestBase;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.api.common.typeutils.base.LongSerializer;
+
+import java.util.Random;
+
 /**
  * A test for the {@link LongSerializer}.
  */
 public class LongSerializerTest extends SerializerTestBase<Long> {
-	
+
 	@Override
 	protected TypeSerializer<Long> createSerializer() {
 		return new LongSerializer();
 	}
-	
+
 	@Override
 	protected int getLength() {
 		return 8;
 	}
-	
+
 	@Override
 	protected Class<Long> getTypeClass() {
 		return Long.class;
 	}
-	
+
 	@Override
 	protected Long[] getTestData() {
 		Random rnd = new Random(874597969123412341L);
 		long rndLong = rnd.nextLong();
-		
-		return new Long[] {Long.valueOf(0L), Long.valueOf(1L), Long.valueOf(-1L),
-							Long.valueOf(Long.MAX_VALUE), Long.valueOf(Long.MIN_VALUE),
-							Long.valueOf(rndLong), Long.valueOf(-rndLong)};
+
+		return new Long[] {0L, 1L, -1L, Long.MAX_VALUE, Long.MIN_VALUE, rndLong, -rndLong};
 	}
-}	
+}