flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [2/8] flink git commit: [FLINK-3367] Add PublicEvolving and Internal annotations to flink-java and flink-scala
Date Sun, 14 Feb 2016 21:54:39 GMT
[FLINK-3367] Add PublicEvolving and Internal annotations to flink-java and flink-scala


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

Branch: refs/heads/master
Commit: e5f33b6d12d8f3d3d2d4bc216ce074d2605fc9ae
Parents: 937963e
Author: Fabian Hueske <fhueske@apache.org>
Authored: Mon Feb 8 15:18:53 2016 +0100
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Sun Feb 14 20:26:26 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/flink/api/java/ClosureCleaner.java | 2 ++
 .../java/org/apache/flink/api/java/CollectionEnvironment.java   | 2 ++
 flink-java/src/main/java/org/apache/flink/api/java/Utils.java   | 2 ++
 .../apache/flink/api/java/aggregation/AggregationFunction.java  | 2 ++
 .../flink/api/java/aggregation/AggregationFunctionFactory.java  | 2 ++
 .../flink/api/java/aggregation/MaxAggregationFunction.java      | 3 ++-
 .../flink/api/java/aggregation/MinAggregationFunction.java      | 3 ++-
 .../flink/api/java/aggregation/SumAggregationFunction.java      | 2 ++
 .../java/aggregation/UnsupportedAggregationTypeException.java   | 2 ++
 .../java/org/apache/flink/api/java/functions/FirstReducer.java  | 2 ++
 .../org/apache/flink/api/java/functions/FlatMapIterator.java    | 2 ++
 .../org/apache/flink/api/java/functions/FormattingMapper.java   | 2 ++
 .../apache/flink/api/java/functions/GroupReduceIterator.java    | 3 ++-
 .../java/org/apache/flink/api/java/functions/IdPartitioner.java | 2 ++
 .../apache/flink/api/java/functions/SampleInCoordinator.java    | 2 ++
 .../org/apache/flink/api/java/functions/SampleInPartition.java  | 2 ++
 .../org/apache/flink/api/java/functions/SampleWithFraction.java | 2 ++
 .../apache/flink/api/java/functions/SelectByMaxFunction.java    | 3 ++-
 .../apache/flink/api/java/functions/SelectByMinFunction.java    | 3 ++-
 .../org/apache/flink/api/java/functions/SemanticPropUtil.java   | 2 ++
 .../api/java/hadoop/common/HadoopInputFormatCommonBase.java     | 2 ++
 .../api/java/hadoop/common/HadoopOutputFormatCommonBase.java    | 2 ++
 .../flink/api/java/hadoop/mapred/HadoopInputFormatBase.java     | 2 ++
 .../flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java    | 2 ++
 .../apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java  | 2 ++
 .../api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java | 2 ++
 .../api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java     | 2 ++
 .../flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java  | 2 ++
 .../flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java  | 2 ++
 .../flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java | 2 ++
 .../flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java      | 2 ++
 .../org/apache/flink/api/java/io/CollectionInputFormat.java     | 2 ++
 .../main/java/org/apache/flink/api/java/io/CsvInputFormat.java  | 2 ++
 .../main/java/org/apache/flink/api/java/io/CsvOutputFormat.java | 2 ++
 .../java/org/apache/flink/api/java/io/IteratorInputFormat.java  | 2 ++
 .../apache/flink/api/java/io/LocalCollectionOutputFormat.java   | 2 ++
 .../apache/flink/api/java/io/ParallelIteratorInputFormat.java   | 2 ++
 .../java/org/apache/flink/api/java/io/PojoCsvInputFormat.java   | 2 ++
 .../java/org/apache/flink/api/java/io/PrimitiveInputFormat.java | 4 +++-
 .../java/org/apache/flink/api/java/io/PrintingOutputFormat.java | 3 ++-
 .../java/org/apache/flink/api/java/io/SplitDataProperties.java  | 2 ++
 .../main/java/org/apache/flink/api/java/io/TextInputFormat.java | 2 ++
 .../java/org/apache/flink/api/java/io/TextOutputFormat.java     | 2 ++
 .../java/org/apache/flink/api/java/io/TextValueInputFormat.java | 3 ++-
 .../java/org/apache/flink/api/java/io/TupleCsvInputFormat.java  | 2 ++
 .../org/apache/flink/api/java/io/TypeSerializerInputFormat.java | 2 ++
 .../apache/flink/api/java/io/TypeSerializerOutputFormat.java    | 2 ++
 .../org/apache/flink/api/java/operators/CoGroupRawOperator.java | 2 ++
 .../java/org/apache/flink/api/java/operators/KeyFunctions.java  | 2 ++
 .../apache/flink/api/java/operators/OperatorTranslation.java    | 2 ++
 .../org/apache/flink/api/java/operators/UdfOperatorUtils.java   | 2 ++
 .../operators/translation/CombineToGroupCombineWrapper.java     | 2 ++
 .../api/java/operators/translation/KeyExtractingMapper.java     | 2 ++
 .../flink/api/java/operators/translation/KeyRemovingMapper.java | 2 ++
 .../translation/PlanBothUnwrappingCoGroupOperator.java          | 2 ++
 .../api/java/operators/translation/PlanFilterOperator.java      | 2 ++
 .../translation/PlanLeftUnwrappingCoGroupOperator.java          | 2 ++
 .../api/java/operators/translation/PlanProjectOperator.java     | 2 ++
 .../translation/PlanRightUnwrappingCoGroupOperator.java         | 2 ++
 .../translation/PlanUnwrappingGroupCombineOperator.java         | 2 ++
 .../translation/PlanUnwrappingReduceGroupOperator.java          | 2 ++
 .../operators/translation/PlanUnwrappingReduceOperator.java     | 2 ++
 .../translation/PlanUnwrappingSortedGroupCombineOperator.java   | 2 ++
 .../translation/PlanUnwrappingSortedReduceGroupOperator.java    | 2 ++
 .../java/operators/translation/Tuple3UnwrappingIterator.java    | 2 ++
 .../api/java/operators/translation/Tuple3WrappingCollector.java | 2 ++
 .../java/operators/translation/TupleLeftUnwrappingJoiner.java   | 2 ++
 .../java/operators/translation/TupleRightUnwrappingJoiner.java  | 2 ++
 .../api/java/operators/translation/TupleUnwrappingIterator.java | 2 ++
 .../api/java/operators/translation/TupleUnwrappingJoiner.java   | 2 ++
 .../api/java/operators/translation/TupleWrappingCollector.java  | 2 ++
 .../api/java/operators/translation/TwoKeyExtractingMapper.java  | 2 ++
 .../flink/api/java/operators/translation/WrappingFunction.java  | 3 ++-
 .../org/apache/flink/api/java/sampling/BernoulliSampler.java    | 2 ++
 .../flink/api/java/sampling/DistributedRandomSampler.java       | 3 +++
 .../apache/flink/api/java/sampling/IntermediateSampleData.java  | 3 +++
 .../java/org/apache/flink/api/java/sampling/PoissonSampler.java | 2 ++
 .../java/org/apache/flink/api/java/sampling/RandomSampler.java  | 4 ++++
 .../api/java/sampling/ReservoirSamplerWithReplacement.java      | 2 ++
 .../api/java/sampling/ReservoirSamplerWithoutReplacement.java   | 2 ++
 .../org/apache/flink/api/java/sca/CodeAnalyzerException.java    | 3 +++
 .../java/org/apache/flink/api/java/sca/CodeErrorException.java  | 3 +++
 .../java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java | 2 ++
 .../java/org/apache/flink/api/java/sca/ModifiedASMFrame.java    | 4 +++-
 .../org/apache/flink/api/java/sca/NestedMethodAnalyzer.java     | 2 ++
 .../main/java/org/apache/flink/api/java/sca/TaggedValue.java    | 2 ++
 .../main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java    | 2 ++
 .../java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java    | 2 ++
 .../src/main/java/org/apache/flink/api/java/utils/Option.java   | 3 +++
 .../main/java/org/apache/flink/api/java/utils/OptionType.java   | 3 +++
 .../org/apache/flink/api/java/utils/RequiredParameters.java     | 3 +++
 .../flink/api/java/utils/RequiredParametersException.java       | 3 +++
 .../apache/flink/api/scala/operators/ScalaCsvOutputFormat.java  | 2 ++
 .../main/scala/org/apache/flink/api/scala/ClosureCleaner.scala  | 5 +++++
 .../main/scala/org/apache/flink/api/scala/CrossDataSet.scala    | 3 ++-
 .../main/scala/org/apache/flink/api/scala/codegen/Counter.scala | 3 +++
 .../org/apache/flink/api/scala/codegen/MacroContextHolder.scala | 4 ++++
 .../main/scala/org/apache/flink/api/scala/codegen/TreeGen.scala | 3 +++
 .../scala/org/apache/flink/api/scala/codegen/TypeAnalyzer.scala | 2 ++
 .../org/apache/flink/api/scala/codegen/TypeDescriptors.scala    | 3 +++
 .../org/apache/flink/api/scala/codegen/TypeInformationGen.scala | 2 ++
 .../src/main/scala/org/apache/flink/api/scala/joinDataSet.scala | 1 +
 .../apache/flink/api/scala/typeutils/CaseClassComparator.scala  | 2 ++
 .../apache/flink/api/scala/typeutils/CaseClassSerializer.scala  | 2 ++
 .../org/apache/flink/api/scala/typeutils/EitherSerializer.scala | 2 ++
 .../apache/flink/api/scala/typeutils/EnumValueComparator.scala  | 2 ++
 .../apache/flink/api/scala/typeutils/EnumValueSerializer.scala  | 2 ++
 .../apache/flink/api/scala/typeutils/NothingSerializer.scala    | 2 ++
 .../org/apache/flink/api/scala/typeutils/OptionSerializer.scala | 2 ++
 .../flink/api/scala/typeutils/TraversableSerializer.scala       | 2 ++
 .../org/apache/flink/api/scala/typeutils/TrySerializer.scala    | 2 ++
 .../scala/org/apache/flink/api/scala/typeutils/TypeUtils.scala  | 3 +++
 .../org/apache/flink/api/scala/typeutils/UnitSerializer.scala   | 2 ++
 .../org/apache/flink/api/scala/unfinishedKeyPairOperation.scala | 3 +++
 114 files changed, 249 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
index 37cf8d3..8eaebb8 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
@@ -19,6 +19,7 @@
 package org.apache.flink.api.java;
 
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.util.InstantiationUtil;
 import org.objectweb.asm.ClassReader;
@@ -31,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
+@Internal
 public class ClosureCleaner {
 	private static Logger LOG = LoggerFactory.getLogger(ClosureCleaner.class);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/CollectionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/CollectionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/CollectionEnvironment.java
index b9e9f81..0d66286 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/CollectionEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/CollectionEnvironment.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.JobExecutionResult;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.common.operators.CollectionExecutor;
 
+@PublicEvolving
 public class CollectionEnvironment extends ExecutionEnvironment {
 
 	@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/Utils.java b/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
index 80f8199..246db02 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
@@ -20,6 +20,7 @@ package org.apache.flink.api.java;
 
 import org.apache.commons.lang3.StringUtils;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.accumulators.Accumulator;
 import org.apache.flink.api.common.accumulators.SerializedListAccumulator;
 import org.apache.flink.api.common.accumulators.SimpleAccumulator;
@@ -40,6 +41,7 @@ import static org.apache.flink.api.java.functions.FunctionAnnotation.SkipCodeAna
 /**
  * Utility class that contains helper methods to work with Java APIs.
  */
+@Internal
 public final class Utils {
 	
 	public static final Random RNG = new Random();

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java
index 562dc34..8117cfe 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunction.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.Internal;
 
 /**
  * @param <T> The type to be aggregated.
  */
+@Internal
 public abstract class AggregationFunction<T> implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java
index 06a05f4..b1d4218 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/AggregationFunctionFactory.java
@@ -18,7 +18,9 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.Internal;
 
+@Internal
 public interface AggregationFunctionFactory extends java.io.Serializable {
 
 	<T> AggregationFunction<T> createAggregationFunction(Class<T> type);

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java
index 59d9e13..d1edbe2 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MaxAggregationFunction.java
@@ -18,10 +18,11 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.types.CopyableValue;
 import org.apache.flink.types.ResettableValue;
 
-
+@Internal
 public abstract class MaxAggregationFunction<T extends Comparable<T>> extends AggregationFunction<T> {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java
index b72b0f4..a4a9e0e 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/MinAggregationFunction.java
@@ -18,10 +18,11 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.types.CopyableValue;
 import org.apache.flink.types.ResettableValue;
 
-
+@Internal
 public abstract class MinAggregationFunction<T extends Comparable<T>> extends AggregationFunction<T> {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java
index ad4644b..7fb1f7b 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/SumAggregationFunction.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.types.ByteValue;
 import org.apache.flink.types.DoubleValue;
 import org.apache.flink.types.FloatValue;
@@ -25,6 +26,7 @@ import org.apache.flink.types.IntValue;
 import org.apache.flink.types.LongValue;
 import org.apache.flink.types.ShortValue;
 
+@Internal
 public abstract class SumAggregationFunction<T> extends AggregationFunction<T> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java
index 7b04b08..694e500 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/aggregation/UnsupportedAggregationTypeException.java
@@ -18,7 +18,9 @@
 
 package org.apache.flink.api.java.aggregation;
 
+import org.apache.flink.annotation.PublicEvolving;
 
+@PublicEvolving
 public class UnsupportedAggregationTypeException extends RuntimeException {
 
 	private static final long serialVersionUID = -1721898801986321005L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/FirstReducer.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/FirstReducer.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FirstReducer.java
index fdd114e..2063a12 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/FirstReducer.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/FirstReducer.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.util.Collector;
 
+@Internal
 public class FirstReducer<T> implements GroupReduceFunction<T, T>, GroupCombineFunction<T, T> {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java
index 6279083..8f47d8f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/FlatMapIterator.java
@@ -20,6 +20,7 @@ package org.apache.flink.api.java.functions;
 
 import java.util.Iterator;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.RichFlatMapFunction;
 import org.apache.flink.util.Collector;
 
@@ -32,6 +33,7 @@ import org.apache.flink.util.Collector;
  * @param <IN> Type of the input elements.
  * @param <OUT> Type of the returned elements.
  */
+@PublicEvolving
 public abstract class FlatMapIterator<IN, OUT> extends RichFlatMapFunction<IN, OUT> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/FormattingMapper.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/FormattingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/FormattingMapper.java
index f2fbde1..95ae4a2 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/FormattingMapper.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/FormattingMapper.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.io.TextOutputFormat;
 import org.apache.flink.api.java.io.TextOutputFormat.TextFormatter;
 
+@Internal
 public class FormattingMapper<T> implements MapFunction<T, String> {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java
index d2f8f1f..722d99b 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/GroupReduceIterator.java
@@ -20,10 +20,11 @@ package org.apache.flink.api.java.functions;
 
 import java.util.Iterator;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.RichGroupReduceFunction;
 import org.apache.flink.util.Collector;
 
-
+@PublicEvolving
 public abstract class GroupReduceIterator<IN, OUT> extends RichGroupReduceFunction<IN, OUT> {
 	
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/IdPartitioner.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/IdPartitioner.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/IdPartitioner.java
index a50ded1..31caf86 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/IdPartitioner.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/IdPartitioner.java
@@ -18,8 +18,10 @@
 
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.Partitioner;
 
+@Internal
 public class IdPartitioner implements Partitioner<Integer> {
 
 	private static final long serialVersionUID = -1206233785103357568L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInCoordinator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInCoordinator.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInCoordinator.java
index 528d746..61b28af 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInCoordinator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInCoordinator.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.api.java.sampling.IntermediateSampleData;
 import org.apache.flink.api.java.sampling.DistributedRandomSampler;
@@ -35,6 +36,7 @@ import java.util.Iterator;
  *
  * @param <T> the data type wrapped in ElementWithRandom as input.
  */
+@Internal
 public class SampleInCoordinator<T> implements GroupReduceFunction<IntermediateSampleData<T>, T> {
 
 	private boolean withReplacement;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInPartition.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInPartition.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInPartition.java
index 295fb44..d524200 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInPartition.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleInPartition.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.RichMapPartitionFunction;
 import org.apache.flink.api.java.sampling.IntermediateSampleData;
 import org.apache.flink.api.java.sampling.DistributedRandomSampler;
@@ -32,6 +33,7 @@ import java.util.Iterator;
  *
  * @param <T> The type of input data
  */
+@Internal
 public class SampleInPartition<T> extends RichMapPartitionFunction<T, IntermediateSampleData<T>> {
 
 	private boolean withReplacement;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleWithFraction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleWithFraction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleWithFraction.java
index 4ef9aa0..04730f2 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleWithFraction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SampleWithFraction.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.RichMapPartitionFunction;
 import org.apache.flink.api.java.sampling.BernoulliSampler;
 import org.apache.flink.api.java.sampling.PoissonSampler;
@@ -31,6 +32,7 @@ import java.util.Iterator;
  *
  * @param <T>
  */
+@Internal
 public class SampleWithFraction<T> extends RichMapPartitionFunction<T, T> {
 
 	private boolean withReplacement;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMaxFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMaxFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMaxFunction.java
index 6dc7710..6e806db 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMaxFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMaxFunction.java
@@ -17,11 +17,12 @@
  */
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.ReduceFunction;
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.typeutils.TupleTypeInfo;
 
-
+@Internal
 public class SelectByMaxFunction<T extends Tuple> implements ReduceFunction<T> {
 	private static final long serialVersionUID = 1L;
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMinFunction.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMinFunction.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMinFunction.java
index 096175b..fdd5f7f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMinFunction.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SelectByMinFunction.java
@@ -17,11 +17,12 @@
  */
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.ReduceFunction;
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.typeutils.TupleTypeInfo;
 
-
+@Internal
 public class SelectByMinFunction<T extends Tuple> implements ReduceFunction<T> {
 	private static final long serialVersionUID = 1L;
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java b/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java
index a75b8e0..f8c76e1 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/functions/SemanticPropUtil.java
@@ -19,6 +19,7 @@
 
 package org.apache.flink.api.java.functions;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.operators.DualInputSemanticProperties;
 import org.apache.flink.api.common.operators.SemanticProperties;
 import org.apache.flink.api.common.operators.SemanticProperties.InvalidSemanticAnnotationException;
@@ -51,6 +52,7 @@ import java.util.regex.Pattern;
 /**
  * Utility class that contains helper methods to work with {@link SemanticProperties}.
  */
+@Internal
 public final class SemanticPropUtil {
 
 	private final static String REGEX_WILDCARD = "[\\"+ Keys.ExpressionKeys.SELECT_ALL_CHAR+"\\"+ Keys.ExpressionKeys.SELECT_ALL_CHAR_SCALA+"]";

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopInputFormatCommonBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopInputFormatCommonBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopInputFormatCommonBase.java
index e442943..0c8ae81 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopInputFormatCommonBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopInputFormatCommonBase.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.hadoop.common;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.RichInputFormat;
 import org.apache.flink.core.io.InputSplit;
 import org.apache.hadoop.security.Credentials;
@@ -31,6 +32,7 @@ import java.lang.reflect.Method;
 /**
  * A common base for both "mapred" and "mapreduce" Hadoop input formats.
  */
+@Internal
 public abstract class HadoopInputFormatCommonBase<T, SPITTYPE extends InputSplit> extends RichInputFormat<T, SPITTYPE> {
 	protected transient Credentials credentials;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopOutputFormatCommonBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopOutputFormatCommonBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopOutputFormatCommonBase.java
index de611ce..8d493c0 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopOutputFormatCommonBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/common/HadoopOutputFormatCommonBase.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.hadoop.common;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.RichOutputFormat;
 import org.apache.hadoop.security.Credentials;
 
@@ -29,6 +30,7 @@ import java.io.ObjectOutputStream;
  *
  * The base is taking care of handling (serializing) security credentials.
  */
+@Internal
 public abstract class HadoopOutputFormatCommonBase<T> extends RichOutputFormat<T> {
 	protected transient Credentials credentials;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopInputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopInputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopInputFormatBase.java
index 356f7ad..d80c80a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopInputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopInputFormatBase.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.hadoop.mapred;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
 import org.apache.flink.api.common.io.LocatableInputSplitAssigner;
 import org.apache.flink.api.common.io.statistics.BaseStatistics;
@@ -53,6 +54,7 @@ import java.util.ArrayList;
  * @param <V> Type of value
  * @param <T> The type iself
  */
+@Internal
 public abstract class HadoopInputFormatBase<K, V, T> extends HadoopInputFormatCommonBase<T, HadoopInputSplit> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
index eef0905..e3f9c69 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.hadoop.mapred;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.FinalizeOnMaster;
 import org.apache.flink.api.java.hadoop.common.HadoopOutputFormatCommonBase;
 import org.apache.flink.api.java.hadoop.mapred.utils.HadoopUtils;
@@ -50,6 +51,7 @@ import static org.apache.flink.api.java.hadoop.common.HadoopInputFormatCommonBas
  * @param <V> Type of Value
  * @param <T> Record type.
  */
+@Internal
 public abstract class HadoopOutputFormatBase<K, V, T> extends HadoopOutputFormatCommonBase<T> implements FinalizeOnMaster {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
index d279e54..ab4e993 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/utils/HadoopUtils.java
@@ -23,6 +23,7 @@ import java.io.File;
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.GlobalConfiguration;
 import org.apache.hadoop.conf.Configuration;
@@ -37,6 +38,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Utility class to work with Apache Hadoop MapRed classes.
  */
+@Internal
 public final class HadoopUtils {
 
 	private static final Logger LOG = LoggerFactory.getLogger(HadoopUtils.class);

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java
index 215b890..15f5975 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyProgressable.java
@@ -19,12 +19,14 @@
 
 package org.apache.flink.api.java.hadoop.mapred.wrapper;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.hadoop.util.Progressable;
 
 /**
  * This is a dummy progress
  *
  */
+@PublicEvolving
 public class HadoopDummyProgressable implements Progressable {
 	@Override
 	public void progress() { 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java
index 01104ac..d074058 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopDummyReporter.java
@@ -19,6 +19,7 @@
 
 package org.apache.flink.api.java.hadoop.mapred.wrapper;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.hadoop.mapred.Counters.Counter;
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.Reporter;
@@ -27,6 +28,7 @@ import org.apache.hadoop.mapred.Reporter;
  * This is a dummy progress monitor / reporter
  *
  */
+@PublicEvolving
 public class HadoopDummyReporter implements Reporter {
 
 	@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java
index 15f94b2..f909a90 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/wrapper/HadoopInputSplit.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.io.InputSplit;
 import org.apache.flink.core.io.LocatableInputSplit;
 
@@ -34,6 +35,7 @@ import org.apache.hadoop.mapred.JobConfigurable;
  * A wrapper that represents an input split from the Hadoop mapred API as
  * a Flink {@link InputSplit}.
  */
+@Internal
 public class HadoopInputSplit extends LocatableInputSplit {
 
 	private static final long serialVersionUID = -6990336376163226160L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java
index e9b23f7..4829ce7 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopInputFormatBase.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.hadoop.mapreduce;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
 import org.apache.flink.api.common.io.LocatableInputSplitAssigner;
 import org.apache.flink.api.common.io.statistics.BaseStatistics;
@@ -53,6 +54,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * Base class shared between the Java and Scala API of Flink
  */
+@Internal
 public abstract class HadoopInputFormatBase<K, V, T> extends HadoopInputFormatCommonBase<T, HadoopInputSplit> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
index d2bb310..84a14e0 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.hadoop.mapreduce;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.FinalizeOnMaster;
 import org.apache.flink.api.java.hadoop.common.HadoopOutputFormatCommonBase;
 import org.apache.flink.api.java.hadoop.mapreduce.utils.HadoopUtils;
@@ -45,6 +46,7 @@ import static org.apache.flink.api.java.hadoop.common.HadoopInputFormatCommonBas
 /**
  * Base class shared between the Java and Scala API of Flink
  */
+@Internal
 public abstract class HadoopOutputFormatBase<K, V, T> extends HadoopOutputFormatCommonBase<T> implements FinalizeOnMaster {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
index 9ca3d70..b219de4 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/utils/HadoopUtils.java
@@ -21,6 +21,7 @@ package org.apache.flink.api.java.hadoop.mapreduce.utils;
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.JobID;
@@ -30,6 +31,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptID;
 /**
  * Utility class to work with next generation of Apache Hadoop MapReduce classes.
  */
+@Internal
 public final class HadoopUtils {
 	
 	/**

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java
index 2ac19ba..0dad9e3 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/CollectionInputFormat.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.GenericInputFormat;
 import org.apache.flink.api.common.io.NonParallelInput;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -36,6 +37,7 @@ import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
 /**
  * An input format that returns objects from a collection.
  */
+@PublicEvolving
 public class CollectionInputFormat<T> extends GenericInputFormat<T> implements NonParallelInput {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java
index 8f0aa64..4105305 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvInputFormat.java
@@ -20,6 +20,7 @@ package org.apache.flink.api.java.io;
 
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Ints;
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.io.GenericCsvInputFormat;
 import org.apache.flink.core.fs.FileInputSplit;
 import org.apache.flink.types.parser.FieldParser;
@@ -28,6 +29,7 @@ import java.io.IOException;
 import org.apache.flink.core.fs.Path;
 import org.apache.flink.util.StringUtils;
 
+@Internal
 public abstract class CsvInputFormat<OUT> extends GenericCsvInputFormat<OUT> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
index 9239e25..dc20620 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +41,7 @@ import org.apache.flink.types.StringValue;
  * Record delimiter separate records from each other ('\n' is common). Field
  * delimiters separate fields within a record.
  */
+@PublicEvolving
 public class CsvOutputFormat<T extends Tuple> extends FileOutputFormat<T> implements InputTypeConfigurable {
 	private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java
index 718e49d..cb8bd6a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/IteratorInputFormat.java
@@ -22,12 +22,14 @@ package org.apache.flink.api.java.io;
 import java.io.Serializable;
 import java.util.Iterator;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.GenericInputFormat;
 import org.apache.flink.api.common.io.NonParallelInput;
 
 /**
  * An input format that returns objects from an iterator.
  */
+@PublicEvolving
 public class IteratorInputFormat<T> extends GenericInputFormat<T> implements NonParallelInput {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java
index f3ffd93..65ed6c3 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/LocalCollectionOutputFormat.java
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.io.RichOutputFormat;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -35,6 +36,7 @@ import org.apache.flink.configuration.Configuration;
 /**
  *  An output format that writes record into collection
  */
+@PublicEvolving
 public class LocalCollectionOutputFormat<T> extends RichOutputFormat<T> implements InputTypeConfigurable {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java
index f02038f..a6ac853 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/ParallelIteratorInputFormat.java
@@ -21,6 +21,7 @@ package org.apache.flink.api.java.io;
 import java.io.IOException;
 import java.util.Iterator;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.GenericInputFormat;
 import org.apache.flink.core.io.GenericInputSplit;
 import org.apache.flink.util.SplittableIterator;
@@ -29,6 +30,7 @@ import org.apache.flink.util.SplittableIterator;
 /**
  * An input format that generates data in parallel through a {@link SplittableIterator}.
  */
+@PublicEvolving
 public class ParallelIteratorInputFormat<T> extends GenericInputFormat<T> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/PojoCsvInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/PojoCsvInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/PojoCsvInputFormat.java
index 2f1139c..26a771f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/PojoCsvInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/PojoCsvInputFormat.java
@@ -18,6 +18,7 @@
 package org.apache.flink.api.java.io;
 
 import com.google.common.base.Preconditions;
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.java.typeutils.PojoTypeInfo;
 import org.apache.flink.core.fs.FileInputSplit;
 import org.apache.flink.core.fs.Path;
@@ -28,6 +29,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+@Internal
 public class PojoCsvInputFormat<OUT> extends CsvInputFormat<OUT> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/PrimitiveInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/PrimitiveInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/PrimitiveInputFormat.java
index 6a22767..3dbc966 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/PrimitiveInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/PrimitiveInputFormat.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.io;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.DelimitedInputFormat;
 import org.apache.flink.core.fs.FileInputSplit;
 import org.apache.flink.core.fs.Path;
@@ -30,6 +31,7 @@ import java.io.IOException;
  * An input format that reads single field primitive data from a given file. The difference between this and
  * {@link org.apache.flink.api.java.io.CsvInputFormat} is that it won't go through {@link org.apache.flink.api.java.tuple.Tuple1}.
  */
+@PublicEvolving
 public class PrimitiveInputFormat<OT> extends DelimitedInputFormat<OT> {
 
 	private static final long serialVersionUID = 1L;
@@ -80,4 +82,4 @@ public class PrimitiveInputFormat<OT> extends DelimitedInputFormat<OT> {
 			throw new IOException("Could not parse value: \""+s+"\" as type "+primitiveClass.getSimpleName());
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java
index 6b67c46..a010fd8 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/PrintingOutputFormat.java
@@ -20,10 +20,11 @@ package org.apache.flink.api.java.io;
 
 import java.io.PrintStream;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.RichOutputFormat;
 import org.apache.flink.configuration.Configuration;
 
-
+@PublicEvolving
 public class PrintingOutputFormat<T> extends RichOutputFormat<T> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/SplitDataProperties.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/SplitDataProperties.java b/flink-java/src/main/java/org/apache/flink/api/java/io/SplitDataProperties.java
index 6763cdf..db09380 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/SplitDataProperties.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/SplitDataProperties.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.io;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.api.common.functions.Partitioner;
 import org.apache.flink.api.common.operators.GenericDataSourceBase;
@@ -55,6 +56,7 @@ import java.util.Arrays;
  * @see org.apache.flink.api.common.io.InputFormat
  * @see org.apache.flink.api.java.operators.DataSource
  */
+@PublicEvolving
 public class SplitDataProperties<T> implements GenericDataSourceBase.SplitDataProperties<T> {
 
 	private TypeInformation<T> type;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java
index 8f03abd..d6a02f1 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TextInputFormat.java
@@ -21,10 +21,12 @@ package org.apache.flink.api.java.io;
 import java.io.IOException;
 import java.nio.charset.Charset;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.DelimitedInputFormat;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.fs.Path;
 
+@PublicEvolving
 public class TextInputFormat extends DelimitedInputFormat<String> {
 	
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java
index 7719ab1..d466082 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TextOutputFormat.java
@@ -24,9 +24,11 @@ import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.FileOutputFormat;
 import org.apache.flink.core.fs.Path;
 
+@PublicEvolving
 public class TextOutputFormat<T> extends FileOutputFormat<T> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
index 1444fb1..fbfcd8d 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
@@ -26,12 +26,13 @@ import java.nio.charset.CharsetDecoder;
 import java.util.Arrays;
 
 import com.google.common.base.Charsets;
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.io.DelimitedInputFormat;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.fs.Path;
 import org.apache.flink.types.StringValue;
 
-
+@PublicEvolving
 public class TextValueInputFormat extends DelimitedInputFormat<StringValue> {
 	
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TupleCsvInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TupleCsvInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TupleCsvInputFormat.java
index 82caddd..6efd566 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TupleCsvInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TupleCsvInputFormat.java
@@ -17,12 +17,14 @@
  */
 package org.apache.flink.api.java.io;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.fs.Path;
 
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.java.typeutils.TupleTypeInfoBase;
 import org.apache.flink.api.java.typeutils.runtime.TupleSerializerBase;
 
+@Internal
 public class TupleCsvInputFormat<OUT> extends CsvInputFormat<OUT> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerInputFormat.java
index 7d0dfaa..50c63b6 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerInputFormat.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.io;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.io.BinaryInputFormat;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -31,6 +32,7 @@ import java.io.IOException;
  * Reads elements by deserializing them with a given type serializer.
  * @param <T>
  */
+@PublicEvolving
 public class TypeSerializerInputFormat<T> extends BinaryInputFormat<T> implements ResultTypeQueryable<T> {
 
 	private static final long serialVersionUID = 2123068581665107480L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerOutputFormat.java
index 0c9ed80..81a142e 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TypeSerializerOutputFormat.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.io;
 
+import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.io.BinaryOutputFormat;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -31,6 +32,7 @@ import java.io.IOException;
  * Stores elements by serializing them with their type serializer.
  * @param <T> type parameter
  */
+@PublicEvolving
 public class TypeSerializerOutputFormat<T> extends BinaryOutputFormat<T> implements InputTypeConfigurable {
 
 	private static final long serialVersionUID = -6653022644629315158L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupRawOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupRawOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupRawOperator.java
index 74f54b8..9a6d800 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupRawOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/CoGroupRawOperator.java
@@ -17,6 +17,7 @@
  */
 package org.apache.flink.api.java.operators;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.functions.Function;
@@ -37,6 +38,7 @@ import org.apache.flink.api.common.operators.Keys.IncompatibleKeysException;
  * 
  * @see DataSet
  */
+@Internal
 public class CoGroupRawOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT, CoGroupRawOperator<I1, I2, OUT>> {
 
 	private final CoGroupFunction<I1, I2, OUT> function;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/KeyFunctions.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/KeyFunctions.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/KeyFunctions.java
index 49d598a..057048c 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/KeyFunctions.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/KeyFunctions.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.MapOperatorBase;
@@ -34,6 +35,7 @@ import org.apache.flink.api.java.typeutils.TupleTypeInfo;
  * This class holds static utilities to append functions that extract and
  * prune keys.
  */
+@Internal
 public class KeyFunctions {
 
 	@SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java
index 339b1af..74811a3 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/OperatorTranslation.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.java.DataSet;
 
@@ -36,6 +37,7 @@ import org.apache.flink.api.common.operators.base.BulkIterationBase;
 import org.apache.flink.api.common.operators.base.DeltaIterationBase;
 import org.apache.flink.configuration.Configuration;
 
+@Internal
 public class OperatorTranslation {
 	
 	/** The already translated operations */

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperatorUtils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperatorUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperatorUtils.java
index 6144975..660f845 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperatorUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/UdfOperatorUtils.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.CodeAnalysisMode;
 import org.apache.flink.api.common.functions.Function;
 import org.apache.flink.api.common.functions.InvalidTypesException;
@@ -33,6 +34,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Utility class that contains helper methods to work with UDF operators.
  */
+@Internal
 public final class UdfOperatorUtils {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UdfOperatorUtils.class);

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/CombineToGroupCombineWrapper.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/CombineToGroupCombineWrapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/CombineToGroupCombineWrapper.java
index 87c1e33..3488403 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/CombineToGroupCombineWrapper.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/CombineToGroupCombineWrapper.java
@@ -18,6 +18,7 @@
 package org.apache.flink.api.java.operators.translation;
 
 import com.google.common.base.Preconditions;
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.CombineFunction;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
@@ -27,6 +28,7 @@ import org.apache.flink.util.Collector;
  * A wrapper the wraps a function that implements both {@link CombineFunction} and {@link GroupReduceFunction} interfaces
  * and makes it look like a function that implements {@link GroupCombineFunction} and {@link GroupReduceFunction} to the runtime.
  */
+@Internal
 public class CombineToGroupCombineWrapper<IN, OUT, F extends CombineFunction<IN, IN> & GroupReduceFunction<IN, OUT>>
 	implements GroupCombineFunction<IN, IN>, GroupReduceFunction<IN, OUT> {
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java
index 1e99e2d..f35b950 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyExtractingMapper.java
@@ -18,11 +18,13 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields;
 import org.apache.flink.api.java.functions.KeySelector;
 import org.apache.flink.api.common.functions.RichMapFunction;
 import org.apache.flink.api.java.tuple.Tuple2;
 
+@Internal
 @ForwardedFields("*->1")
 public final class KeyExtractingMapper<T, K> extends RichMapFunction<T, Tuple2<K, T>> {
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java
index e61c0de..5f0de32 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/KeyRemovingMapper.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.RichMapFunction;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields;
 import org.apache.flink.api.java.tuple.Tuple2;
 
+@Internal
 @ForwardedFields("1->*")
 public final class KeyRemovingMapper<T, K> extends RichMapFunction<Tuple2<K, T>, T> {
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanBothUnwrappingCoGroupOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanBothUnwrappingCoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanBothUnwrappingCoGroupOperator.java
index f620e11..1814329 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanBothUnwrappingCoGroupOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanBothUnwrappingCoGroupOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.operators.BinaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.CoGroupOperatorBase;
@@ -26,6 +27,7 @@ import org.apache.flink.api.common.operators.Keys;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.util.Collector;
 
+@Internal
 public class PlanBothUnwrappingCoGroupOperator<I1, I2, OUT, K>
 		extends CoGroupOperatorBase<Tuple2<K, I1>, Tuple2<K, I2>, OUT, CoGroupFunction<Tuple2<K, I1>, Tuple2<K, I2>, OUT>>
 {

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java
index 77dbad6..c93191f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.FilterFunction;
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
@@ -26,6 +27,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields;
 import org.apache.flink.util.Collector;
 
+@Internal
 @ForwardedFields("*")
 public class PlanFilterOperator<T> extends FilterOperatorBase<T, FlatMapFunction<T, T>> {
 	

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanLeftUnwrappingCoGroupOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanLeftUnwrappingCoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanLeftUnwrappingCoGroupOperator.java
index 2307c0c..78840ce 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanLeftUnwrappingCoGroupOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanLeftUnwrappingCoGroupOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.operators.BinaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.CoGroupOperatorBase;
@@ -26,6 +27,7 @@ import org.apache.flink.api.common.operators.Keys;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.util.Collector;
 
+@Internal
 public class PlanLeftUnwrappingCoGroupOperator<I1, I2, OUT, K>
 		extends CoGroupOperatorBase<Tuple2<K, I1>, I2, OUT, CoGroupFunction<Tuple2<K, I1>, I2, OUT>>
 {

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java
index 101b89b..fe981a5 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanProjectOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.functions.AbstractRichFunction;
 import org.apache.flink.api.common.functions.MapFunction;
@@ -26,6 +27,7 @@ import org.apache.flink.api.common.operators.base.MapOperatorBase;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple;
 
+@Internal
 public class PlanProjectOperator<T, R extends Tuple> extends MapOperatorBase<T, R, MapFunction<T, R>> {
 
 	public PlanProjectOperator(int[] fields, String name,

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanRightUnwrappingCoGroupOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanRightUnwrappingCoGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanRightUnwrappingCoGroupOperator.java
index 30e28eb..faeca4e 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanRightUnwrappingCoGroupOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanRightUnwrappingCoGroupOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.operators.BinaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.CoGroupOperatorBase;
@@ -26,6 +27,7 @@ import org.apache.flink.api.common.operators.Keys;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.util.Collector;
 
+@Internal
 public class PlanRightUnwrappingCoGroupOperator<I1, I2, OUT, K>
 		extends CoGroupOperatorBase<I1, Tuple2<K, I2>, OUT, CoGroupFunction<I1, Tuple2<K, I2>, OUT>>
 {

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingGroupCombineOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingGroupCombineOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingGroupCombineOperator.java
index 95b5840..e9feb61 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingGroupCombineOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingGroupCombineOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.GroupCombineOperatorBase;
@@ -30,6 +31,7 @@ import org.apache.flink.util.Collector;
  * A group combine operator that takes 2-tuples (key-value pairs), and applies the group combine operation only
  * on the unwrapped values.
  */
+@Internal
 public class PlanUnwrappingGroupCombineOperator<IN, OUT, K> extends GroupCombineOperatorBase<Tuple2<K, IN>, OUT, GroupCombineFunction<Tuple2<K, IN>, OUT>> {
 
 	public PlanUnwrappingGroupCombineOperator(GroupCombineFunction<IN, OUT> udf, Keys.SelectorFunctionKeys<IN, K> key, String name,

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java
index 21f15d4..8568659 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceGroupOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
@@ -31,6 +32,7 @@ import org.apache.flink.util.Collector;
  * A reduce operator that takes 2-tuples (key-value pairs), and applies the group reduce operation only
  * on the unwrapped values.
  */
+@Internal
 public class PlanUnwrappingReduceGroupOperator<IN, OUT, K> extends GroupReduceOperatorBase<Tuple2<K, IN>, OUT, GroupReduceFunction<Tuple2<K, IN>,OUT>> {
 
 	public PlanUnwrappingReduceGroupOperator(

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java
index e85bb79..72dc41a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingReduceOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.ReduceFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.ReduceOperatorBase;
@@ -30,6 +31,7 @@ import org.apache.flink.api.java.tuple.Tuple2;
  * A reduce operator that takes 2-tuples (key-value pairs), and applies the reduce operation only
  * on the unwrapped values.
  */
+@Internal
 public class PlanUnwrappingReduceOperator<T, K> extends ReduceOperatorBase<Tuple2<K, T>, ReduceFunction<Tuple2<K, T>>> {
 
 	public PlanUnwrappingReduceOperator(ReduceFunction<T> udf, Keys.SelectorFunctionKeys<T, K> key, String name,

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedGroupCombineOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedGroupCombineOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedGroupCombineOperator.java
index 46773fa..f65f169 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedGroupCombineOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedGroupCombineOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
 import org.apache.flink.api.common.operators.base.GroupCombineOperatorBase;
@@ -30,6 +31,7 @@ import org.apache.flink.util.Collector;
  * A reduce operator that takes 3-tuples (groupKey, sortKey, value), and applies the sorted partial group reduce
  * operation only on the unwrapped values.
  */
+@Internal
 public class PlanUnwrappingSortedGroupCombineOperator<IN, OUT, K1, K2> extends GroupCombineOperatorBase<Tuple3<K1, K2, IN>, OUT, GroupCombineFunction<Tuple3<K1, K2, IN>,OUT>> {
 
 	public PlanUnwrappingSortedGroupCombineOperator(GroupCombineFunction<IN, OUT> udf, Keys.SelectorFunctionKeys<IN, K1> groupingKey, Keys.SelectorFunctionKeys<IN, K2> sortingKey, String name,

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedReduceGroupOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedReduceGroupOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedReduceGroupOperator.java
index f0e8055..8080477 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedReduceGroupOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanUnwrappingSortedReduceGroupOperator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.GroupCombineFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
@@ -31,6 +32,7 @@ import org.apache.flink.util.Collector;
  * A reduce operator that takes 3-tuples (groupKey, sortKey, value), and applies the sorted group reduce
  * operation only on the unwrapped values.
  */
+@Internal
 public class PlanUnwrappingSortedReduceGroupOperator<IN, OUT, K1, K2> extends GroupReduceOperatorBase<Tuple3<K1, K2, IN>, OUT, GroupReduceFunction<Tuple3<K1, K2, IN>,OUT>> {
 
 	public PlanUnwrappingSortedReduceGroupOperator(

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3UnwrappingIterator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3UnwrappingIterator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3UnwrappingIterator.java
index 2ee55bf..fd3b4f6 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3UnwrappingIterator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3UnwrappingIterator.java
@@ -20,6 +20,7 @@ package org.apache.flink.api.java.operators.translation;
 
 import java.util.Iterator;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.java.tuple.Tuple3;
 import org.apache.flink.util.TraversableOnceException;
 
@@ -27,6 +28,7 @@ import org.apache.flink.util.TraversableOnceException;
  * An iterator that reads 3-tuples (groupKey, sortKey, value) and returns only the values (third field).
  * The iterator also tracks the groupKeys, as the triples flow though it.
  */
+@Internal
 public class Tuple3UnwrappingIterator<T, K1, K2> implements Iterator<T>, Iterable<T>, java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3WrappingCollector.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3WrappingCollector.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3WrappingCollector.java
index 29d68f1..189dcdb 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3WrappingCollector.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/Tuple3WrappingCollector.java
@@ -18,12 +18,14 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.java.tuple.Tuple3;
 import org.apache.flink.util.Collector;
 
 /**
  * Needed to wrap tuples to {@code Tuple3<groupKey, sortKey, value>} for combine method of group reduce with key selector sorting
  */
+@Internal
 public class Tuple3WrappingCollector<IN, K1, K2> implements Collector<IN>, java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/flink/blob/e5f33b6d/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleLeftUnwrappingJoiner.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleLeftUnwrappingJoiner.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleLeftUnwrappingJoiner.java
index 18d3378..2ff73ef 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleLeftUnwrappingJoiner.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/TupleLeftUnwrappingJoiner.java
@@ -18,10 +18,12 @@
 
 package org.apache.flink.api.java.operators.translation;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.FlatJoinFunction;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.util.Collector;
 
+@Internal
 public final class TupleLeftUnwrappingJoiner<I1, I2, OUT, K>
 		extends WrappingFunction<FlatJoinFunction<I1, I2, OUT>>
 		implements FlatJoinFunction<Tuple2<K, I1>, I2, OUT> {


Mime
View raw message