From 639bde0797690817438c4b53fe4fd30a07d605d6 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 23 Dec 2025 17:45:58 +0000 Subject: [PATCH 1/3] Rename `validate` to `validation` --- .../TimeOptionsProvider.java | 7 +++---- .../time/{validate => validation}/When.java | 8 +++---- .../WhenConstraint.java | 4 +--- .../{validate => validation}/WhenFactory.kt | 2 +- .../package-info.java | 6 +++--- .../WhenFactoryTest.java | 6 +++--- .../{validate => validation}/WhenTest.java | 21 ++++++++++++------- .../given/WhenTestEnv.java | 6 +++--- .../given/package-info.java | 6 +++--- .../{validate => validation}/messages.proto | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) rename time/src/main/java/io/spine/time/{validate => validation}/TimeOptionsProvider.java (89%) rename time/src/main/java/io/spine/time/{validate => validation}/When.java (89%) rename time/src/main/java/io/spine/time/{validate => validation}/WhenConstraint.java (97%) rename time/src/main/java/io/spine/time/{validate => validation}/WhenFactory.kt (98%) rename time/src/main/java/io/spine/time/{validate => validation}/package-info.java (91%) rename time/src/test/java/io/spine/time/{validate => validation}/WhenFactoryTest.java (94%) rename time/src/test/java/io/spine/time/{validate => validation}/WhenTest.java (90%) rename time/src/test/java/io/spine/time/{validate => validation}/given/WhenTestEnv.java (95%) rename time/src/test/java/io/spine/time/{validate => validation}/given/package-info.java (90%) rename time/src/test/proto/spine/time/{validate => validation}/messages.proto (96%) diff --git a/time/src/main/java/io/spine/time/validate/TimeOptionsProvider.java b/time/src/main/java/io/spine/time/validation/TimeOptionsProvider.java similarity index 89% rename from time/src/main/java/io/spine/time/validate/TimeOptionsProvider.java rename to time/src/main/java/io/spine/time/validation/TimeOptionsProvider.java index 0a4afc2a8..209e6fc11 100644 --- a/time/src/main/java/io/spine/time/validate/TimeOptionsProvider.java +++ b/time/src/main/java/io/spine/time/validation/TimeOptionsProvider.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -24,12 +24,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate; +package io.spine.time.validation; import com.google.auto.service.AutoService; import com.google.protobuf.ExtensionRegistry; import io.spine.option.OptionsProvider; -import io.spine.time.validation.TimeOptionsProto; /** * Registers time-related proto options introduced by this library. diff --git a/time/src/main/java/io/spine/time/validate/When.java b/time/src/main/java/io/spine/time/validation/When.java similarity index 89% rename from time/src/main/java/io/spine/time/validate/When.java rename to time/src/main/java/io/spine/time/validation/When.java index f173e653a..c3e85ba87 100644 --- a/time/src/main/java/io/spine/time/validate/When.java +++ b/time/src/main/java/io/spine/time/validation/When.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -24,12 +24,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate; +package io.spine.time.validation; import com.google.protobuf.Timestamp; import io.spine.code.proto.FieldContext; -import io.spine.time.validation.TimeOption; -import io.spine.time.validation.TimeOptionsProto; import io.spine.validation.Constraint; import io.spine.validation.option.FieldValidatingOption; diff --git a/time/src/main/java/io/spine/time/validate/WhenConstraint.java b/time/src/main/java/io/spine/time/validation/WhenConstraint.java similarity index 97% rename from time/src/main/java/io/spine/time/validate/WhenConstraint.java rename to time/src/main/java/io/spine/time/validation/WhenConstraint.java index a2cf490ba..dfc2d8917 100644 --- a/time/src/main/java/io/spine/time/validate/WhenConstraint.java +++ b/time/src/main/java/io/spine/time/validation/WhenConstraint.java @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate; +package io.spine.time.validation; import com.google.common.collect.ImmutableList; import com.google.protobuf.Message; @@ -33,8 +33,6 @@ import io.spine.code.proto.FieldDeclaration; import io.spine.time.Temporal; import io.spine.time.Temporals; -import io.spine.time.validation.Time; -import io.spine.time.validation.TimeOption; import io.spine.validation.ConstraintViolation; import io.spine.validation.CustomConstraint; import io.spine.validation.FieldValue; diff --git a/time/src/main/java/io/spine/time/validate/WhenFactory.kt b/time/src/main/java/io/spine/time/validation/WhenFactory.kt similarity index 98% rename from time/src/main/java/io/spine/time/validate/WhenFactory.kt rename to time/src/main/java/io/spine/time/validation/WhenFactory.kt index b78b0d411..00fee6deb 100644 --- a/time/src/main/java/io/spine/time/validate/WhenFactory.kt +++ b/time/src/main/java/io/spine/time/validation/WhenFactory.kt @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate +package io.spine.time.validation import com.google.auto.service.AutoService import com.google.common.collect.ImmutableSet diff --git a/time/src/main/java/io/spine/time/validate/package-info.java b/time/src/main/java/io/spine/time/validation/package-info.java similarity index 91% rename from time/src/main/java/io/spine/time/validate/package-info.java rename to time/src/main/java/io/spine/time/validation/package-info.java index c508010e5..e6c4eee95 100644 --- a/time/src/main/java/io/spine/time/validate/package-info.java +++ b/time/src/main/java/io/spine/time/validation/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -30,7 +30,7 @@ @CheckReturnValue @NullMarked -package io.spine.time.validate; +package io.spine.time.validation; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/time/src/test/java/io/spine/time/validate/WhenFactoryTest.java b/time/src/test/java/io/spine/time/validation/WhenFactoryTest.java similarity index 94% rename from time/src/test/java/io/spine/time/validate/WhenFactoryTest.java rename to time/src/test/java/io/spine/time/validation/WhenFactoryTest.java index d61e574eb..157cfab0a 100644 --- a/time/src/test/java/io/spine/time/validate/WhenFactoryTest.java +++ b/time/src/test/java/io/spine/time/validation/WhenFactoryTest.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate; +package io.spine.time.validation; import com.google.common.collect.Iterables; import io.spine.validation.option.ValidatingOptionFactory; diff --git a/time/src/test/java/io/spine/time/validate/WhenTest.java b/time/src/test/java/io/spine/time/validation/WhenTest.java similarity index 90% rename from time/src/test/java/io/spine/time/validate/WhenTest.java rename to time/src/test/java/io/spine/time/validation/WhenTest.java index af7123aee..52c90e600 100644 --- a/time/src/test/java/io/spine/time/validate/WhenTest.java +++ b/time/src/test/java/io/spine/time/validation/WhenTest.java @@ -24,9 +24,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate; +package io.spine.time.validation; import io.spine.base.Time; +import io.spine.time.validation.given.AlwaysValidTime; +import io.spine.time.validation.given.TimeInFutureFieldValue; +import io.spine.time.validation.given.TimeInPastFieldValue; +import io.spine.time.validation.given.TimeWithDefaultErrorMessage; +import io.spine.time.validation.given.TimeWithoutOptsFieldValue; import io.spine.validation.ConstraintViolation; import io.spine.validation.TemplateString; import io.spine.validation.TemplateStrings; @@ -38,13 +43,13 @@ import static com.google.common.truth.Truth.assertThat; import static io.spine.string.Strings.count; -import static io.spine.time.validate.given.WhenTestEnv.FIFTY_NANOSECONDS; -import static io.spine.time.validate.given.WhenTestEnv.ZERO_NANOSECONDS; -import static io.spine.time.validate.given.WhenTestEnv.currentTimeWithNanos; -import static io.spine.time.validate.given.WhenTestEnv.freezeTime; -import static io.spine.time.validate.given.WhenTestEnv.future; -import static io.spine.time.validate.given.WhenTestEnv.past; -import static io.spine.time.validate.given.WhenTestEnv.timeWithNanos; +import static io.spine.time.validation.given.WhenTestEnv.FIFTY_NANOSECONDS; +import static io.spine.time.validation.given.WhenTestEnv.ZERO_NANOSECONDS; +import static io.spine.time.validation.given.WhenTestEnv.currentTimeWithNanos; +import static io.spine.time.validation.given.WhenTestEnv.freezeTime; +import static io.spine.time.validation.given.WhenTestEnv.future; +import static io.spine.time.validation.given.WhenTestEnv.past; +import static io.spine.time.validation.given.WhenTestEnv.timeWithNanos; @DisplayName("`(when)` option should") class WhenTest { diff --git a/time/src/test/java/io/spine/time/validate/given/WhenTestEnv.java b/time/src/test/java/io/spine/time/validation/given/WhenTestEnv.java similarity index 95% rename from time/src/test/java/io/spine/time/validate/given/WhenTestEnv.java rename to time/src/test/java/io/spine/time/validation/given/WhenTestEnv.java index 3b907128e..ef487a2c4 100644 --- a/time/src/test/java/io/spine/time/validate/given/WhenTestEnv.java +++ b/time/src/test/java/io/spine/time/validation/given/WhenTestEnv.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.spine.time.validate.given; +package io.spine.time.validation.given; import com.google.protobuf.Duration; import com.google.protobuf.Timestamp; diff --git a/time/src/test/java/io/spine/time/validate/given/package-info.java b/time/src/test/java/io/spine/time/validation/given/package-info.java similarity index 90% rename from time/src/test/java/io/spine/time/validate/given/package-info.java rename to time/src/test/java/io/spine/time/validation/given/package-info.java index 688f67d92..3a8a5bc97 100644 --- a/time/src/test/java/io/spine/time/validate/given/package-info.java +++ b/time/src/test/java/io/spine/time/validation/given/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2022, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -26,7 +26,7 @@ @CheckReturnValue @NullMarked -package io.spine.time.validate.given; +package io.spine.time.validation.given; import com.google.errorprone.annotations.CheckReturnValue; diff --git a/time/src/test/proto/spine/time/validate/messages.proto b/time/src/test/proto/spine/time/validation/messages.proto similarity index 96% rename from time/src/test/proto/spine/time/validate/messages.proto rename to time/src/test/proto/spine/time/validation/messages.proto index 913a8ec6e..331e7ef8a 100644 --- a/time/src/test/proto/spine/time/validate/messages.proto +++ b/time/src/test/proto/spine/time/validation/messages.proto @@ -26,13 +26,13 @@ syntax = "proto3"; -package spine.time.validate; +package spine.time.validation; import "spine/options.proto"; import "spine/time_options.proto"; option (type_url_prefix) = "type.spine.io"; -option java_package = "io.spine.time.validate"; +option java_package = "io.spine.time.validation.given"; option java_outer_classname = "MessagesProto"; option java_multiple_files = true; From 5da24889c4345a310d039b6b1fa48473f1faa682 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 23 Dec 2025 17:46:20 +0000 Subject: [PATCH 2/3] Bump version -> `2.0.0-SNAPSHOT.230` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 46462d3e6..6f9a6f7a6 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For dependencies on Spine modules please see [io.spine.dependency.local.Spine]. */ -val versionToPublish by extra("2.0.0-SNAPSHOT.226") +val versionToPublish by extra("2.0.0-SNAPSHOT.230") From 98a2c3a0359395f6b8126c963a95b679df38e53a Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 23 Dec 2025 17:47:02 +0000 Subject: [PATCH 3/3] Update dependency reports --- dependencies.md | 20 ++++++++++---------- pom.xml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dependencies.md b/dependencies.md index 09f849694..b499b1338 100644 --- a/dependencies.md +++ b/dependencies.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine:spine-time:2.0.0-SNAPSHOT.226` +# Dependencies of `io.spine:spine-time:2.0.0-SNAPSHOT.230` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -1022,14 +1022,14 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Dec 22 19:38:35 WET 2025** using +This report was generated on **Tue Dec 23 17:45:28 WET 2025** 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-time-java:2.0.0-SNAPSHOT.226` +# Dependencies of `io.spine:spine-time-java:2.0.0-SNAPSHOT.230` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -1881,14 +1881,14 @@ This report was generated on **Mon Dec 22 19:38:35 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Dec 22 19:38:35 WET 2025** using +This report was generated on **Tue Dec 23 17:45:28 WET 2025** 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-time-js:2.0.0-SNAPSHOT.226` +# Dependencies of `io.spine:spine-time-js:2.0.0-SNAPSHOT.230` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -2070,14 +2070,14 @@ This report was generated on **Mon Dec 22 19:38:35 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Dec 22 19:38:35 WET 2025** using +This report was generated on **Tue Dec 23 17:45:27 WET 2025** 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-time-kotlin:2.0.0-SNAPSHOT.226` +# Dependencies of `io.spine:spine-time-kotlin:2.0.0-SNAPSHOT.230` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -2933,14 +2933,14 @@ This report was generated on **Mon Dec 22 19:38:35 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Dec 22 19:38:35 WET 2025** using +This report was generated on **Tue Dec 23 17:45:28 WET 2025** 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-time-testlib:2.0.0-SNAPSHOT.226` +# Dependencies of `io.spine.tools:spine-time-testlib:2.0.0-SNAPSHOT.230` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -3792,6 +3792,6 @@ This report was generated on **Mon Dec 22 19:38:35 WET 2025** using The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Mon Dec 22 19:38:35 WET 2025** using +This report was generated on **Tue Dec 23 17:45:28 WET 2025** 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 bb9c355c2..834b78187 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject. --> io.spine spine-time -2.0.0-SNAPSHOT.226 +2.0.0-SNAPSHOT.230 2015