[hotfix] [core] Add missing @Internal annotations to classes in flink-core.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/082d40fd Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/082d40fd Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/082d40fd Branch: refs/heads/master Commit: 082d40fdc415952737a109c913a86d009ed234c1 Parents: 0aa9918 Author: Fabian Hueske <fhue...@apache.org> Authored: Wed Feb 15 15:25:15 2017 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Mon Feb 20 01:01:24 2017 +0100 ---------------------------------------------------------------------- .../org/apache/flink/api/common/ArchivedExecutionConfig.java | 3 +++ .../api/common/typeutils/TypeSerializerSerializationProxy.java | 4 +++- .../apache/flink/api/common/typeutils/base/ListSerializer.java | 2 ++ .../apache/flink/api/java/typeutils/runtime/AvroSerializer.java | 2 ++ .../api/java/typeutils/runtime/CopyableValueComparator.java | 2 ++ .../api/java/typeutils/runtime/CopyableValueSerializer.java | 2 ++ .../flink/api/java/typeutils/runtime/DataInputDecoder.java | 3 ++- .../flink/api/java/typeutils/runtime/DataInputViewStream.java | 2 ++ .../flink/api/java/typeutils/runtime/DataOutputEncoder.java | 3 ++- .../flink/api/java/typeutils/runtime/DataOutputViewStream.java | 2 ++ .../flink/api/java/typeutils/runtime/EitherSerializer.java | 2 ++ .../flink/api/java/typeutils/runtime/FieldSerializer.java | 3 +++ .../flink/api/java/typeutils/runtime/GenericTypeComparator.java | 2 ++ .../flink/api/java/typeutils/runtime/NoFetchingInput.java | 2 ++ .../flink/api/java/typeutils/runtime/NullAwareComparator.java | 2 ++ .../apache/flink/api/java/typeutils/runtime/NullMaskUtils.java | 2 ++ .../apache/flink/api/java/typeutils/runtime/PojoComparator.java | 3 ++- .../apache/flink/api/java/typeutils/runtime/PojoSerializer.java | 2 ++ .../apache/flink/api/java/typeutils/runtime/RowComparator.java | 2 ++ .../apache/flink/api/java/typeutils/runtime/RowSerializer.java | 2 ++ .../api/java/typeutils/runtime/RuntimeComparatorFactory.java | 2 ++ .../java/typeutils/runtime/RuntimePairComparatorFactory.java | 2 ++ .../api/java/typeutils/runtime/RuntimeSerializerFactory.java | 2 ++ .../flink/api/java/typeutils/runtime/Tuple0Serializer.java | 2 ++ .../flink/api/java/typeutils/runtime/TupleComparator.java | 3 ++- .../flink/api/java/typeutils/runtime/TupleComparatorBase.java | 3 ++- .../flink/api/java/typeutils/runtime/TupleSerializer.java | 3 ++- .../flink/api/java/typeutils/runtime/TupleSerializerBase.java | 2 ++ .../flink/api/java/typeutils/runtime/ValueComparator.java | 2 ++ .../flink/api/java/typeutils/runtime/ValueSerializer.java | 2 ++ .../apache/flink/core/fs/AbstractMultiFSDataInputStream.java | 2 ++ .../java/org/apache/flink/core/fs/ClosingFSDataInputStream.java | 4 +++- .../org/apache/flink/core/fs/ClosingFSDataOutputStream.java | 4 +++- .../java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java | 4 +++- .../org/apache/flink/core/fs/FSDataOutputStreamWrapper.java | 4 +++- .../org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java | 4 +++- .../java/org/apache/flink/core/fs/WrappingProxyCloseable.java | 2 ++ .../apache/flink/core/memory/ByteArrayOutputStreamWithPos.java | 2 ++ .../java/org/apache/flink/util/AbstractCloseableRegistry.java | 3 +++ .../src/main/java/org/apache/flink/util/CollectionUtil.java | 3 +++ flink-core/src/main/java/org/apache/flink/util/FutureUtil.java | 5 ++++- flink-core/src/main/java/org/apache/flink/util/Migration.java | 3 +++ .../src/main/java/org/apache/flink/util/WrappingProxy.java | 3 +++ .../src/main/java/org/apache/flink/util/WrappingProxyUtil.java | 5 ++++- 44 files changed, 104 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/common/ArchivedExecutionConfig.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ArchivedExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ArchivedExecutionConfig.java index faf920d..f267e91 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/ArchivedExecutionConfig.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/ArchivedExecutionConfig.java @@ -17,6 +17,8 @@ */ package org.apache.flink.api.common; +import org.apache.flink.annotation.Internal; + import java.io.Serializable; import java.util.Collections; import java.util.Map; @@ -26,6 +28,7 @@ import java.util.Map; * It can be used to display job information on the web interface * without having to keep the classloader around after job completion. */ +@Internal public class ArchivedExecutionConfig implements Serializable { private final String executionMode; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSerializationProxy.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSerializationProxy.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSerializationProxy.java index 06ad8bf..cebd348 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSerializationProxy.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSerializationProxy.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.io.VersionedIOReadableWritable; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; import org.apache.flink.core.memory.DataInputView; @@ -30,6 +31,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Arrays; +@Internal public class TypeSerializerSerializationProxy<T> extends VersionedIOReadableWritable { public static final int VERSION = 1; @@ -228,4 +230,4 @@ public class TypeSerializerSerializationProxy<T> extends VersionedIOReadableWrit return Arrays.hashCode(getActualBytes()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java ---------------------------------------------------------------------- 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 ca3c143..5d5e8f8 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 @@ -18,6 +18,7 @@ package org.apache.flink.api.common.typeutils.base; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -37,6 +38,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * @param <T> The type of element in the list. */ +@Internal public class ListSerializer<T> extends TypeSerializer<List<T>> { private static final long serialVersionUID = 1119562170939152304L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java index 4c2a7f9..8bcd157 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java @@ -25,6 +25,7 @@ import org.apache.avro.reflect.ReflectDatumReader; import org.apache.avro.reflect.ReflectDatumWriter; import org.apache.avro.util.Utf8; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.Serializers; import org.apache.flink.core.memory.DataInputView; @@ -42,6 +43,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * @param <T> The type serialized. */ +@Internal public final class AvroSerializer<T> extends TypeSerializer<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java index 9b3b191..0093436 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java @@ -20,6 +20,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -31,6 +32,7 @@ import org.apache.flink.util.InstantiationUtil; /** * Comparator for all Value types that extend Key */ +@Internal public class CopyableValueComparator<T extends CopyableValue<T> & Comparable<T>> extends TypeComparator<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java index f30a767..1f3fcbc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java @@ -20,6 +20,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -28,6 +29,7 @@ import org.apache.flink.util.InstantiationUtil; import static org.apache.flink.util.Preconditions.checkNotNull; +@Internal public class CopyableValueSerializer<T extends CopyableValue<T>> extends TypeSerializer<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java index e48f9fa..c0454c6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputDecoder.java @@ -24,8 +24,9 @@ import java.nio.ByteBuffer; import org.apache.avro.io.Decoder; import org.apache.avro.util.Utf8; +import org.apache.flink.annotation.Internal; - +@Internal public class DataInputDecoder extends Decoder implements java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java index be17d64..aab4689 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java @@ -18,6 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import java.io.EOFException; @@ -27,6 +28,7 @@ import java.io.InputStream; /** * An input stream that draws its data from a {@link DataInputView}. */ +@Internal public class DataInputViewStream extends InputStream { protected DataInputView inputView; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java index 5c89962..c41b648 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputEncoder.java @@ -24,8 +24,9 @@ import java.nio.ByteBuffer; import org.apache.avro.io.Encoder; import org.apache.avro.util.Utf8; +import org.apache.flink.annotation.Internal; - +@Internal public final class DataOutputEncoder extends Encoder implements java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java index 66f2af6..9c06043 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java @@ -18,10 +18,12 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataOutputView; import java.io.IOException; import java.io.OutputStream; +@Internal public class DataOutputViewStream extends OutputStream { protected DataOutputView outputView; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java index e5d9070..4066e9a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java @@ -18,6 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -34,6 +35,7 @@ import static org.apache.flink.types.Either.Right; * @param <L> the Left value type * @param <R> the Right value type */ +@Internal public class EitherSerializer<L, R> extends TypeSerializer<Either<L, R>> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/FieldSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/FieldSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/FieldSerializer.java index 057eee9..5519889 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/FieldSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/FieldSerializer.java @@ -18,6 +18,8 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -28,6 +30,7 @@ import java.lang.reflect.Field; * readObject/writeObject need to be implemented in classes where there is a field of type java.lang.reflect.Field. * The two static methods in this class are to be called from these readObject/writeObject methods. */ +@Internal public class FieldSerializer { public static void serializeField(Field field, ObjectOutputStream out) throws IOException { http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java index 28fea6a..e708079 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; @@ -32,6 +33,7 @@ import org.apache.flink.util.InstantiationUtil; /** * TypeComparator for all types that extend Comparable. */ +@Internal public class GenericTypeComparator<T extends Comparable<T>> extends TypeComparator<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NoFetchingInput.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NoFetchingInput.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NoFetchingInput.java index 0f4fe94..b247783 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NoFetchingInput.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NoFetchingInput.java @@ -20,11 +20,13 @@ package org.apache.flink.api.java.typeutils.runtime; import com.esotericsoftware.kryo.KryoException; import com.esotericsoftware.kryo.io.Input; +import org.apache.flink.annotation.Internal; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; +@Internal public class NoFetchingInput extends Input { public NoFetchingInput(InputStream inputStream){ super(inputStream, 8); http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java index 3587811..47297c7 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java @@ -17,6 +17,7 @@ */ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.core.memory.DataInputView; @@ -33,6 +34,7 @@ import java.util.List; * NOTE: This class assumes to be used within a composite type comparator (such * as {@link RowComparator}) that handles serialized comparison. */ +@Internal public class NullAwareComparator<T> extends TypeComparator<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullMaskUtils.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullMaskUtils.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullMaskUtils.java index 010af7f..cfe562f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullMaskUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullMaskUtils.java @@ -17,12 +17,14 @@ */ package org.apache.flink.api.java.typeutils.runtime; +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.Row; import java.io.IOException; +@Internal public class NullMaskUtils { public static void writeNullMask(int len, Row value, DataOutputView target) throws IOException { http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java index fc4a305..945abc8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java @@ -24,6 +24,7 @@ import java.io.ObjectOutputStream; import java.lang.reflect.Field; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -33,7 +34,7 @@ import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NullKeyFieldException; import org.apache.flink.util.InstantiationUtil; - +@Internal public final class PojoComparator<T> extends CompositeTypeComparator<T> implements java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java index 57928b8..1a9c8f9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -41,6 +42,7 @@ import org.apache.flink.core.memory.DataOutputView; import static org.apache.flink.util.Preconditions.checkNotNull; +@Internal public final class PojoSerializer<T> extends TypeSerializer<T> { // Flags for the header http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java index d6c5195..135623b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java @@ -17,6 +17,7 @@ */ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -37,6 +38,7 @@ import static org.apache.flink.util.Preconditions.checkArgument; /** * Comparator for {@link Row} */ +@Internal public class RowComparator extends CompositeTypeComparator<Row> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java index 5457c05..827c2fa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java @@ -17,6 +17,7 @@ */ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -33,6 +34,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** * Serializer for {@link Row}. */ +@Internal public class RowSerializer extends TypeSerializer<Row> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java index 4b734a7..13d5575 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeComparatorFactory.java @@ -19,11 +19,13 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.InstantiationUtil; +@Internal public final class RuntimeComparatorFactory<T> implements TypeComparatorFactory<T>, java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java index 31e28f7..13b3f2c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimePairComparatorFactory.java @@ -18,11 +18,13 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; +@Internal public final class RuntimePairComparatorFactory<T1, T2> implements TypePairComparatorFactory<T1, T2>, java.io.Serializable { http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java index 96aff73..f03a7ab 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java @@ -19,11 +19,13 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.InstantiationUtil; +@Internal public final class RuntimeSerializerFactory<T> implements TypeSerializerFactory<T>, java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java index a06ff1a..b96126d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java @@ -14,11 +14,13 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple0; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +@Internal public class Tuple0Serializer extends TupleSerializer<Tuple0> { private static final long serialVersionUID = 1278813169022975971L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java index 875ecc2..e5e32be 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java @@ -18,6 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; @@ -26,7 +27,7 @@ import org.apache.flink.types.KeyFieldOutOfBoundsException; import org.apache.flink.types.NullFieldException; import org.apache.flink.types.NullKeyFieldException; - +@Internal public final class TupleComparator<T extends Tuple> extends TupleComparatorBase<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java index 28169e5..f7a327a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java @@ -20,6 +20,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; import java.util.List; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -28,7 +29,7 @@ import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.KeyFieldOutOfBoundsException; import org.apache.flink.types.NullKeyFieldException; - +@Internal public abstract class TupleComparatorBase<T> extends CompositeTypeComparator<T> implements java.io.Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java index 0897063..df6694c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java @@ -20,13 +20,14 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.types.NullFieldException; - +@Internal public class TupleSerializer<T extends Tuple> extends TupleSerializerBase<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java index 5a93cc5..afc4aa2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java @@ -18,6 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -28,6 +29,7 @@ import java.util.Objects; import static org.apache.flink.util.Preconditions.checkNotNull; +@Internal public abstract class TupleSerializerBase<T> extends TypeSerializer<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java index 4b9629a..fb81bcd 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java @@ -20,6 +20,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -34,6 +35,7 @@ import org.objenesis.strategy.StdInstantiatorStrategy; /** * Comparator for all Value types that extend Key */ +@Internal public class ValueComparator<T extends Value & Comparable<T>> extends TypeComparator<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java index 73dc0fc..56e204c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java @@ -20,6 +20,7 @@ package org.apache.flink.api.java.typeutils.runtime; import java.io.IOException; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -37,6 +38,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * @param <T> The type serialized. */ +@Internal public class ValueSerializer<T extends Value> extends TypeSerializer<T> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/AbstractMultiFSDataInputStream.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/AbstractMultiFSDataInputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/AbstractMultiFSDataInputStream.java index 88c0092..a161ceb 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/AbstractMultiFSDataInputStream.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/AbstractMultiFSDataInputStream.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; @@ -28,6 +29,7 @@ import java.io.IOException; * Abstract base class for wrappers over multiple {@link FSDataInputStream}, which gives a contiguous view on all inner * streams and makes them look like a single stream, in which we can read, seek, etc. */ +@Internal public abstract class AbstractMultiFSDataInputStream extends FSDataInputStream { /** Inner stream for the currently accessed segment of the virtual global stream */ http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataInputStream.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataInputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataInputStream.java index 23ac4f2..7c97271 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataInputStream.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataInputStream.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import java.io.IOException; @@ -28,6 +29,7 @@ import java.io.IOException; * <p> * See {@link SafetyNetCloseableRegistry} for more details on how this is utilized. */ +@Internal public class ClosingFSDataInputStream extends FSDataInputStreamWrapper implements WrappingProxyCloseable<FSDataInputStream> { @@ -94,4 +96,4 @@ public class ClosingFSDataInputStream registry.registerClosable(inputStream); return inputStream; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataOutputStream.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataOutputStream.java b/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataOutputStream.java index 120ca67..c517a83 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataOutputStream.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/ClosingFSDataOutputStream.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import java.io.IOException; @@ -28,6 +29,7 @@ import java.io.IOException; * <p> * See {@link SafetyNetCloseableRegistry} for more details on how this is utilized. */ +@Internal public class ClosingFSDataOutputStream extends FSDataOutputStreamWrapper implements WrappingProxyCloseable<FSDataOutputStream> { @@ -99,4 +101,4 @@ public class ClosingFSDataOutputStream registry.registerClosable(inputStream); return inputStream; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java index 507b756..d2eb9f2 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataInputStreamWrapper.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import org.apache.flink.util.WrappingProxy; @@ -26,6 +27,7 @@ import java.io.IOException; /** * Simple forwarding wrapper around {@link FSDataInputStream} */ +@Internal public class FSDataInputStreamWrapper extends FSDataInputStream implements WrappingProxy<FSDataInputStream> { protected final FSDataInputStream inputStream; @@ -93,4 +95,4 @@ public class FSDataInputStreamWrapper extends FSDataInputStream implements Wrapp public FSDataInputStream getWrappedDelegate() { return inputStream; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStreamWrapper.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStreamWrapper.java index 36ebe10..f015012 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStreamWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/FSDataOutputStreamWrapper.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import org.apache.flink.util.WrappingProxy; @@ -26,6 +27,7 @@ import java.io.IOException; /** * Simple forwarding wrapper around {@link FSDataInputStream} */ +@Internal public class FSDataOutputStreamWrapper extends FSDataOutputStream implements WrappingProxy<FSDataOutputStream> { protected final FSDataOutputStream outputStream; @@ -73,4 +75,4 @@ public class FSDataOutputStreamWrapper extends FSDataOutputStream implements Wra public FSDataOutputStream getWrappedDelegate() { return outputStream; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java index bf30b4f..63e6253 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/SafetyNetWrapperFileSystem.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import org.apache.flink.util.WrappingProxy; @@ -32,6 +33,7 @@ import java.net.URI; * Streams obtained by this are therefore managed by the {@link SafetyNetCloseableRegistry} to prevent resource leaks * from unclosed streams. */ +@Internal public class SafetyNetWrapperFileSystem extends FileSystem implements WrappingProxy<FileSystem> { private final SafetyNetCloseableRegistry registry; @@ -147,4 +149,4 @@ public class SafetyNetWrapperFileSystem extends FileSystem implements WrappingPr public FileSystem getWrappedDelegate() { return unsafeFileSystem; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/fs/WrappingProxyCloseable.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/WrappingProxyCloseable.java b/flink-core/src/main/java/org/apache/flink/core/fs/WrappingProxyCloseable.java index b74fc78..9f100ef 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/WrappingProxyCloseable.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/WrappingProxyCloseable.java @@ -18,6 +18,7 @@ package org.apache.flink.core.fs; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.WrappingProxy; import java.io.Closeable; @@ -25,6 +26,7 @@ import java.io.Closeable; /** * {@link WrappingProxy} for {@link Closeable} that is also closeable. */ +@Internal public interface WrappingProxyCloseable<T extends Closeable> extends Closeable, WrappingProxy<T> { } http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/core/memory/ByteArrayOutputStreamWithPos.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/ByteArrayOutputStreamWithPos.java b/flink-core/src/main/java/org/apache/flink/core/memory/ByteArrayOutputStreamWithPos.java index ebaf1b9..ddfd30a 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/ByteArrayOutputStreamWithPos.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/ByteArrayOutputStreamWithPos.java @@ -18,6 +18,7 @@ package org.apache.flink.core.memory; +import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; import java.io.IOException; @@ -27,6 +28,7 @@ import java.util.Arrays; /** * Un-synchronized stream similar to Java's ByteArrayOutputStream that also exposes the current position. */ +@Internal public class ByteArrayOutputStreamWithPos extends OutputStream { protected byte[] buffer; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/AbstractCloseableRegistry.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/AbstractCloseableRegistry.java b/flink-core/src/main/java/org/apache/flink/util/AbstractCloseableRegistry.java index 85af982..e165d97 100644 --- a/flink-core/src/main/java/org/apache/flink/util/AbstractCloseableRegistry.java +++ b/flink-core/src/main/java/org/apache/flink/util/AbstractCloseableRegistry.java @@ -18,6 +18,8 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + import java.io.Closeable; import java.io.IOException; import java.util.Map; @@ -33,6 +35,7 @@ import java.util.Map; * @param <C> Type of the closeable this registers * @param <T> Type for potential meta data associated with the registering closeables */ +@Internal public abstract class AbstractCloseableRegistry<C extends Closeable, T> implements Closeable { protected final Map<Closeable, T> closeableToRef; http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java b/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java index cd5c2e5..bd6847a 100644 --- a/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java +++ b/flink-core/src/main/java/org/apache/flink/util/CollectionUtil.java @@ -18,9 +18,12 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + import java.util.Collection; import java.util.Map; +@Internal public final class CollectionUtil { private CollectionUtil() { http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/FutureUtil.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/FutureUtil.java b/flink-core/src/main/java/org/apache/flink/util/FutureUtil.java index 62d836b..5ecf344 100644 --- a/flink-core/src/main/java/org/apache/flink/util/FutureUtil.java +++ b/flink-core/src/main/java/org/apache/flink/util/FutureUtil.java @@ -18,9 +18,12 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + import java.util.concurrent.ExecutionException; import java.util.concurrent.RunnableFuture; +@Internal public class FutureUtil { private FutureUtil() { @@ -39,4 +42,4 @@ public class FutureUtil { return future.get(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/Migration.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/Migration.java b/flink-core/src/main/java/org/apache/flink/util/Migration.java index 4bd9e39..a82488d 100644 --- a/flink-core/src/main/java/org/apache/flink/util/Migration.java +++ b/flink-core/src/main/java/org/apache/flink/util/Migration.java @@ -18,8 +18,11 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + /** * Tagging interface for migration related classes. */ +@Internal public interface Migration { } http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/WrappingProxy.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/WrappingProxy.java b/flink-core/src/main/java/org/apache/flink/util/WrappingProxy.java index 82fcf04..213feee 100644 --- a/flink-core/src/main/java/org/apache/flink/util/WrappingProxy.java +++ b/flink-core/src/main/java/org/apache/flink/util/WrappingProxy.java @@ -18,6 +18,9 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + +@Internal public interface WrappingProxy<T> { T getWrappedDelegate(); http://git-wip-us.apache.org/repos/asf/flink/blob/082d40fd/flink-core/src/main/java/org/apache/flink/util/WrappingProxyUtil.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/WrappingProxyUtil.java b/flink-core/src/main/java/org/apache/flink/util/WrappingProxyUtil.java index 0f62abd..6a79913 100644 --- a/flink-core/src/main/java/org/apache/flink/util/WrappingProxyUtil.java +++ b/flink-core/src/main/java/org/apache/flink/util/WrappingProxyUtil.java @@ -18,6 +18,9 @@ package org.apache.flink.util; +import org.apache.flink.annotation.Internal; + +@Internal public final class WrappingProxyUtil { private WrappingProxyUtil() { @@ -30,4 +33,4 @@ public final class WrappingProxyUtil { } return object; } -} \ No newline at end of file +}
