diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..7726e56 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.9.9 +7ffa254984beda08df23a8d8d212f0eea70faaba diff --git a/.scalafmt.conf b/.scalafmt.conf index b04ee5c..15656dd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.9.9" runner.dialect = scala213source3 maxColumn = 120 align.preset = more diff --git a/build.sbt b/build.sbt index 4f64c37..c8b773d 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ inThisBuild( licenses := List("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")), organization := "io.github.jxnu-liguobin", organizationName := "梦境迷离", - developers := List( + developers := List( Developer( id = "jxnu-liguobin", name = "梦境迷离", diff --git a/examples/src/main/scala/nebula4scala/example/cats/effect/NebulaSessionClientExample.scala b/examples/src/main/scala/nebula4scala/example/cats/effect/NebulaSessionClientExample.scala index 856c7d6..459d002 100644 --- a/examples/src/main/scala/nebula4scala/example/cats/effect/NebulaSessionClientExample.scala +++ b/examples/src/main/scala/nebula4scala/example/cats/effect/NebulaSessionClientExample.scala @@ -20,8 +20,8 @@ object NebulaSessionClientExample extends IOApp { |'Lily':('Lily', 9),'Tom':('Tom', 10), |'Jerry':('Jerry', 13), |'John':('John', 11);""".stripMargin)) - res1 <- resM1.errorMessageM - _ <- Console[IO].print(res1) + res1 <- resM1.errorMessageM + _ <- Console[IO].print(res1) resM2 <- client.execute(Stmt.str[IO](""" |INSERT EDGE like(likeness) VALUES |'Bob'->'Lily':(80.0), @@ -29,8 +29,8 @@ object NebulaSessionClientExample extends IOApp { |'Lily'->'Jerry':(84.0), |'Tom'->'Jerry':(68.3), |'Bob'->'John':(97.2);""".stripMargin)) - res2 <- resM2.errorMessageM - _ <- Console[IO].print(res2) + res2 <- resM2.errorMessageM + _ <- Console[IO].print(res2) resM3 <- client.execute(Stmt.str[IO](""" |USE test; |MATCH (p:person) RETURN p LIMIT 4; diff --git a/examples/src/main/scala/nebula4scala/example/default_try/NebulaClientExample.scala b/examples/src/main/scala/nebula4scala/example/default_try/NebulaClientExample.scala index 0c22b91..e51323e 100644 --- a/examples/src/main/scala/nebula4scala/example/default_try/NebulaClientExample.scala +++ b/examples/src/main/scala/nebula4scala/example/default_try/NebulaClientExample.scala @@ -16,7 +16,7 @@ object NebulaClientExample { sessionM match { case Failure(exception) => exception.printStackTrace() - case Success(session) => + case Success(session) => val res = session.execute( Stmt.str[Try]( """ diff --git a/examples/src/main/scala/nebula4scala/example/zio/NebulaClientExample.scala b/examples/src/main/scala/nebula4scala/example/zio/NebulaClientExample.scala index 38d1db9..614dbd0 100644 --- a/examples/src/main/scala/nebula4scala/example/zio/NebulaClientExample.scala +++ b/examples/src/main/scala/nebula4scala/example/zio/NebulaClientExample.scala @@ -22,7 +22,7 @@ object NebulaClientMain extends ZIOAppDefault { (for { status <- ZIO.serviceWithZIO[NebulaClient[Task]](_.init()) _ <- ZIO.logInfo(status.toString) - res <- ZIO + res <- ZIO .serviceWithZIO[NebulaClientExample]( _.execute(""" |CREATE SPACE IF NOT EXISTS test(vid_type=fixed_string(20)); diff --git a/examples/src/main/scala/nebula4scala/example/zio/NebulaSessionClientExample.scala b/examples/src/main/scala/nebula4scala/example/zio/NebulaSessionClientExample.scala index 8991bef..0072cdb 100644 --- a/examples/src/main/scala/nebula4scala/example/zio/NebulaSessionClientExample.scala +++ b/examples/src/main/scala/nebula4scala/example/zio/NebulaSessionClientExample.scala @@ -28,7 +28,7 @@ object NebulaSessionClientMain extends ZIOAppDefault { |'Jerry':('Jerry', 13), |'John':('John', 11);""".stripMargin) ) - _ <- ZIO.logInfo(resultset1.toString) + _ <- ZIO.logInfo(resultset1.toString) resultset2 <- ZIO .serviceWithZIO[NebulaSessionClientExample]( _.execute(""" @@ -39,7 +39,7 @@ object NebulaSessionClientMain extends ZIOAppDefault { |'Tom'->'Jerry':(68.3), |'Bob'->'John':(97.2);""".stripMargin) ) - _ <- ZIO.logInfo(resultset2.toString) + _ <- ZIO.logInfo(resultset2.toString) resultset3 <- ZIO .serviceWithZIO[NebulaSessionClientExample]( _.execute(""" diff --git a/examples/src/main/scala/nebula4scala/example/zio/NebulaStorageClientExample.scala b/examples/src/main/scala/nebula4scala/example/zio/NebulaStorageClientExample.scala index ea85be6..8067f95 100644 --- a/examples/src/main/scala/nebula4scala/example/zio/NebulaStorageClientExample.scala +++ b/examples/src/main/scala/nebula4scala/example/zio/NebulaStorageClientExample.scala @@ -24,7 +24,7 @@ object NebulaStorageClientMain extends ZIOAppDefault { override def run = (for { connect <- ZIO .serviceWithZIO[NebulaStorageClientExample](_.connect()) - _ <- ZIO.logInfo(s"connect status: ${connect.toString}") + _ <- ZIO.logInfo(s"connect status: ${connect.toString}") scan <- ZIO .serviceWithZIO[NebulaStorageClientExample]( _.scan(ScanEdge("test", None, "like", None)) diff --git a/modules/nebula4scala-cats-effect/src/main/scala/nebula4scala/cats/effect/package.scala b/modules/nebula4scala-cats-effect/src/main/scala/nebula4scala/cats/effect/package.scala index c2da5ab..fcd9690 100644 --- a/modules/nebula4scala-cats-effect/src/main/scala/nebula4scala/cats/effect/package.scala +++ b/modules/nebula4scala-cats-effect/src/main/scala/nebula4scala/cats/effect/package.scala @@ -19,7 +19,7 @@ object syntax { def handle(result: Any): F[Any] = result match { case set: NebulaResultSet[Try] @unchecked => Async[F].delay(new NebulaResultSetImpl(set)) case str: String => Async[F].delay(str) - case other => + case other => Async[F].raiseError(new IllegalArgumentException(s"Unexpected result type: ${other.getClass}")) } } diff --git a/modules/nebula4scala-core/src/main/scala/nebula4scala/impl/NebulaStorageClientDefault.scala b/modules/nebula4scala-core/src/main/scala/nebula4scala/impl/NebulaStorageClientDefault.scala index 64bdc4e..ed7cf1e 100644 --- a/modules/nebula4scala-core/src/main/scala/nebula4scala/impl/NebulaStorageClientDefault.scala +++ b/modules/nebula4scala-core/src/main/scala/nebula4scala/impl/NebulaStorageClientDefault.scala @@ -38,8 +38,8 @@ final class NebulaStorageClientDefault(underlying: StorageClient) extends Nebula override def scan(scanInput: ScanInput): Try[scanInput.T] = Try { scanInput match { case ScanVertex(spaceName, part, tagName, returnCols, _limit, _between, _allowConfig) => - val limit = _limit.getOrElse(DEFAULT_LIMIT) - val between = _between.getOrElse(Between(DEFAULT_START_TIME, DEFAULT_END_TIME)) + val limit = _limit.getOrElse(DEFAULT_LIMIT) + val between = _between.getOrElse(Between(DEFAULT_START_TIME, DEFAULT_END_TIME)) val allowConfig = _allowConfig.getOrElse(AllowConfig(DEFAULT_ALLOW_PART_SUCCESS, DEFAULT_ALLOW_READ_FOLLOWER)) ((part, returnCols) match { @@ -91,8 +91,8 @@ final class NebulaStorageClientDefault(underlying: StorageClient) extends Nebula }).asInstanceOf[scanInput.T] case ScanEdge(spaceName, part, edgeName, returnCols, _limit, _between, _allowConfig) => - val limit = _limit.getOrElse(DEFAULT_LIMIT) - val between = _between.getOrElse(Between(DEFAULT_START_TIME, DEFAULT_END_TIME)) + val limit = _limit.getOrElse(DEFAULT_LIMIT) + val between = _between.getOrElse(Between(DEFAULT_START_TIME, DEFAULT_END_TIME)) val allowConfig = _allowConfig.getOrElse(AllowConfig(DEFAULT_ALLOW_PART_SUCCESS, DEFAULT_ALLOW_READ_FOLLOWER)) ((part, returnCols) match { diff --git a/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaClient.scala b/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaClient.scala index 7c650a0..20c6cf2 100644 --- a/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaClient.scala +++ b/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaClient.scala @@ -38,7 +38,7 @@ object NebulaClient { ZLayer.fromZIO( for { config <- ZIO.service[NebulaClientConfig] - cb <- ZIO.acquireRelease(ZIO.attempt(new Impl(new NebulaClientDefault(config, new Pool))))(p => + cb <- ZIO.acquireRelease(ZIO.attempt(new Impl(new NebulaClientDefault(config, new Pool))))(p => p.close().onError(e => ZIO.logErrorCause(e)).ignoreLogged ) } yield cb diff --git a/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaSessionClient.scala b/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaSessionClient.scala index ec932f5..2f46362 100644 --- a/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaSessionClient.scala +++ b/modules/nebula4scala-zio/src/main/scala/nebula4scala/zio/NebulaSessionClient.scala @@ -34,7 +34,7 @@ object NebulaSessionClient { val layer: ZLayer[Scope & NebulaClientConfig, Throwable, NebulaSessionClient[Task]] = ZLayer.fromZIO { for { - config <- ZIO.service[NebulaClientConfig] + config <- ZIO.service[NebulaClientConfig] sessionPool <- ZIO.acquireRelease( ZIO.attemptBlocking(new Impl(NebulaSessionClientDefault.make(config))) )(release => release.close().onError(e => ZIO.logErrorCause(e)).ignoreLogged) diff --git a/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaClientSpec.scala b/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaClientSpec.scala index aa98fd8..52cd81a 100644 --- a/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaClientSpec.scala +++ b/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaClientSpec.scala @@ -61,8 +61,8 @@ object NebulaClientSpec extends NebulaSpec { suite("nebula storage client")( test("query") { for { - status <- ZIO.serviceWithZIO[NebulaStorageClient[Task]](_.connect()) - _ <- ZIO.logInfo(s"connect status: ${status.toString}") + status <- ZIO.serviceWithZIO[NebulaStorageClient[Task]](_.connect()) + _ <- ZIO.logInfo(s"connect status: ${status.toString}") scanResult <- ZIO.serviceWithZIO[NebulaStorageClient[Task]]( _.scan(ScanEdge("test", None, "like", None)) ) diff --git a/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaSpec.scala b/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaSpec.scala index c854d14..94c4c1a 100644 --- a/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaSpec.scala +++ b/modules/nebula4scala-zio/src/test/scala/nebula4scala/zio/NebulaSpec.scala @@ -62,7 +62,7 @@ trait NebulaSpec extends ZIOSpecDefault { _ <- ZIO.serviceWithZIO[NebulaClient[Task]](_.init()) client <- ZIO.service[NebulaClient[Task]] session <- client.getSession(false) - res <- session.execute(Stmt.str[Task](""" + res <- session.execute(Stmt.str[Task](""" |CREATE SPACE IF NOT EXISTS test(vid_type=fixed_string(20)); |USE test; |CREATE TAG IF NOT EXISTS person(name string, age int);