You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/10/01 15:42:12 UTC

[1/3] git commit: [FLINK-514] Fixed javadoc problems

Repository: incubator-flink
Updated Branches:
  refs/heads/master 8573bf46d -> 39ac5ab05


[FLINK-514] Fixed javadoc problems


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

Branch: refs/heads/master
Commit: c8054a3a4e9deee39e00f6132db056105c841a41
Parents: 949699d
Author: Daniel Warneke <wa...@apache.org>
Authored: Wed Oct 1 12:25:38 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Oct 1 14:03:00 2014 +0200

----------------------------------------------------------------------
 .../org/apache/flink/api/io/avro/example/User.java  |  2 +-
 .../flink/streaming/connectors/db/LevelDBState.java |  2 +-
 .../streaming/connectors/db/MemcachedState.java     |  4 +---
 .../flink/streaming/connectors/db/RedisState.java   |  2 +-
 .../streaming/connectors/twitter/TwitterSource.java |  2 +-
 .../apache/flink/streaming/api/JobGraphBuilder.java |  5 +----
 .../api/datastream/ConnectedDataStream.java         |  4 ++--
 .../flink/streaming/api/datastream/DataStream.java  | 10 +++++-----
 .../streaming/api/function/co/CoReduceFunction.java | 14 ++++----------
 .../streaming/api/invokable/StreamInvokable.java    |  2 +-
 .../java/org/apache/flink/api/java/DataSet.java     | 15 +++++++--------
 .../flink/api/java/io/RemoteCollectorImpl.java      |  6 ++----
 .../flink/api/java/operators/CrossOperator.java     |  8 ++++----
 .../flink/api/java/operators/JoinOperator.java      |  2 +-
 .../java/org/apache/flink/api/java/tuple/Tuple.java |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple1.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple10.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple11.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple12.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple13.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple14.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple15.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple16.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple17.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple18.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple19.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple2.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple20.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple21.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple22.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple23.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple24.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple25.java    |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple3.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple4.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple5.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple6.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple7.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple8.java     |  2 +-
 .../org/apache/flink/api/java/tuple/Tuple9.java     |  2 +-
 .../apache/flink/api/java/tuple/TupleGenerator.java |  2 +-
 .../java/typeutils/runtime/TupleComparatorBase.java |  4 ++--
 .../io/disk/iomanager/ChannelReaderInputView.java   |  2 +-
 .../apache/flink/runtime/net/SocketInputStream.java |  2 +-
 .../flink/runtime/operators/hash/HashPartition.java |  8 +-------
 .../runtime/operators/hash/MutableHashTable.java    | 16 +---------------
 .../operators/hash/ReOpenableHashPartition.java     |  6 ------
 .../flink/runtime/util/SingleElementIterator.java   |  2 +-
 48 files changed, 66 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
index 3394d60..4608f96 100644
--- a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
+++ b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
@@ -35,7 +35,7 @@ public class User extends org.apache.avro.specific.SpecificRecordBase implements
   /**
    * Default constructor.  Note that this does not initialize fields
    * to their default values from the schema.  If that is desired then
-   * one should use {@link \#newBuilder()}. 
+   * one should use {@link #newBuilder()}. 
    */
   public User() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/LevelDBState.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/LevelDBState.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/LevelDBState.java
index 961c7df..2e8626d 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/LevelDBState.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/LevelDBState.java
@@ -30,7 +30,7 @@ import org.iq80.leveldb.Options;
 /**
  * Interface to a LevelDB key-value store.
  * 
- * See {@linktourl https://code.google.com/p/leveldb/}
+ * @see <a href="https://code.google.com/p/leveldb/">https://code.google.com/p/leveldb/</a>
  * 
  * @param <K>
  *            Type of key

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/MemcachedState.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/MemcachedState.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/MemcachedState.java
index a05ff12..7f06a1f 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/MemcachedState.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/MemcachedState.java
@@ -25,10 +25,8 @@ import net.spy.memcached.MemcachedClient;
 /**
  * Interface to a Memcached key-value cache. It needs a running instance of Memcached.
  * 
- * See {@linktourl http://memcached.org/}
+ * @see <a href="http://memcached.org/">http://memcached.org</a>
  * 
- * @param <K>
- *            Type of key
  * @param <V>
  *            Type of value
  */

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/RedisState.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/RedisState.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/RedisState.java
index 9cce824..b9244c5 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/RedisState.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/db/RedisState.java
@@ -26,7 +26,7 @@ import redis.clients.jedis.Jedis;
 /**
  * Interface to a Redis key-value cache. It needs a running instance of Redis.
  * 
- * See {@linktourl http://redis.io/}
+ * @see <a href="http://redis.io/">http://redis.io/</a>
  * 
  * @param <K>
  *            Type of key

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
index d85c11b..3ffa8ae 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
@@ -246,7 +246,7 @@ public class TwitterSource extends RichSourceFunction<String> {
 	/**
 	 * Get the size of the queue in which the tweets are contained temporarily.
 	 * 
-	 * @return
+	 * @return the size of the queue in which the tweets are contained temporarily
 	 */
 	public int getQueueSize() {
 		return queueSize;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
index e06fde3..2defd28 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
@@ -83,10 +83,7 @@ public class JobGraphBuilder {
 
 	/**
 	 * Creates an new {@link JobGraph} with the given name. A JobGraph is a DAG
-	 * and consists of sources, tasks (intermediate vertices) and sinks. A
-	 * 
-	 * @param jobGraphName
-	 *            Name of the JobGraph
+	 * and consists of sources, tasks (intermediate vertices) and sinks.
 	 */
 	public JobGraphBuilder() {
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
index d491fad..ed46822 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
@@ -157,8 +157,8 @@ public class ConnectedDataStream<IN1, IN2> {
 	/**
 	 * Applies a CoFlatMap transformation on a {@link ConnectedDataStream} and
 	 * maps the output to a common type. The transformation calls a
-	 * {@link CoFlatMapFunction#map1} for each element of the first input and
-	 * {@link CoFlatMapFunction#map2} for each element of the second input. Each
+	 * {@link CoFlatMapFunction#flatMap1} for each element of the first input and
+	 * {@link CoFlatMapFunction#flatMap2} for each element of the second input. Each
 	 * CoFlatMapFunction call returns any number of elements including none. The
 	 * user can also extend {@link RichFlatMapFunction} to gain access to other
 	 * features provided by the {@link RichFuntion} interface.

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
index 8ff8c54..44c893b 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
@@ -222,13 +222,13 @@ public class DataStream<OUT> {
 	}
 
 	/**
-	 * Creates a new {@link MergedDataStream} by merging {@link DataStream}
+	 * Creates a new {@link DataStream} by merging {@link DataStream}
 	 * outputs of the same type with each other. The DataStreams merged using
 	 * this operator will be transformed simultaneously.
 	 * 
 	 * @param streams
 	 *            The DataStreams to merge output with.
-	 * @return The {@link MergedDataStream}.
+	 * @return The {@link DataStream}.
 	 */
 	public DataStream<OUT> merge(DataStream<OUT>... streams) {
 		DataStream<OUT> returnStream = this.copy();
@@ -391,7 +391,7 @@ public class DataStream<OUT> {
 	 * <b>Note: Only Tuple DataStreams can be projected.</b></br> The
 	 * transformation projects each Tuple of the DataSet onto a (sub)set of
 	 * fields.</br> This method returns a {@link StreamProjection} on which
-	 * {@link StreamProjection#types()} needs to be called to completed the
+	 * {@link StreamProjection#types(Class)} needs to be called to completed the
 	 * transformation.
 	 * 
 	 * @param fieldIndexes
@@ -400,7 +400,7 @@ public class DataStream<OUT> {
 	 *            of field indexes.
 	 * @return A StreamProjection that needs to be converted into a DataStream
 	 *         to complete the project transformation by calling
-	 *         {@link StreamProjection#types()}.
+	 *         {@link StreamProjection#types(Class)}.
 	 * 
 	 * @see Tuple
 	 * @see DataStream
@@ -1103,7 +1103,7 @@ public class DataStream<OUT> {
 
 	/**
 	 * Internal function for assembling the underlying
-	 * {@link org.apache.flink.nephele.jobgraph.JobGraph} of the job. Connects
+	 * {@link org.apache.flink.runtime.jobgraph.JobGraph} of the job. Connects
 	 * the outputs of the given input stream to the specified output stream
 	 * given by the outputID.
 	 * 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/co/CoReduceFunction.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/co/CoReduceFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/co/CoReduceFunction.java
index 37be1d1..879a1b4 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/co/CoReduceFunction.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/co/CoReduceFunction.java
@@ -90,24 +90,18 @@ public interface CoReduceFunction<IN1, IN2, OUT> extends Function, Serializable
 	/**
 	 * Maps the reduced first input to the output type.
 	 * 
-	 * @param <IN1>
+	 * @param value
 	 *            Type of the first input.
-	 * @param <IN2>
-	 *            Type of the second input.
-	 * @param <OUT>
-	 *            Output type.
+	 * @return the output type.
 	 */
 	public OUT map1(IN1 value);
 
 	/**
 	 * Maps the reduced second input to the output type.
 	 * 
-	 * @param <IN1>
-	 *            Type of the first input.
-	 * @param <IN2>
+	 * @param value
 	 *            Type of the second input.
-	 * @param <OUT>
-	 *            Output type.
+	 * @return the output type.
 	 */
 	public OUT map2(IN2 value);
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
index 476c519..0840722 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamInvokable.java
@@ -56,7 +56,7 @@ public abstract class StreamInvokable<IN, OUT> implements Serializable {
 	}
 
 	/**
-	 * Initializes the {@link StreamOperatorInvokable} for input and output
+	 * Initializes the {@link StreamInvokable} for input and output
 	 * handling
 	 * 
 	 * @param collector

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java b/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
index bd28cde..c582c74 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
@@ -229,13 +229,13 @@ public abstract class DataSet<T> {
 	 * Initiates a Project transformation on a {@link Tuple} {@link DataSet}.<br/>
 	 * <b>Note: Only Tuple DataSets can be projected.</b></br>
 	 * The transformation projects each Tuple of the DataSet onto a (sub)set of fields.</br>
-	 * This method returns a {@link Projection} on which {@link Projection#types} needs to
+	 * This method returns a {@link Projection} on which {@link Projection#types(Class)} needs to
 	 *   be called to completed the transformation.
 	 * 
 	 * @param fieldIndexes The field indexes of the input tuples that are retained.
 	 * 					   The order of fields in the output tuple corresponds to the order of field indexes.
 	 * @return A Projection that needs to be converted into a {@link org.apache.flink.api.java.operators.ProjectOperator} to complete the 
-	 *           Project transformation by calling {@link Projection#types}.
+	 *           Project transformation by calling {@link Projection#types(Class)}.
 	 * 
 	 * @see Tuple
 	 * @see DataSet
@@ -541,7 +541,7 @@ public abstract class DataSet<T> {
 	 *   joining elements into one DataSet.</br>
 	 * 
 	 * This method returns a {@link JoinOperatorSets} on which 
-	 *   {@link JoinOperatorSets#where} needs to be called to define the join key of the first
+	 *   {@link JoinOperatorSets#where(int...)} needs to be called to define the join key of the first 
 	 *   joining (i.e., this) DataSet.
 	 *  
 	 * @param other The other DataSet with which this DataSet is joined.
@@ -562,7 +562,7 @@ public abstract class DataSet<T> {
 	 * This method also gives the hint to the optimizer that the second DataSet to join is much
 	 *   smaller than the first one.</br>
 	 * This method returns a {@link JoinOperatorSets} on which 
-	 *   {@link JoinOperatorSets#where} needs to be called to define the join key of the first
+	 *   {@link JoinOperatorSets#where(int...)} needs to be called to define the join key of the first 
 	 *   joining (i.e., this) DataSet.
 	 *  
 	 * @param other The other DataSet with which this DataSet is joined.
@@ -583,7 +583,7 @@ public abstract class DataSet<T> {
 	 * This method also gives the hint to the optimizer that the second DataSet to join is much
 	 *   larger than the first one.</br>
 	 * This method returns a {@link JoinOperatorSets JoinOperatorSet} on which 
-	 *   {@link JoinOperatorSets#where} needs to be called to define the join key of the first
+	 *   {@link JoinOperatorSets#where(int...)} needs to be called to define the join key of the first 
 	 *   joining (i.e., this) DataSet.
 	 *  
 	 * @param other The other DataSet with which this DataSet is joined.
@@ -610,7 +610,7 @@ public abstract class DataSet<T> {
 	 * The CoGroupFunction can iterate over the elements of both groups and return any number 
 	 *   of elements including none.</br>
 	 * This method returns a {@link CoGroupOperatorSets} on which 
-	 *   {@link CoGroupOperatorSets#where} needs to be called to define the grouping key of the first
+	 *   {@link CoGroupOperatorSets#where(int...)} needs to be called to define the grouping key of the first 
 	 *   (i.e., this) DataSet.
 	 * 
 	 * @param other The other DataSet of the CoGroup transformation.
@@ -653,8 +653,7 @@ public abstract class DataSet<T> {
 	 * second input being the second field of the tuple.
 	 * 
 	 * <p>
-	 * Call {@link org.apache.flink.api.java.operators.CrossOperator.DefaultCross#with(org.apache.flink.api.common.functions.CrossFunction)} to define a
-	 * {@link org.apache.flink.api.common.functions.CrossFunction} which is called for
+	 * Call {@link org.apache.flink.api.java.operators.CrossOperator.DefaultCross#with(org.apache.flink.api.common.functions.CrossFunction)} to define a {@link CrossFunction} which is called for
 	 * each pair of crossed elements. The CrossFunction returns a exactly one element for each pair of input elements.</br>
 	 * 
 	 * @param other The other DataSet with which this DataSet is crossed. 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/io/RemoteCollectorImpl.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/RemoteCollectorImpl.java b/flink-java/src/main/java/org/apache/flink/api/java/io/RemoteCollectorImpl.java
index 79ce9f1..9596114 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/RemoteCollectorImpl.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/RemoteCollectorImpl.java
@@ -64,7 +64,6 @@ public class RemoteCollectorImpl<T> extends UnicastRemoteObject implements
 	 *            The consumer instance.
 	 * @param rmiId 
 	 * 	          An ID to register the collector in the RMI registry.
-	 * @return
 	 */
 	public static <T> void createAndBind(Integer port, RemoteCollectorConsumer<T> consumer, String rmiId) {
 		RemoteCollectorImpl<T> collectorInstance = null;
@@ -149,9 +148,8 @@ public class RemoteCollectorImpl<T> extends UnicastRemoteObject implements
 	 * implementation remotely called from the
 	 * {@link RemoteCollectorOutputFormat}.<br/>
 	 * 
-	 * @param local
-	 * @param port
-	 * @param collection
+	 * @param source the source data set
+	 * @param collection the local collection
 	 */
 	public static <T> void collectLocal(DataSet<T> source,
 			Collection<T> collection) {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
index c4cc759..fb882c1 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
@@ -152,7 +152,7 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a 
 		 *           {@link org.apache.flink.api.java.operators.CrossOperator.ProjectCross} to complete the
-		 *           Cross transformation by calling {@link CrossProjection#types()}.
+		 *           Cross transformation by calling {@link CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -177,7 +177,7 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a
 		 *           {@link org.apache.flink.api.java.operators.CrossOperator.ProjectCross} to complete the
-		 *           Cross transformation by calling {@link CrossProjection#types()}.
+		 *           Cross transformation by calling {@link CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -379,7 +379,7 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   For a non-Tuple DataSet, do not provide parameters.
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a {@link ProjectOperator} to complete the
-		 *           ProjectCross transformation by calling {@link CrossProjection#types()}.
+		 *           ProjectCross transformation by calling {@link CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -447,7 +447,7 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   For a non-Tuple DataSet, do not provide parameters.
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a {@link ProjectOperator} to complete the
-		 *           ProjectCross transformation by calling {@link CrossProjection#types()}.
+		 *           ProjectCross transformation by calling {@link CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java
index 00ae022..704bf1b 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/JoinOperator.java
@@ -144,7 +144,7 @@ public abstract class JoinOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1,
 	// --------------------------------------------------------------------------------------------
 	
 	/**
-	 * A Join transformation that applies a {@JoinFunction} on each pair of joining elements.<br/>
+	 * A Join transformation that applies a {@link JoinFunction} on each pair of joining elements.<br/>
 	 * It also represents the {@link DataSet} that is the result of a Join transformation. 
 	 * 
 	 * @param <I1> The type of the first input DataSet of the Join transformation.

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java
index ffc97b3..5e2b8a2 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple.java
@@ -53,7 +53,7 @@ public abstract class Tuple implements java.io.Serializable {
 	 * Gets the field at the specified position, throws NullFieldException if the field is null. Used for comparing key fields.
 	 * 
 	 * @param pos The position of the field, zero indexed. 
-	 * @returnThe field at the specified position.
+	 * @return The field at the specified position.
 	 * @throws IndexOutOfBoundsException Thrown, if the position is negative, or equal to, or larger than the number of fields.
 	 * @throws NullFieldException Thrown, if the field at pos is null.
 	 */

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java
index 7e50e18..5d0a226 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple1.java
@@ -132,7 +132,7 @@ public class Tuple1<T0> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple1<T0> copy(){ 
 		return new Tuple1<T0>(this.f0);

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java
index 91a5bf8..04d4d66 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple10.java
@@ -258,7 +258,7 @@ public class Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple10<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> copy(){ 
 		return new Tuple10<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java
index 905369a..eaa726d 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple11.java
@@ -272,7 +272,7 @@ public class Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Tuple
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple11<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> copy(){ 
 		return new Tuple11<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java
index 2a14e85..09de5b2 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple12.java
@@ -286,7 +286,7 @@ public class Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends T
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple12<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> copy(){ 
 		return new Tuple12<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java
index 2ddd916..1667158 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple13.java
@@ -300,7 +300,7 @@ public class Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> exte
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple13<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> copy(){ 
 		return new Tuple13<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java
index 4b8dea4..18c2a0d 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple14.java
@@ -314,7 +314,7 @@ public class Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple14<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> copy(){ 
 		return new Tuple14<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java
index 114041f..f160f4f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple15.java
@@ -328,7 +328,7 @@ public class Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple15<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> copy(){ 
 		return new Tuple15<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java
index f6b5df8..86c3226 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple16.java
@@ -342,7 +342,7 @@ public class Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple16<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> copy(){ 
 		return new Tuple16<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java
index c30c305..8b48455 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple17.java
@@ -356,7 +356,7 @@ public class Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple17<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> copy(){ 
 		return new Tuple17<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java
index a182c9d..4706df9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple18.java
@@ -370,7 +370,7 @@ public class Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple18<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17> copy(){ 
 		return new Tuple18<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java
index b93032d..2383348 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple19.java
@@ -384,7 +384,7 @@ public class Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple19<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18> copy(){ 
 		return new Tuple19<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java
index 4ea9a5f..99511e8e 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple2.java
@@ -154,7 +154,7 @@ public class Tuple2<T0, T1> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple2<T0,T1> copy(){ 
 		return new Tuple2<T0,T1>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java
index f5cad0f..0e19aed 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple20.java
@@ -398,7 +398,7 @@ public class Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple20<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19> copy(){ 
 		return new Tuple20<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java
index 34f1909..496d00f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple21.java
@@ -412,7 +412,7 @@ public class Tuple21<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple21<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20> copy(){ 
 		return new Tuple21<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java
index b937084..0195263 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple22.java
@@ -426,7 +426,7 @@ public class Tuple22<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple22<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21> copy(){ 
 		return new Tuple22<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java
index 59dda80..9a57e80 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple23.java
@@ -440,7 +440,7 @@ public class Tuple23<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple23<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22> copy(){ 
 		return new Tuple23<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java
index f8b737f..12a23a7 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple24.java
@@ -454,7 +454,7 @@ public class Tuple24<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple24<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23> copy(){ 
 		return new Tuple24<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java
index 71fb1b7..f45e78f 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple25.java
@@ -468,7 +468,7 @@ public class Tuple25<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple25<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24> copy(){ 
 		return new Tuple25<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java
index df38edf..3cf47bf 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple3.java
@@ -160,7 +160,7 @@ public class Tuple3<T0, T1, T2> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple3<T0,T1,T2> copy(){ 
 		return new Tuple3<T0,T1,T2>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java
index 3492425..6b8dbf9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple4.java
@@ -174,7 +174,7 @@ public class Tuple4<T0, T1, T2, T3> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple4<T0,T1,T2,T3> copy(){ 
 		return new Tuple4<T0,T1,T2,T3>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java
index 3d34266..8f5b75a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple5.java
@@ -188,7 +188,7 @@ public class Tuple5<T0, T1, T2, T3, T4> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple5<T0,T1,T2,T3,T4> copy(){ 
 		return new Tuple5<T0,T1,T2,T3,T4>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java
index 4d97148..c3ec29b 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple6.java
@@ -202,7 +202,7 @@ public class Tuple6<T0, T1, T2, T3, T4, T5> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple6<T0,T1,T2,T3,T4,T5> copy(){ 
 		return new Tuple6<T0,T1,T2,T3,T4,T5>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java
index 621fe1a..d211287 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple7.java
@@ -216,7 +216,7 @@ public class Tuple7<T0, T1, T2, T3, T4, T5, T6> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple7<T0,T1,T2,T3,T4,T5,T6> copy(){ 
 		return new Tuple7<T0,T1,T2,T3,T4,T5,T6>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java
index db0f4ec..1e05ad9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple8.java
@@ -230,7 +230,7 @@ public class Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple8<T0,T1,T2,T3,T4,T5,T6,T7> copy(){ 
 		return new Tuple8<T0,T1,T2,T3,T4,T5,T6,T7>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java
index 45d7d05..92d52c8 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/Tuple9.java
@@ -244,7 +244,7 @@ public class Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> extends Tuple {
 
 	/**
 	* Shallow tuple copy.
-	* @returns A new Tuple with the same fields as this.
+	* @return A new Tuple with the same fields as this.
 	 */
 	public Tuple9<T0,T1,T2,T3,T4,T5,T6,T7,T8> copy(){ 
 		return new Tuple9<T0,T1,T2,T3,T4,T5,T6,T7,T8>(this.f0,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java b/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java
index cdc369f..d439e79 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/tuple/TupleGenerator.java
@@ -722,7 +722,7 @@ class TupleGenerator {
 		w.println();
 		w.println("\t/**");
 		w.println("\t* Shallow tuple copy.");
-		w.println("\t* @returns A new Tuple with the same fields as this.");
+		w.println("\t* @return A new Tuple with the same fields as this.");
 		w.println("\t */");
 		w.println("\tpublic " + className + tupleTypes + " copy(){ ");
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java
index 5966231..4c26318 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java
@@ -270,8 +270,8 @@ public abstract class TupleComparatorBase<T> extends TypeComparator<T> implement
 	 * Based on some empirical evidence, we are using a 32-element subsequence of the  
 	 * OEIS sequence #A068652 (numbers such that every cyclic permutation is a prime).
 	 * 
-	 * @see: http://en.wikipedia.org/wiki/List_of_prime_numbers
-	 * @see: http://oeis.org/A068652
+	 * @see <a href="http://en.wikipedia.org/wiki/List_of_prime_numbers">http://en.wikipedia.org/wiki/List_of_prime_numbers</a>
+	 * @see <a href="http://oeis.org/A068652">http://oeis.org/A068652</a>
 	 */
 	public static final int[] HASH_SALT = new int[] {
 		73   , 79   , 97   , 113  , 131  , 197  , 199  , 311   , 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java
index a49b83f..25aa289 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java
@@ -110,7 +110,7 @@ public class ChannelReaderInputView extends AbstractPagedInputView {
 	 *                  given, the reader avoids issuing pre-fetch requests for blocks
 	 *                  beyond the channel size.
 	 * @param headerLen The length of the header assumed at the beginning of the block. Note that the
-	 *                  {@link #nextSegment(MemorySegment)} method assumes the default header length,
+	 *                  {@link #nextSegment(org.apache.flink.core.memory.MemorySegment)} method assumes the default header length,
 	 *                  so any subclass changing the header length should override that methods as well.
 	 * @param waitForFirstBlock A flag indicating weather this constructor call should block
 	 *                          until the first block has returned from the asynchronous I/O reader.

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java
index 6ca7d81..eb22ad0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketInputStream.java
@@ -148,7 +148,7 @@ public class SocketInputStream extends InputStream implements ReadableByteChanne
 	/**
 	 * Returns underlying channel used by inputstream.
 	 * This is useful in certain cases like channel for
-	 * {@link FileChannel#transferFrom(ReadableByteChannel, long, long)}.
+	 * {@link java.nio.channels.FileChannel#transferFrom(ReadableByteChannel, long, long)}.
 	 */
 	public ReadableByteChannel getChannel() {
 		return reader.channel;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java
index 16ebc5f..5bae3a1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java
@@ -261,7 +261,7 @@ public class HashPartition<BT, PT> extends AbstractPagedInputView implements See
 	 * <p>
 	 * If this method is invoked when the partition is still being built, it has undefined behavior.
 	 *   
-	 * @param object The record to be inserted into the probe side buffers.
+	 * @param record The record to be inserted into the probe side buffers.
 	 * @throws IOException Thrown, if the buffer is full, needs to be spilled, and spilling causes an error.
 	 */
 	public final void insertIntoProbeBuffer(PT record) throws IOException
@@ -311,12 +311,6 @@ public class HashPartition<BT, PT> extends AbstractPagedInputView implements See
 		return this.buildSideWriteBuffer.spill(this.buildSideChannel);
 	}
 	
-	/**
-	 * @param spilledPartitions
-	 * @param ioAccess
-	 * @param probeChannelEnumerator
-	 * @throws IOException
-	 */
 	public void finalizeBuildPhase(IOManager ioAccess, Channel.Enumerator probeChannelEnumerator,
 			LinkedBlockingQueue<MemorySegment> bufferReturnQueue)
 	throws IOException

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
index dca88eb..21bd8df 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
@@ -531,10 +531,7 @@ public class MutableHashTable<BT, PT> implements MemorySegmentSource {
 			return false;
 		}
 	}
-	/**
-	 * @return
-	 * @throws IOException
-	 */
+	
 	public boolean nextRecord() throws IOException {
 		
 		final boolean probeProcessing = processProbeIter();
@@ -596,16 +593,10 @@ public class MutableHashTable<BT, PT> implements MemorySegmentSource {
 //		}
 //	}
 	
-	/**
-	 * @return
-	 */
 	public PT getCurrentProbeRecord() {
 		return this.probeIterator.getCurrent();
 	}
 	
-	/**
-	 * @return
-	 */
 	public HashBucketIterator<BT, PT> getBuildSideIterator() {
 		return this.bucketIterator;
 	}
@@ -1025,11 +1016,6 @@ public class MutableHashTable<BT, PT> implements MemorySegmentSource {
 		this.partitionsBeingBuilt.clear();
 	}
 	
-	/**
-	 * @param numBuckets
-	 * @param numPartitions
-	 * @return
-	 */
 	protected void initTable(int numBuckets, byte numPartitions) {
 		final int bucketsPerSegment = this.bucketsPerSegmentMask + 1;
 		final int numSegs = (numBuckets >>> this.bucketsPerSegmentBits) + ( (numBuckets & this.bucketsPerSegmentMask) == 0 ? 0 : 1);

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java
index afe5c3b..3695aea 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java
@@ -59,12 +59,6 @@ public class ReOpenableHashPartition<BT, PT> extends HashPartition<BT, PT> {
 				initialBuffer, memSource, segmentSize);
 	}
 
-	/**
-	* This method is used if the HashTable is setup for multiple probe phases.
-	* We can drop probe related files but not build files (or memory)
-	* @param furtherPartitioning Set to true if additional partitioning steps are required -> release as much memory as possible! (Memory contents are stored on disk)
-	* @throws IOException 
-	*/
 	@Override
 	public int finalizeProbePhase(List<MemorySegment> freeMemory,
 			List<HashPartition<BT, PT>> spilledPartitions) throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c8054a3a/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java
index 0b2247b..b98d7d5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/SingleElementIterator.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * An {@link Iterator} that contains only a single element. The element can be reset such that the iterator can be used
  * multiple times. Initially, the iterator is empty until an element is set via {@link #set(Object)}.
  * 
- * @param<E> The generic type of the iterator.
+ * @param <E> The generic type of the iterator.
  */
 public final class SingleElementIterator<E> implements Iterator<E>, Iterable<E> {
 		


[2/3] git commit: Fix guava dependency in flink-streaming-core to allow IDE local testing.

Posted by se...@apache.org.
Fix guava dependency in flink-streaming-core to allow IDE local testing.


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

Branch: refs/heads/master
Commit: 949699dbfe17b62352413769635aed3aaff56100
Parents: 8573bf4
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Oct 1 12:14:18 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Oct 1 14:03:00 2014 +0200

----------------------------------------------------------------------
 flink-addons/flink-streaming/flink-streaming-core/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/949699db/flink-addons/flink-streaming/flink-streaming-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
index 63b1145..65111ad 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -48,6 +48,14 @@ under the License.
 			<version>2.2</version>
 		</dependency>
 
+		<!--  guava needs to be in "provided" scope, so to not re-export the dependency -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>


[3/3] git commit: [FLINK-514] Fix additional javadoc problems and add suppressions for certain compiler warnings.

Posted by se...@apache.org.
[FLINK-514] Fix additional javadoc problems and add suppressions for certain compiler warnings.


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

Branch: refs/heads/master
Commit: 39ac5ab0562d1c40ed051395a9ac056c7a1ee54a
Parents: c8054a3
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Oct 1 13:27:25 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Oct 1 14:30:14 2014 +0200

----------------------------------------------------------------------
 .../org/apache/flink/client/web/GUIServletStub.java     |  1 -
 .../flink/api/common/typeutils/TypeComparator.java      |  2 +-
 .../api/common/typeutils/base/BasicTypeComparator.java  |  3 +++
 .../main/java/org/apache/flink/api/java/DataSet.java    |  3 ++-
 .../apache/flink/api/java/operators/CrossOperator.java  | 12 ++++++++----
 .../api/java/record/io/ExternalProcessInputSplit.java   |  2 ++
 .../apache/flink/api/java/typeutils/TypeExtractor.java  |  1 +
 .../operators/testutils/types/IntListComparator.java    |  1 +
 .../operators/testutils/types/IntPairComparator.java    |  3 +--
 .../operators/testutils/types/StringPairComparator.java |  1 +
 .../flink/runtime/operators/util/OutputEmitterTest.java |  2 +-
 11 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java b/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java
index 1e3785b..83f8c39 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/GUIServletStub.java
@@ -143,7 +143,6 @@ public abstract class GUIServletStub extends HttpServlet {
 				+ "</div></h1>");
 		writer.println("  </div>");
 
-		@SuppressWarnings("unchecked")
 		Map<String, String[]> m = (Map<String, String[]>) req.getParameterMap();
 
 		// let the content be printed by the child class

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java
index f935656..27487ed 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.api.common.typeutils;
 
 import java.io.IOException;
@@ -297,6 +296,7 @@ public abstract class TypeComparator<T> implements Serializable {
 	 * Get the field comparators. This is used together with {@link #extractKeys(Object)} to provide
 	 * interoperability between different record types.
 	 */
+	@SuppressWarnings("rawtypes")
 	public abstract TypeComparator[] getComparators();
 
 	// --------------------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java
index 5f61081..4e44326 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java
@@ -34,9 +34,11 @@ public abstract class BasicTypeComparator<T extends Comparable<T>> extends TypeC
 	protected final boolean ascendingComparison;
 
 	// This is used in extractKeys, so that we don't create a new array for every call.
+	@SuppressWarnings("rawtypes")
 	private final Comparable[] extractedKey = new Comparable[1];
 
 	// For use by getComparators
+	@SuppressWarnings("rawtypes")
 	private final TypeComparator[] comparators = new TypeComparator[] {this};
 	
 
@@ -93,6 +95,7 @@ public abstract class BasicTypeComparator<T extends Comparable<T>> extends TypeC
 	}
 
 	@Override
+	@SuppressWarnings("rawtypes")
 	public TypeComparator[] getComparators() {
 		return comparators;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java b/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
index c582c74..d2939d8 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/DataSet.java
@@ -653,7 +653,8 @@ public abstract class DataSet<T> {
 	 * second input being the second field of the tuple.
 	 * 
 	 * <p>
-	 * Call {@link org.apache.flink.api.java.operators.CrossOperator.DefaultCross#with(org.apache.flink.api.common.functions.CrossFunction)} to define a {@link CrossFunction} which is called for
+	 * Call {@link org.apache.flink.api.java.operators.CrossOperator.DefaultCross#with(org.apache.flink.api.common.functions.CrossFunction)} to define a
+	 * {@link org.apache.flink.api.common.functions.CrossFunction} which is called for
 	 * each pair of crossed elements. The CrossFunction returns a exactly one element for each pair of input elements.</br>
 	 * 
 	 * @param other The other DataSet with which this DataSet is crossed. 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
index fb882c1..d0b5054 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java
@@ -152,7 +152,8 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a 
 		 *           {@link org.apache.flink.api.java.operators.CrossOperator.ProjectCross} to complete the
-		 *           Cross transformation by calling {@link CrossProjection#types(Class)}.
+		 *           Cross transformation by calling
+		 *           {@link org.apache.flink.api.java.operators.CrossOperator.CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -177,7 +178,8 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a
 		 *           {@link org.apache.flink.api.java.operators.CrossOperator.ProjectCross} to complete the
-		 *           Cross transformation by calling {@link CrossProjection#types(Class)}.
+		 *           Cross transformation by calling
+		 *           {@link org.apache.flink.api.java.operators.CrossOperator.CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -379,7 +381,8 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   For a non-Tuple DataSet, do not provide parameters.
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a {@link ProjectOperator} to complete the
-		 *           ProjectCross transformation by calling {@link CrossProjection#types(Class)}.
+		 *           Cross transformation by calling
+		 *           {@link org.apache.flink.api.java.operators.CrossOperator.CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet
@@ -447,7 +450,8 @@ public class CrossOperator<I1, I2, OUT> extends TwoInputUdfOperator<I1, I2, OUT,
 		 * 					   For a non-Tuple DataSet, do not provide parameters.
 		 * 					   The order of fields in the output tuple is defined by to the order of field indexes.
 		 * @return A CrossProjection that needs to be converted into a {@link ProjectOperator} to complete the
-		 *           ProjectCross transformation by calling {@link CrossProjection#types(Class)}.
+		 *           Cross transformation by calling
+		 *           {@link org.apache.flink.api.java.operators.CrossOperator.CrossProjection#types(Class)}.
 		 *
 		 * @see Tuple
 		 * @see DataSet

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java
index 84a660b..7b5ac96 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/record/io/ExternalProcessInputSplit.java
@@ -36,6 +36,8 @@ import org.apache.flink.core.memory.DataOutputView;
  */
 public class ExternalProcessInputSplit extends GenericInputSplit {
 
+	private static final long serialVersionUID = 1L;
+	
 	// command to be executed for this input split
 	private String extProcessCommand;
 	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
index d30d152..d8e1aed 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
@@ -873,6 +873,7 @@ public class TypeExtractor {
 		return new GenericTypeInfo<X>(clazz);
 	}
 
+	@SuppressWarnings("unused")
 	private <X> TypeInformation<X> analyzePojo(Class<X> clazz) {
 		List<Field> fields = getAllDeclaredFields(clazz);
 		List<PojoField> pojoFields = new ArrayList<PojoField>();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java
index 1a886a1..49d31a2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java
@@ -26,6 +26,7 @@ import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.core.memory.MemorySegment;
 
+@SuppressWarnings("rawtypes")
 public class IntListComparator extends TypeComparator<IntList> {
 	
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java
index 6abb502..98c5b69 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.runtime.operators.testutils.types;
 
 import java.io.IOException;
@@ -27,7 +26,7 @@ import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.core.memory.MemorySegment;
 
-
+@SuppressWarnings("rawtypes")
 public class IntPairComparator extends TypeComparator<IntPair> {
 
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java
index 7b32874..a5355dd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java
@@ -27,6 +27,7 @@ import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.core.memory.MemorySegment;
 import org.apache.flink.types.StringValue;
 
+@SuppressWarnings("rawtypes")
 public class StringPairComparator extends TypeComparator<StringPair> {
 	
 	private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/39ac5ab0/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
index c39054f..765d121 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
@@ -380,7 +380,7 @@ public class OutputEmitterTest extends TestCase {
 		Assert.fail("Expected a NullKeyFieldException.");
 	}
 	
-	@SuppressWarnings("serial")
+	@SuppressWarnings({"serial", "rawtypes"})
 	private static class TestIntComparator extends TypeComparator<Integer> {
 		private final Comparable[] extractedKey = new Comparable[1];