Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
refactor(triplestore): ZIO-fying triplestore service (DSP-904) (#2059)
  • Loading branch information
subotic committed Jul 1, 2022
1 parent 3d660a3 commit 9e038ec
Show file tree
Hide file tree
Showing 251 changed files with 5,964 additions and 10,847 deletions.
15 changes: 14 additions & 1 deletion Makefile
Expand Up @@ -203,7 +203,20 @@ test-repository-upgrade: build init-db-test-minimal ## runs DB upgrade integrati

.PHONY: test
test: build ## runs all tests
sbt -v +test
sbt -v "schemaApi/test"
sbt -v "schemaCore/test"
sbt -v "schemaRepo/test"
sbt -v "schemaRepoEventStoreService/test"
sbt -v "schemaRepoSearchService/test"
sbt -v "shared/test"
sbt -v "sipi/test"
sbt -v "userCore/test"
sbt -v "userHandler/test"
sbt -v "userInterface/test"
sbt -v "userRepo/test"
sbt -v "valueObjects/test"
sbt -v "webapi/test"


#################################
## Database Management
Expand Down
15 changes: 11 additions & 4 deletions build.sbt
Expand Up @@ -105,7 +105,8 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
.settings(
name := "webapi",
resolvers ++= Seq(
Resolver.bintrayRepo("hseeberger", "maven")
Resolver.bintrayRepo("hseeberger", "maven"),
"Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots"
),
libraryDependencies ++= Dependencies.webapiLibraryDependencies
)
Expand Down Expand Up @@ -143,9 +144,9 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
logLevel := Level.Info,
run / javaOptions := webapiJavaRunOptions,
javaAgents += Dependencies.aspectjweaver,
fork := true, // run tests in a forked JVM
Test / testForkedParallel := false, // run forked tests in parallel
Test / parallelExecution := false, // run non-forked tests in parallel
Test / fork := true, // run tests in a forked JVM
Test / testForkedParallel := false, // not run forked tests in parallel
Test / parallelExecution := false, // not run non-forked tests in parallel
// Global / concurrentRestrictions += Tags.limit(Tags.Test, 1), // restrict the number of concurrently executing tests in all projects
Test / javaOptions ++= Seq("-Dconfig.resource=fuseki.conf") ++ webapiJavaTestOptions,
// Test / javaOptions ++= Seq("-Dakka.log-config-on-start=on"), // prints out akka config
Expand Down Expand Up @@ -236,6 +237,7 @@ lazy val apiMain = project
.settings(
name := "dsp-api-main",
libraryDependencies ++= Dependencies.dspApiMainLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore, schemaRepo, schemaApi)
Expand All @@ -257,6 +259,7 @@ lazy val schemaApi = project
.settings(
name := "schemaApi",
libraryDependencies ++= Dependencies.schemaApiLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore)
Expand All @@ -266,6 +269,7 @@ lazy val schemaCore = project
.settings(
name := "schemaCore",
libraryDependencies ++= Dependencies.schemaCoreLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)

Expand All @@ -274,6 +278,7 @@ lazy val schemaRepo = project
.settings(
name := "schemaRepo",
libraryDependencies ++= Dependencies.schemaRepoLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaCore)
Expand All @@ -283,6 +288,7 @@ lazy val schemaRepoEventStoreService = project
.settings(
name := "schemaRepoEventstoreService",
libraryDependencies ++= Dependencies.schemaRepoEventStoreServiceLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaRepo)
Expand All @@ -292,6 +298,7 @@ lazy val schemaRepoSearchService = project
.settings(
name := "dsp-schema-repo-search-service",
libraryDependencies ++= Dependencies.schemaRepoSearchServiceLibraryDependencies,
resolvers += "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
.dependsOn(schemaRepo)
Expand Down
@@ -0,0 +1,20 @@