From 04a7efa747de7f51100e686c3faf4c68b711bdc3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 Jul 2021 22:07:25 +0200 Subject: [PATCH 1/2] Update java-driver-core from 4.12.1 to 4.13.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a257e5d6f..c3493313c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -42,7 +42,7 @@ object Dependencies { object Versions { - val datastaxJavaDriverCore = "4.12.1" + val datastaxJavaDriverCore = "4.13.0" val doobie = "0.13.4" val grpc = "1.39.0" val http4s = "0.21.25" From 701ed837b6128c44022a1b1d9e58e51eba4a3f6d Mon Sep 17 00:00:00 2001 From: Janecek Jakub Date: Mon, 9 Aug 2021 21:34:53 +0200 Subject: [PATCH 2/2] fix: Deprecation warnings --- .../sst/datastax/CassandraDatastaxDriverModule.scala | 6 +++--- .../com/avast/sst/datastax/config/advanced.scala | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala index 0e9ffc802..fdf37c956 100644 --- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala +++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala @@ -51,7 +51,7 @@ object CassandraDatastaxDriverModule { durationProperty(TIMESTAMP_GENERATOR_DRIFT_WARNING_THRESHOLD)(cfg.advanced.timestampGenerator.driftWarning.threshold), durationProperty(TIMESTAMP_GENERATOR_DRIFT_WARNING_INTERVAL)(cfg.advanced.timestampGenerator.driftWarning.interval), booleanProperty(TIMESTAMP_GENERATOR_FORCE_JAVA_CLOCK)(cfg.advanced.timestampGenerator.forceJavaClock), - stringProperty(REQUEST_TRACKER_CLASS)(cfg.advanced.requestTracker.`class`), + stringListProperty(REQUEST_TRACKER_CLASSES)(cfg.advanced.requestTracker.classes), optional(booleanProperty(REQUEST_LOGGER_SUCCESS_ENABLED), cfg.advanced.requestTracker.logs.flatMap(_.successEnabled)), optional(booleanProperty(REQUEST_LOGGER_ERROR_ENABLED), cfg.advanced.requestTracker.logs.flatMap(_.errorEnabled)), optional(intProperty(REQUEST_LOGGER_MAX_QUERY_LENGTH), cfg.advanced.requestTracker.logs.flatMap(_.maxQueryLength)), @@ -66,8 +66,8 @@ object CassandraDatastaxDriverModule { optional(intProperty(REQUEST_THROTTLER_MAX_CONCURRENT_REQUESTS), cfg.advanced.throttler.maxConcurrentRequests), optional(intProperty(REQUEST_THROTTLER_MAX_REQUESTS_PER_SECOND), cfg.advanced.throttler.maxRequestsPerSecond), optional(durationProperty(REQUEST_THROTTLER_DRAIN_INTERVAL), cfg.advanced.throttler.drainInterval), - stringProperty(METADATA_NODE_STATE_LISTENER_CLASS)(cfg.advanced.nodeStateListener.`class`), - stringProperty(METADATA_SCHEMA_CHANGE_LISTENER_CLASS)(cfg.advanced.schemaChangeListener.`class`), + stringListProperty(METADATA_NODE_STATE_LISTENER_CLASSES)(cfg.advanced.nodeStateListener.classes), + stringListProperty(METADATA_SCHEMA_CHANGE_LISTENER_CLASSES)(cfg.advanced.schemaChangeListener.classes), stringProperty(ADDRESS_TRANSLATOR_CLASS)(cfg.advanced.addressTranslator.`class`), booleanProperty(RESOLVE_CONTACT_POINTS)(cfg.advanced.resolveContactPoints), optional(stringProperty(PROTOCOL_VERSION), cfg.advanced.protocol.version), diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala index 87f1a97a5..1bb787668 100644 --- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala +++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala @@ -280,12 +280,12 @@ object DriftWarningConfig { * @param logs Parameters for RequestLogger */ final case class RequestTrackerConfig( - `class`: String = "com.datastax.oss.driver.internal.core.tracker.NoopRequestTracker", + classes: List[String] = List("com.datastax.oss.driver.internal.core.tracker.NoopRequestTracker"), logs: Option[LogsConfig] ) object RequestTrackerConfig { - val Default: RequestTrackerConfig = RequestTrackerConfig("com.datastax.oss.driver.internal.core.tracker.NoopRequestTracker", None) + val Default: RequestTrackerConfig = RequestTrackerConfig(List("com.datastax.oss.driver.internal.core.tracker.NoopRequestTracker"), None) } /** Parameters for RequestLogger. @@ -377,12 +377,12 @@ object ThrottlerConfig { * You can also specify a custom class that implements NodeStateListener and has a public * constructor with a DriverContext argument. */ -final case class NodeStateListenerConfig(`class`: String) +final case class NodeStateListenerConfig(classes: List[String]) object NodeStateListenerConfig { /** Node state listener implementation with empty methods. */ - val Noop: NodeStateListenerConfig = NodeStateListenerConfig("com.datastax.oss.driver.internal.core.metadata.NoopNodeStateListener") + val Noop: NodeStateListenerConfig = NodeStateListenerConfig(List("com.datastax.oss.driver.internal.core.metadata.NoopNodeStateListener")) val Default: NodeStateListenerConfig = Noop } @@ -395,13 +395,13 @@ object NodeStateListenerConfig { * You can also specify a custom class that implements `SchemaChangeListener` and has a public * constructor with a DriverContext argument. */ -final case class SchemaChangeListenerConfig(`class`: String) +final case class SchemaChangeListenerConfig(classes: List[String]) object SchemaChangeListenerConfig { /** Schema change listener implementation with empty methods. */ val Noop: SchemaChangeListenerConfig = SchemaChangeListenerConfig( - "com.datastax.oss.driver.internal.core.metadata.schema.NoopSchemaChangeListener" + List("com.datastax.oss.driver.internal.core.metadata.schema.NoopSchemaChangeListener") ) val Default: SchemaChangeListenerConfig = Noop