From eac0049773c288d0b2f05c626662585a913cbaef Mon Sep 17 00:00:00 2001 From: irinaschubert Date: Fri, 4 Mar 2022 17:28:09 +0100 Subject: [PATCH] refactor: improve code structure (DEV-612) (#2012) Co-authored-by: Ivan Subotic <400790+subotic@users.noreply.github.com> --- .gitignore | 1 - build.sbt | 10 +++++----- .../api}/src/main/scala/dsp/schema/api/app/App.scala | 0 .../main/scala/dsp/schema/domain/SchemaDomain.scala | 0 .../main/scala/dsp/schema/handler/CreateSchema.scala | 0 .../src/main/scala/dsp/schema/repo/SchemaRepo.scala | 0 .../dsp/schema/repo/eventstore/EventStoreLive.scala | 0 .../scala/dsp/schema/repo/search/SearchService.scala | 0 .../main/scala/dsp/schema/repo/SchemaRepoLive.scala | 0 .../main/scala/dsp/schema/repo/SchemaRepoTest.scala | 0 10 files changed, 5 insertions(+), 6 deletions(-) rename {dsp-schema-api => dsp-schema/api}/src/main/scala/dsp/schema/api/app/App.scala (100%) rename {dsp-schema-core => dsp-schema/core}/src/main/scala/dsp/schema/domain/SchemaDomain.scala (100%) rename {dsp-schema-core => dsp-schema/core}/src/main/scala/dsp/schema/handler/CreateSchema.scala (100%) rename {dsp-schema-core => dsp-schema/core}/src/main/scala/dsp/schema/repo/SchemaRepo.scala (100%) rename {dsp-schema-repo-eventstore-service => dsp-schema/repo-eventstore-service}/src/main/scala/dsp/schema/repo/eventstore/EventStoreLive.scala (100%) rename {dsp-schema-repo-search-service => dsp-schema/repo-search-service}/src/main/scala/dsp/schema/repo/search/SearchService.scala (100%) rename {dsp-schema-repo => dsp-schema/repo}/src/main/scala/dsp/schema/repo/SchemaRepoLive.scala (100%) rename {dsp-schema-repo => dsp-schema/repo}/src/main/scala/dsp/schema/repo/SchemaRepoTest.scala (100%) diff --git a/.gitignore b/.gitignore index cd2f7b4c4a..477028dcf6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ webapi-test upgrade/project sipi/test -**/project/target/ **/target/ *.aux *.bbl diff --git a/build.sbt b/build.sbt index 6700c194bb..c34ffeac55 100644 --- a/build.sbt +++ b/build.sbt @@ -232,7 +232,7 @@ lazy val apiMain = project .dependsOn(schemaCore, schemaRepo, schemaApi) lazy val schemaApi = project - .in(file("dsp-schema-api")) + .in(file("dsp-schema/api")) .settings( name := "schemaApi", Dependencies.webapiLibraryDependencies, @@ -241,7 +241,7 @@ lazy val schemaApi = project .dependsOn(schemaCore) lazy val schemaCore = project - .in(file("dsp-schema-core")) + .in(file("dsp-schema/core")) .settings( name := "schemaCore", Dependencies.webapiLibraryDependencies, @@ -249,7 +249,7 @@ lazy val schemaCore = project ) lazy val schemaRepo = project - .in(file("dsp-schema-repo")) + .in(file("dsp-schema/repo")) .settings( name := "schemaRepo", Dependencies.webapiLibraryDependencies, @@ -258,7 +258,7 @@ lazy val schemaRepo = project .dependsOn(schemaCore) lazy val schemaRepoEventStoreService = project - .in(file("dsp-schema-repo-eventstore-service")) + .in(file("dsp-schema/repo-eventstore-service")) .settings( name := "schemaRepoEventstoreService", Dependencies.webapiLibraryDependencies, @@ -267,7 +267,7 @@ lazy val schemaRepoEventStoreService = project .dependsOn(schemaRepo) lazy val schemaRepoSearchService = project - .in(file("dsp-schema-repo-search-service")) + .in(file("dsp-schema/repo-search-service")) .settings( name := "dsp-schema-repo-search-service", Dependencies.webapiLibraryDependencies, diff --git a/dsp-schema-api/src/main/scala/dsp/schema/api/app/App.scala b/dsp-schema/api/src/main/scala/dsp/schema/api/app/App.scala similarity index 100% rename from dsp-schema-api/src/main/scala/dsp/schema/api/app/App.scala rename to dsp-schema/api/src/main/scala/dsp/schema/api/app/App.scala diff --git a/dsp-schema-core/src/main/scala/dsp/schema/domain/SchemaDomain.scala b/dsp-schema/core/src/main/scala/dsp/schema/domain/SchemaDomain.scala similarity index 100% rename from dsp-schema-core/src/main/scala/dsp/schema/domain/SchemaDomain.scala rename to dsp-schema/core/src/main/scala/dsp/schema/domain/SchemaDomain.scala diff --git a/dsp-schema-core/src/main/scala/dsp/schema/handler/CreateSchema.scala b/dsp-schema/core/src/main/scala/dsp/schema/handler/CreateSchema.scala similarity index 100% rename from dsp-schema-core/src/main/scala/dsp/schema/handler/CreateSchema.scala rename to dsp-schema/core/src/main/scala/dsp/schema/handler/CreateSchema.scala diff --git a/dsp-schema-core/src/main/scala/dsp/schema/repo/SchemaRepo.scala b/dsp-schema/core/src/main/scala/dsp/schema/repo/SchemaRepo.scala similarity index 100% rename from dsp-schema-core/src/main/scala/dsp/schema/repo/SchemaRepo.scala rename to dsp-schema/core/src/main/scala/dsp/schema/repo/SchemaRepo.scala diff --git a/dsp-schema-repo-eventstore-service/src/main/scala/dsp/schema/repo/eventstore/EventStoreLive.scala b/dsp-schema/repo-eventstore-service/src/main/scala/dsp/schema/repo/eventstore/EventStoreLive.scala similarity index 100% rename from dsp-schema-repo-eventstore-service/src/main/scala/dsp/schema/repo/eventstore/EventStoreLive.scala rename to dsp-schema/repo-eventstore-service/src/main/scala/dsp/schema/repo/eventstore/EventStoreLive.scala diff --git a/dsp-schema-repo-search-service/src/main/scala/dsp/schema/repo/search/SearchService.scala b/dsp-schema/repo-search-service/src/main/scala/dsp/schema/repo/search/SearchService.scala similarity index 100% rename from dsp-schema-repo-search-service/src/main/scala/dsp/schema/repo/search/SearchService.scala rename to dsp-schema/repo-search-service/src/main/scala/dsp/schema/repo/search/SearchService.scala diff --git a/dsp-schema-repo/src/main/scala/dsp/schema/repo/SchemaRepoLive.scala b/dsp-schema/repo/src/main/scala/dsp/schema/repo/SchemaRepoLive.scala similarity index 100% rename from dsp-schema-repo/src/main/scala/dsp/schema/repo/SchemaRepoLive.scala rename to dsp-schema/repo/src/main/scala/dsp/schema/repo/SchemaRepoLive.scala diff --git a/dsp-schema-repo/src/main/scala/dsp/schema/repo/SchemaRepoTest.scala b/dsp-schema/repo/src/main/scala/dsp/schema/repo/SchemaRepoTest.scala similarity index 100% rename from dsp-schema-repo/src/main/scala/dsp/schema/repo/SchemaRepoTest.scala rename to dsp-schema/repo/src/main/scala/dsp/schema/repo/SchemaRepoTest.scala