You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/02/28 18:36:45 UTC

[02/11] flink git commit: [hotfix] [runtime] Reduce the gazillion deprecation warnings from the backwards-compatible savepoint path

[hotfix] [runtime] Reduce the gazillion deprecation warnings from the backwards-compatible savepoint path


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/40743aac
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/40743aac
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/40743aac

Branch: refs/heads/master
Commit: 40743aac9257677142a510fdd869036d13436edc
Parents: daf0ccd
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Feb 24 18:22:50 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Feb 28 18:59:09 2017 +0100

----------------------------------------------------------------------
 .../flink/migration/MigrationNamespaceSerializerProxy.java       | 1 +
 .../src/main/java/org/apache/flink/migration/MigrationUtil.java  | 1 +
 .../flink/migration/api/common/state/ListStateDescriptor.java    | 1 +
 .../apache/flink/migration/runtime/checkpoint/KeyGroupState.java | 1 +
 .../apache/flink/migration/runtime/checkpoint/SubtaskState.java  | 1 +
 .../org/apache/flink/migration/runtime/checkpoint/TaskState.java | 1 +
 .../migration/runtime/checkpoint/savepoint/SavepointV0.java      | 1 +
 .../runtime/checkpoint/savepoint/SavepointV0Serializer.java      | 1 +
 .../flink/migration/runtime/state/AbstractCloseableHandle.java   | 1 +
 .../flink/migration/runtime/state/AbstractStateBackend.java      | 1 +
 .../apache/flink/migration/runtime/state/KvStateSnapshot.java    | 1 +
 .../org/apache/flink/migration/runtime/state/StateHandle.java    | 1 +
 .../org/apache/flink/migration/runtime/state/StateObject.java    | 1 +
 .../apache/flink/migration/runtime/state/StreamStateHandle.java  | 1 +
 .../runtime/state/filesystem/AbstractFileStateHandle.java        | 1 +
 .../runtime/state/filesystem/AbstractFsStateSnapshot.java        | 1 +
 .../runtime/state/filesystem/FileSerializableStateHandle.java    | 1 +
 .../runtime/state/filesystem/FileStreamStateHandle.java          | 1 +
 .../flink/migration/runtime/state/filesystem/FsFoldingState.java | 1 +
 .../flink/migration/runtime/state/filesystem/FsListState.java    | 1 +
 .../migration/runtime/state/filesystem/FsReducingState.java      | 1 +
 .../flink/migration/runtime/state/filesystem/FsStateBackend.java | 1 +
 .../flink/migration/runtime/state/filesystem/FsValueState.java   | 1 +
 .../migration/runtime/state/memory/AbstractMemStateSnapshot.java | 1 +
 .../migration/runtime/state/memory/ByteStreamStateHandle.java    | 1 +
 .../flink/migration/runtime/state/memory/MemFoldingState.java    | 1 +
 .../flink/migration/runtime/state/memory/MemListState.java       | 1 +
 .../flink/migration/runtime/state/memory/MemReducingState.java   | 1 +
 .../flink/migration/runtime/state/memory/MemValueState.java      | 1 +
 .../migration/runtime/state/memory/SerializedStateHandle.java    | 1 +
 .../flink/migration/state/MigrationKeyGroupStateHandle.java      | 4 ++--
 .../apache/flink/migration/state/MigrationStreamStateHandle.java | 4 ++--
 .../flink/migration/streaming/runtime/tasks/StreamTaskState.java | 1 +
 .../migration/streaming/runtime/tasks/StreamTaskStateList.java   | 1 +
 34 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/MigrationNamespaceSerializerProxy.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/MigrationNamespaceSerializerProxy.java b/flink-runtime/src/main/java/org/apache/flink/migration/MigrationNamespaceSerializerProxy.java
index 808a9ae..91fa633 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/MigrationNamespaceSerializerProxy.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/MigrationNamespaceSerializerProxy.java
@@ -32,6 +32,7 @@ import java.io.Serializable;
  * the first run under Flink 1.2 and provides again the real namespace serializer.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class MigrationNamespaceSerializerProxy extends TypeSerializer<Serializable> {
 
 	public static final MigrationNamespaceSerializerProxy INSTANCE = new MigrationNamespaceSerializerProxy();

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/MigrationUtil.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/MigrationUtil.java b/flink-runtime/src/main/java/org/apache/flink/migration/MigrationUtil.java
index 76d4eef..9427f72 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/MigrationUtil.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/MigrationUtil.java
@@ -25,6 +25,7 @@ import java.util.Collection;
 
 public class MigrationUtil {
 
+	@SuppressWarnings("deprecation")
 	public static boolean isOldSavepointKeyedState(Collection<KeyGroupsStateHandle> keyGroupsStateHandles) {
 		return (keyGroupsStateHandles != null)
 				&& (keyGroupsStateHandles.size() == 1)

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/api/common/state/ListStateDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/api/common/state/ListStateDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/migration/api/common/state/ListStateDescriptor.java
index 3b1af54..1847c08 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/api/common/state/ListStateDescriptor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/api/common/state/ListStateDescriptor.java
@@ -31,6 +31,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
  */
 @Internal
 @Deprecated
+@SuppressWarnings("deprecation")
 public class ListStateDescriptor<T> extends StateDescriptor<ListState<T>, T> {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/KeyGroupState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/KeyGroupState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/KeyGroupState.java
index ad94993..483a403 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/KeyGroupState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/KeyGroupState.java
@@ -32,6 +32,7 @@ import java.io.Serializable;
  * which might not be available on the JobManager.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class KeyGroupState implements Serializable {
 	private static final long serialVersionUID = -5926696455438467634L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/SubtaskState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/SubtaskState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/SubtaskState.java
index df886b3..7e84fdc 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/SubtaskState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/SubtaskState.java
@@ -26,6 +26,7 @@ import java.io.Serializable;
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class SubtaskState implements Serializable {
 
 	private static final long serialVersionUID = -2394696997971923995L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/TaskState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/TaskState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/TaskState.java
index 798c112..91d8ba0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/TaskState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/TaskState.java
@@ -30,6 +30,7 @@ import java.util.Objects;
 import java.util.Set;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class TaskState implements Serializable {
 
 	private static final long serialVersionUID = -4845578005863201810L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0.java
index 8aa562e..1c51a69 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0.java
@@ -29,6 +29,7 @@ import java.util.Collection;
  *
  * <p>This format was introduced with Flink 1.1.0.
  */
+@SuppressWarnings("deprecation")
 public class SavepointV0 implements Savepoint {
 
 	/** The savepoint version. */

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0Serializer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0Serializer.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0Serializer.java
index 2efe786..4739033 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0Serializer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/checkpoint/savepoint/SavepointV0Serializer.java
@@ -67,6 +67,7 @@ import java.util.Map;
  * that no default Java serialization is used for serialization. Therefore, we
  * don't rely on any involved Java classes to stay the same.
  */
+@SuppressWarnings("deprecation")
 public class SavepointV0Serializer implements SavepointSerializer<SavepointV1> {
 
 	public static final SavepointV0Serializer INSTANCE = new SavepointV0Serializer();

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractCloseableHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractCloseableHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractCloseableHandle.java
index 873dab8..ad75dae 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractCloseableHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractCloseableHandle.java
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
  * the handle is closed or was already closed.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public abstract class AbstractCloseableHandle implements Closeable, Serializable {
 
 	/** Serial Version UID must be constant to maintain format compatibility */

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractStateBackend.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractStateBackend.java
index 1d76c06..ff97e19 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractStateBackend.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/AbstractStateBackend.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
  * A state backend defines how state is stored and snapshotted during checkpoints.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public abstract class AbstractStateBackend implements Serializable {
 	
 	private static final long serialVersionUID = 4620413814639220247L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/KvStateSnapshot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/KvStateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/KvStateSnapshot.java
index 9936ca7..7aecd31 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/KvStateSnapshot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/KvStateSnapshot.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.common.state.State;
 import org.apache.flink.api.common.state.StateDescriptor;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public interface KvStateSnapshot<K, N, S extends State, SD extends StateDescriptor<S, ?>>
 		extends StateObject {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateHandle.java
index 97d6984..8cdeefa 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateHandle.java
@@ -24,6 +24,7 @@ package org.apache.flink.migration.runtime.state;
  * is lightweight or fetching it lazily from some external storage when the state is too large.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public interface StateHandle<T> extends StateObject {
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateObject.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateObject.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateObject.java
index 2f1048f..128a074 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateObject.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StateObject.java
@@ -34,6 +34,7 @@ package org.apache.flink.migration.runtime.state;
  * </ul>
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public interface StateObject extends java.io.Closeable, java.io.Serializable {
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StreamStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StreamStateHandle.java
index 55f9b58..ee6be97 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StreamStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/StreamStateHandle.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
  * A state handle that produces an input stream when resolved.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public interface StreamStateHandle extends StateHandle<InputStream> {
 
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFileStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFileStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFileStateHandle.java
index fcdcc78..3d77064 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFileStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFileStateHandle.java
@@ -32,6 +32,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
  * Base class for state that is stored in a file.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public abstract class AbstractFileStateHandle extends AbstractCloseableHandle implements StateObject {
 
 	private static final long serialVersionUID = 350284443258002355L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFsStateSnapshot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFsStateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFsStateSnapshot.java
index 59c373b..103c214 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFsStateSnapshot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/AbstractFsStateSnapshot.java
@@ -34,6 +34,7 @@ import java.io.IOException;
  * @param <SV> The type of the state value.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public abstract class AbstractFsStateSnapshot<K, N, SV, S extends State, SD extends StateDescriptor<S, ?>> 
 		extends AbstractFileStateHandle implements KvStateSnapshot<K, N, S, SD> {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileSerializableStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileSerializableStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileSerializableStateHandle.java
index ef908f5..bee5ded 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileSerializableStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileSerializableStateHandle.java
@@ -33,6 +33,7 @@ import java.io.Serializable;
  * @param <T> The type of state pointed to by the state handle.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FileSerializableStateHandle<T extends Serializable> extends AbstractFileStateHandle implements StateHandle<T> {
 
 	private static final long serialVersionUID = -657631394290213622L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileStreamStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileStreamStateHandle.java
index 89ff4c4..e44b823 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileStreamStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FileStreamStateHandle.java
@@ -30,6 +30,7 @@ import java.io.Serializable;
  * A state handle that points to state in a file system, accessible as an input stream.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FileStreamStateHandle extends AbstractFileStateHandle implements StreamStateHandle {
 
 	private static final long serialVersionUID = -6826990484549987311L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsFoldingState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsFoldingState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsFoldingState.java
index e1bac83..6e98a30 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsFoldingState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsFoldingState.java
@@ -24,6 +24,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.core.fs.Path;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FsFoldingState<K, N, T, ACC> {
 	public static class Snapshot<K, N, T, ACC> extends AbstractFsStateSnapshot<K, N, ACC, FoldingState<T, ACC>, FoldingStateDescriptor<T, ACC>> {
 		private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsListState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsListState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsListState.java
index d4e3d4b..e8f7a9d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsListState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsListState.java
@@ -26,6 +26,7 @@ import org.apache.flink.core.fs.Path;
 import java.util.ArrayList;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FsListState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractFsStateSnapshot<K, N, ArrayList<V>, ListState<V>, ListStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsReducingState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsReducingState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsReducingState.java
index 5cd9505..8174871 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsReducingState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsReducingState.java
@@ -24,6 +24,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.core.fs.Path;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FsReducingState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractFsStateSnapshot<K, N, V, ReducingState<V>, ReducingStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsStateBackend.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsStateBackend.java
index e964ec9..fbdd393 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsStateBackend.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsStateBackend.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FsStateBackend extends AbstractStateBackend {
 
 	private static final long serialVersionUID = -8191916350224044011L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsValueState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsValueState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsValueState.java
index 3b432a3..b185f88 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsValueState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/filesystem/FsValueState.java
@@ -24,6 +24,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.core.fs.Path;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class FsValueState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractFsStateSnapshot<K, N, V, ValueState<V>, ValueStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/AbstractMemStateSnapshot.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/AbstractMemStateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/AbstractMemStateSnapshot.java
index 3336556..6056578 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/AbstractMemStateSnapshot.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/AbstractMemStateSnapshot.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public abstract class AbstractMemStateSnapshot<K, N, SV, S extends State, SD extends StateDescriptor<S, ?>> 
 		implements KvStateSnapshot<K, N, S, SD> {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/ByteStreamStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/ByteStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/ByteStreamStateHandle.java
index d9474dc..45785bc 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/ByteStreamStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/ByteStreamStateHandle.java
@@ -28,6 +28,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public final class ByteStreamStateHandle extends AbstractCloseableHandle implements StreamStateHandle {
 
 	private static final long serialVersionUID = -5280226231200217594L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemFoldingState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemFoldingState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemFoldingState.java
index d6c63c4..0956ddd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemFoldingState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemFoldingState.java
@@ -23,6 +23,7 @@ import org.apache.flink.api.common.state.FoldingStateDescriptor;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class MemFoldingState<K, N, T, ACC> {
 
 	public static class Snapshot<K, N, T, ACC> extends AbstractMemStateSnapshot<K, N, ACC, FoldingState<T, ACC>, FoldingStateDescriptor<T, ACC>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemListState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemListState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemListState.java
index 416a898..3ff7c50 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemListState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemListState.java
@@ -25,6 +25,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
 import java.util.ArrayList;
 
 @Deprecated
+@SuppressWarnings("deprecation")
 public class MemListState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractMemStateSnapshot<K, N, ArrayList<V>, ListState<V>, ListStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemReducingState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemReducingState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemReducingState.java
index 52d60a9..e6154fb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemReducingState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemReducingState.java
@@ -31,6 +31,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
  * @param <V> The type of the values in the list state.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class MemReducingState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractMemStateSnapshot<K, N, V, ReducingState<V>, ReducingStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemValueState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemValueState.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemValueState.java
index ff9bed8..777b0f6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemValueState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/MemValueState.java
@@ -30,6 +30,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
  * @param <V> The type of the value.
  */
 @Deprecated
+@SuppressWarnings("deprecation")
 public class MemValueState<K, N, V> {
 
 	public static class Snapshot<K, N, V> extends AbstractMemStateSnapshot<K, N, V, ValueState<V>, ValueStateDescriptor<V>> {

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/SerializedStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/SerializedStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/SerializedStateHandle.java
index d3c9b6c..49d772e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/SerializedStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/runtime/state/memory/SerializedStateHandle.java
@@ -31,6 +31,7 @@ import java.io.Serializable;
  *
  * @param <T> The type of state represented by this state handle.
  */
+@SuppressWarnings("deprecation")
 public class SerializedStateHandle<T extends Serializable> extends AbstractCloseableHandle implements StateHandle<T> {
 	
 	private static final long serialVersionUID = 4145685722538475769L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationKeyGroupStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationKeyGroupStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationKeyGroupStateHandle.java
index 995d234..ee15b83 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationKeyGroupStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationKeyGroupStateHandle.java
@@ -24,12 +24,12 @@ import org.apache.flink.runtime.state.KeyGroupsStateHandle;
 import org.apache.flink.runtime.state.StreamStateHandle;
 import org.apache.flink.util.Migration;
 
-@Internal
-@Deprecated
 /**
  * This class is just a KeyGroupsStateHandle that is tagged as migration, to figure out which restore logic to apply,
  * e.g. when restoring backend data from a state handle.
  */
+@Internal
+@Deprecated
 public class MigrationKeyGroupStateHandle extends KeyGroupsStateHandle implements Migration {
 
 	private static final long serialVersionUID = -8554427169776881697L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java
index e7831a9..797d5d2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java
@@ -26,12 +26,12 @@ import org.apache.flink.util.Migration;
 
 import java.io.IOException;
 
-@Internal
-@Deprecated
 /**
  * This class is just a StreamStateHandle that is tagged as migration, to figure out which restore logic to apply, e.g.
  * when restoring backend data from a state handle.
  */
+@Internal
+@Deprecated
 public class MigrationStreamStateHandle implements StreamStateHandle, Migration {
 
 	private static final long serialVersionUID = -2332113722532150112L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskState.java b/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskState.java
index f5af185..a6b6e3f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskState.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 
 @Deprecated
 @Internal
+@SuppressWarnings("deprecation")
 public class StreamTaskState implements Serializable, Closeable {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/40743aac/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskStateList.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskStateList.java b/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskStateList.java
index 8b0dcd3..07ce44b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskStateList.java
+++ b/flink-runtime/src/main/java/org/apache/flink/migration/streaming/runtime/tasks/StreamTaskStateList.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 
 @Deprecated
 @Internal
+@SuppressWarnings("deprecation")
 public class StreamTaskStateList implements StateHandle<StreamTaskState[]> {
 
 	private static final long serialVersionUID = 1L;