Extract shared code into new Gradle modules

TIBHannover · Feb 13, 2025 · 85071e3 · 85071e3
1 parent f7c8ef1
commit 85071e3
Show file tree

Hide file tree

Showing 33 changed files with 286 additions and 245 deletions.
diff --git a/community/community-adapter-input-representations/build.gradle.kts b/community/community-adapter-input-representations/build.gradle.kts
@@ -9,4 +9,5 @@ dependencies {
     api(project(":community:community-core-model"))
     api(project(":graph:graph-core-model"))
     api(project(":graph:graph-ports-input"))
+    implementation(project(":graph:graph-core-constants"))
 }
diff --git a/community/community-adapter-input-rest-spring-mvc/build.gradle.kts b/community/community-adapter-input-rest-spring-mvc/build.gradle.kts
@@ -16,6 +16,7 @@ testing {
                 implementation(testFixtures(project(":media-storage:media-storage-core-model")))
                 implementation(project(":common:serialization"))
                 implementation(project(":content-types:content-types-core-model"))
+                implementation(project(":graph:graph-core-constants"))
                 implementation("io.kotest:kotest-assertions-shared")
                 implementation("io.mockk:mockk-dsl")
                 implementation("io.mockk:mockk-jvm")

diff --git a/community/community-core-model/build.gradle.kts b/community/community-core-model/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     testFixturesApi(project(":media-storage:media-storage-core-model"))
     testFixturesImplementation(project(":graph:graph-core-model"))
     testFixturesImplementation(testFixtures(project(":testing:spring")))
+    testFixturesImplementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/community/community-core-services/build.gradle.kts b/community/community-core-services/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
     api(project(":media-storage:media-storage-ports-input"))
     implementation(project(":content-types:content-types-core-model"))
     implementation(project(":graph:graph-core-model")) // for ResearchFields
+    implementation(project(":graph:graph-core-constants"))
     implementation("org.springframework:spring-core")
 }
 

diff --git a/content-types/content-types-adapter-input-rest-spring-mvc/build.gradle.kts b/content-types/content-types-adapter-input-rest-spring-mvc/build.gradle.kts
@@ -34,10 +34,11 @@ dependencies {
     implementation(project(":common:datatypes"))
     implementation(project(":common:functional"))
     implementation(project(":common:serialization"))
+    implementation(project(":graph:graph-core-constants"))
     testFixturesApi(project(":content-types:content-types-adapter-input-representations"))
     testFixturesImplementation(project(":common:datatypes"))
     testFixturesImplementation(project(":common:identifiers"))
-    testFixturesImplementation(project(":graph:graph-core-model"))
+    testFixturesImplementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/content-types/content-types-adapter-output-simcomp/build.gradle.kts b/content-types/content-types-adapter-output-simcomp/build.gradle.kts
@@ -33,19 +33,20 @@ testing {
         val test by getting(JvmTestSuite::class) {
             dependencies {
                 implementation("io.kotest:kotest-assertions-api")
+                implementation("io.kotest:kotest-assertions-core")
                 implementation("io.kotest:kotest-assertions-shared")
                 implementation("io.kotest:kotest-common")
+                implementation("io.kotest:kotest-runner-junit5")
                 implementation("io.mockk:mockk-dsl")
                 implementation("io.mockk:mockk-jvm")
                 implementation("org.assertj:assertj-core")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
                 implementation("org.junit.jupiter:junit-jupiter-api")
                 implementation("org.springframework:spring-test")
-                implementation("io.kotest:kotest-runner-junit5")
-                implementation("io.kotest:kotest-assertions-core")
                 implementation(project(":common:serialization"))
                 implementation(project(":content-types:content-types-adapter-output-simcomp"))
                 implementation(project(":graph:graph-adapter-input-rest-spring-mvc"))
+                implementation(project(":graph:graph-core-constants"))
                 implementation(testFixtures(project(":common:spring-webmvc")))
                 implementation(testFixtures(project(":common:testing")))
                 implementation(testFixtures(project(":content-types:content-types-core-model")))

diff --git a/content-types/content-types-adapter-output-spring-data-neo4j-sdn6/build.gradle.kts b/content-types/content-types-adapter-output-spring-data-neo4j-sdn6/build.gradle.kts
@@ -43,4 +43,5 @@ dependencies {
     api("org.neo4j:neo4j-cypher-dsl")
     api(project(":common:neo4j-dsl"))
     implementation("dev.forkhandles:values4k")
+    implementation(project(":graph:graph-core-constants"))
 }
diff --git a/content-types/content-types-adapter-output-web/build.gradle.kts b/content-types/content-types-adapter-output-web/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
     implementation("org.springframework:spring-web")
     implementation("dev.forkhandles:values4k")
     implementation(project(":common:spring-webmvc"))
+    implementation(project(":integrations:datacite-serialization"))
 }
 
 testing {

diff --git a/...web/src/main/kotlin/org/orkg/contenttypes/adapter/output/web/DataCiteDoiServiceAdapter.kt b/...web/src/main/kotlin/org/orkg/contenttypes/adapter/output/web/DataCiteDoiServiceAdapter.kt
@@ -12,16 +12,16 @@ import org.orkg.common.exceptions.ServiceUnavailable
 import org.orkg.contenttypes.domain.Author
 import org.orkg.contenttypes.domain.configuration.DataCiteConfiguration
 import org.orkg.contenttypes.domain.identifiers.DOI
-import org.orkg.contenttypes.domain.json.DataCiteJson
-import org.orkg.contenttypes.domain.json.DataCiteJson.Attributes
-import org.orkg.contenttypes.domain.json.DataCiteJson.Creator
-import org.orkg.contenttypes.domain.json.DataCiteJson.Description
-import org.orkg.contenttypes.domain.json.DataCiteJson.NameIdentifier
-import org.orkg.contenttypes.domain.json.DataCiteJson.RelatedIdentifier
-import org.orkg.contenttypes.domain.json.DataCiteJson.Rights
-import org.orkg.contenttypes.domain.json.DataCiteJson.Subject
-import org.orkg.contenttypes.domain.json.DataCiteJson.Title
-import org.orkg.contenttypes.domain.json.DataCiteJson.Type
+import org.orkg.integration.datacite.json.DataCiteJson
+import org.orkg.integration.datacite.json.DataCiteJson.Attributes
+import org.orkg.integration.datacite.json.DataCiteJson.Creator
+import org.orkg.integration.datacite.json.DataCiteJson.Description
+import org.orkg.integration.datacite.json.DataCiteJson.NameIdentifier
+import org.orkg.integration.datacite.json.DataCiteJson.RelatedIdentifier
+import org.orkg.integration.datacite.json.DataCiteJson.Rights
+import org.orkg.integration.datacite.json.DataCiteJson.Subject
+import org.orkg.integration.datacite.json.DataCiteJson.Title
+import org.orkg.integration.datacite.json.DataCiteJson.Type
 import org.orkg.contenttypes.output.DoiService
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType

diff --git a/content-types/content-types-core-model/build.gradle.kts b/content-types/content-types-core-model/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
     api(project(":common:datatypes"))
     api(project(":common:spring-webmvc"))
     api(project(":graph:graph-core-model"))
+    implementation(project(":graph:graph-core-constants"))
     api("org.springframework:spring-web")
 
     testFixturesApi(project(":common:identifiers"))
@@ -27,6 +28,7 @@ dependencies {
     testFixturesImplementation("org.eclipse.rdf4j:rdf4j-common-io")
     testFixturesImplementation("dev.forkhandles:values4k")
     testFixturesImplementation(testFixtures(project(":graph:graph-core-model")))
+    testFixturesImplementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/content-types/content-types-core-services/build.gradle.kts b/content-types/content-types-core-services/build.gradle.kts
@@ -7,15 +7,13 @@ plugins {
 
 dependencies {
     api("org.eclipse.rdf4j:rdf4j-common-io")
+    api("org.jbibtex:jbibtex")
     api("org.springframework.data:spring-data-commons")
     api("org.springframework:spring-beans")
     api("org.springframework:spring-context")
-    api(project(":common:spring-data"))
-    api("org.jbibtex:jbibtex")
     api(project(":common:functional"))
-    implementation(project(":common:pagination"))
-    implementation(project(":common:datatypes"))
     api(project(":common:identifiers"))
+    api(project(":common:spring-data"))
     api(project(":community:community-core-model"))
     api(project(":community:community-ports-input")) // used in LegacyPaperService
     api(project(":community:community-ports-output"))
@@ -27,6 +25,9 @@ dependencies {
     api(project(":graph:graph-ports-output"))
     api(project(":statistics:statistics-core-model"))
     implementation("dev.forkhandles:values4k")
+    implementation(project(":common:datatypes"))
+    implementation(project(":common:pagination"))
+    implementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/content-types/content-types-ports-input/build.gradle.kts b/content-types/content-types-ports-input/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     testFixturesApi(project(":content-types:content-types-core-model"))
     testFixturesApi(project(":content-types:content-types-ports-input"))
     testFixturesImplementation("dev.forkhandles:values4k")
+    testFixturesImplementation(project(":graph:graph-core-constants"))
     testFixturesImplementation(project(":graph:graph-core-model"))
     testFixturesImplementation(testFixtures(project(":content-types:content-types-core-model")))
     testFixturesImplementation("org.eclipse.rdf4j:rdf4j-common-io")

diff --git a/content-types/content-types-ports-output/build.gradle.kts b/content-types/content-types-ports-output/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     testFixturesImplementation(project(":common:pagination"))
     testFixturesImplementation(project(":common:identifiers"))
     testFixturesImplementation(project(":content-types:content-types-core-model"))
+    testFixturesImplementation(project(":graph:graph-core-constants"))
     testFixturesImplementation(project(":graph:graph-core-model"))
     testFixturesImplementation(testFixtures(project(":common:testing")))
     testFixturesImplementation(testFixtures(project(":content-types:content-types-core-model")))

diff --git a/curation/curation-ports-output/build.gradle.kts b/curation/curation-ports-output/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     testFixturesImplementation("io.kotest:kotest-runner-junit5")
     testFixturesImplementation("io.kotest:kotest-assertions-core")
     testFixturesImplementation(project(":common:identifiers"))
+    testFixturesImplementation(project(":graph:graph-core-constants"))
     testFixturesImplementation(project(":graph:graph-core-model"))
     testFixturesImplementation(testFixtures(project(":graph:graph-core-model")))
 }
diff --git a/data-export/data-export-core/build.gradle.kts b/data-export/data-export-core/build.gradle.kts
@@ -6,24 +6,26 @@ plugins {
 }
 
 dependencies {
+    api("com.fasterxml.jackson.core:jackson-databind")
     api("org.eclipse.rdf4j:rdf4j-model-api")
-    implementation("org.eclipse.rdf4j:rdf4j-common-io")
     api("org.springframework:spring-beans")
     api("org.springframework:spring-context")
-    api("com.fasterxml.jackson.core:jackson-databind")
-    implementation(project(":common:pagination"))
     api(project(":common:identifiers"))
     api(project(":content-types:content-types-ports-input"))
     api(project(":content-types:content-types-ports-output"))
     api(project(":data-export:data-export-ports-input"))
     api(project(":graph:graph-core-model"))
     api(project(":graph:graph-ports-output"))
     implementation("com.fasterxml.jackson.core:jackson-core")
+    implementation("org.eclipse.rdf4j:rdf4j-common-io")
     implementation("org.eclipse.rdf4j:rdf4j-model")
     implementation("org.eclipse.rdf4j:rdf4j-model-vocabulary")
+    implementation("org.slf4j:slf4j-api")
     implementation("org.springframework.data:spring-data-commons")
+    implementation(project(":common:pagination"))
     implementation(project(":content-types:content-types-core-model"))
-    implementation("org.slf4j:slf4j-api")
+    implementation(project(":integrations:datacite-serialization"))
+    implementation(project(":graph:graph-core-constants"))
 
     testFixturesImplementation("io.kotest:kotest-runner-junit5")
     testFixturesImplementation("io.kotest:kotest-assertions-shared")

diff --git a/...export/data-export-core/src/main/kotlin/org/orkg/export/domain/ExportComparisonService.kt b/...export/data-export-core/src/main/kotlin/org/orkg/export/domain/ExportComparisonService.kt
@@ -4,20 +4,20 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import java.io.Writer
 import java.net.URI
 import org.orkg.contenttypes.domain.Comparison
-import org.orkg.contenttypes.domain.json.DataCiteJson
-import org.orkg.contenttypes.domain.json.DataCiteJson.Attributes
-import org.orkg.contenttypes.domain.json.DataCiteJson.Creator
-import org.orkg.contenttypes.domain.json.DataCiteJson.Description
-import org.orkg.contenttypes.domain.json.DataCiteJson.NameIdentifier
-import org.orkg.contenttypes.domain.json.DataCiteJson.RelatedIdentifier
-import org.orkg.contenttypes.domain.json.DataCiteJson.Rights
-import org.orkg.contenttypes.domain.json.DataCiteJson.Subject
-import org.orkg.contenttypes.domain.json.DataCiteJson.Title
-import org.orkg.contenttypes.domain.json.DataCiteJson.Type
 import org.orkg.contenttypes.input.ComparisonUseCases
 import org.orkg.contenttypes.output.ComparisonRepository
 import org.orkg.export.input.ExportUnpublishedComparisonUseCase
 import org.orkg.graph.domain.Classes
+import org.orkg.integration.datacite.json.DataCiteJson
+import org.orkg.integration.datacite.json.DataCiteJson.Attributes
+import org.orkg.integration.datacite.json.DataCiteJson.Creator
+import org.orkg.integration.datacite.json.DataCiteJson.Description
+import org.orkg.integration.datacite.json.DataCiteJson.NameIdentifier
+import org.orkg.integration.datacite.json.DataCiteJson.RelatedIdentifier
+import org.orkg.integration.datacite.json.DataCiteJson.Rights
+import org.orkg.integration.datacite.json.DataCiteJson.Subject
+import org.orkg.integration.datacite.json.DataCiteJson.Title
+import org.orkg.integration.datacite.json.DataCiteJson.Type
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.PageRequest

diff --git a/graph/graph-adapter-input-representations/build.gradle.kts b/graph/graph-adapter-input-representations/build.gradle.kts
@@ -4,8 +4,6 @@ plugins {
 
 dependencies {
     api("com.fasterxml.jackson.core:jackson-annotations")
-    api("com.fasterxml.jackson.core:jackson-annotations")
-    api("org.eclipse.rdf4j:rdf4j-common-io")
     api("org.eclipse.rdf4j:rdf4j-common-io")
     api("org.springframework.data:spring-data-commons")
     api(project(":common:identifiers"))
@@ -14,6 +12,7 @@ dependencies {
     api(project(":graph:graph-core-model"))
     api(project(":graph:graph-ports-input"))
     implementation(project(":common:pagination"))
+    implementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/graph/graph-adapter-input-rest-spring-mvc/build.gradle.kts b/graph/graph-adapter-input-rest-spring-mvc/build.gradle.kts
@@ -36,6 +36,7 @@ testing {
             dependencies {
                 implementation(project(":common:serialization"))
                 implementation(project(":common:pagination"))
+                implementation(project(":graph:graph-core-constants"))
                 implementation(testFixtures(project(":community:community-core-model")))
                 implementation(testFixtures(project(":graph:graph-core-model")))
                 implementation(testFixtures(project(":testing:spring")))

diff --git a/graph/graph-adapter-output-in-memory/build.gradle.kts b/graph/graph-adapter-output-in-memory/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     api(project(":graph:graph-ports-output"))
     implementation("org.eclipse.rdf4j:rdf4j-common-io")
     implementation(project(":common:spring-webmvc"))
+    implementation(project(":graph:graph-core-constants"))
 }
 
 testing {

diff --git a/graph/graph-adapter-output-spring-data-neo4j-sdn6/build.gradle.kts b/graph/graph-adapter-output-spring-data-neo4j-sdn6/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     implementation(project(":common:datatypes"))
     implementation(project(":common:spring-webmvc"))
     implementation(project(":common:string-utils"))
+    implementation(project(":graph:graph-core-constants"))
 
     api("org.neo4j.driver:neo4j-java-driver")
     api("org.neo4j:neo4j-cypher-dsl")

diff --git a/graph/graph-core-constants/build.gradle.kts b/graph/graph-core-constants/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("org.orkg.gradle.kotlin-library")
+}
+
+dependencies {
+    api(project(":common:identifiers"))
+}