diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ea20e746..b951b804 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -42,3 +42,6 @@ a82026bb66f0e17cf76f2d91c6ea286431bbbd31 # Scala Steward: Reformat with scalafmt 3.9.9 b83264042216c7d83b73247b8b7a998902ec26d5 + +# Scala Steward: Reformat with scalafmt 3.9.10 +7d900f00d9e3f23f45fca7989ae6a4c1c75580c7 diff --git a/.scalafmt.conf b/.scalafmt.conf index 4adb34e8..e72ec1e1 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,6 +1,6 @@ style = defaultWithAlign maxColumn = 120 -version = 3.9.9 +version = 3.9.10 assumeStandardLibraryStripMargin = true align.stripMargin = true runner.dialect = scala3 \ No newline at end of file diff --git a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/function/util/WrappingFunction.scala b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/function/util/WrappingFunction.scala index 54ea770d..f4c4dc56 100644 --- a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/function/util/WrappingFunction.scala +++ b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/function/util/WrappingFunction.scala @@ -3,16 +3,16 @@ package org.apache.flinkx.api.function.util import org.apache.flink.api.common.functions.util.FunctionUtils import org.apache.flink.api.common.functions.{AbstractRichFunction, Function, OpenContext, RuntimeContext} - -/** - * Wrapper of [[Function]]. - * - * Created to replace `org.apache.flink.api.java.operators.translation.WrappingFunction` in Flink 1.x that was moved to - * `org.apache.flink.api.common.functions.WrappingFunction` in Flink 2.x making it not cross-compatible. - * - * @tparam T the type of the wrapped function. - * @param wrappedFunction the underlying function to be wrapped. - */ +/** Wrapper of [[Function]]. + * + * Created to replace `org.apache.flink.api.java.operators.translation.WrappingFunction` in Flink 1.x that was moved to + * `org.apache.flink.api.common.functions.WrappingFunction` in Flink 2.x making it not cross-compatible. + * + * @tparam T + * the type of the wrapped function. + * @param wrappedFunction + * the underlying function to be wrapped. + */ class WrappingFunction[T <: Function](val wrappedFunction: T) extends AbstractRichFunction { override def open(openContext: OpenContext): Unit = { diff --git a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/ListSerializer.scala b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/ListSerializer.scala index 962b8e38..99308fe8 100644 --- a/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/ListSerializer.scala +++ b/modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/ListSerializer.scala @@ -28,7 +28,7 @@ class ListSerializer[T](child: TypeSerializer[T], clazz: Class[T]) extends Mutab override def getLength: Int = -1 override def deserialize(source: DataInputView): List[T] = { var remaining = source.readInt() - val builder = List.newBuilder[T] + val builder = List.newBuilder[T] builder.sizeHint(remaining) while (remaining > 0) { builder.addOne(child.deserialize(source)) diff --git a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SerializerSnapshotTest.scala b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SerializerSnapshotTest.scala index 120aed89..2e933214 100644 --- a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SerializerSnapshotTest.scala +++ b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/SerializerSnapshotTest.scala @@ -156,7 +156,7 @@ class SerializerSnapshotTest extends AnyFlatSpec with Matchers { .readVersionedSnapshot[WithDefault](input, getClass.getClassLoader) // Flink always calls this // Deserialize the old data with the new serializer - val newSerializer = implicitly[TypeSerializer[WithDefault]] + val newSerializer = implicitly[TypeSerializer[WithDefault]] val deserializedData = newSerializer.deserialize(input) deserializedData should be(expectedData) diff --git a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/TestUtils.scala b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/TestUtils.scala index 843c9a25..0ac62f0c 100644 --- a/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/TestUtils.scala +++ b/modules/flink-common-api/src/test/scala/org/apache/flinkx/api/TestUtils.scala @@ -158,7 +158,7 @@ trait TestUtils extends Matchers with Inspectors { @tailrec private def getAllFields[T](typeClass: Class[T], fields: Array[Field] = Array.empty): Array[Field] = { - val allFields = fields ++ typeClass.getDeclaredFields + val allFields = fields ++ typeClass.getDeclaredFields .filter(isInstanceField) .filter(isNotBitmapField) .filter(isNotOverriddenField(_, fields))