Repository: flink Updated Branches: refs/heads/master dcce6def9 -> 55fd5f32d
[hotfix] Java-7-ify the ExecutionConfig class Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4097666e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4097666e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4097666e Branch: refs/heads/master Commit: 4097666ef3bf595e20fef206e07aa0251fe7eb35 Parents: dcce6de Author: Stephan Ewen <se...@apache.org> Authored: Thu Nov 19 18:03:55 2015 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Thu Nov 26 10:51:43 2015 +0100 ---------------------------------------------------------------------- .../org/apache/flink/api/common/ExecutionConfig.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/4097666e/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java index b031441..a0d3363 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java @@ -88,7 +88,7 @@ public class ExecutionConfig implements Serializable { /** If set to true, progress updates are printed to System.out during execution */ private boolean printProgressDuringExecution = true; - private GlobalJobParameters globalJobParameters = null; + private GlobalJobParameters globalJobParameters; private long autoWatermarkInterval = 0; @@ -99,17 +99,17 @@ public class ExecutionConfig implements Serializable { // Serializers and types registered with Kryo and the PojoSerializer // we store them in linked maps/sets to ensure they are registered in order in all kryo instances. - private final LinkedHashMap<Class<?>, SerializableSerializer<?>> registeredTypesWithKryoSerializers = new LinkedHashMap<Class<?>, SerializableSerializer<?>>(); + private final LinkedHashMap<Class<?>, SerializableSerializer<?>> registeredTypesWithKryoSerializers = new LinkedHashMap<>(); - private final LinkedHashMap<Class<?>, Class<? extends Serializer<?>>> registeredTypesWithKryoSerializerClasses = new LinkedHashMap<Class<?>, Class<? extends Serializer<?>>>(); + private final LinkedHashMap<Class<?>, Class<? extends Serializer<?>>> registeredTypesWithKryoSerializerClasses = new LinkedHashMap<>(); - private final LinkedHashMap<Class<?>, SerializableSerializer<?>> defaultKryoSerializers = new LinkedHashMap<Class<?>, SerializableSerializer<?>>(); + private final LinkedHashMap<Class<?>, SerializableSerializer<?>> defaultKryoSerializers = new LinkedHashMap<>(); - private final LinkedHashMap<Class<?>, Class<? extends Serializer<?>>> defaultKryoSerializerClasses = new LinkedHashMap<Class<?>, Class<? extends Serializer<?>>>(); + private final LinkedHashMap<Class<?>, Class<? extends Serializer<?>>> defaultKryoSerializerClasses = new LinkedHashMap<>(); - private final LinkedHashSet<Class<?>> registeredKryoTypes = new LinkedHashSet<Class<?>>(); + private final LinkedHashSet<Class<?>> registeredKryoTypes = new LinkedHashSet<>(); - private final LinkedHashSet<Class<?>> registeredPojoTypes = new LinkedHashSet<Class<?>>(); + private final LinkedHashSet<Class<?>> registeredPojoTypes = new LinkedHashSet<>(); // --------------------------------------------------------------------------------------------