Skip to content

Commit 9764f8d

Browse files
Update scalafmt-core to 3.9.6 (#249)
* Update scalafmt-core to 3.9.6 * Reformat with scalafmt 3.9.6 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.9.6' to .git-blame-ignore-revs
1 parent dc0c94a commit 9764f8d

File tree

8 files changed

+18
-11
lines changed

8 files changed

+18
-11
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ ae9aadfa2b4779b5096a9004d6d7f5d9db2c2c7f
3030

3131
# Scala Steward: Reformat with scalafmt 3.9.5
3232
86e22a329b56041cf014ca16e78ab03e8fd7df00
33+
34+
# Scala Steward: Reformat with scalafmt 3.9.6
35+
9fd34d49283551ea5253cbe6177a10661be715d3

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
style = defaultWithAlign
22
maxColumn = 120
3-
version = 3.9.5
3+
version = 3.9.6
44
assumeStandardLibraryStripMargin = true
55
align.stripMargin = true
66
runner.dialect = scala3

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ lazy val `scala-api-common` = (project in file("modules/flink-common-api"))
114114
crossScalaVersions := crossVersions,
115115
libraryDependencies ++= Seq(
116116
"org.apache.flink" % "flink-streaming-java" % flinkVersion1 % Provided,
117-
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
118-
"ch.qos.logback" % "logback-classic" % "1.5.17" % Test
117+
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
118+
"ch.qos.logback" % "logback-classic" % "1.5.17" % Test
119119
)
120120
)
121121

modules/flink-1-api/src/test/scala/org/apache/flinkx/api/SerializerSnapshotTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class SerializerSnapshotTest extends AnyFlatSpec with Matchers {
9191
val output = new DataOutputViewStreamWrapper(buffer)
9292
TypeSerializerSnapshot.writeVersionedSnapshot(output, snap)
9393
output.close()
94-
val input = new DataInputViewStreamWrapper(new ByteArrayInputStream(buffer.toByteArray))
94+
val input = new DataInputViewStreamWrapper(new ByteArrayInputStream(buffer.toByteArray))
9595
val deserSnap = TypeSerializerSnapshot.readVersionedSnapshot[T](input, cl)
9696
deserSnap.restoreSerializer()
9797
}

modules/flink-1-api/src/test/scala/org/apache/flinkx/api/TestUtils.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ trait TestUtils extends Matchers with Inspectors {
1414
val out = new ByteArrayOutputStream()
1515
ser.serialize(in, new DataOutputViewStreamWrapper(out))
1616
val snapBytes = new ByteArrayOutputStream()
17-
TypeSerializerSnapshot.writeVersionedSnapshot(new DataOutputViewStreamWrapper(snapBytes), ser.snapshotConfiguration())
17+
TypeSerializerSnapshot.writeVersionedSnapshot(
18+
new DataOutputViewStreamWrapper(snapBytes),
19+
ser.snapshotConfiguration()
20+
)
1821
val restoredSnapshot = TypeSerializerSnapshot.readVersionedSnapshot[T](
1922
new DataInputViewStreamWrapper(new ByteArrayInputStream(snapBytes.toByteArray)),
20-
ser.getClass.getClassLoader)
23+
ser.getClass.getClassLoader
24+
)
2125
val restoredSerializer = restoredSnapshot.restoreSerializer()
2226
val copy = restoredSerializer.deserialize(new DataInputViewStreamWrapper(new ByteArrayInputStream(out.toByteArray)))
2327
in shouldBe copy

modules/flink-1-api/src/test/scala/org/apache/flinkx/api/serializer/CoproductSerializerTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CoproductSerializerTest extends AnyFlatSpec with Matchers {
2828

2929
it should "return the same instance when immutable" in {
3030
val immutableSerializer = implicitly[TypeSerializer[Immutable]]
31-
val expectedData = Immutable2("a")
31+
val expectedData = Immutable2("a")
3232

3333
val resultData = immutableSerializer.copy(expectedData)
3434

@@ -37,7 +37,7 @@ class CoproductSerializerTest extends AnyFlatSpec with Matchers {
3737

3838
it should "copy the instance when mutable" in {
3939
val mutableSerializer = implicitly[TypeSerializer[Mutable]]
40-
val expectedData = Mutable1("a")
40+
val expectedData = Mutable1("a")
4141

4242
val resultData = mutableSerializer.copy(expectedData)
4343

@@ -47,7 +47,7 @@ class CoproductSerializerTest extends AnyFlatSpec with Matchers {
4747

4848
it should "return the same instance when immutable even if some other subtypes of the sealed trait are mutable" in {
4949
val mutableSerializer = implicitly[TypeSerializer[Mutable]]
50-
val expectedData = Immutable3("a")
50+
val expectedData = Immutable3("a")
5151

5252
val resultData = mutableSerializer.copy(expectedData)
5353

modules/flink-common-api/src/main/scala/org/apache/flinkx/api/serializer/EitherSerializer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class EitherSerializer[A, B](
5555
override def copy(from: Either[A, B]): Either[A, B] = from match {
5656
case Left(a) => if (leftSerializer.isImmutableType) from else Left(leftSerializer.copy(a))
5757
case Right(b) => if (rightSerializer.isImmutableType) from else Right(rightSerializer.copy(b))
58-
case null => from
58+
case null => from
5959
}
6060

6161
override def copy(source: DataInputView, target: DataOutputView): Unit = {

modules/flink-common-api/src/test/scala/org/apache/flinkx/api/serializer/CaseClassSerializerTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CaseClassSerializerTest extends AnyFlatSpec with Matchers {
4949

5050
it should "copy the case class when mutable" in {
5151
val mutableSerializer = new CaseClassSerializer[Mutable](classOf[Mutable], Array(StringSerializer.INSTANCE), false)
52-
val expectedData = Mutable("a")
52+
val expectedData = Mutable("a")
5353

5454
val resultData = mutableSerializer.copy(expectedData)
5555

0 commit comments

Comments
 (0)