diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 77f12af069..fc87668a0c 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -30,3 +30,6 @@ d5e9a90c86690605d6572c03f4380b5bd65056d1 # Scala Steward: Reformat with scalafmt 3.9.7 cdb933851eea9dd94f1e44cf371adb0617b664be + +# Scala Steward: Reformat with scalafmt 3.10.2 +94a280d73886dce7f6275b294565a8d95f34bae7 diff --git a/.scalafmt.conf b/.scalafmt.conf index fd3015d7b5..954b09bbd0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.10.1" +version = "3.10.2" runner.dialect = scala213 fileOverride { diff --git a/scio-managed/src/main/scala/com/spotify/scio/iceberg/IcebergIO.scala b/scio-managed/src/main/scala/com/spotify/scio/iceberg/IcebergIO.scala index 67179dc9a6..df1d1f94e3 100644 --- a/scio-managed/src/main/scala/com/spotify/scio/iceberg/IcebergIO.scala +++ b/scio-managed/src/main/scala/com/spotify/scio/iceberg/IcebergIO.scala @@ -50,9 +50,9 @@ private[scio] object ConfigMap { val label = toSnakeCase(p.label) val fieldValue = p.dereference(value) fieldValue match { - case null => None - case x: Option[_] => x.map { v => label -> v.asInstanceOf[AnyRef] } - case _ => + case null => None + case x: Option[_] => x.map(v => label -> v.asInstanceOf[AnyRef]) + case _ => Some(label -> fieldValue.asInstanceOf[AnyRef]) } }.toMap diff --git a/scio-managed/src/main/scala/com/spotify/scio/iceberg/syntax/IcebergSCollectionSyntax.scala b/scio-managed/src/main/scala/com/spotify/scio/iceberg/syntax/IcebergSCollectionSyntax.scala index 54aa9a0eb9..148b7bd609 100644 --- a/scio-managed/src/main/scala/com/spotify/scio/iceberg/syntax/IcebergSCollectionSyntax.scala +++ b/scio-managed/src/main/scala/com/spotify/scio/iceberg/syntax/IcebergSCollectionSyntax.scala @@ -44,7 +44,9 @@ class IcebergSCollectionSyntax[T: RowType: Coder](self: SCollection[T]) { val params = IcebergIO.WriteParam( catalogProperties, configProperties, - Option(triggeringFrequencySeconds).filter(_ != IcebergIO.WriteParam.DefaultTriggeringFrequencySeconds), + Option(triggeringFrequencySeconds).filter( + _ != IcebergIO.WriteParam.DefaultTriggeringFrequencySeconds + ), Option(directWriteByteLimit).filter(_ != IcebergIO.WriteParam.DefaultDirectWriteByteLimit), keep, drop,