Merge branch 'develop'

CoordaaS · Mar 24, 2020 · 55a6644 · 55a6644
2 parents 2de01cb + c61d08c
commit 55a6644
Show file tree

Hide file tree

Showing 32 changed files with 74 additions and 63 deletions.
diff --git a/linda-core-presentation/build.gradle.kts b/linda-core-presentation/build.gradle.kts
@@ -1,8 +1,7 @@
 dependencies {
     api(project(":linda-core"))
     api(project(":presentation"))
-
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
     testImplementation(project(":test-utils"))

diff --git a/linda-core/build.gradle.kts b/linda-core/build.gradle.kts
@@ -3,7 +3,7 @@ dependencies {
     api(Libs.slf4j_api)
     api(project(":utils"))
 
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
 }
diff --git a/linda-logic-client/build.gradle.kts b/linda-logic-client/build.gradle.kts
@@ -2,12 +2,11 @@ dependencies {
     api(project(":linda-logic"))
     api(project(":linda-remote-client"))
     api(project(":linda-logic-presentation"))
+    api(kotlin("stdlib-jdk8"))
     api(Libs.vertx_web_client)
 
-    implementation(kotlin("stdlib-jdk8"))
     implementation(project(":prologx"))
 
-
     testImplementation(Libs.junit)
     testImplementation(project(":tusow-service"))
     testImplementation(project(":linda-test"))

diff --git a/linda-logic-presentation/build.gradle.kts b/linda-logic-presentation/build.gradle.kts
@@ -1,9 +1,9 @@
 dependencies {
     api(project(":linda-logic"))
     api(project(":linda-core-presentation"))
+    api(kotlin("stdlib-jdk8"))
 
     implementation(project(":prologx"))
-    implementation(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
     testImplementation(project(":test-utils"))

diff --git a/linda-logic/build.gradle.kts b/linda-logic/build.gradle.kts
@@ -1,10 +1,10 @@
 dependencies {
     api(Libs.`2p_core`)
     api(project(":linda-core"))
+    api(project(":utils"))
+    api(kotlin("stdlib-jdk8"))
 
-    implementation(project(":utils"))
     implementation(project(":prologx"))
-    implementation(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
     testImplementation(project(":linda-test"))

diff --git a/linda-remote-client/build.gradle.kts b/linda-remote-client/build.gradle.kts
@@ -2,9 +2,7 @@ dependencies {
     api(project(":linda-core"))
     api(project(":presentation"))
     api(Libs.vertx_web_client)
-
-    implementation(kotlin("stdlib-jdk8"))
-
+    api(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
 }
diff --git a/linda-text-client/build.gradle.kts b/linda-text-client/build.gradle.kts
@@ -2,11 +2,9 @@ dependencies {
     api(project(":linda-text"))
     api(project(":linda-remote-client"))
     api(project(":linda-text-presentation"))
+    api(kotlin("stdlib-jdk8"))
     api(Libs.vertx_web_client)
 
-    implementation(kotlin("stdlib-jdk8"))
-
-
     testImplementation(Libs.junit)
     testImplementation(project(":tusow-service"))
     testImplementation(project(":linda-test"))

diff --git a/linda-text-presentation/build.gradle.kts b/linda-text-presentation/build.gradle.kts
@@ -1,8 +1,7 @@
 dependencies {
     api(project(":linda-text"))
     api(project(":linda-core-presentation"))
-
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
 }
diff --git a/linda-text/build.gradle.kts b/linda-text/build.gradle.kts
@@ -1,8 +1,7 @@
 dependencies {
     api(project(":linda-core"))
-
-    implementation(Libs.named_regexp)
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
+    api(Libs.named_regexp)
 
     testImplementation(Libs.junit)
     testImplementation(project(":linda-test"))

diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -3,11 +3,10 @@ dependencies {
     api(Libs.jackson_datatype_jsr310)
     api(Libs.jackson_dataformat_xml)
     api(Libs.jackson_dataformat_yaml)
+    api(kotlin("stdlib-jdk8"))
+    api(project(":utils"))
 
-    implementation(project(":utils"))
     implementation(project(":prologx"))
-    implementation(kotlin("stdlib-jdk8"))
-
 
     testImplementation(Libs.junit)
     testImplementation(project(":test-utils"))

diff --git a/prologx/build.gradle.kts b/prologx/build.gradle.kts
@@ -5,8 +5,7 @@ val ktFreeCompilerArgs: String by project
 
 dependencies {
     api(Libs.`2p_presentation`)
-
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.junit)
 }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -3,6 +3,6 @@ val junitVersion: String by project
 val ktFreeCompilerArgs: String by project
 
 dependencies {
-    implementation(Libs.junit)
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
+    api(Libs.junit)
 }
diff --git a/tusow-cli/build.gradle.kts b/tusow-cli/build.gradle.kts
@@ -6,17 +6,18 @@ plugins {
 dependencies {
     api(project(":linda-logic-client"))
     api(project(":linda-text-client"))
+    api(kotlin("stdlib-jdk8"))
+    api(Libs.clikt)
 
-    implementation(Libs.clikt)
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(Libs.logback_classic)
 
     testImplementation(Libs.junit)
     testImplementation(project(":tusow-service"))
     testImplementation(project(":linda-test"))
     testImplementation(project(":test-utils"))
 }
 
-val mainClass = "it.unibo.coordination.linda.cli.TusowCommandKt"
+val mainClass = "it.unibo.coordination.tusow.Cli"
 
 application {
     mainClassName = mainClass

diff --git a/...o/coordination/linda/cli/AbsentCommand.kt → ...unibo/coordination/tusow/AbsentCommand.kt b/...o/coordination/linda/cli/AbsentCommand.kt → ...unibo/coordination/tusow/AbsentCommand.kt
@@ -1,12 +1,12 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT
 import it.unibo.coordination.linda.core.Match
 import it.unibo.coordination.linda.core.Template
 import it.unibo.coordination.linda.core.Tuple
 import it.unibo.coordination.linda.logic.LogicSpace
 import it.unibo.coordination.linda.text.TextualSpace
+import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC
+import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT
 
 class AbsentCommand(
         epilog: String = "",

diff --git a/...ation/linda/cli/AbstractObserveCommand.kt → ...rdination/tusow/AbstractObserveCommand.kt b/...ation/linda/cli/AbstractObserveCommand.kt → ...rdination/tusow/AbstractObserveCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.options.flag

diff --git a/...on/linda/cli/AbstractTupleSpaceCommand.kt → ...nation/tusow/AbstractTupleSpaceCommand.kt b/...on/linda/cli/AbstractTupleSpaceCommand.kt → ...nation/tusow/AbstractTupleSpaceCommand.kt
@@ -1,16 +1,16 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.int
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT
 import it.unibo.coordination.linda.core.TupleSpace
 import it.unibo.coordination.linda.logic.remote.RemoteLogicSpace
 import it.unibo.coordination.linda.text.remote.RemoteTextualSpace
+import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC
+import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT
 import java.net.URL
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutionException

diff --git a/...nation/linda/cli/AbstractUpdateCommand.kt → ...ordination/tusow/AbstractUpdateCommand.kt b/...nation/linda/cli/AbstractUpdateCommand.kt → ...ordination/tusow/AbstractUpdateCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.multiple

diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/Cli.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/Cli.kt
@@ -0,0 +1,14 @@
+package it.unibo.coordination.tusow
+
+object Cli {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        try {
+            TusowCommand().main(args)
+            System.exit(0)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            System.exit(1)
+        }
+    }
+}
diff --git a/...bo/coordination/linda/cli/CountCommand.kt → .../unibo/coordination/tusow/CountCommand.kt b/...bo/coordination/linda/cli/CountCommand.kt → .../unibo/coordination/tusow/CountCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import it.unibo.coordination.linda.logic.LogicSpace
 import it.unibo.coordination.linda.text.TextualSpace

diff --git a/...nibo/coordination/linda/cli/GetCommand.kt → ...it/unibo/coordination/tusow/GetCommand.kt b/...nibo/coordination/linda/cli/GetCommand.kt → ...it/unibo/coordination/tusow/GetCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import it.unibo.coordination.linda.core.Tuple
 import it.unibo.coordination.linda.logic.LogicSpace

diff --git a/...ibo/coordination/linda/cli/ReadCommand.kt → ...t/unibo/coordination/tusow/ReadCommand.kt b/...ibo/coordination/linda/cli/ReadCommand.kt → ...t/unibo/coordination/tusow/ReadCommand.kt
@@ -1,9 +1,9 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT
 import it.unibo.coordination.linda.logic.LogicSpace
 import it.unibo.coordination.linda.text.TextualSpace
+import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC
+import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT
 
 class ReadCommand(
         epilog: String = "",

diff --git a/...ibo/coordination/linda/cli/TakeCommand.kt → ...t/unibo/coordination/tusow/TakeCommand.kt b/...ibo/coordination/linda/cli/TakeCommand.kt → ...t/unibo/coordination/tusow/TakeCommand.kt
@@ -1,9 +1,9 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC
-import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT
 import it.unibo.coordination.linda.logic.LogicSpace
 import it.unibo.coordination.linda.text.TextualSpace
+import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC
+import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT
 
 class TakeCommand(
         epilog: String = "",

diff --git a/...bo/coordination/linda/cli/TupleSpaceID.kt → .../unibo/coordination/tusow/TupleSpaceID.kt b/...bo/coordination/linda/cli/TupleSpaceID.kt → .../unibo/coordination/tusow/TupleSpaceID.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import java.net.URL
 

diff --git a/...coordination/linda/cli/TupleSpaceTypes.kt → ...ibo/coordination/tusow/TupleSpaceTypes.kt b/...coordination/linda/cli/TupleSpaceTypes.kt → ...ibo/coordination/tusow/TupleSpaceTypes.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 enum class TupleSpaceTypes {
     LOGIC,

diff --git a/...bo/coordination/linda/cli/TusowCommand.kt → .../unibo/coordination/tusow/TusowCommand.kt b/...bo/coordination/linda/cli/TusowCommand.kt → .../unibo/coordination/tusow/TusowCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.subcommands
@@ -16,14 +16,4 @@ class TusowCommand() : CliktCommand(name="tusow") {
     }
 
     override fun run() = Unit
-}
-
-fun main(args: Array<String>) {
-    try {
-        TusowCommand().main(args)
-        System.exit(0)
-    } catch (e: Exception) {
-        e.printStackTrace()
-        System.exit(1)
-    }
 }
diff --git a/...bo/coordination/linda/cli/WriteCommand.kt → .../unibo/coordination/tusow/WriteCommand.kt b/...bo/coordination/linda/cli/WriteCommand.kt → .../unibo/coordination/tusow/WriteCommand.kt
@@ -1,4 +1,4 @@
-package it.unibo.coordination.linda.cli
+package it.unibo.coordination.tusow
 
 import it.unibo.coordination.linda.logic.LogicSpace
 import it.unibo.coordination.linda.logic.LogicTuple

diff --git a/tusow-full/build.gradle.kts b/tusow-full/build.gradle.kts
@@ -7,6 +7,8 @@ dependencies {
             .forEach {
                 api(project(":$it"))
             }
+
+    implementation(Libs.logback_classic)
 }
 
 tasks.getByName<Jar>("shadowJar") {

diff --git a/tusow-full/src/main/kotlin/TusowCli.kt b/tusow-full/src/main/kotlin/TusowCli.kt
@@ -0,0 +1,8 @@
+import it.unibo.coordination.tusow.Cli
+
+object TusowCli {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        Cli.main(args)
+    }
+}
diff --git a/tusow-full/src/main/kotlin/TusowService.kt b/tusow-full/src/main/kotlin/TusowService.kt
@@ -0,0 +1,6 @@
+object TusowService {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        it.unibo.coordination.tusow.Service.main(args)
+    }
+}
diff --git a/tusow-service/build.gradle.kts b/tusow-service/build.gradle.kts
@@ -8,10 +8,11 @@ dependencies {
     api(project(":linda-logic-presentation"))
     api(project(":linda-text"))
     api(project(":linda-text-presentation"))
+    api(kotlin("stdlib-jdk8"))
     api(Libs.vertx_core)
     api(Libs.vertx_web)
 
-    runtimeOnly(Libs.logback_classic)
+    implementation(Libs.logback_classic)
 
     implementation(project(":prologx"))
     implementation(Libs.commons_cli)
@@ -20,7 +21,6 @@ dependencies {
     implementation(Libs.jackson_dataformat_xml)
     implementation(Libs.jackson_dataformat_yaml)
     implementation(Libs.jool)
-    implementation(kotlin("stdlib-jdk8"))
 
     testImplementation(Libs.vertx_unit)
     testImplementation(Libs.junit)

diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts
@@ -1,4 +1,4 @@
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    api(kotlin("stdlib-jdk8"))
     testImplementation(Libs.junit)
 }
diff --git a/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt b/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt
@@ -1,3 +1,3 @@
 package it.unibo.coordination.utils.events
 
-typealias EventListener<T> = (T) -> Any
+typealias EventListener<T> = (T) -> Unit