This is an automated email from the ASF dual-hosted git repository. aljoscha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8513045042bf2b973b39813ed63882666bd25634 Author: Aljoscha Krettek <[email protected]> AuthorDate: Tue Oct 2 10:16:11 2018 +0200 [FLINK-7811] Add "override" in Scala code to support Scala 2.12 Some places in the code didn't have override, this wasn't a problem for Scala 2.11 but Scala 2.12 seems to be more strict. --- .../apache/flink/table/runtime/stream/sql/SortITCase.scala | 2 +- .../org/apache/flink/table/runtime/utils/StreamITCase.scala | 6 +++--- .../org/apache/flink/streaming/api/scala/DataStream.scala | 2 +- .../apache/flink/streaming/api/scala/CoGroupJoinITCase.scala | 12 ++++++------ .../apache/flink/streaming/api/scala/WindowFoldITCase.scala | 12 ++++++------ .../flink/streaming/api/scala/WindowFunctionITCase.scala | 8 ++++---- .../flink/streaming/api/scala/WindowReduceITCase.scala | 12 ++++++------ .../migration/StatefulJobSavepointMigrationITCase.scala | 2 +- .../StatefulJobWBroadcastStateMigrationITCase.scala | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala index e7b79a5..3b08b64 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/stream/sql/SortITCase.scala @@ -142,7 +142,7 @@ class SortITCase extends StreamingWithStateTestBase { object SortITCase { final class StringRowSelectorSink(private val field:Int) extends RichSinkFunction[Row]() { - def invoke(value: Row) { + override def invoke(value: Row) { testResults.synchronized { testResults += value.getField(field).toString } diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala index 5386b40..a75c5d9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/runtime/utils/StreamITCase.scala @@ -44,7 +44,7 @@ object StreamITCase { } final class StringSink[T] extends RichSinkFunction[T]() { - def invoke(value: T) { + override def invoke(value: T) { testResults.synchronized { testResults += value.toString } @@ -52,7 +52,7 @@ object StreamITCase { } final class RetractMessagesSink extends RichSinkFunction[(Boolean, Row)]() { - def invoke(v: (Boolean, Row)) { + override def invoke(v: (Boolean, Row)) { testResults.synchronized { testResults += (if (v._1) "+" else "-") + v._2 } @@ -60,7 +60,7 @@ object StreamITCase { } final class RetractingSink() extends RichSinkFunction[(Boolean, Row)] { - def invoke(v: (Boolean, Row)) { + override def invoke(v: (Boolean, Row)) { retractedResults.synchronized { val value = v._2.toString if (v._1) { diff --git a/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala b/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala index 23260cc..247f54c 100644 --- a/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala +++ b/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala @@ -1112,7 +1112,7 @@ class DataStream[T](stream: JavaStream[T]) { } val cleanFun = clean(fun) val sinkFunction = new SinkFunction[T] { - def invoke(in: T) = cleanFun(in) + override def invoke(in: T) = cleanFun(in) } this.addSink(sinkFunction) } diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/CoGroupJoinITCase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/CoGroupJoinITCase.scala index 5412e8e..f6aede4 100644 --- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/CoGroupJoinITCase.scala +++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/CoGroupJoinITCase.scala @@ -86,7 +86,7 @@ class CoGroupJoinITCase extends AbstractTestBase { "F:" + first.mkString("") + " S:" + second.mkString("") } .addSink(new SinkFunction[String]() { - def invoke(value: String) { + override def invoke(value: String) { CoGroupJoinITCase.testResults += value } }) @@ -154,7 +154,7 @@ class CoGroupJoinITCase extends AbstractTestBase { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .apply( (l, r) => l.toString + ":" + r.toString) .addSink(new SinkFunction[String]() { - def invoke(value: String) { + override def invoke(value: String) { CoGroupJoinITCase.testResults += value } }) @@ -216,10 +216,10 @@ class CoGroupJoinITCase extends AbstractTestBase { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .apply( (l, r) => l.toString + ":" + r.toString) .addSink(new SinkFunction[String]() { - def invoke(value: String) { - CoGroupJoinITCase.testResults += value - } - }) + override def invoke(value: String) { + CoGroupJoinITCase.testResults += value + } + }) env.execute("Self-Join Test") diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFoldITCase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFoldITCase.scala index ef27685..9bb0caf 100644 --- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFoldITCase.scala +++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFoldITCase.scala @@ -75,7 +75,7 @@ class WindowFoldITCase extends AbstractTestBase { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .fold(("R:", 0)) { (acc: (String, Int), v: (String, Int)) => (acc._1 + v._1, acc._2 + v._2) } .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFoldITCase.testResults += value.toString } }) @@ -132,7 +132,7 @@ class WindowFoldITCase extends AbstractTestBase { foldFunc, new CheckingIdentityRichWindowFunction[(String, Int), Tuple, TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFoldITCase.testResults += value.toString } }) @@ -191,7 +191,7 @@ class WindowFoldITCase extends AbstractTestBase { foldFunc, new CheckingIdentityRichProcessWindowFunction[(Int, String), Tuple, TimeWindow]()) .addSink(new SinkFunction[(Int, String)]() { - def invoke(value: (Int, String)) { + override def invoke(value: (Int, String)) { WindowFoldITCase.testResults += value.toString } }) @@ -239,7 +239,7 @@ class WindowFoldITCase extends AbstractTestBase { .windowAll(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .fold(("R:", 0)) { (acc: (String, Int), v: (String, Int)) => (acc._1 + v._1, acc._2 + v._2) } .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFoldITCase.testResults += value.toString } }) @@ -294,7 +294,7 @@ class WindowFoldITCase extends AbstractTestBase { foldFunc, new CheckingIdentityRichAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFoldITCase.testResults += value.toString } }) @@ -351,7 +351,7 @@ class WindowFoldITCase extends AbstractTestBase { foldFunc, new CheckingIdentityRichProcessAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFoldITCase.testResults += value.toString } }) diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFunctionITCase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFunctionITCase.scala index ce5f09e..5914d0b 100644 --- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFunctionITCase.scala +++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowFunctionITCase.scala @@ -71,7 +71,7 @@ class WindowFunctionITCase extends TestLogger { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .apply(new CheckingIdentityRichWindowFunction[(String, Int), Tuple, TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFunctionITCase.testResults += value.toString } }) @@ -120,7 +120,7 @@ class WindowFunctionITCase extends TestLogger { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .process(new CheckingIdentityRichProcessWindowFunction[(String, Int), Tuple, TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFunctionITCase.testResults += value.toString } }) @@ -168,7 +168,7 @@ class WindowFunctionITCase extends TestLogger { .windowAll(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .apply(new CheckingIdentityRichAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFunctionITCase.testResults += value.toString } }) @@ -216,7 +216,7 @@ class WindowFunctionITCase extends TestLogger { .windowAll(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .process(new CheckingIdentityRichProcessAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowFunctionITCase.testResults += value.toString } }) diff --git a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowReduceITCase.scala b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowReduceITCase.scala index b2137f5..748d5a1 100644 --- a/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowReduceITCase.scala +++ b/flink-streaming-scala/src/test/scala/org/apache/flink/streaming/api/scala/WindowReduceITCase.scala @@ -75,7 +75,7 @@ class WindowReduceITCase extends AbstractTestBase { .window(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .reduce( (a, b) => (a._1 + b._1, a._2 + b._2) ) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) @@ -131,7 +131,7 @@ class WindowReduceITCase extends AbstractTestBase { reduceFunc, new CheckingIdentityRichWindowFunction[(String, Int), Tuple, TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) @@ -189,7 +189,7 @@ class WindowReduceITCase extends AbstractTestBase { reduceFunc, new CheckingIdentityRichProcessWindowFunction[(String, Int), Tuple, TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) @@ -237,7 +237,7 @@ class WindowReduceITCase extends AbstractTestBase { .windowAll(TumblingEventTimeWindows.of(Time.of(3, TimeUnit.MILLISECONDS))) .reduce( (a, b) => (a._1 + b._1, a._2 + b._2) ) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) @@ -291,7 +291,7 @@ class WindowReduceITCase extends AbstractTestBase { reduceFunc, new CheckingIdentityRichAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) @@ -347,7 +347,7 @@ class WindowReduceITCase extends AbstractTestBase { reduceFunc, new CheckingIdentityRichProcessAllWindowFunction[(String, Int), TimeWindow]()) .addSink(new SinkFunction[(String, Int)]() { - def invoke(value: (String, Int)) { + override def invoke(value: (String, Int)) { WindowReduceITCase.testResults += value.toString } }) diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala index 557f54a..6395b05 100644 --- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala +++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala @@ -229,7 +229,7 @@ class StatefulJobSavepointMigrationITCase( } @throws[Exception] - def invoke(value: T) { + override def invoke(value: T) { count += 1 getRuntimeContext.getAccumulator( AccumulatorCountingSink.NUM_ELEMENTS_ACCUMULATOR).add(1) diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala index 19575b4..665254e 100644 --- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala +++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala @@ -318,7 +318,7 @@ private class AccumulatorCountingSink[T] extends RichSinkFunction[T] { } @throws[Exception] - def invoke(value: T) { + override def invoke(value: T) { count += 1 getRuntimeContext.getAccumulator( AccumulatorCountingSink.NUM_ELEMENTS_ACCUMULATOR).add(1)
