From 7f3a29a6e1f4c79eeb9fb0838a51ee46dd2279cf Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 31 May 2023 08:23:09 +0100 Subject: [PATCH] More scala3 work (cassandra / azure) (#130) * scala3 support for cassandra connector * try azure connector --- .../azure/storagequeue/impl/AzureQueueSourceStage.scala | 2 +- .../connectors/cassandra/javadsl/CassandraSessionSpec.scala | 2 +- .../cassandra/scaladsl/CassandraSessionPerformanceSpec.scala | 2 +- project/Dependencies.scala | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala b/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala index 1ba78bb51..ff882cc00 100644 --- a/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala +++ b/azure-storage-queue/src/main/scala/org/apache/pekko/stream/connectors/azure/storagequeue/impl/AzureQueueSourceStage.scala @@ -68,7 +68,7 @@ import scala.collection.mutable.Queue setHandler( out, new OutHandler { - override def onPull: Unit = + override def onPull(): Unit = if (!buffer.isEmpty) { push(out, buffer.dequeue()) } else { diff --git a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSessionSpec.scala b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSessionSpec.scala index 210c60321..0aeec5fe1 100644 --- a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSessionSpec.scala +++ b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/javadsl/CassandraSessionSpec.scala @@ -38,7 +38,7 @@ import scala.concurrent.duration._ final class CassandraSessionSpec extends CassandraSpecBase(ActorSystem("CassandraSessionSpec")) { - val log = Logging(system, this.getClass) + val log = Logging(system, classOf[CassandraSessionSpec]) val javadslSessionRegistry = javadsl.CassandraSessionRegistry.get(system) val data = 1 until 103 diff --git a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionPerformanceSpec.scala b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionPerformanceSpec.scala index da0943efc..00fb120c6 100644 --- a/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionPerformanceSpec.scala +++ b/cassandra/src/test/scala/org/apache/pekko/stream/connectors/cassandra/scaladsl/CassandraSessionPerformanceSpec.scala @@ -25,7 +25,7 @@ import scala.concurrent.duration._ final class CassandraSessionPerformanceSpec extends CassandraSpecBase(ActorSystem("CassandraSessionPerformanceSpec")) { - val log = Logging(system, this.getClass) + val log = Logging(system, classOf[CassandraSessionPerformanceSpec]) val data = 1 to 5 * 1000 * 1000 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f711adcd3..0989ee015 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -102,7 +102,6 @@ object Dependencies { ExclusionRule("software.amazon.awssdk", "netty-nio-client"))) ++ Mockito) val AzureStorageQueue = Seq( - crossScalaVersions -= Scala3, libraryDependencies ++= Seq( "com.microsoft.azure" % "azure-storage" % "8.0.0")) @@ -111,7 +110,6 @@ object Dependencies { val CassandraDriverVersionInDocs = "4.15" val Cassandra = Seq( - crossScalaVersions -= Scala3, libraryDependencies ++= Seq( ("com.datastax.oss" % "java-driver-core" % CassandraDriverVersion) .exclude("com.github.spotbugs", "spotbugs-annotations")