diff --git a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandra.scala b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandra.scala index bb1e35391..a5fe8f17e 100644 --- a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandra.scala +++ b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandra.scala @@ -7,7 +7,6 @@ import cats.{Monad, MonadThrow, Parallel} import com.evolutiongaming.catshelper.LogOf import com.evolutiongaming.kafka.journal._ import com.evolutiongaming.kafka.journal.eventual.EventualPayloadAndType -import com.evolutiongaming.kafka.journal.eventual.cassandra.EventualCassandraConfig.ConsistencyConfig import com.evolutiongaming.scassandra.CassandraClusterOf import java.time.Instant @@ -34,7 +33,7 @@ object SnapshotCassandra { def of[F[_]: Temporal: Parallel: CassandraCluster: CassandraSession: LogOf]( schemaConfig: SchemaConfig, origin: Option[Origin], - consistencyConfig: ConsistencyConfig, + consistencyConfig: CassandraConsistencyConfig, numberOfSnapshots: Int ): F[SnapshotStoreFlat[F]] = for { @@ -158,7 +157,7 @@ object SnapshotCassandra { ) object Statements { - def of[F[_]: Monad: CassandraSession](schema: Schema, consistencyConfig: ConsistencyConfig): F[Statements[F]] = { + def of[F[_]: Monad: CassandraSession](schema: Schema, consistencyConfig: CassandraConsistencyConfig): F[Statements[F]] = { for { insertRecord <- SnapshotStatements.InsertRecord.of[F](schema.snapshot, consistencyConfig.write) updateRecord <- SnapshotStatements.UpdateRecord.of[F](schema.snapshot, consistencyConfig.write) diff --git a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandraConfig.scala b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandraConfig.scala index c475ed31e..93561881c 100644 --- a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandraConfig.scala +++ b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotCassandraConfig.scala @@ -33,7 +33,7 @@ final case class SnapshotCassandraConfig( query = QueryConfig(consistency = ConsistencyLevel.LOCAL_QUORUM, fetchSize = 1000, defaultIdempotence = true) ), schema: SchemaConfig = SchemaConfig.default, - consistencyConfig: EventualCassandraConfig.ConsistencyConfig = EventualCassandraConfig.ConsistencyConfig.default + consistencyConfig: CassandraConsistencyConfig = CassandraConsistencyConfig.default ) object SnapshotCassandraConfig { diff --git a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotStatements.scala b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotStatements.scala index 93a260558..fcd0d8315 100644 --- a/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotStatements.scala +++ b/eventual-cassandra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/SnapshotStatements.scala @@ -6,7 +6,6 @@ import com.datastax.driver.core.Row import com.evolutiongaming.kafka.journal._ import com.evolutiongaming.kafka.journal.eventual.EventualPayloadAndType import com.evolutiongaming.kafka.journal.eventual.cassandra.CassandraHelper._ -import com.evolutiongaming.kafka.journal.eventual.cassandra.EventualCassandraConfig.ConsistencyConfig import com.evolutiongaming.scassandra.syntax._ import com.evolutiongaming.scassandra.{DecodeByName, EncodeByName, TableName} import scodec.bits.ByteVector @@ -41,7 +40,7 @@ object SnapshotStatements { def of[F[_]: Monad: CassandraSession]( name: TableName, - consistencyConfig: ConsistencyConfig.Write + consistencyConfig: CassandraConsistencyConfig.Write ): F[InsertRecord[F]] = { implicit val encodeByNameByteVector: EncodeByName[ByteVector] = @@ -107,7 +106,7 @@ object SnapshotStatements { def of[F[_]: Monad: CassandraSession]( name: TableName, - consistencyConfig: ConsistencyConfig.Write + consistencyConfig: CassandraConsistencyConfig.Write ): F[UpdateRecord[F]] = { implicit val encodeByNameByteVector: EncodeByName[ByteVector] = @@ -168,7 +167,7 @@ object SnapshotStatements { def of[F[_]: Monad: CassandraSession]( name: TableName, - consistencyConfig: ConsistencyConfig.Read + consistencyConfig: CassandraConsistencyConfig.Read ): F[SelectMetadata[F]] = { val query = @@ -213,7 +212,7 @@ object SnapshotStatements { def of[F[_]: Monad: CassandraSession]( name: TableName, - consistencyConfig: ConsistencyConfig.Read + consistencyConfig: CassandraConsistencyConfig.Read ): F[SelectRecord[F]] = { implicit val decodeByNameByteVector: DecodeByName[ByteVector] = @@ -282,7 +281,7 @@ object SnapshotStatements { object Delete { - def of[F[_]: Monad: CassandraSession](name: TableName, consistencyConfig: ConsistencyConfig.Write): F[Delete[F]] = { + def of[F[_]: Monad: CassandraSession](name: TableName, consistencyConfig: CassandraConsistencyConfig.Write): F[Delete[F]] = { val query = s"""