Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ a82026bb66f0e17cf76f2d91c6ea286431bbbd31

# Scala Steward: Reformat with scalafmt 3.9.9
b83264042216c7d83b73247b8b7a998902ec26d5

# Scala Steward: Reformat with scalafmt 3.9.10
7d900f00d9e3f23f45fca7989ae6a4c1c75580c7
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
style = defaultWithAlign
maxColumn = 120
version = 3.9.9
version = 3.9.10
assumeStandardLibraryStripMargin = true
align.stripMargin = true
runner.dialect = scala3
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down