Skip to content

Commit 0545722

Browse files
committed
update zio-config
1 parent 55d0254 commit 0545722

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Examples in Scala of
1414
* [Schema Registry](#schema-registry)
1515
* [Kafka Streams](#kafka-streams)
1616
- with [cats](https://github.com/niqdev/kafka-scala-examples#demo-3)
17-
- with [ZIO](https://github.com/niqdev/kafka-scala-examples#demo-4)
17+
- with [ZIO](https://github.com/niqdev/kafka-scala-examples#demo-4), see also [zio-kafka-streams](https://github.com/niqdev/zio-kafka-streams)
1818
* [KSQL](#ksql)
1919
* [Kafka Connect](#kafka-connect)
2020

Diff for: build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ lazy val V = new {
1818
val catsRetry = "1.1.1"
1919
val zio = "1.0.1"
2020
val zioLogging = "0.5.1"
21-
val zioConfig = "1.0.0-RC26"
21+
val zioConfig = "1.0.0-RC27"
2222

2323
// compatibility issues
2424
val cakeSolutions = new {

Diff for: kafka/src/main/scala/com/kafka/demo/cakesolutions/Producer.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ object Producer {
2424
val producer = newProducer(BOOTSTRAP_SERVERS_VALUE)
2525

2626
KafkaHelper
27-
.produceMessages {
28-
case (i, message) => KafkaProducerRecord(TOPIC_NAME, s"$i", message)
27+
.produceMessages { case (i, message) =>
28+
KafkaProducerRecord(TOPIC_NAME, s"$i", message)
2929
}
3030
.foreach(producer.send)
3131

Diff for: kafka/src/main/scala/com/kafka/demo/original/Producer.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ object Producer {
3636
val producer = newProducer()
3737

3838
KafkaHelper
39-
.produceMessages {
40-
case (i, message) => new ProducerRecord(TOPIC_NAME, s"$i", message)
39+
.produceMessages { case (i, message) =>
40+
new ProducerRecord(TOPIC_NAME, s"$i", message)
4141
}
4242
.foreach(producer.send)
4343

Diff for: schema-registry/src/main/scala/com/kafka/demo/generic/Producer.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ object Producer {
6868
("id-3", customer)
6969
}
7070
)
71-
.map {
72-
case (key: String, customer: GenericRecord) =>
73-
new ProducerRecord[String, GenericRecord](TOPIC_NAME, key, customer)
71+
.map { case (key: String, customer: GenericRecord) =>
72+
new ProducerRecord[String, GenericRecord](TOPIC_NAME, key, customer)
7473
}
7574
.foreach { record =>
7675
logger.info(s"record: $record")

Diff for: zio-kafka-streams/src/main/scala/com/kafka/demo/ZioKafkaStreamsApp.scala

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.kafka.demo
33
import com.kafka.demo.settings.Settings
44
import com.kafka.demo.streams.{ KafkaStreamsRuntime, KafkaStreamsTopology }
55
import zio._
6-
import zio.config.{ ZConfig, config, generateReport, write }
6+
import zio.config._
77
import zio.logging._
88

99
// sbt "zio-kafka-streams/runMain com.kafka.demo.ZioKafkaStreamsApp"
@@ -30,10 +30,12 @@ object ZioKafkaStreamsApp extends App {
3030

3131
private[this] final val program =
3232
for {
33-
settings <- config[Settings]
34-
_ <- log.info(s"${generateReport(Settings.descriptor, settings).map(_.toTable.asMarkdownContent)}")
35-
_ <- log.info(s"${write(Settings.descriptor, settings).map(_.flattenString())}")
36-
_ <- KafkaStreamsRuntime.make.use(_ => ZIO.succeed()) // option 2
33+
settings <- getConfig[Settings]
34+
_ <- log.info(
35+
s"${generateReport(Settings.descriptor, settings).map(_.toTable.asGithubFlavouredMarkdown)}"
36+
)
37+
_ <- log.info(s"${write(Settings.descriptor, settings).map(_.flattenString())}")
38+
_ <- KafkaStreamsRuntime.make.use(_ => ZIO.succeed()) // option 2
3739
} yield ()
3840

3941
override def run(args: List[String]): URIO[ZEnv, ExitCode] =

Diff for: zio-kafka-streams/src/main/scala/com/kafka/demo/streams/KafkaStreamsRuntime.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.kafka.demo.settings.Settings
55
import com.kafka.demo.streams.KafkaStreamsTopology.KafkaStreamsTopology
66
import org.apache.kafka.streams.KafkaStreams
77
import zio._
8-
import zio.config.{ ZConfig, config }
8+
import zio.config.{ ZConfig, getConfig }
99
import zio.logging.{ Logging, log }
1010

1111
object KafkaStreamsRuntime {
@@ -14,7 +14,7 @@ object KafkaStreamsRuntime {
1414
: ZIO[Logging with ZConfig[Settings] with KafkaStreamsTopology, Throwable, KafkaStreams] =
1515
for {
1616
_ <- log.info("Setup runtime ...")
17-
settings <- config[Settings]
17+
settings <- getConfig[Settings]
1818
topology <- KafkaStreamsTopology.build
1919
kafkaStreams <- ZIO.effect(new KafkaStreams(topology, settings.properties))
2020
_ <- log.info("Start runtime ...")

0 commit comments

Comments
 (0)