diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt index 45e02672d61..8f33cde905c 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt @@ -27,6 +27,7 @@ import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.tasks.Input import org.gradle.api.tasks.TaskAction +import java.io.FileNotFoundException import java.net.URL /** @@ -52,13 +53,13 @@ open class CheckVersionIncrement : DefaultTask() { val artifact = "${project.artifactPath()}/${MavenMetadata.FILE_NAME}" val repoUrl = repository.releases val metadata = fetch(repoUrl, artifact) - val versions = metadata.versioning.versions - val versionExists = versions.contains(version) + val versions = metadata?.versioning?.versions + val versionExists = versions?.contains(version) ?: false if (versionExists) { throw GradleException(""" Version `$version` is already published to maven repository `$repoUrl`. Try incrementing the library version. - All available versions are: ${versions.joinToString(separator = ", ")}. + All available versions are: ${versions?.joinToString(separator = ", ")}. To disable this check, run Gradle with `-x $name`. """.trimIndent() @@ -66,7 +67,7 @@ open class CheckVersionIncrement : DefaultTask() { } } - private fun fetch(repository: String, artifact: String): MavenMetadata { + private fun fetch(repository: String, artifact: String): MavenMetadata? { val url = URL("$repository/$artifact") return MavenMetadata.fetchAndParse(url) } @@ -94,9 +95,19 @@ private data class MavenMetadata(var versioning: Versioning = Versioning()) { mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false) } - fun fetchAndParse(url: URL): MavenMetadata { - val metadata = mapper.readValue(url, MavenMetadata::class.java) - return metadata + /** + * Fetches the metadata for the repository and parses the document. + * + *

If the document could not be found, assumes that the module was never + * released and thus has no metadata. + */ + fun fetchAndParse(url: URL): MavenMetadata? { + return try { + val metadata = mapper.readValue(url, MavenMetadata::class.java) + metadata + } catch (e: FileNotFoundException) { + null + } } } } diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt index 9a8992c8c07..163234f79f4 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt @@ -94,7 +94,7 @@ object Versions { val javaPoet = "1.12.1" val autoService = "1.0-rc6" val autoCommon = "0.10" - val jackson = "2.9.10.4" + val jackson = "2.9.10.5" val animalSniffer = "1.18" val apiguardian = "1.1.0" val javaxAnnotation = "1.3.2" diff --git a/config b/config index 9799ecc527e..c4ce66e250b 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 9799ecc527ee27429415daf76893f6fae2e2da52 +Subproject commit c4ce66e250bbb86f2d17baea67a35a2452e0e10d diff --git a/core/src/main/java/io/spine/core/BoundedContext.java b/core/src/main/java/io/spine/core/BoundedContext.java index 578a3bd9288..6ca21c1ce6f 100644 --- a/core/src/main/java/io/spine/core/BoundedContext.java +++ b/core/src/main/java/io/spine/core/BoundedContext.java @@ -21,11 +21,12 @@ package io.spine.core; import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Marks a package as one belonging to a Bounded Context with * the {@linkplain #value() specified name}. @@ -49,8 +50,8 @@ *

Packages that do not have a common “parent” but annotated with the same name belong * to the same Bounded Context. */ -@Target(ElementType.PACKAGE) -@Retention(RetentionPolicy.RUNTIME) +@Target(PACKAGE) +@Retention(RUNTIME) @Documented public @interface BoundedContext { diff --git a/license-report.md b/license-report.md index f5a2b03bc0a..f19dba5580b 100644 --- a/license-report.md +++ b/license-report.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine:spine-client:1.5.20` +# Dependencies of `io.spine:spine-client:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -324,6 +324,7 @@ 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -405,12 +406,12 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:39 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:07 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-core:1.5.20` +# Dependencies of `io.spine:spine-core:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -694,6 +695,7 @@ This report was generated on **Fri Jun 19 14:07:39 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -775,12 +777,12 @@ This report was generated on **Fri Jun 19 14:07:39 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:07 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:spine-model-assembler:1.5.20` +# Dependencies of `io.spine.tools:spine-model-assembler:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -1099,6 +1101,7 @@ This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -1180,12 +1183,12 @@ This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:08 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:spine-model-verifier:1.5.20` +# Dependencies of `io.spine.tools:spine-model-verifier:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -1570,6 +1573,7 @@ This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-Lic * **POM License: Eclipse Public License version 1.0** - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) * **POM License: Public Domain** - [http://repository.jboss.org/licenses/cc0-1.0.txt](http://repository.jboss.org/licenses/cc0-1.0.txt) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit-pioneer **Name:** junit-pioneer **Version:** 0.4.2 * **POM Project URL:** [https://github.com/junit-pioneer/junit-pioneer](https://github.com/junit-pioneer/junit-pioneer) * **POM License: The MIT License** - [https://github.com/junit-pioneer/junit-pioneer/blob/master/LICENSE](https://github.com/junit-pioneer/junit-pioneer/blob/master/LICENSE) @@ -1655,12 +1659,12 @@ This report was generated on **Fri Jun 19 14:07:40 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:41 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:11 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-server:1.5.20` +# Dependencies of `io.spine:spine-server:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -1996,6 +2000,7 @@ This report was generated on **Fri Jun 19 14:07:41 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -2077,12 +2082,12 @@ This report was generated on **Fri Jun 19 14:07:41 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:42 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:14 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-testutil-client:1.5.20` +# Dependencies of `io.spine:spine-testutil-client:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -2215,6 +2220,7 @@ This report was generated on **Fri Jun 19 14:07:42 EEST 2020** using [Gradle-Lic 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3 * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -2454,6 +2460,7 @@ This report was generated on **Fri Jun 19 14:07:42 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -2535,12 +2542,12 @@ This report was generated on **Fri Jun 19 14:07:42 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:44 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:16 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-testutil-core:1.5.20` +# Dependencies of `io.spine:spine-testutil-core:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -2673,6 +2680,7 @@ This report was generated on **Fri Jun 19 14:07:44 EEST 2020** using [Gradle-Lic 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3 * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -2920,6 +2928,7 @@ This report was generated on **Fri Jun 19 14:07:44 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -3001,12 +3010,12 @@ This report was generated on **Fri Jun 19 14:07:44 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:45 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Fri Aug 07 17:07:16 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-testutil-server:1.5.20` +# Dependencies of `io.spine:spine-testutil-server:2.0.0-alfa-001` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -3139,6 +3148,7 @@ This report was generated on **Fri Jun 19 14:07:45 EEST 2020** using [Gradle-Lic 1. **Group:** org.hamcrest **Name:** hamcrest-core **Version:** 1.3 * **POM License: New BSD License** - [http://www.opensource.org/licenses/bsd-license.php](http://www.opensource.org/licenses/bsd-license.php) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -3422,6 +3432,7 @@ This report was generated on **Fri Jun 19 14:07:45 EEST 2020** using [Gradle-Lic 1. **Group:** org.jacoco **Name:** org.jacoco.report **Version:** 0.8.5 * **POM License: Eclipse Public License 2.0** - [https://www.eclipse.org/legal/epl-2.0/](https://www.eclipse.org/legal/epl-2.0/) +1. **Group:** org.junit **Name:** junit-bom **Version:** 5.6.2 **No license information found** 1. **Group:** org.junit.jupiter **Name:** junit-jupiter-api **Version:** 5.6.2 * **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/) * **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html) @@ -3503,4 +3514,4 @@ This report was generated on **Fri Jun 19 14:07:45 EEST 2020** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Fri Jun 19 14:07:48 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file +This report was generated on **Fri Aug 07 17:07:21 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file diff --git a/pom.xml b/pom.xml index 886cc359469..77cf3022d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject. io.spine spine-core-java -1.5.21 +2.0.0-alfa-001 2015 @@ -70,25 +70,25 @@ all modules and does not describe the project structure per-subproject. io.spine spine-base - 1.5.19 + 1.5.21 compile io.spine spine-time - 1.5.19 + 1.5.21 compile io.spine.tools spine-model-compiler - 1.5.19 + 1.5.21 compile io.spine.tools spine-plugin-base - 1.5.19 + 1.5.21 compile @@ -130,25 +130,25 @@ all modules and does not describe the project structure per-subproject. io.spine spine-testlib - 1.5.19 + 1.5.21 test io.spine spine-testutil-time - 1.5.19 + 1.5.21 test io.spine.tools spine-mute-logging - 1.5.19 + 1.5.21 test io.spine.tools spine-plugin-testlib - 1.5.19 + 1.5.21 test @@ -204,12 +204,12 @@ all modules and does not describe the project structure per-subproject. io.spine.tools spine-javadoc-filter - 1.5.19 + 1.5.21 io.spine.tools spine-protoc-plugin - 1.5.19 + 1.5.21 net.sourceforge.pmd diff --git a/server/src/main/java/io/spine/server/aggregate/Apply.java b/server/src/main/java/io/spine/server/aggregate/Apply.java index 1e8693efcae..7ba2c12e9d1 100644 --- a/server/src/main/java/io/spine/server/aggregate/Apply.java +++ b/server/src/main/java/io/spine/server/aggregate/Apply.java @@ -20,11 +20,12 @@ package io.spine.server.aggregate; -import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Marks a method of an aggregate as one that modifies the state of the aggregate with data * from the passed event. @@ -47,8 +48,8 @@ * {@code true}, the aggregate can receive incoming events as if they were produced * by the aggregate. */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) +@Retention(RUNTIME) +@Target(METHOD) public @interface Apply { /** diff --git a/server/src/main/java/io/spine/server/command/Assign.java b/server/src/main/java/io/spine/server/command/Assign.java index 96a83a0fcd9..d8744cc4d15 100644 --- a/server/src/main/java/io/spine/server/command/Assign.java +++ b/server/src/main/java/io/spine/server/command/Assign.java @@ -20,11 +20,12 @@ package io.spine.server.command; -import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Marks a method as command handler. * @@ -133,7 +134,7 @@ * @see io.spine.server.tuple.Either Returning One of Event Messages * @see io.spine.server.command.Command Transforming Commands */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) +@Retention(RUNTIME) +@Target(METHOD) public @interface Assign { } diff --git a/server/src/main/java/io/spine/server/entity/Friend.java b/server/src/main/java/io/spine/server/entity/Friend.java new file mode 100644 index 00000000000..de56f15cb64 --- /dev/null +++ b/server/src/main/java/io/spine/server/entity/Friend.java @@ -0,0 +1,47 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package io.spine.server.entity; + +import io.spine.server.command.CommandHandlingEntity; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Specifies classes of entities, such as {@link io.spine.server.aggregate.Aggregate Aggregate} + * or {@link io.spine.server.procman.ProcessManager ProcessManager}, that can load the state + * of the annotated entity. + */ +@Target(TYPE) +@Retention(RUNTIME) +public @interface Friend { + + /** + * Enumerates classes of command-handling entities, such as + * {@link io.spine.server.aggregate.Aggregate Aggregate} or + * {@link io.spine.server.procman.ProcessManager ProcessManager}, + * that can load the state of the annotated entity. + */ + Class>[] entity(); +} diff --git a/server/src/main/java/io/spine/server/event/React.java b/server/src/main/java/io/spine/server/event/React.java index 27fd7f7b5ff..91cc8c5d7ab 100644 --- a/server/src/main/java/io/spine/server/event/React.java +++ b/server/src/main/java/io/spine/server/event/React.java @@ -23,11 +23,12 @@ import io.spine.core.AcceptsExternal; import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Marks a method of an entity as one that may modify the state of the entity in * response to some domain event. @@ -150,8 +151,8 @@ *

If the annotation is applied to a method which does not satisfy either of these requirements, * this method will not be registering for receiving events. */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) +@Retention(RUNTIME) +@Target(METHOD) @Documented @AcceptsExternal public @interface React { diff --git a/server/src/test/java/io/spine/server/test/friends/TaskDefinitionAggregate.java b/server/src/test/java/io/spine/server/test/friends/TaskDefinitionAggregate.java new file mode 100644 index 00000000000..5bb24a81834 --- /dev/null +++ b/server/src/test/java/io/spine/server/test/friends/TaskDefinitionAggregate.java @@ -0,0 +1,43 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package io.spine.server.test.friends; + +import io.spine.server.aggregate.Aggregate; +import io.spine.server.aggregate.Apply; +import io.spine.server.command.Assign; +import io.spine.server.test.friends.command.CreateTask; +import io.spine.server.test.friends.event.TaskCreated; + +final class TaskDefinitionAggregate extends Aggregate { + + @Assign + TaskCreated handle(CreateTask c) { + return TaskCreated.newBuilder() + .setId(id()) + .setTitle(c.getTitle()) + .vBuild(); + } + + @Apply + void event(TaskCreated e) { + builder().setTitle(e.getTitle()); + } +} diff --git a/server/src/test/java/io/spine/server/test/friends/WorkLogAggregate.java b/server/src/test/java/io/spine/server/test/friends/WorkLogAggregate.java new file mode 100644 index 00000000000..e2abcc49c9e --- /dev/null +++ b/server/src/test/java/io/spine/server/test/friends/WorkLogAggregate.java @@ -0,0 +1,46 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package io.spine.server.test.friends; + +import io.spine.server.aggregate.Aggregate; +import io.spine.server.aggregate.Apply; +import io.spine.server.command.Assign; +import io.spine.server.entity.Friend; +import io.spine.server.test.friends.command.LogWork; +import io.spine.server.test.friends.event.WorkLogged; + +@Friend(entity = TaskDefinitionAggregate.class) +final class WorkLogAggregate extends Aggregate { + + @Assign + WorkLogged handle(LogWork c) { + return WorkLogged.newBuilder() + .setTask(c.getTask()) + .setWork(c.getWork()) + .vBuild(); + } + + @Apply + void event(WorkLogged e) { + builder().setTotal(state().getTotal() + e.getWork()) + .addRecord(e.getWork()); + } +} diff --git a/server/src/test/java/io/spine/server/test/friends/package-info.java b/server/src/test/java/io/spine/server/test/friends/package-info.java new file mode 100644 index 00000000000..a38ccbba6c6 --- /dev/null +++ b/server/src/test/java/io/spine/server/test/friends/package-info.java @@ -0,0 +1,33 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * This package tests the {@link io.spine.server.entity.Friend Friend} annotation + * which allows {@linkplain io.spine.server.command.CommandHandlingEntity command handling entities} + * to load states of other entities. + */ + +@CheckReturnValue +@ParametersAreNonnullByDefault +package io.spine.server.test.friends; + +import com.google.errorprone.annotations.CheckReturnValue; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/src/test/proto/spine/test/server/friends/commands.proto b/server/src/test/proto/spine/test/server/friends/commands.proto new file mode 100644 index 00000000000..f753da7fa29 --- /dev/null +++ b/server/src/test/proto/spine/test/server/friends/commands.proto @@ -0,0 +1,43 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +syntax = "proto3"; + +package spine.test.server.friends; + +import "spine/options.proto"; + +option (type_url_prefix) = "type.spine.io"; +option java_package = "io.spine.server.test.friends.command"; +option java_outer_classname = "CommandsProto"; +option java_multiple_files = true; + +import "spine/test/server/friends/identifiers.proto"; + +message CreateTask { + TaskId id = 1; + string title = 2 [(required) = true]; +} + +message LogWork { + TaskId task = 1; + + // For simplicity of the test we assume work is in man-hours. Must be a positive value. + int32 work = 2 [(required) = true, (min).value = "1"]; +} diff --git a/server/src/test/proto/spine/test/server/friends/entities.proto b/server/src/test/proto/spine/test/server/friends/entities.proto new file mode 100644 index 00000000000..a251dab0d9d --- /dev/null +++ b/server/src/test/proto/spine/test/server/friends/entities.proto @@ -0,0 +1,49 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +syntax = "proto3"; + +package spine.test.server.friends; + +import "spine/options.proto"; + +option (type_url_prefix) = "type.spine.io"; +option java_package = "io.spine.server.test.friends"; +option java_outer_classname = "EntitiesProto"; +option java_multiple_files = true; + +import "spine/test/server/friends/identifiers.proto"; + +message Task { + option (entity).kind = AGGREGATE; + TaskId id = 1; + string title = 2 [(required) = true]; +} + +message WorkLog { + option (entity).kind = AGGREGATE; + TaskId task = 1; + + // For simplicity of the test we simply accumulate values. + // A real-world log would have a repeated field of a `Record` type. + repeated int32 record = 2; + + // The total work done. + int32 total = 3; +} diff --git a/server/src/test/proto/spine/test/server/friends/events.proto b/server/src/test/proto/spine/test/server/friends/events.proto new file mode 100644 index 00000000000..86c647eb225 --- /dev/null +++ b/server/src/test/proto/spine/test/server/friends/events.proto @@ -0,0 +1,43 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +syntax = "proto3"; + +package spine.test.server.friends; + +import "spine/options.proto"; + +option (type_url_prefix) = "type.spine.io"; +option java_package = "io.spine.server.test.friends.event"; +option java_outer_classname = "EventsProto"; +option java_multiple_files = true; + +import "spine/test/server/friends/identifiers.proto"; + +message TaskCreated { + TaskId id = 1; + string title = 2 [(required) = true]; +} + +message WorkLogged { + TaskId task = 1; + + // For simplicity of the test we assume work is in man-hours. Must be a positive value. + int32 work = 2 [(required) = true, (min).value = "1"]; +} diff --git a/server/src/test/proto/spine/test/server/friends/identifiers.proto b/server/src/test/proto/spine/test/server/friends/identifiers.proto new file mode 100644 index 00000000000..824388b78dd --- /dev/null +++ b/server/src/test/proto/spine/test/server/friends/identifiers.proto @@ -0,0 +1,33 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +syntax = "proto3"; + +package spine.test.server.friends; + +import "spine/options.proto"; + +option (type_url_prefix) = "type.spine.io"; +option java_package = "io.spine.server.test.friends"; +option java_outer_classname = "IdentifiersProto"; +option java_multiple_files = true; + +message TaskId { + string uuid = 1; +} diff --git a/version.gradle.kts b/version.gradle.kts index 9d700d9bf4e..fe4889e13d2 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -27,4 +27,4 @@ val spineBaseVersion: String by extra("1.5.21") val spineTimeVersion: String by extra("1.5.21") -val versionToPublish: String by extra("1.5.21") +val versionToPublish: String by extra("2.0.0-alfa-001")