Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update java-driver-core from 4.12.1 to 4.13.0 #630

Merged
merged 2 commits into from
Aug 9, 2021
Merged

Update java-driver-core from 4.12.1 to 4.13.0 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a7efa
Update java-driver-core from 4.12.1 to 4.13.0
scala-steward Jul 30, 2021
701ed83
fix: Deprecation warnings
jakubjanecek Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand All @@ -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),
Expand Down
12 changes: 6 additions & 6 deletions cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down