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

[3/9] flink git commit: [FLINK-7182] Activate checkstyle flink-java/functions

http://git-wip-us.apache.org/repos/asf/flink/blob/ec1044d9/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesPrecedenceTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesPrecedenceTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesPrecedenceTest.java
index ed778c7..3a27cda 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesPrecedenceTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesPrecedenceTest.java
@@ -29,6 +29,7 @@ import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.io.DiscardingOutputFormat;
 import org.apache.flink.api.java.tuple.Tuple3;
+
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
@@ -36,7 +37,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
- * Tests the precedence of semantic properties: annotation > API > static code analyzer
+ * Tests the precedence of semantic properties: annotation > API > static code analyzer.
  */
 public class SemanticPropertiesPrecedenceTest {
 
@@ -46,7 +47,7 @@ public class SemanticPropertiesPrecedenceTest {
 		env.getConfig().setCodeAnalysisMode(CodeAnalysisMode.OPTIMIZE);
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3l, "test", 42));
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3L, "test", 42));
 		input
 				.map(new WildcardForwardedMapperWithForwardAnnotation<Tuple3<Long, String, Integer>>())
 				.output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
@@ -74,7 +75,7 @@ public class SemanticPropertiesPrecedenceTest {
 		env.getConfig().setCodeAnalysisMode(CodeAnalysisMode.OPTIMIZE);
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3l, "test", 42));
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3L, "test", 42));
 		input
 				.map(new WildcardForwardedMapperWithSkipAnnotation<Tuple3<Long, String, Integer>>())
 				.output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
@@ -102,7 +103,7 @@ public class SemanticPropertiesPrecedenceTest {
 		env.getConfig().setCodeAnalysisMode(CodeAnalysisMode.OPTIMIZE);
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3l, "test", 42));
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3L, "test", 42));
 		input
 				.map(new WildcardForwardedMapper<Tuple3<Long, String, Integer>>())
 				.withForwardedFields("f0")
@@ -131,7 +132,7 @@ public class SemanticPropertiesPrecedenceTest {
 		env.getConfig().setCodeAnalysisMode(CodeAnalysisMode.OPTIMIZE);
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3l, "test", 42));
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(Tuple3.of(3L, "test", 42));
 		input
 				.map(new WildcardForwardedMapper<Tuple3<Long, String, Integer>>())
 				.output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
@@ -156,7 +157,7 @@ public class SemanticPropertiesPrecedenceTest {
 	// --------------------------------------------------------------------------------------------
 
 	@FunctionAnnotation.ForwardedFields("f0")
-	public static class WildcardForwardedMapperWithForwardAnnotation<T> implements MapFunction<T, T> {
+	private static class WildcardForwardedMapperWithForwardAnnotation<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
@@ -165,7 +166,7 @@ public class SemanticPropertiesPrecedenceTest {
 	}
 
 	@FunctionAnnotation.SkipCodeAnalysis
-	public static class WildcardForwardedMapperWithSkipAnnotation<T> implements MapFunction<T, T> {
+	private static class WildcardForwardedMapperWithSkipAnnotation<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
@@ -173,7 +174,7 @@ public class SemanticPropertiesPrecedenceTest {
 		}
 	}
 
-	public static class WildcardForwardedMapper<T> implements MapFunction<T, T> {
+	private static class WildcardForwardedMapper<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {

http://git-wip-us.apache.org/repos/asf/flink/blob/ec1044d9/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java
index 0368ca3..255dec0 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesProjectionTest.java
@@ -16,11 +16,8 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.api.java.functions;
 
-import org.apache.flink.api.java.DataSet;
-import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.common.operators.DualInputSemanticProperties;
 import org.apache.flink.api.common.operators.GenericDataSinkBase;
@@ -28,24 +25,33 @@ import org.apache.flink.api.common.operators.SingleInputSemanticProperties;
 import org.apache.flink.api.common.operators.base.CrossOperatorBase;
 import org.apache.flink.api.common.operators.base.InnerJoinOperatorBase;
 import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
+import org.apache.flink.api.java.DataSet;
+import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.io.DiscardingOutputFormat;
 import org.apache.flink.api.java.operators.translation.PlanProjectOperator;
-import org.apache.flink.api.java.tuple.*;
+import org.apache.flink.api.java.tuple.Tuple;
+import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.api.java.tuple.Tuple3;
+import org.apache.flink.api.java.tuple.Tuple4;
+import org.apache.flink.api.java.tuple.Tuple5;
 import org.apache.flink.api.java.typeutils.TupleTypeInfo;
+
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
+/**
+ * Tests for semantic properties of projected fields.
+ */
 public class SemanticPropertiesProjectionTest {
 
 	final List<Tuple5<Integer, Long, String, Long, Integer>> emptyTupleData = new ArrayList<Tuple5<Integer, Long, String, Long, Integer>>();
 
-
 	final TupleTypeInfo<Tuple5<Integer, Long, String, Long, Integer>> tupleTypeInfo = new
 			TupleTypeInfo<Tuple5<Integer, Long, String, Long, Integer>>(
 			BasicTypeInfo.INT_TYPE_INFO,
@@ -159,8 +165,8 @@ public class SemanticPropertiesProjectionTest {
 		DataSet<Tuple4<Integer, Tuple3<String, Integer, Long>, Tuple2<Long, Long>, String>> tupleDs = env.fromCollection(emptyNestedTupleData, nestedTupleTypeInfo);
 
 		tupleDs.join(tupleDs).where(0).equalTo(0)
-				.projectFirst(2,0)
-				.projectSecond(1,3)
+				.projectFirst(2, 0)
+				.projectSecond(1, 3)
 				.output(new DiscardingOutputFormat<Tuple>());
 
 		Plan plan = env.createProgramPlan();
@@ -237,7 +243,7 @@ public class SemanticPropertiesProjectionTest {
 
 		tupleDs.cross(tupleDs)
 				.projectFirst(2, 0)
-				.projectSecond(1,3)
+				.projectSecond(1, 3)
 				.output(new DiscardingOutputFormat<Tuple>());
 
 		Plan plan = env.createProgramPlan();

http://git-wip-us.apache.org/repos/asf/flink/blob/ec1044d9/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java
index d01ca32..8bbd92b 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropertiesTranslationTest.java
@@ -16,11 +16,8 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.api.java.functions;
 
-import static org.junit.Assert.*;
-
 import org.apache.flink.api.common.Plan;
 import org.apache.flink.api.common.functions.JoinFunction;
 import org.apache.flink.api.common.functions.MapFunction;
@@ -31,32 +28,35 @@ import org.apache.flink.api.common.operators.SingleInputSemanticProperties;
 import org.apache.flink.api.common.operators.base.InnerJoinOperatorBase;
 import org.apache.flink.api.common.operators.base.MapOperatorBase;
 import org.apache.flink.api.common.operators.util.FieldSet;
+import org.apache.flink.api.java.DataSet;
+import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFields;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFieldsFirst;
 import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFieldsSecond;
 import org.apache.flink.api.java.io.DiscardingOutputFormat;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple3;
+
 import org.junit.Test;
-import org.apache.flink.api.java.DataSet;
-import org.apache.flink.api.java.ExecutionEnvironment;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * This is a minimal test to verify that semantic annotations are evaluated against
  * the type information properly translated correctly to the common data flow API.
- *
  */
 @SuppressWarnings("serial")
 public class SemanticPropertiesTranslationTest {
-	
+
 	@Test
 	public void testUnaryFunctionWildcardForwardedAnnotation() {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(new Tuple3<Long, String, Integer>(3l, "test", 42));
-		input.map(new WildcardForwardedMapper<Tuple3<Long,String,Integer>>()).output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(new Tuple3<Long, String, Integer>(3L, "test", 42));
+		input.map(new WildcardForwardedMapper<Tuple3<Long, String, Integer>>()).output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
 		Plan plan = env.createProgramPlan();
 
 		GenericDataSinkBase<?> sink = plan.getDataSinks().iterator().next();
@@ -74,13 +74,13 @@ public class SemanticPropertiesTranslationTest {
 		assertTrue(fw2.contains(1));
 		assertTrue(fw3.contains(2));
 	}
-	
+
 	@Test
 	public void testUnaryFunctionInPlaceForwardedAnnotation() {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(new Tuple3<Long, String, Integer>(3l, "test", 42));
+		DataSet<Tuple3<Long, String, Integer>> input = env.fromElements(new Tuple3<Long, String, Integer>(3L, "test", 42));
 		input.map(new IndividualForwardedMapper<Long, String, Integer>()).output(new DiscardingOutputFormat<Tuple3<Long, String, Integer>>());
 		Plan plan = env.createProgramPlan();
 
@@ -102,7 +102,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new ShufflingMapper<Long>()).output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
 
@@ -127,7 +127,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new NoAnnotationMapper<Tuple3<Long, Long, Long>>()).withForwardedFields("0->1; 2")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
@@ -150,7 +150,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new ReadSetMapper<Tuple3<Long, Long, Long>>()).withForwardedFields("0->1; 2")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
@@ -173,7 +173,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new ReadSetMapper<Tuple3<Long, Long, Long>>()).withForwardedFields("0->1; 2")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
@@ -196,7 +196,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new AllForwardedExceptMapper<Tuple3<Long, Long, Long>>()).output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
 
@@ -218,7 +218,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new ReadSetMapper<Tuple3<Long, Long, Long>>()).output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
 
@@ -239,7 +239,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new WildcardForwardedMapper<Tuple3<Long, Long, Long>>()).withForwardedFields("0->1; 2");
 	}
 
@@ -248,7 +248,7 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input.map(new AllForwardedExceptMapper<Tuple3<Long, Long, Long>>()).withForwardedFields("0->1; 2");
 	}
 
@@ -257,9 +257,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, String>> input1 = env.fromElements(new Tuple2<Long, String>(3l, "test"));
+		DataSet<Tuple2<Long, String>> input1 = env.fromElements(new Tuple2<Long, String>(3L, "test"));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Double>> input2 = env.fromElements(new Tuple2<Long, Double>(3l, 3.1415));
+		DataSet<Tuple2<Long, Double>> input2 = env.fromElements(new Tuple2<Long, Double>(3L, 3.1415));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedBothAnnotationJoin<Long, String, Long, Double>())
 				.output(new DiscardingOutputFormat<Tuple2<String, Double>>());
 		Plan plan = env.createProgramPlan();
@@ -283,9 +283,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new NoAnnotationJoin<Long>())
 				.withForwardedFieldsFirst("0->1; 1->2").withForwardedFieldsSecond("1->0")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
@@ -310,9 +310,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ReadSetJoin<Long>())
 				.withForwardedFieldsFirst("0->1; 1->2").withForwardedFieldsSecond("1->0")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
@@ -343,9 +343,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedFirstAnnotationJoin<Long>())
 				.withForwardedFieldsSecond("1")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
@@ -373,9 +373,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedSecondAnnotationJoin<Long>())
 				.withForwardedFieldsFirst("0->1")
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
@@ -402,9 +402,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 4l, 5l));
+		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 4L, 5L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input1.join(input2).where(0).equalTo(0).with(new AllForwardedExceptJoin<Long>())
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
@@ -432,9 +432,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ReadSetJoin<Long>())
 				.output(new DiscardingOutputFormat<Tuple3<Long, Long, Long>>());
 		Plan plan = env.createProgramPlan();
@@ -456,9 +456,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedFirstAnnotationJoin<Long>())
 				.withForwardedFieldsFirst("0->1");
 	}
@@ -468,9 +468,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedSecondAnnotationJoin<Long>())
 				.withForwardedFieldsSecond("0->1");
 	}
@@ -480,9 +480,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedBothAnnotationJoin<Long, Long, Long, Long>())
 				.withForwardedFieldsFirst("0->1;");
 	}
@@ -492,9 +492,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3l, 4l));
+		DataSet<Tuple2<Long, Long>> input1 = env.fromElements(new Tuple2<Long, Long>(3L, 4L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3l, 2l));
+		DataSet<Tuple2<Long, Long>> input2 = env.fromElements(new Tuple2<Long, Long>(3L, 2L));
 		input1.join(input2).where(0).equalTo(0).with(new ForwardedBothAnnotationJoin<Long, Long, Long, Long>())
 				.withForwardedFieldsSecond("0->1;");
 	}
@@ -504,9 +504,9 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 4l, 5l));
+		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 4L, 5L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input1.join(input2).where(0).equalTo(0).with(new AllForwardedExceptJoin<Long>())
 				.withForwardedFieldsFirst("0->1;");
 	}
@@ -516,34 +516,34 @@ public class SemanticPropertiesTranslationTest {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 4l, 5l));
+		DataSet<Tuple3<Long, Long, Long>> input1 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 4L, 5L));
 		@SuppressWarnings("unchecked")
-		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3l, 2l, 1l));
+		DataSet<Tuple3<Long, Long, Long>> input2 = env.fromElements(new Tuple3<Long, Long, Long>(3L, 2L, 1L));
 		input1.join(input2).where(0).equalTo(0).with(new AllForwardedExceptJoin<Long>())
 				.withForwardedFieldsSecond("0->1;");
 	}
 
 	// --------------------------------------------------------------------------------------------
 
-	public static class NoAnnotationMapper<T> implements MapFunction<T, T> {
+	private static class NoAnnotationMapper<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
 			return value;
 		}
 	}
-	
+
 	@ForwardedFields("*")
-	public static class WildcardForwardedMapper<T> implements MapFunction<T, T> {
+	private static class WildcardForwardedMapper<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
 			return value;
 		}
 	}
-	
+
 	@ForwardedFields("0;2")
-	public static class IndividualForwardedMapper<X, Y, Z> implements MapFunction<Tuple3<X, Y, Z>, Tuple3<X, Y, Z>> {
+	private static class IndividualForwardedMapper<X, Y, Z> implements MapFunction<Tuple3<X, Y, Z>, Tuple3<X, Y, Z>> {
 
 		@Override
 		public Tuple3<X, Y, Z> map(Tuple3<X, Y, Z> value) {
@@ -552,7 +552,7 @@ public class SemanticPropertiesTranslationTest {
 	}
 
 	@ForwardedFields("0->2;1->0;2->1")
-	public static class ShufflingMapper<X> implements MapFunction<Tuple3<X, X, X>, Tuple3<X, X, X>> {
+	private static class ShufflingMapper<X> implements MapFunction<Tuple3<X, X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> map(Tuple3<X, X, X> value) {
@@ -561,7 +561,7 @@ public class SemanticPropertiesTranslationTest {
 	}
 
 	@FunctionAnnotation.NonForwardedFields({"1"})
-	public static class AllForwardedExceptMapper<T> implements MapFunction<T, T> {
+	private static class AllForwardedExceptMapper<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
@@ -570,7 +570,7 @@ public class SemanticPropertiesTranslationTest {
 	}
 
 	@FunctionAnnotation.ReadFields({"0;2"})
-	public static class ReadSetMapper<T> implements MapFunction<T, T> {
+	private static class ReadSetMapper<T> implements MapFunction<T, T> {
 
 		@Override
 		public T map(T value)  {
@@ -578,7 +578,7 @@ public class SemanticPropertiesTranslationTest {
 		}
 	}
 
-	public static class NoAnnotationJoin<X> implements JoinFunction<Tuple2<X,X>, Tuple2<X,X>, Tuple3<X,X,X>> {
+	private static class NoAnnotationJoin<X> implements JoinFunction<Tuple2<X, X>, Tuple2<X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> join(Tuple2<X, X> first, Tuple2<X, X> second) throws Exception {
@@ -587,7 +587,7 @@ public class SemanticPropertiesTranslationTest {
 	}
 
 	@ForwardedFieldsFirst("0->2")
-	public static class ForwardedFirstAnnotationJoin<X> implements JoinFunction<Tuple2<X,X>, Tuple2<X,X>, Tuple3<X,X,X>> {
+	private static class ForwardedFirstAnnotationJoin<X> implements JoinFunction<Tuple2<X, X>, Tuple2<X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> join(Tuple2<X, X> first, Tuple2<X, X> second) throws Exception {
@@ -596,7 +596,7 @@ public class SemanticPropertiesTranslationTest {
 	}
 
 	@ForwardedFieldsSecond("1->2")
-	public static class ForwardedSecondAnnotationJoin<X> implements JoinFunction<Tuple2<X,X>, Tuple2<X,X>, Tuple3<X,X,X>> {
+	private static class ForwardedSecondAnnotationJoin<X> implements JoinFunction<Tuple2<X, X>, Tuple2<X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> join(Tuple2<X, X> first, Tuple2<X, X> second) throws Exception {
@@ -606,7 +606,7 @@ public class SemanticPropertiesTranslationTest {
 
 	@ForwardedFieldsFirst("1 -> 0")
 	@ForwardedFieldsSecond("1 -> 1")
-	public static class ForwardedBothAnnotationJoin<A, B, C, D> implements JoinFunction<Tuple2<A, B>, Tuple2<C, D>, Tuple2<B, D>> {
+	private static class ForwardedBothAnnotationJoin<A, B, C, D> implements JoinFunction<Tuple2<A, B>, Tuple2<C, D>, Tuple2<B, D>> {
 
 		@Override
 		public Tuple2<B, D> join(Tuple2<A, B> first, Tuple2<C, D> second) {
@@ -616,7 +616,7 @@ public class SemanticPropertiesTranslationTest {
 
 	@FunctionAnnotation.NonForwardedFieldsFirst("0;2")
 	@FunctionAnnotation.NonForwardedFieldsSecond("0;1")
-	public static class AllForwardedExceptJoin<X> implements JoinFunction<Tuple3<X,X,X>, Tuple3<X,X,X>, Tuple3<X,X,X>> {
+	private static class AllForwardedExceptJoin<X> implements JoinFunction<Tuple3<X, X, X>, Tuple3<X, X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> join(Tuple3<X, X, X> first, Tuple3<X, X, X> second) throws Exception {
@@ -626,7 +626,7 @@ public class SemanticPropertiesTranslationTest {
 
 	@FunctionAnnotation.ReadFieldsFirst("1")
 	@FunctionAnnotation.ReadFieldsSecond("0")
-	public static class ReadSetJoin<X> implements JoinFunction<Tuple2<X,X>, Tuple2<X,X>, Tuple3<X,X,X>> {
+	private static class ReadSetJoin<X> implements JoinFunction<Tuple2<X, X>, Tuple2<X, X>, Tuple3<X, X, X>> {
 
 		@Override
 		public Tuple3<X, X, X> join(Tuple2<X, X> first, Tuple2<X, X> second) throws Exception {