From 359f4748d4b475306ff952399c0402c5ebf4aaf7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 29 Jun 2025 13:57:56 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.9.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b063155..9b13b6b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.8.6 +version=3.9.8 runner.dialect = scala213 align.openParenCallSite = true align.openParenDefnSite = true From c89b7675fa21be644e7f7a22e5f2cfbbab74e1e5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 29 Jun 2025 13:58:03 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.9.8 Executed command: scalafmt --non-interactive --- build.sbt | 2 +- .../io/github/azhur/kafka/serde/Avro4sBinarySupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala | 4 ++-- .../main/scala/io/github/azhur/kafka/serde/CirceSupport.scala | 4 ++-- .../src/main/scala/io/github/azhur/kafka/serde/Jackson.scala | 4 ++-- .../github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala | 4 ++-- .../io/github/azhur/kafka/serde/JacksonJsonSupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/Json4sSupport.scala | 4 ++-- .../io/github/azhur/kafka/serde/JsoniterScalaSupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/UpickleSupport.scala | 4 ++-- .../scala/io/github/azhur/kafka/serde/ZioJsonSupport.scala | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.sbt b/build.sbt index 8526c4b..7dbf927 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ inThisBuild( organizationHomepage := Some(url("https://github.com/azhur")), homepage := Some(url("https://github.com/azhur/kafka-serde-scala")), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - scmInfo := Some( + scmInfo := Some( ScmInfo( url("https://github.com/azhur/kafka-serde-scala"), "git@github.com:azhur/kafka-serde-scala.git" diff --git a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sBinarySupport.scala b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sBinarySupport.scala index 5f7b2c3..2fd1526 100644 --- a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sBinarySupport.scala +++ b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sBinarySupport.scala @@ -31,7 +31,7 @@ trait Avro4sBinarySupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else { val baos = new ByteArrayOutputStream() @@ -54,7 +54,7 @@ trait Avro4sBinarySupport { private val schema = AvroSchema[T] override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else { val it = AvroInputStream.binary[T].from(data).build(schema).tryIterator diff --git a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala index 1c333ca..847e998 100644 --- a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala +++ b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sDataSupport.scala @@ -35,7 +35,7 @@ trait Avro4sDataSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else { val baos = new ByteArrayOutputStream() @@ -58,7 +58,7 @@ trait Avro4sDataSupport { private val schema = AvroSchema[T] override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else { val it = AvroInputStream.data[T].from(data).build(schema).tryIterator diff --git a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala index 56b8cd1..0596128 100644 --- a/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala +++ b/kafka-serde-avro4s/src/main/scala/io/github/azhur/kafka/serde/Avro4sJsonSupport.scala @@ -31,7 +31,7 @@ trait Avro4sJsonSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else { val baos = new ByteArrayOutputStream() @@ -54,7 +54,7 @@ trait Avro4sJsonSupport { private val schema = AvroSchema[T] override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else { val it = AvroInputStream.json[T].from(data).build(schema).tryIterator diff --git a/kafka-serde-circe/src/main/scala/io/github/azhur/kafka/serde/CirceSupport.scala b/kafka-serde-circe/src/main/scala/io/github/azhur/kafka/serde/CirceSupport.scala index b9c8369..7baadcd 100644 --- a/kafka-serde-circe/src/main/scala/io/github/azhur/kafka/serde/CirceSupport.scala +++ b/kafka-serde-circe/src/main/scala/io/github/azhur/kafka/serde/CirceSupport.scala @@ -34,7 +34,7 @@ trait CirceSupport { import io.circe.syntax._ override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try printer.print(data.asJson).getBytes(UTF_8) @@ -50,7 +50,7 @@ trait CirceSupport { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else parser diff --git a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/Jackson.scala b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/Jackson.scala index 75a6846..8bdb4d2 100644 --- a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/Jackson.scala +++ b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/Jackson.scala @@ -22,8 +22,8 @@ import java.lang.reflect.{ ParameterizedType, Type => JType } object Jackson { def typeReference[T: TypeTag]: TypeReference[T] = { - val t = typeTag[T] - val mirror = t.mirror + val t = typeTag[T] + val mirror = t.mirror def mapType(t: Type): JType = if (t.typeArgs.isEmpty) { mirror.runtimeClass(t) diff --git a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala index c0c1ff0..12fdabc 100644 --- a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala +++ b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonFormatSchemaSupport.scala @@ -37,7 +37,7 @@ trait JacksonFormatSchemaSupport { private val writer = mapper.writer(schema) override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try writer.writeValueAsBytes(data) @@ -55,7 +55,7 @@ trait JacksonFormatSchemaSupport { private val reader = mapper.readerFor(typeReference[T]).`with`(schema) override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else try reader.readValue[T](data) diff --git a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonJsonSupport.scala b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonJsonSupport.scala index d9ddb13..68afe5f 100644 --- a/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonJsonSupport.scala +++ b/kafka-serde-jackson/src/main/scala/io/github/azhur/kafka/serde/JacksonJsonSupport.scala @@ -31,7 +31,7 @@ trait JacksonJsonSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try mapper.writeValueAsBytes(data) @@ -48,7 +48,7 @@ trait JacksonJsonSupport { private val tr = typeReference[T] override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else try mapper.readValue[T](data, tr) diff --git a/kafka-serde-json4s/src/main/scala/io/github/azhur/kafka/serde/Json4sSupport.scala b/kafka-serde-json4s/src/main/scala/io/github/azhur/kafka/serde/Json4sSupport.scala index dcc0a7c..fc7a59f 100644 --- a/kafka-serde-json4s/src/main/scala/io/github/azhur/kafka/serde/Json4sSupport.scala +++ b/kafka-serde-json4s/src/main/scala/io/github/azhur/kafka/serde/Json4sSupport.scala @@ -33,7 +33,7 @@ trait Json4sSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try serialization.write[T](data).getBytes(UTF_8) @@ -50,7 +50,7 @@ trait Json4sSupport { new Deserializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else try serialization.read[T](new String(data, UTF_8)) diff --git a/kafka-serde-jsoniter-scala/src/main/scala/io/github/azhur/kafka/serde/JsoniterScalaSupport.scala b/kafka-serde-jsoniter-scala/src/main/scala/io/github/azhur/kafka/serde/JsoniterScalaSupport.scala index 8f32e9e..d8f7a12 100644 --- a/kafka-serde-jsoniter-scala/src/main/scala/io/github/azhur/kafka/serde/JsoniterScalaSupport.scala +++ b/kafka-serde-jsoniter-scala/src/main/scala/io/github/azhur/kafka/serde/JsoniterScalaSupport.scala @@ -32,7 +32,7 @@ trait JsoniterScalaSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try writeToArray(data, writerConfig) @@ -48,7 +48,7 @@ trait JsoniterScalaSupport { new Deserializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else try readFromArray(data, readerConfig) diff --git a/kafka-serde-play-json/src/main/scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala b/kafka-serde-play-json/src/main/scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala index 7185049..7145609 100644 --- a/kafka-serde-play-json/src/main/scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala +++ b/kafka-serde-play-json/src/main/scala/io/github/azhur/kafka/serde/PlayJsonSupport.scala @@ -34,7 +34,7 @@ trait PlayJsonSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try printer(writes.writes(data)).getBytes(UTF_8) @@ -49,7 +49,7 @@ trait PlayJsonSupport { new Deserializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else reads diff --git a/kafka-serde-upickle/src/main/scala/io/github/azhur/kafka/serde/UpickleSupport.scala b/kafka-serde-upickle/src/main/scala/io/github/azhur/kafka/serde/UpickleSupport.scala index 4f9679f..70ec626 100644 --- a/kafka-serde-upickle/src/main/scala/io/github/azhur/kafka/serde/UpickleSupport.scala +++ b/kafka-serde-upickle/src/main/scala/io/github/azhur/kafka/serde/UpickleSupport.scala @@ -30,7 +30,7 @@ trait UpickleSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try write(data).getBytes(UTF_8) @@ -43,7 +43,7 @@ trait UpickleSupport { new Deserializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else try read(new String(data, UTF_8)) diff --git a/kafka-serde-zio-json/src/main/scala/io/github/azhur/kafka/serde/ZioJsonSupport.scala b/kafka-serde-zio-json/src/main/scala/io/github/azhur/kafka/serde/ZioJsonSupport.scala index f374917..472d151 100644 --- a/kafka-serde-zio-json/src/main/scala/io/github/azhur/kafka/serde/ZioJsonSupport.scala +++ b/kafka-serde-zio-json/src/main/scala/io/github/azhur/kafka/serde/ZioJsonSupport.scala @@ -30,7 +30,7 @@ trait ZioJsonSupport { new Serializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def serialize(topic: String, data: T): Array[Byte] = + override def serialize(topic: String, data: T): Array[Byte] = if (data == null) null else try data.toJson.getBytes(UTF_8) @@ -43,7 +43,7 @@ trait ZioJsonSupport { new Deserializer[T] { override def configure(configs: util.Map[String, ?], isKey: Boolean): Unit = {} override def close(): Unit = {} - override def deserialize(topic: String, data: Array[Byte]): T = + override def deserialize(topic: String, data: Array[Byte]): T = if (data == null) null else decoder.decodeJson(new String(data, UTF_8)) match { From cf2d1a327a4c7590cf5a2933cb295967eb13ab70 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 29 Jun 2025 13:58:03 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.9.8' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..41cd078 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.9.8 +c89b7675fa21be644e7f7a22e5f2cfbbab74e1e5