Skip to content

Commit

Permalink
refactor: 'events' segment in the avro namespace; renamed 'messages' …
Browse files Browse the repository at this point in the history
…to 'events'
  • Loading branch information
jachro committed Feb 12, 2024
1 parent 63fe6fa commit 0fa2b88
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 16 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ lazy val root = project
.aggregate(
commons,
httpClient,
messages,
events,
redisClient,
solrClient,
searchSolrClient,
Expand Down Expand Up @@ -204,11 +204,11 @@ lazy val http4sAvro = project
avroCodec % "compile->compile;test->test"
)

lazy val messages = project
.in(file("modules/messages"))
lazy val events = project
.in(file("modules/events"))
.settings(commonSettings)
.settings(
name := "messages"
name := "events"
)
.dependsOn(
commons % "compile->compile;test->test",
Expand All @@ -227,7 +227,7 @@ lazy val configValues = project
)
.dependsOn(
commons % "compile->compile;test->test",
messages % "compile->compile;test->test",
events % "compile->compile;test->test",
redisClient % "compile->compile;test->test",
searchSolrClient % "compile->compile;test->test"
)
Expand All @@ -242,7 +242,7 @@ lazy val searchProvision = project
)
.dependsOn(
commons % "compile->compile;test->test",
messages % "compile->compile;test->test",
events % "compile->compile;test->test",
redisClient % "compile->compile;test->test",
searchSolrClient % "compile->compile;test->test",
configValues % "compile->compile;test->test"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
* limitations under the License.
*/

package io.renku.messages
package io.renku.events

import io.renku.avro.codec.decoders.all.given
import io.renku.avro.codec.encoders.all.given
import io.renku.avro.codec.{AvroDecoder, AvroEncoder, AvroIO}
import io.renku.events.v1.{ProjectCreated, Visibility}
import munit.FunSuite

import java.time.Instant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import fs2.Chunk
import fs2.io.net.Network
import io.renku.avro.codec.AvroReader
import io.renku.avro.codec.decoders.all.given
import io.renku.messages.ProjectCreated
import io.renku.events.v1.ProjectCreated
import io.renku.queue.client.*
import io.renku.redis.client.RedisUrl
import io.renku.search.solr.client.SearchSolrClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import fs2.Stream
import fs2.concurrent.SignallingRef
import io.renku.avro.codec.AvroIO
import io.renku.avro.codec.encoders.all.given
import io.renku.messages.{ProjectCreated, Visibility}
import io.renku.events.v1.{ProjectCreated, Visibility}
import io.renku.queue.client.Encoding
import io.renku.redis.client.RedisClientGenerators
import io.renku.redis.client.RedisClientGenerators.*
Expand Down
8 changes: 1 addition & 7 deletions project/AvroSchemaDownload.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,7 @@ object AvroSchemaDownload extends AutoPlugin {
Compile / sourceGenerators += Def
.sequential(
schemaDownloadRepository,
Compile / avroScalaGenerate,
Def.task {
val out = (Compile / avroScalaSource).value
val pkg = "io.renku.messages"
val logger = streams.value.log
evilHackAddPackage(logger, out, pkg)
}
Compile / avroScalaGenerate
)
.taskValue
)
Expand Down

0 comments on commit 0fa2b88

Please sign in to comment.