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.

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

Feat/tck projection #34

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
target
.bsp/
.DS_Store
.bloop
.bloop
*.iml
.java-version
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ lazy val `thoth-kafka-goodies` = project
)

lazy val `thoth-jooq-async` = project
.dependsOn(`thoth-core`)
.dependsOn(`thoth-core`, `thoth-tck`)
.settings(
sonatypeRepository := "https://s01.oss.sonatype.org/service/local",
sonatypeCredentialHost := "s01.oss.sonatype.org",
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ object Dependencies {
val akkaVersion = "2.6.14"
val vavrVersion = "0.10.3"
val jooqVersion = "3.14.3"
val jooqAsyncVersion = "1.1.0"
val jooqAsyncVersion = "1.1.2"
val functionalJsonVersion = "1.0.3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ public Source<EventEnvelope<E, Meta, Context>, NotUsed> loadEventsByQuery(Tuple0
@Override
public Source<EventEnvelope<E, Meta, Context>, NotUsed> loadEventsByQuery(Query query) {
return Source.from(eventStore)
.filter(e -> {
return Option.of(query.entityId).map(id -> id.equals(e.entityId)).getOrElse(true);
});
.filter(e -> Option.of(query.entityId).map(id -> id.equals(e.entityId)).getOrElse(true));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this modification is unecessary for this feature. Could you remove it to clarify ?

}

@Override
Expand Down
9 changes: 8 additions & 1 deletion thoth-jooq-async/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,16 @@ libraryDependencies ++= Seq(
"org.junit.platform" % "junit-platform-commons" % "1.4.2" % Test,
"org.junit.jupiter" % "junit-jupiter-engine" % "5.4.2" % Test,
"org.junit.vintage" % "junit-vintage-engine" % "5.4.2" % Test,
"net.aichler" % "jupiter-interface" % "0.9.1" % Test
"net.aichler" % "jupiter-interface" % "0.9.1" % Test,
"org.mockito" % "mockito-core" % "2.22.0" % Test,
"org.testng" % "testng" % "6.3" % Test,
"org.testcontainers" % "postgresql" % "1.15.0" % Test,
"org.testcontainers" % "kafka" % "1.15.0" % Test
)


testNGSuites := Seq(((resourceDirectory in Test).value / "testng.xml").absolutePath)

javacOptions in Compile ++= Seq(
"-source",
"8",
Expand Down
Loading