[hotfix] Clean up warnings in Serializers util class
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d902d164 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d902d164 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d902d164 Branch: refs/heads/master Commit: d902d164556e631d1c8edea475515901691c639c Parents: 8c8f1c4 Author: Stephan Ewen <se...@apache.org> Authored: Fri Jan 29 16:29:31 2016 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Mon Feb 1 14:45:55 2016 +0100 ---------------------------------------------------------------------- .../typeutils/runtime/kryo/Serializers.java | 44 +++++++++++++------- 1 file changed, 30 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/d902d164/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/Serializers.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/Serializers.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/Serializers.java index 76f8eb4..0ea8691 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/Serializers.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/Serializers.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.flink.api.java.typeutils.runtime.kryo; import com.esotericsoftware.kryo.Kryo; @@ -60,48 +61,51 @@ public class Serializers { * to Kryo. * It also watches for types which need special serializers. */ - private static Set<Class<?>> alreadySeen = new HashSet<Class<?>>(); + private static Set<Class<?>> alreadySeen = new HashSet<>(); public static void recursivelyRegisterType(Class<?> type, ExecutionConfig config) { alreadySeen.add(type); - if(type.isPrimitive()) { + + if (type.isPrimitive()) { return; } config.registerKryoType(type); addSerializerForType(config, type); Field[] fields = type.getDeclaredFields(); - for(Field field : fields) { + for (Field field : fields) { if(Modifier.isStatic(field.getModifiers()) || Modifier.isTransient(field.getModifiers())) { continue; } Type fieldType = field.getGenericType(); - if(fieldType instanceof ParameterizedType) { // field has generics + if (fieldType instanceof ParameterizedType) { // field has generics ParameterizedType parameterizedFieldType = (ParameterizedType) fieldType; - for(Type t: parameterizedFieldType.getActualTypeArguments()) { - if(TypeExtractor.isClassType(t) ) { - Class clazz = TypeExtractor.typeToClass(t); - if(!alreadySeen.contains(clazz)) { + for (Type t: parameterizedFieldType.getActualTypeArguments()) { + if (TypeExtractor.isClassType(t) ) { + Class<?> clazz = TypeExtractor.typeToClass(t); + if (!alreadySeen.contains(clazz)) { recursivelyRegisterType(TypeExtractor.typeToClass(t), config); } } } } Class<?> clazz = field.getType(); - if(!alreadySeen.contains(clazz)) { + if (!alreadySeen.contains(clazz)) { recursivelyRegisterType(clazz, config); } } } public static void addSerializerForType(ExecutionConfig reg, Class<?> type) { - if(GenericData.Record.class.isAssignableFrom(type)) { + if (GenericData.Record.class.isAssignableFrom(type)) { registerGenericAvro(reg); } - if(SpecificRecordBase.class.isAssignableFrom(type)) { - registerSpecificAvro(reg, (Class<? extends SpecificRecordBase>) type); + if (SpecificRecordBase.class.isAssignableFrom(type)) { + @SuppressWarnings("unchecked") + Class<? extends SpecificRecordBase> specRecordClass = (Class<? extends SpecificRecordBase>) type; + registerSpecificAvro(reg, specRecordClass); } - if(DateTime.class.isAssignableFrom(type) || Interval.class.isAssignableFrom(type)) { + if (DateTime.class.isAssignableFrom(type) || Interval.class.isAssignableFrom(type)) { registerJodaTime(reg); } } @@ -114,6 +118,7 @@ public class Serializers { // Avro POJOs contain java.util.List which have GenericData.Array as their runtime type // because Kryo is not able to serialize them properly, we use this serializer for them reg.registerTypeWithKryoSerializer(GenericData.Array.class, SpecificInstanceCollectionSerializerForArrayList.class); + // We register this serializer for users who want to use untyped Avro records (GenericData.Record). // Kryo is able to serialize everything in there, except for the Schema. // This serializer is very slow, but using the GenericData.Records of Kryo is in general a bad idea. @@ -167,7 +172,10 @@ public class Serializers { // Custom Serializers // -------------------------------------------------------------------------------------------- + @SuppressWarnings("rawtypes") public static class SpecificInstanceCollectionSerializerForArrayList extends SpecificInstanceCollectionSerializer<ArrayList> { + private static final long serialVersionUID = 1L; + public SpecificInstanceCollectionSerializerForArrayList() { super(ArrayList.class); } @@ -177,8 +185,14 @@ public class Serializers { * Avro is serializing collections with an "GenericData.Array" type. Kryo is not able to handle * this type, so we use ArrayLists. */ - public static class SpecificInstanceCollectionSerializer<T extends Collection> extends CollectionSerializer implements Serializable { + @SuppressWarnings("rawtypes") + public static class SpecificInstanceCollectionSerializer<T extends Collection> + extends CollectionSerializer implements Serializable + { + private static final long serialVersionUID = 1L; + private Class<T> type; + public SpecificInstanceCollectionSerializer(Class<T> type) { this.type = type; } @@ -200,6 +214,8 @@ public class Serializers { * Having this serializer, we are able to handle avro Records. */ public static class AvroSchemaSerializer extends Serializer<Schema> implements Serializable { + private static final long serialVersionUID = 1L; + @Override public void write(Kryo kryo, Output output, Schema object) { String schemaAsString = object.toString(false);
