refactor: Minor improvements

Author: jakubjanecek

docs/cassandra-datastax-driver.md

@@ -1,34 +1,34 @@
 # Datastax Cassandra Driver
 
+[![Maven Central](https://img.shields.io/maven-central/v/com.avast/sst-cassandra-datastax-driver_2.12)](https://repo1.maven.org/maven2/com/avast/sst-cassandra-datastax-driver_2.12/)
+
 This module initializes Datastax Cassandra driver's `Session`.
 
 `libraryDependencies += "com.avast" %% "sst-cassandra-datastax-driver" % "<VERSION>"`
 
 ```scala
 import cats.effect.Resource
 import com.avast.sst.datastax.CassandraDatastaxDriverModule
-import com.avast.sst.example.config.Configuration
+import com.avast.sst.datastax.config.CassandraDatastaxDriverConfig
+import com.avast.sst.datastax.pureconfig.implicits._
 import com.avast.sst.pureconfig.PureConfigModule
 import zio._
 import zio.interop.catz._
 
 implicit val runtime = new DefaultRuntime {} // this is just needed in example
 
 for {
-    configuration <- Resource.liftF(PureConfigModule.makeOrRaise[Task, Configuration])
-    db <- CassandraDatastaxDriverModule.make[Task](configuration.datastaxDriver)
+    configuration <- Resource.liftF(PureConfigModule.makeOrRaise[Task, CassandraDatastaxDriverConfig])
+    db <- CassandraDatastaxDriverModule.make[Task](configuration)
 } yield db
 ```
 
 ```HOCON
-datastax-driver {
-  basic {
-    contact-points = [
-      "localhost:9042"
-    ]
-    load-balancing-policy {
-      local-datacenter = "datacenter1"
-    }
+basic {
+  contact-points = ["localhost:9042"]
+
+  load-balancing-policy {
+    local-datacenter = "datacenter1"
   }
 }
 ```

docs/index.md

@@ -8,6 +8,7 @@
 * [Module JVM](jvm.md)
 * [Modules Micrometer](micrometer.md)
 * [Module PureConfig](pureconfig.md)
+* [Module Datastax Cassandra Driver](cassandra-datastax-driver.md)
 * [Module SSL Config](ssl-config.md)
 * [Module doobie](doobie.md)
 * [Module Flyway](flyway.md)

example/docker-compose.yml

@@ -6,7 +6,3 @@ postgres:
     - POSTGRES_USER=user
     - POSTGRES_PASSWORD=pass
     - POSTGRES_DB=database
-cassandra:
-  image: cassandra
-  ports:
-    - "9042:9042/tcp"

example/mdoc/cassandra-datastax-driver.md

@@ -1,34 +1,34 @@
 # Datastax Cassandra Driver
 
+[![Maven Central](https://img.shields.io/maven-central/v/com.avast/sst-cassandra-datastax-driver_2.12)](https://repo1.maven.org/maven2/com/avast/sst-cassandra-datastax-driver_2.12/)
+
 This module initializes Datastax Cassandra driver's `Session`.
 
 `libraryDependencies += "com.avast" %% "sst-cassandra-datastax-driver" % "<VERSION>"`
 
 ```scala mdoc:silent
 import cats.effect.Resource
 import com.avast.sst.datastax.CassandraDatastaxDriverModule
-import com.avast.sst.example.config.Configuration
+import com.avast.sst.datastax.config.CassandraDatastaxDriverConfig
+import com.avast.sst.datastax.pureconfig.implicits._
 import com.avast.sst.pureconfig.PureConfigModule
 import zio._
 import zio.interop.catz._
 
 implicit val runtime = new DefaultRuntime {} // this is just needed in example
 
 for {
-    configuration <- Resource.liftF(PureConfigModule.makeOrRaise[Task, Configuration])
-    db <- CassandraDatastaxDriverModule.make[Task](configuration.datastaxDriver)
+    configuration <- Resource.liftF(PureConfigModule.makeOrRaise[Task, CassandraDatastaxDriverConfig])
+    db <- CassandraDatastaxDriverModule.make[Task](configuration)
 } yield db
 ```
 
 ```HOCON
-datastax-driver {
-  basic {
-    contact-points = [
-      "localhost:9042"
-    ]
-    load-balancing-policy {
-      local-datacenter = "datacenter1"
-    }
+basic {
+  contact-points = ["localhost:9042"]
+
+  load-balancing-policy {
+    local-datacenter = "datacenter1"
   }
 }
 ```

example/mdoc/index.md

@@ -8,6 +8,7 @@
 * [Module JVM](jvm.md)
 * [Modules Micrometer](micrometer.md)
 * [Module PureConfig](pureconfig.md)
+* [Module Datastax Cassandra Driver](cassandra-datastax-driver.md)
 * [Module SSL Config](ssl-config.md)
 * [Module doobie](doobie.md)
 * [Module Flyway](flyway.md)

example/src/main/resources/reference.conf

@@ -27,14 +27,3 @@ jmx {
   domain = "com.avast.sst.example"
   enable-type-scope-name-hierarchy = true
 }
-
-datastax-driver {
-  basic {
-    contact-points = [
-      "localhost:9042"
-    ]
-    load-balancing-policy {
-      local-datacenter = "datacenter1"
-    }
-  }
-}

example/src/main/scala/com/avast/sst/example/Main.scala

@@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit
 
 import cats.effect.{Clock, Resource}
 import com.avast.sst.bundle.ZioServerApp
-import com.avast.sst.datastax.CassandraDatastaxDriverModule
 import com.avast.sst.doobie.DoobieHikariModule
 import com.avast.sst.example.config.Configuration
 import com.avast.sst.example.module.Http4sRoutingModule
@@ -65,7 +64,6 @@ object Main extends ZioServerApp {
       client = Http4sClientCircuitBreakerModule.make[Task](httpClient, enrichedCircuitBreaker)
       routingModule = new Http4sRoutingModule(randomService, client, serverMetricsModule)
       server <- Http4sBlazeServerModule.make[Task](configuration.server, routingModule.router, executorModule.executionContext)
-      datastaxDriver <- CassandraDatastaxDriverModule.make[Task](configuration.datastaxDriver, None)
     } yield server
   }
 

example/src/main/scala/com/avast/sst/example/config/Configuration.scala

@@ -1,7 +1,5 @@
 package com.avast.sst.example.config
 
-import com.avast.sst.datastax.config.CassandraDatastaxDriverConfig
-import com.avast.sst.datastax.pureconfig.implicits._
 import com.avast.sst.doobie.DoobieHikariConfig
 import com.avast.sst.doobie.pureconfig.implicits._
 import com.avast.sst.http4s.client.Http4sBlazeClientConfig
@@ -22,8 +20,7 @@ final case class Configuration(server: Http4sBlazeServerConfig,
                                boundedConnectExecutor: ThreadPoolExecutorConfig,
                                client: Http4sBlazeClientConfig,
                                circuitBreaker: CircuitBreakerConfig,
-                               jmx: MicrometerJmxConfig,
-                               datastaxDriver: CassandraDatastaxDriverConfig)
+                               jmx: MicrometerJmxConfig)
 
 object Configuration {