From 14054c642f58864f80a07d691a5c53876310b851 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 15 Apr 2025 21:03:44 +0100 Subject: [PATCH 01/13] Bump version -> `2.0.0-SNAPSHOT.310` --- config | 2 +- version.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index 99fb7ce679..ed512da1e9 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 99fb7ce679e6c71713fd6c21c24e0cd19304b118 +Subproject commit ed512da1e96e801278fa8c2531081c37c2260d97 diff --git a/version.gradle.kts b/version.gradle.kts index 7b2eca4d22..df6f188d2a 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For versions of Spine-based dependencies, please see [io.spine.dependency.local.Spine]. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.301") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.310") From 6a63331e0fc83811ce047ac4dc32284e2c82004d Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Tue, 15 Apr 2025 21:11:45 +0100 Subject: [PATCH 02/13] Apply JSpecify annotations --- .../src/main/kotlin/io/spine/dependency/local/Base.kt | 4 ++-- .../main/java/io/spine/client/ActorRequestFactory.java | 2 +- client/src/main/java/io/spine/client/Client.java | 2 +- .../src/main/java/io/spine/client/ClientRequestBase.java | 2 +- client/src/main/java/io/spine/client/CommandRequest.java | 2 +- client/src/main/java/io/spine/client/Consumers.java | 2 +- .../io/spine/client/DeliveringMultiEventObserver.java | 2 +- .../main/java/io/spine/client/EventsAfterCommand.java | 4 ++-- .../main/java/io/spine/client/LoggingErrorHandler.java | 2 +- .../main/java/io/spine/client/MultiEventConsumers.java | 2 +- .../src/main/java/io/spine/client/OperatorEvaluator.java | 2 +- client/src/main/java/io/spine/client/QueryFactory.java | 2 +- .../src/main/java/io/spine/client/ResponseFormats.java | 2 +- .../main/java/io/spine/client/SubscriptionRequest.java | 2 +- client/src/main/java/io/spine/client/Subscriptions.java | 2 +- client/src/main/java/io/spine/client/TargetBuilder.java | 2 +- client/src/main/java/io/spine/client/Targets.java | 2 +- client/src/main/java/io/spine/client/TopicFactory.java | 2 +- client/src/main/java/io/spine/client/package-info.java | 4 ++-- .../src/main/java/io/spine/grpc/MemoizingObserver.java | 2 +- client/src/main/java/io/spine/grpc/StreamObservers.java | 2 +- client/src/main/java/io/spine/grpc/package-info.java | 4 ++-- .../test/java/io/spine/client/OperatorAssertions.java | 2 +- client/src/test/java/io/spine/client/QueryBuilderSpec.kt | 2 +- .../test/java/io/spine/client/given/package-info.java | 4 ++-- client/src/test/java/io/spine/client/package-info.java | 4 ++-- .../kotlin/io/spine/client/ActorRequestFactorySpec.kt | 9 ++++----- core/src/main/java/io/spine/core/package-info.java | 4 ++-- server/src/main/java/io/spine/server/BoundedContext.java | 2 +- .../main/java/io/spine/server/BoundedContextBuilder.java | 2 +- server/src/main/java/io/spine/server/CommandService.java | 2 +- .../src/main/java/io/spine/server/ConnectionBuilder.java | 2 +- server/src/main/java/io/spine/server/GrpcContainer.java | 2 +- server/src/main/java/io/spine/server/QueryService.java | 2 +- server/src/main/java/io/spine/server/Server.java | 2 +- .../src/main/java/io/spine/server/ServiceDelegate.java | 2 +- .../main/java/io/spine/server/SubscriptionService.java | 2 +- .../java/io/spine/server/aggregate/AggregateStorage.java | 2 +- .../spine/server/aggregate/HistoryBackwardOperation.java | 2 +- .../io/spine/server/aggregate/UncommittedHistory.java | 2 +- .../io/spine/server/aggregate/model/package-info.java | 4 ++-- .../java/io/spine/server/aggregate/package-info.java | 4 ++-- server/src/main/java/io/spine/server/bus/BusBuilder.java | 2 +- .../src/main/java/io/spine/server/bus/package-info.java | 4 ++-- .../io/spine/server/command/model/AssigneeReceptor.java | 2 +- .../java/io/spine/server/command/model/package-info.java | 4 ++-- .../main/java/io/spine/server/command/package-info.java | 4 ++-- .../main/java/io/spine/server/commandbus/CommandBus.java | 2 +- .../io/spine/server/commandbus/CommandScheduler.java | 2 +- .../java/io/spine/server/commandbus/package-info.java | 4 ++-- .../server/delivery/CatchUpAlreadyStartedException.java | 2 +- .../java/io/spine/server/delivery/CatchUpProcess.java | 2 +- .../java/io/spine/server/delivery/CatchUpStarter.java | 2 +- .../java/io/spine/server/delivery/DeliveryErrors.java | 2 +- server/src/main/java/io/spine/server/delivery/Inbox.java | 2 +- .../main/java/io/spine/server/delivery/InboxPage.java | 2 +- .../main/java/io/spine/server/delivery/InboxStorage.java | 2 +- .../io/spine/server/delivery/LiveDeliveryStation.java | 2 +- .../java/io/spine/server/delivery/NoOpInboxStorage.java | 2 +- .../java/io/spine/server/delivery/TargetDelivery.java | 2 +- .../io/spine/server/delivery/memory/package-info.java | 4 ++-- .../main/java/io/spine/server/delivery/package-info.java | 4 ++-- .../main/java/io/spine/server/dispatch/package-info.java | 4 ++-- .../src/main/java/io/spine/server/enrich/Enricher.java | 2 +- server/src/main/java/io/spine/server/enrich/Schema.java | 2 +- .../src/main/java/io/spine/server/enrich/SchemaFn.java | 2 +- .../main/java/io/spine/server/enrich/package-info.java | 4 ++-- .../main/java/io/spine/server/entity/AbstractEntity.java | 2 +- .../io/spine/server/entity/DefaultEntityFactory.java | 2 +- server/src/main/java/io/spine/server/entity/IdField.java | 2 +- .../spine/server/entity/InvalidEntityStateException.java | 2 +- .../src/main/java/io/spine/server/entity/Migration.java | 2 +- .../io/spine/server/entity/RecordBasedRepository.java | 2 +- .../src/main/java/io/spine/server/entity/Repository.java | 4 ++-- .../java/io/spine/server/entity/StorageConverter.java | 2 +- .../java/io/spine/server/entity/TransactionalEntity.java | 2 +- .../java/io/spine/server/entity/model/package-info.java | 4 ++-- .../main/java/io/spine/server/entity/package-info.java | 4 ++-- .../io/spine/server/entity/rejection/package-info.java | 4 ++-- .../java/io/spine/server/entity/status/package-info.java | 4 ++-- .../java/io/spine/server/entity/storage/SpecScanner.java | 4 ++-- .../io/spine/server/entity/storage/StateColumns.java | 2 +- .../io/spine/server/entity/storage/package-info.java | 4 ++-- server/src/main/java/io/spine/server/event/EventBus.java | 2 +- .../src/main/java/io/spine/server/event/EventOrigin.java | 2 +- .../java/io/spine/server/event/model/package-info.java | 4 ++-- .../main/java/io/spine/server/event/package-info.java | 4 ++-- .../java/io/spine/server/event/storage/package-info.java | 4 ++-- .../java/io/spine/server/event/store/MatchFilter.java | 2 +- .../io/spine/server/event/store/MatchesStreamQuery.java | 2 +- .../java/io/spine/server/event/store/package-info.java | 4 ++-- .../io/spine/server/integration/grpc/package-info.java | 4 ++-- .../java/io/spine/server/integration/package-info.java | 4 ++-- .../src/main/java/io/spine/server/log/package-info.java | 4 ++-- .../io/spine/server/migration/mirror/package-info.java | 4 ++-- .../java/io/spine/server/model/AbstractReceptor.java | 2 +- .../main/java/io/spine/server/model/ArgumentFilter.java | 2 +- .../main/java/io/spine/server/model/CommandEmitter.java | 2 +- .../src/main/java/io/spine/server/model/DispatchKey.java | 2 +- .../main/java/io/spine/server/model/EventEmitter.java | 2 +- .../main/java/io/spine/server/model/MatchCriterion.java | 2 +- .../java/io/spine/server/model/MethodExceptionCheck.java | 2 +- .../main/java/io/spine/server/model/MethodParams.java | 2 +- .../main/java/io/spine/server/model/MethodResult.java | 2 +- server/src/main/java/io/spine/server/model/Receptor.java | 2 +- .../java/io/spine/server/model/SignatureMismatch.java | 2 +- .../src/main/java/io/spine/server/model/VoidMethod.java | 2 +- .../main/java/io/spine/server/model/package-info.java | 4 ++-- server/src/main/java/io/spine/server/package-info.java | 4 ++-- .../io/spine/server/procman/migration/package-info.java | 4 ++-- .../java/io/spine/server/procman/model/package-info.java | 4 ++-- .../main/java/io/spine/server/procman/package-info.java | 4 ++-- .../io/spine/server/projection/ProjectionRepository.java | 2 +- .../spine/server/projection/migration/package-info.java | 4 ++-- .../io/spine/server/projection/model/package-info.java | 4 ++-- .../java/io/spine/server/projection/package-info.java | 4 ++-- .../main/java/io/spine/server/route/package-info.java | 4 ++-- .../main/java/io/spine/server/stand/QueryValidator.java | 2 +- .../java/io/spine/server/stand/RequestValidator.java | 2 +- server/src/main/java/io/spine/server/stand/Stand.java | 2 +- .../io/spine/server/stand/SubscriptionValidator.java | 2 +- .../spine/server/stand/TenantSubscriptionRegistry.java | 2 +- .../main/java/io/spine/server/stand/package-info.java | 4 ++-- .../main/java/io/spine/server/storage/ColumnMapping.java | 2 +- .../io/spine/server/storage/DefaultColumnMapping.java | 2 +- .../java/io/spine/server/storage/FieldMaskApplier.java | 2 +- .../main/java/io/spine/server/storage/RecordSpec.java | 2 +- .../java/io/spine/server/storage/RecordWithColumns.java | 2 +- .../spine/server/storage/memory/MultitenantStorage.java | 2 +- .../spine/server/storage/memory/RecordQueryMatcher.java | 2 +- .../io/spine/server/storage/memory/package-info.java | 4 ++-- .../main/java/io/spine/server/storage/package-info.java | 4 ++-- .../io/spine/server/storage/system/package-info.java | 4 ++-- .../main/java/io/spine/server/tenant/TenantAware.java | 2 +- .../io/spine/server/tenant/TenantAwareFunction0.java | 2 +- .../main/java/io/spine/server/tenant/TenantFunction.java | 2 +- .../main/java/io/spine/server/tenant/package-info.java | 4 ++-- .../main/java/io/spine/server/trace/package-info.java | 4 ++-- .../transport/memory/SingleThreadInMemSubscriber.java | 2 +- .../io/spine/server/transport/memory/package-info.java | 4 ++-- .../java/io/spine/server/transport/package-info.java | 4 ++-- server/src/main/java/io/spine/server/tuple/Pair.java | 2 +- server/src/main/java/io/spine/server/tuple/Quartet.java | 2 +- server/src/main/java/io/spine/server/tuple/Quintet.java | 2 +- server/src/main/java/io/spine/server/tuple/Triplet.java | 2 +- server/src/main/java/io/spine/server/tuple/Tuple.java | 4 ++-- .../main/java/io/spine/server/tuple/package-info.java | 4 ++-- .../src/main/java/io/spine/server/type/package-info.java | 4 ++-- .../main/java/io/spine/system/server/SystemConfig.java | 2 +- .../io/spine/system/server/SystemRequestFactory.java | 2 +- .../main/java/io/spine/system/server/SystemSettings.java | 2 +- .../java/io/spine/system/server/event/package-info.java | 4 ++-- .../main/java/io/spine/system/server/package-info.java | 4 ++-- .../src/test/java/io/spine/client/ClientBuilderTest.java | 2 +- .../test/java/io/spine/client/CommandRequestTest.java | 2 +- server/src/test/java/io/spine/client/package-info.java | 4 ++-- .../io/spine/server/ServerEnvironmentConfigTest.java | 2 +- .../io/spine/server/aggregate/AggregateStorageTest.java | 2 +- .../java/io/spine/server/aggregate/EventImportTest.java | 2 +- .../io/spine/server/aggregate/TestAggregateStorage.java | 2 +- .../io/spine/server/aggregate/model/ApplierTest.java | 2 +- .../server/commandbus/AckRejectionPublisherTest.java | 2 +- .../spine/server/commandbus/CommandReceivedTapTest.java | 2 +- .../commandbus/CommandValidatorViolationCheckTest.java | 2 +- .../test/java/io/spine/server/event/EventBusTest.java | 2 +- .../io/spine/server/model/contexts/package-info.java | 4 ++-- .../java/io/spine/server/model/handler/package-info.java | 4 ++-- server/src/test/java/io/spine/server/package-info.java | 4 ++-- .../io/spine/server/projection/e2e/package-info.java | 4 ++-- .../io/spine/server/route/StateUpdateRoutingTest.java | 2 +- .../src/test/java/io/spine/server/stand/StandTest.java | 2 +- .../io/spine/server/storage/EntityRecordStorageTest.java | 2 +- .../server/storage/memory/RecordQueryMatcherTest.java | 2 +- .../src/testFixtures/java/com/example/package-info.java | 4 ++-- .../java/io/spine/client/given/package-info.java | 4 ++-- .../java/io/spine/core/given/package-info.java | 4 ++-- .../testFixtures/java/io/spine/given/package-info.java | 4 ++-- server/src/testFixtures/java/io/spine/server/Given.java | 2 +- .../server/aggregate/given/aggregate/TaskAggregate.java | 2 +- .../server/aggregate/given/aggregate/package-info.java | 4 ++-- .../server/aggregate/given/dispatch/package-info.java | 4 ++-- .../server/aggregate/given/fibonacci/package-info.java | 4 ++-- .../server/aggregate/given/importado/package-info.java | 4 ++-- .../server/aggregate/given/klasse/package-info.java | 4 ++-- .../io/spine/server/aggregate/given/package-info.java | 4 ++-- .../spine/server/aggregate/given/part/package-info.java | 4 ++-- .../spine/server/aggregate/given/query/package-info.java | 4 ++-- .../aggregate/given/repo/ProjectAggregateRepository.java | 2 +- .../spine/server/aggregate/given/repo/package-info.java | 4 ++-- .../server/aggregate/given/thermometer/package-info.java | 4 ++-- .../java/io/spine/server/bc/given/package-info.java | 4 ++-- .../java/io/spine/server/bc/package-info.java | 4 ++-- .../java/io/spine/server/bus/given/package-info.java | 4 ++-- .../io/spine/server/bus/given/stock/package-info.java | 4 ++-- .../java/io/spine/server/command/given/package-info.java | 4 ++-- .../server/command/model/given/handler/package-info.java | 4 ++-- .../command/model/given/reaction/package-info.java | 4 ++-- .../java/io/spine/server/command/package-info.java | 4 ++-- .../server/commandbus/given/DirectScheduledExecutor.java | 2 +- .../commandbus/given/caffetteria/package-info.java | 4 ++-- .../io/spine/server/commandbus/given/package-info.java | 4 ++-- .../java/io/spine/server/delivery/MemoizingAction.java | 2 +- .../java/io/spine/server/delivery/NastyClient.java | 2 +- .../server/delivery/given/ReceptionFailureTestEnv.java | 2 +- .../io/spine/server/delivery/given/TestCatchUpJobs.java | 2 +- .../io/spine/server/delivery/given/WhatToCatchUp.java | 2 +- .../io/spine/server/delivery/given/package-info.java | 4 ++-- .../io/spine/server/dispatch/given/package-info.java | 4 ++-- .../io/spine/server/enrich/given/event/package-info.java | 4 ++-- .../java/io/spine/server/enrich/given/package-info.java | 4 ++-- .../spine/server/entity/given/entity/package-info.java | 4 ++-- .../java/io/spine/server/entity/given/package-info.java | 4 ++-- .../server/entity/given/repository/package-info.java | 4 ++-- .../io/spine/server/entity/given/tx/package-info.java | 4 ++-- .../spine/server/entity/storage/given/package-info.java | 4 ++-- .../io/spine/server/event/given/bus/package-info.java | 4 ++-- .../java/io/spine/server/event/given/package-info.java | 4 ++-- .../server/event/model/given/classes/package-info.java | 4 ++-- .../io/spine/server/event/model/given/package-info.java | 4 ++-- .../server/event/model/given/reactor/package-info.java | 4 ++-- .../event/model/given/subscriber/package-info.java | 4 ++-- .../server/given/context/drawing/event/package-info.java | 4 ++-- .../io/spine/server/given/environment/package-info.java | 4 ++-- .../java/io/spine/server/given/groups/package-info.java | 4 ++-- .../spine/server/given/organizations/package-info.java | 4 ++-- .../java/io/spine/server/given/package-info.java | 4 ++-- .../java/io/spine/server/given/service/package-info.java | 4 ++-- .../io/spine/server/given/transport/package-info.java | 4 ++-- .../server/integration/given/broker/package-info.java | 4 ++-- .../io/spine/server/integration/given/package-info.java | 4 ++-- .../java/io/spine/server/log/given/package-info.java | 4 ++-- .../server/migration/mirror/given/package-info.java | 4 ++-- .../spine/server/model/contexts/orders/package-info.java | 4 ++-- .../server/model/contexts/projects/package-info.java | 4 ++-- .../spine/server/model/contexts/tasks/package-info.java | 4 ++-- .../spine/server/model/given/external/package-info.java | 4 ++-- .../io/spine/server/model/given/filter/package-info.java | 4 ++-- .../io/spine/server/model/given/map/package-info.java | 4 ++-- .../io/spine/server/model/given/method/package-info.java | 4 ++-- .../java/io/spine/server/model/given/package-info.java | 4 ++-- .../spine/server/model/given/storage/package-info.java | 4 ++-- .../server/model/handler/given/event/package-info.java | 4 ++-- .../spine/server/model/handler/given/package-info.java | 4 ++-- .../server/procman/given/delivery/package-info.java | 4 ++-- .../server/procman/given/dispatch/package-info.java | 4 ++-- .../java/io/spine/server/procman/given/package-info.java | 4 ++-- .../io/spine/server/procman/given/pm/package-info.java | 4 ++-- .../server/procman/given/repo/RememberingSubscriber.java | 2 +- .../io/spine/server/procman/given/repo/package-info.java | 4 ++-- .../spine/server/projection/given/cls/package-info.java | 4 ++-- .../server/projection/given/dispatch/package-info.java | 4 ++-- .../io/spine/server/projection/given/package-info.java | 4 ++-- .../java/io/spine/server/route/given/package-info.java | 4 ++-- .../io/spine/server/route/given/sur/package-info.java | 4 ++-- .../spine/server/route/given/switchman/package-info.java | 4 ++-- .../java/io/spine/server/stand/given/Given.java | 2 +- .../java/io/spine/server/stand/given/StandTestEnv.java | 2 +- .../java/io/spine/server/stand/given/package-info.java | 4 ++-- .../io/spine/server/storage/given/TestColumnMapping.java | 2 +- .../java/io/spine/server/storage/given/package-info.java | 4 ++-- .../spine/server/storage/memory/given/package-info.java | 4 ++-- .../spine/server/storage/system/given/package-info.java | 4 ++-- .../spine/server/trace/given/airport/package-info.java | 4 ++-- .../java/io/spine/server/trace/given/package-info.java | 4 ++-- .../server/transport/memory/given/package-info.java | 4 ++-- .../java/io/spine/server/tuple/given/package-info.java | 4 ++-- .../java/io/spine/server/type/given/package-info.java | 4 ++-- .../spine/system/server/given/client/package-info.java | 4 ++-- .../spine/system/server/given/command/package-info.java | 4 ++-- .../system/server/given/diagnostics/package-info.java | 4 ++-- .../spine/system/server/given/entity/package-info.java | 4 ++-- .../java/io/spine/system/server/given/package-info.java | 4 ++-- .../spine/system/server/given/schedule/package-info.java | 4 ++-- .../java/io/spine/test/client/package-info.java | 4 ++-- .../java/io/spine/test/route/package-info.java | 4 ++-- .../java/io/spine/testdata/package-info.java | 4 ++-- .../io/spine/testing/client/TestActorRequestFactory.java | 2 +- .../java/io/spine/testing/client/grpc/package-info.java | 4 ++-- .../main/java/io/spine/testing/client/package-info.java | 4 ++-- .../java/io/spine/testing/core/given/package-info.java | 4 ++-- .../java/io/spine/testing/server/CommandSubject.java | 2 +- .../io/spine/testing/server/EmittedMessageSubject.java | 4 ++-- .../main/java/io/spine/testing/server/EventSubject.java | 2 +- .../java/io/spine/testing/server/TestEventFactory.java | 2 +- .../java/io/spine/testing/server/blackbox/Actor.java | 2 +- .../java/io/spine/testing/server/blackbox/BlackBox.java | 2 +- .../spine/testing/server/blackbox/BlackBoxClients.java | 2 +- .../io/spine/testing/server/blackbox/ClientFactory.java | 2 +- .../spine/testing/server/blackbox/ContextAwareTest.java | 2 +- .../io/spine/testing/server/blackbox/MtBlackBox.java | 2 +- .../io/spine/testing/server/blackbox/package-info.java | 4 ++-- .../testing/server/blackbox/probe/BlackboxProbe.java | 2 +- .../server/blackbox/probe/UnsupportedCommandGuard.java | 2 +- .../testing/server/blackbox/probe/package-info.java | 4 ++-- .../io/spine/testing/server/entity/EntitySubject.java | 2 +- .../testing/server/entity/EntityVersionSubject.java | 2 +- .../server/entity/IterableEntityVersionSubject.java | 2 +- .../io/spine/testing/server/entity/package-info.java | 4 ++-- .../java/io/spine/testing/server/model/package-info.java | 4 ++-- .../main/java/io/spine/testing/server/package-info.java | 4 ++-- .../testing/server/query/ResponseStatusSubject.java | 2 +- .../java/io/spine/testing/server/query/package-info.java | 4 ++-- .../io/spine/testing/server/tenant/package-info.java | 4 ++-- .../io/spine/testing/client/grpc/given/package-info.java | 4 ++-- .../testing/server/blackbox/given/BbInitProcess.java | 2 +- .../testing/server/blackbox/given/package-info.java | 4 ++-- .../spine/testing/server/entity/given/package-info.java | 4 ++-- .../java/io/spine/testing/server/given/package-info.java | 4 ++-- .../spine/testing/server/model/given/package-info.java | 4 ++-- 309 files changed, 477 insertions(+), 478 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt index 8a8e0fb9ad..c0342a8b68 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt @@ -33,8 +33,8 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName") object Base { - const val version = "2.0.0-SNAPSHOT.307" - const val versionForBuildScript = "2.0.0-SNAPSHOT.307" + const val version = "2.0.0-SNAPSHOT.310" + const val versionForBuildScript = "2.0.0-SNAPSHOT.310" const val group = Spine.group const val artifact = "spine-base" const val lib = "$group:$artifact:$version" diff --git a/client/src/main/java/io/spine/client/ActorRequestFactory.java b/client/src/main/java/io/spine/client/ActorRequestFactory.java index 00bb7e1e6e..aa38cae309 100644 --- a/client/src/main/java/io/spine/client/ActorRequestFactory.java +++ b/client/src/main/java/io/spine/client/ActorRequestFactory.java @@ -35,7 +35,7 @@ import io.spine.core.UserId; import io.spine.time.ZoneId; import io.spine.time.ZoneIds; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.base.Time.currentTime; diff --git a/client/src/main/java/io/spine/client/Client.java b/client/src/main/java/io/spine/client/Client.java index 17efc99129..35c5aef013 100644 --- a/client/src/main/java/io/spine/client/Client.java +++ b/client/src/main/java/io/spine/client/Client.java @@ -42,7 +42,7 @@ import io.spine.core.TenantId; import io.spine.core.UserId; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.concurrent.TimeUnit; diff --git a/client/src/main/java/io/spine/client/ClientRequestBase.java b/client/src/main/java/io/spine/client/ClientRequestBase.java index bf9562b895..4dce6aaf6e 100644 --- a/client/src/main/java/io/spine/client/ClientRequestBase.java +++ b/client/src/main/java/io/spine/client/ClientRequestBase.java @@ -29,7 +29,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper; import io.spine.core.UserId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.util.Preconditions2.checkNotDefaultArg; diff --git a/client/src/main/java/io/spine/client/CommandRequest.java b/client/src/main/java/io/spine/client/CommandRequest.java index 9b7d6ab153..165bdfef80 100644 --- a/client/src/main/java/io/spine/client/CommandRequest.java +++ b/client/src/main/java/io/spine/client/CommandRequest.java @@ -35,7 +35,7 @@ import io.spine.core.Command; import io.spine.core.Status; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.function.Consumer; diff --git a/client/src/main/java/io/spine/client/Consumers.java b/client/src/main/java/io/spine/client/Consumers.java index ea2a3bf4a4..65047a4eb9 100644 --- a/client/src/main/java/io/spine/client/Consumers.java +++ b/client/src/main/java/io/spine/client/Consumers.java @@ -33,7 +33,7 @@ import io.grpc.stub.StreamObserver; import io.spine.base.MessageContext; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.function.Supplier; diff --git a/client/src/main/java/io/spine/client/DeliveringMultiEventObserver.java b/client/src/main/java/io/spine/client/DeliveringMultiEventObserver.java index 4da5344fd7..0dcf04245f 100644 --- a/client/src/main/java/io/spine/client/DeliveringMultiEventObserver.java +++ b/client/src/main/java/io/spine/client/DeliveringMultiEventObserver.java @@ -31,7 +31,7 @@ import io.spine.base.EventMessage; import io.spine.core.Event; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static java.util.Objects.requireNonNull; diff --git a/client/src/main/java/io/spine/client/EventsAfterCommand.java b/client/src/main/java/io/spine/client/EventsAfterCommand.java index 66819c17d5..08e20f2cf4 100644 --- a/client/src/main/java/io/spine/client/EventsAfterCommand.java +++ b/client/src/main/java/io/spine/client/EventsAfterCommand.java @@ -32,8 +32,8 @@ import io.spine.core.EventContext; import io.spine.core.UserId; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableSet.toImmutableSet; diff --git a/client/src/main/java/io/spine/client/LoggingErrorHandler.java b/client/src/main/java/io/spine/client/LoggingErrorHandler.java index d807e862e6..c44b3e1f99 100644 --- a/client/src/main/java/io/spine/client/LoggingErrorHandler.java +++ b/client/src/main/java/io/spine/client/LoggingErrorHandler.java @@ -27,7 +27,7 @@ package io.spine.client; import io.spine.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static java.lang.String.format; diff --git a/client/src/main/java/io/spine/client/MultiEventConsumers.java b/client/src/main/java/io/spine/client/MultiEventConsumers.java index a209eecbc5..eb60c30517 100644 --- a/client/src/main/java/io/spine/client/MultiEventConsumers.java +++ b/client/src/main/java/io/spine/client/MultiEventConsumers.java @@ -35,7 +35,7 @@ import io.spine.core.Event; import io.spine.core.EventContext; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/client/src/main/java/io/spine/client/OperatorEvaluator.java b/client/src/main/java/io/spine/client/OperatorEvaluator.java index e69d35064d..849dc9f942 100644 --- a/client/src/main/java/io/spine/client/OperatorEvaluator.java +++ b/client/src/main/java/io/spine/client/OperatorEvaluator.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableMap; import com.google.protobuf.Timestamp; import io.spine.annotation.Internal; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/client/src/main/java/io/spine/client/QueryFactory.java b/client/src/main/java/io/spine/client/QueryFactory.java index 9adc3226b5..da7804fb3c 100644 --- a/client/src/main/java/io/spine/client/QueryFactory.java +++ b/client/src/main/java/io/spine/client/QueryFactory.java @@ -30,7 +30,7 @@ import com.google.protobuf.FieldMask; import io.spine.base.EntityState; import io.spine.core.ActorContext; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/client/src/main/java/io/spine/client/ResponseFormats.java b/client/src/main/java/io/spine/client/ResponseFormats.java index 0befcdcaa4..89f15b916f 100644 --- a/client/src/main/java/io/spine/client/ResponseFormats.java +++ b/client/src/main/java/io/spine/client/ResponseFormats.java @@ -27,7 +27,7 @@ package io.spine.client; import com.google.protobuf.FieldMask; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkArgument; diff --git a/client/src/main/java/io/spine/client/SubscriptionRequest.java b/client/src/main/java/io/spine/client/SubscriptionRequest.java index ac517598e6..5da593c511 100644 --- a/client/src/main/java/io/spine/client/SubscriptionRequest.java +++ b/client/src/main/java/io/spine/client/SubscriptionRequest.java @@ -30,7 +30,7 @@ import io.grpc.stub.StreamObserver; import io.spine.base.EntityState; import io.spine.core.EmptyContext; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.function.Consumer; diff --git a/client/src/main/java/io/spine/client/Subscriptions.java b/client/src/main/java/io/spine/client/Subscriptions.java index 44ab979220..5fd0057aa8 100644 --- a/client/src/main/java/io/spine/client/Subscriptions.java +++ b/client/src/main/java/io/spine/client/Subscriptions.java @@ -38,7 +38,7 @@ import io.spine.core.Response; import io.spine.logging.Logger; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashSet; import java.util.Optional; diff --git a/client/src/main/java/io/spine/client/TargetBuilder.java b/client/src/main/java/io/spine/client/TargetBuilder.java index 8f40bfbe46..0e7a0e47b2 100644 --- a/client/src/main/java/io/spine/client/TargetBuilder.java +++ b/client/src/main/java/io/spine/client/TargetBuilder.java @@ -30,7 +30,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.protobuf.FieldMask; import com.google.protobuf.Message; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/client/src/main/java/io/spine/client/Targets.java b/client/src/main/java/io/spine/client/Targets.java index 8d85547bc4..cd6d426e72 100644 --- a/client/src/main/java/io/spine/client/Targets.java +++ b/client/src/main/java/io/spine/client/Targets.java @@ -31,7 +31,7 @@ import io.spine.annotation.Internal; import io.spine.base.Identifier; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.List; diff --git a/client/src/main/java/io/spine/client/TopicFactory.java b/client/src/main/java/io/spine/client/TopicFactory.java index 2566fd88be..9f5a9bdd72 100644 --- a/client/src/main/java/io/spine/client/TopicFactory.java +++ b/client/src/main/java/io/spine/client/TopicFactory.java @@ -31,7 +31,7 @@ import io.spine.annotation.Internal; import io.spine.base.Identifier; import io.spine.core.ActorContext; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; diff --git a/client/src/main/java/io/spine/client/package-info.java b/client/src/main/java/io/spine/client/package-info.java index 0982488e89..1193fadc2a 100644 --- a/client/src/main/java/io/spine/client/package-info.java +++ b/client/src/main/java/io/spine/client/package-info.java @@ -54,9 +54,9 @@ * correspondingly. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.client; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/client/src/main/java/io/spine/grpc/MemoizingObserver.java b/client/src/main/java/io/spine/grpc/MemoizingObserver.java index 90fb3d00ad..27d0a9e9c2 100644 --- a/client/src/main/java/io/spine/grpc/MemoizingObserver.java +++ b/client/src/main/java/io/spine/grpc/MemoizingObserver.java @@ -28,7 +28,7 @@ import io.grpc.stub.StreamObserver; import io.spine.annotation.Internal; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/client/src/main/java/io/spine/grpc/StreamObservers.java b/client/src/main/java/io/spine/grpc/StreamObservers.java index 796bcd9110..d3d0539690 100644 --- a/client/src/main/java/io/spine/grpc/StreamObservers.java +++ b/client/src/main/java/io/spine/grpc/StreamObservers.java @@ -33,7 +33,7 @@ import io.spine.base.Error; import io.spine.core.Response; import io.spine.core.Responses; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/client/src/main/java/io/spine/grpc/package-info.java b/client/src/main/java/io/spine/grpc/package-info.java index 091560d547..d4991b3e45 100644 --- a/client/src/main/java/io/spine/grpc/package-info.java +++ b/client/src/main/java/io/spine/grpc/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces related to gRPC. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.grpc; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/client/src/test/java/io/spine/client/OperatorAssertions.java b/client/src/test/java/io/spine/client/OperatorAssertions.java index 2b31b02094..4b8b281e31 100644 --- a/client/src/test/java/io/spine/client/OperatorAssertions.java +++ b/client/src/test/java/io/spine/client/OperatorAssertions.java @@ -27,7 +27,7 @@ package io.spine.client; import io.spine.client.Filter.Operator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Assertions; import static io.spine.client.Filter.Operator.EQUAL; diff --git a/client/src/test/java/io/spine/client/QueryBuilderSpec.kt b/client/src/test/java/io/spine/client/QueryBuilderSpec.kt index 7ab9f4beee..69349ef009 100644 --- a/client/src/test/java/io/spine/client/QueryBuilderSpec.kt +++ b/client/src/test/java/io/spine/client/QueryBuilderSpec.kt @@ -89,7 +89,7 @@ internal class QueryBuilderSpec { } fun requestFactory(): ActorRequestFactory = ActorRequestFactory.newBuilder().apply { - zoneId = ZONE_ID + setZoneId(ZONE_ID) actor = ACTOR }.build() } diff --git a/client/src/test/java/io/spine/client/given/package-info.java b/client/src/test/java/io/spine/client/given/package-info.java index 5a6759c092..c7bd8db334 100644 --- a/client/src/test/java/io/spine/client/given/package-info.java +++ b/client/src/test/java/io/spine/client/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.client.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/client/src/test/java/io/spine/client/package-info.java b/client/src/test/java/io/spine/client/package-info.java index ddee7366ed..995f0aa8be 100644 --- a/client/src/test/java/io/spine/client/package-info.java +++ b/client/src/test/java/io/spine/client/package-info.java @@ -32,9 +32,9 @@ * the same name under the tests of the {@code ":server"} module. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.client; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/client/src/test/kotlin/io/spine/client/ActorRequestFactorySpec.kt b/client/src/test/kotlin/io/spine/client/ActorRequestFactorySpec.kt index e94a52873f..b87e924afd 100644 --- a/client/src/test/kotlin/io/spine/client/ActorRequestFactorySpec.kt +++ b/client/src/test/kotlin/io/spine/client/ActorRequestFactorySpec.kt @@ -111,10 +111,9 @@ internal class ActorRequestFactorySpec { @Test fun `require actor in 'Builder'`() { assertThrows { - requestFactoryBuilder().apply { - zoneId = ZoneIds.systemDefault() - build() - } + requestFactoryBuilder() + .setZoneId(ZoneIds.systemDefault()) + .build() } } @@ -122,7 +121,7 @@ internal class ActorRequestFactorySpec { fun `return values set in 'Builder'`() { val builder = requestFactoryBuilder().apply { actor = ACTOR - zoneId = ZONE_ID + setZoneId(ZONE_ID) } builder.actor shouldBe ACTOR builder.zoneId shouldBe ZONE_ID diff --git a/core/src/main/java/io/spine/core/package-info.java b/core/src/main/java/io/spine/core/package-info.java index 8843716980..57802522a0 100644 --- a/core/src/main/java/io/spine/core/package-info.java +++ b/core/src/main/java/io/spine/core/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.core; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/BoundedContext.java b/server/src/main/java/io/spine/server/BoundedContext.java index fbdfbfa0b6..85b43d0794 100644 --- a/server/src/main/java/io/spine/server/BoundedContext.java +++ b/server/src/main/java/io/spine/server/BoundedContext.java @@ -55,7 +55,7 @@ import io.spine.system.server.SystemClient; import io.spine.system.server.SystemContext; import io.spine.type.TypeName; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/BoundedContextBuilder.java b/server/src/main/java/io/spine/server/BoundedContextBuilder.java index 43c5085650..c7953cbcce 100644 --- a/server/src/main/java/io/spine/server/BoundedContextBuilder.java +++ b/server/src/main/java/io/spine/server/BoundedContextBuilder.java @@ -55,7 +55,7 @@ import io.spine.system.server.SystemContext; import io.spine.system.server.SystemSettings; import io.spine.system.server.SystemWriteSide; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/main/java/io/spine/server/CommandService.java b/server/src/main/java/io/spine/server/CommandService.java index cf081e9769..a7c9af3551 100644 --- a/server/src/main/java/io/spine/server/CommandService.java +++ b/server/src/main/java/io/spine/server/CommandService.java @@ -39,7 +39,7 @@ import io.spine.type.MessageClass; import io.spine.type.TypeUrl; import io.spine.type.UnpublishedLanguageException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableSet.toImmutableSet; diff --git a/server/src/main/java/io/spine/server/ConnectionBuilder.java b/server/src/main/java/io/spine/server/ConnectionBuilder.java index ef94a78410..ac5f58792d 100644 --- a/server/src/main/java/io/spine/server/ConnectionBuilder.java +++ b/server/src/main/java/io/spine/server/ConnectionBuilder.java @@ -26,7 +26,7 @@ package io.spine.server; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/GrpcContainer.java b/server/src/main/java/io/spine/server/GrpcContainer.java index 5a2eaea087..33ae043af8 100644 --- a/server/src/main/java/io/spine/server/GrpcContainer.java +++ b/server/src/main/java/io/spine/server/GrpcContainer.java @@ -37,7 +37,7 @@ import io.grpc.ServerServiceDefinition; import io.grpc.inprocess.InProcessServerBuilder; import io.spine.annotation.Experimental; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/QueryService.java b/server/src/main/java/io/spine/server/QueryService.java index e35198dd19..2f824b42ed 100644 --- a/server/src/main/java/io/spine/server/QueryService.java +++ b/server/src/main/java/io/spine/server/QueryService.java @@ -34,7 +34,7 @@ import io.spine.server.model.UnknownEntityStateTypeException; import io.spine.server.stand.InvalidRequestException; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.protobuf.TextFormat.shortDebugString; diff --git a/server/src/main/java/io/spine/server/Server.java b/server/src/main/java/io/spine/server/Server.java index 0dcc773dbe..79bfee7782 100644 --- a/server/src/main/java/io/spine/server/Server.java +++ b/server/src/main/java/io/spine/server/Server.java @@ -32,7 +32,7 @@ import io.grpc.BindableService; import io.spine.logging.WithLogging; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.util.HashSet; diff --git a/server/src/main/java/io/spine/server/ServiceDelegate.java b/server/src/main/java/io/spine/server/ServiceDelegate.java index faa610c0f4..f2af9cb389 100644 --- a/server/src/main/java/io/spine/server/ServiceDelegate.java +++ b/server/src/main/java/io/spine/server/ServiceDelegate.java @@ -32,7 +32,7 @@ import io.spine.logging.WithLogging; import io.spine.type.TypeUrl; import io.spine.type.UnpublishedLanguageException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/SubscriptionService.java b/server/src/main/java/io/spine/server/SubscriptionService.java index b4d645062c..5947550b4d 100644 --- a/server/src/main/java/io/spine/server/SubscriptionService.java +++ b/server/src/main/java/io/spine/server/SubscriptionService.java @@ -44,7 +44,7 @@ import io.spine.logging.WithLogging; import io.spine.server.stand.SubscriptionCallback; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/io/spine/server/aggregate/AggregateStorage.java b/server/src/main/java/io/spine/server/aggregate/AggregateStorage.java index 89fd52c860..4fa9f374a7 100644 --- a/server/src/main/java/io/spine/server/aggregate/AggregateStorage.java +++ b/server/src/main/java/io/spine/server/aggregate/AggregateStorage.java @@ -45,7 +45,7 @@ import io.spine.server.storage.QueryConverter; import io.spine.server.storage.RecordWithColumns; import io.spine.server.storage.StorageFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/aggregate/HistoryBackwardOperation.java b/server/src/main/java/io/spine/server/aggregate/HistoryBackwardOperation.java index 63932f6da2..6cef52c441 100644 --- a/server/src/main/java/io/spine/server/aggregate/HistoryBackwardOperation.java +++ b/server/src/main/java/io/spine/server/aggregate/HistoryBackwardOperation.java @@ -29,7 +29,7 @@ import io.spine.base.Identifier; import io.spine.core.Version; import io.spine.query.RecordQueryBuilder; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; diff --git a/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java b/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java index 4508cca5c3..ee63d60bee 100644 --- a/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java +++ b/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList; import io.spine.core.Event; import io.spine.server.type.EventEnvelope; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/io/spine/server/aggregate/model/package-info.java b/server/src/main/java/io/spine/server/aggregate/model/package-info.java index 2608c36d22..7308c83a73 100644 --- a/server/src/main/java/io/spine/server/aggregate/model/package-info.java +++ b/server/src/main/java/io/spine/server/aggregate/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/aggregate/package-info.java b/server/src/main/java/io/spine/server/aggregate/package-info.java index 71341c2d13..beb290020b 100644 --- a/server/src/main/java/io/spine/server/aggregate/package-info.java +++ b/server/src/main/java/io/spine/server/aggregate/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/bus/BusBuilder.java b/server/src/main/java/io/spine/server/bus/BusBuilder.java index 4495f11f4f..d31e109f60 100644 --- a/server/src/main/java/io/spine/server/bus/BusBuilder.java +++ b/server/src/main/java/io/spine/server/bus/BusBuilder.java @@ -38,7 +38,7 @@ import io.spine.server.type.SignalEnvelope; import io.spine.system.server.SystemWriteSide; import io.spine.type.MessageClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.HashSet; diff --git a/server/src/main/java/io/spine/server/bus/package-info.java b/server/src/main/java/io/spine/server/bus/package-info.java index 562d968b13..899a8563ad 100644 --- a/server/src/main/java/io/spine/server/bus/package-info.java +++ b/server/src/main/java/io/spine/server/bus/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces for abstract {@code Bus}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.bus; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/command/model/AssigneeReceptor.java b/server/src/main/java/io/spine/server/command/model/AssigneeReceptor.java index 7a487358a2..ba0c601991 100644 --- a/server/src/main/java/io/spine/server/command/model/AssigneeReceptor.java +++ b/server/src/main/java/io/spine/server/command/model/AssigneeReceptor.java @@ -34,7 +34,7 @@ import io.spine.server.type.CommandClass; import io.spine.server.type.CommandEnvelope; import io.spine.server.type.EventClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; diff --git a/server/src/main/java/io/spine/server/command/model/package-info.java b/server/src/main/java/io/spine/server/command/model/package-info.java index dd924af295..15158e8a37 100644 --- a/server/src/main/java/io/spine/server/command/model/package-info.java +++ b/server/src/main/java/io/spine/server/command/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/command/package-info.java b/server/src/main/java/io/spine/server/command/package-info.java index d74a3eb602..6f72d2dc29 100644 --- a/server/src/main/java/io/spine/server/command/package-info.java +++ b/server/src/main/java/io/spine/server/command/package-info.java @@ -28,9 +28,9 @@ * This package provides classes and interfaces related to command processing at the server side. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/commandbus/CommandBus.java b/server/src/main/java/io/spine/server/commandbus/CommandBus.java index 336af7c570..04423eb1d3 100644 --- a/server/src/main/java/io/spine/server/commandbus/CommandBus.java +++ b/server/src/main/java/io/spine/server/commandbus/CommandBus.java @@ -51,7 +51,7 @@ import io.spine.server.type.CommandEnvelope; import io.spine.system.server.SystemWriteSide; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; import java.util.function.Consumer; diff --git a/server/src/main/java/io/spine/server/commandbus/CommandScheduler.java b/server/src/main/java/io/spine/server/commandbus/CommandScheduler.java index 4281c86ba9..8639a766a3 100644 --- a/server/src/main/java/io/spine/server/commandbus/CommandScheduler.java +++ b/server/src/main/java/io/spine/server/commandbus/CommandScheduler.java @@ -35,7 +35,7 @@ import io.spine.server.Closeable; import io.spine.server.bus.BusFilter; import io.spine.server.type.CommandEnvelope; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/commandbus/package-info.java b/server/src/main/java/io/spine/server/commandbus/package-info.java index 57ec0c6030..91ab19d043 100644 --- a/server/src/main/java/io/spine/server/commandbus/package-info.java +++ b/server/src/main/java/io/spine/server/commandbus/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.commandbus.CommandBus CommandBus} and its configuration. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.commandbus; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/delivery/CatchUpAlreadyStartedException.java b/server/src/main/java/io/spine/server/delivery/CatchUpAlreadyStartedException.java index d9dbb7818e..3bf458b06a 100644 --- a/server/src/main/java/io/spine/server/delivery/CatchUpAlreadyStartedException.java +++ b/server/src/main/java/io/spine/server/delivery/CatchUpAlreadyStartedException.java @@ -29,7 +29,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/delivery/CatchUpProcess.java b/server/src/main/java/io/spine/server/delivery/CatchUpProcess.java index 0d31fc21c7..d8b3ccc6ef 100644 --- a/server/src/main/java/io/spine/server/delivery/CatchUpProcess.java +++ b/server/src/main/java/io/spine/server/delivery/CatchUpProcess.java @@ -65,7 +65,7 @@ import io.spine.server.type.EventEnvelope; import io.spine.type.TypeUrl; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashSet; import java.util.List; diff --git a/server/src/main/java/io/spine/server/delivery/CatchUpStarter.java b/server/src/main/java/io/spine/server/delivery/CatchUpStarter.java index 12f14d70fc..326a8f15a6 100644 --- a/server/src/main/java/io/spine/server/delivery/CatchUpStarter.java +++ b/server/src/main/java/io/spine/server/delivery/CatchUpStarter.java @@ -35,7 +35,7 @@ import io.spine.server.projection.ProjectionRepository; import io.spine.server.type.EventClass; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/delivery/DeliveryErrors.java b/server/src/main/java/io/spine/server/delivery/DeliveryErrors.java index 33a5bab433..210f1c61ca 100644 --- a/server/src/main/java/io/spine/server/delivery/DeliveryErrors.java +++ b/server/src/main/java/io/spine/server/delivery/DeliveryErrors.java @@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableList; import io.spine.server.model.ModelError; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/io/spine/server/delivery/Inbox.java b/server/src/main/java/io/spine/server/delivery/Inbox.java index f94f53bda4..e814459db6 100644 --- a/server/src/main/java/io/spine/server/delivery/Inbox.java +++ b/server/src/main/java/io/spine/server/delivery/Inbox.java @@ -32,7 +32,7 @@ import io.spine.server.type.CommandEnvelope; import io.spine.server.type.EventEnvelope; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/src/main/java/io/spine/server/delivery/InboxPage.java b/server/src/main/java/io/spine/server/delivery/InboxPage.java index 1b45997cb0..222ff171ad 100644 --- a/server/src/main/java/io/spine/server/delivery/InboxPage.java +++ b/server/src/main/java/io/spine/server/delivery/InboxPage.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.protobuf.Timestamp; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/delivery/InboxStorage.java b/server/src/main/java/io/spine/server/delivery/InboxStorage.java index d97c016122..2287e9529a 100644 --- a/server/src/main/java/io/spine/server/delivery/InboxStorage.java +++ b/server/src/main/java/io/spine/server/delivery/InboxStorage.java @@ -33,7 +33,7 @@ import io.spine.server.storage.RecordSpec; import io.spine.server.storage.MessageStorage; import io.spine.server.storage.StorageFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/delivery/LiveDeliveryStation.java b/server/src/main/java/io/spine/server/delivery/LiveDeliveryStation.java index 9074905a26..0e76be4e5c 100644 --- a/server/src/main/java/io/spine/server/delivery/LiveDeliveryStation.java +++ b/server/src/main/java/io/spine/server/delivery/LiveDeliveryStation.java @@ -27,7 +27,7 @@ package io.spine.server.delivery; import com.google.protobuf.Duration; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/main/java/io/spine/server/delivery/NoOpInboxStorage.java b/server/src/main/java/io/spine/server/delivery/NoOpInboxStorage.java index 53ef52c181..aed954000b 100644 --- a/server/src/main/java/io/spine/server/delivery/NoOpInboxStorage.java +++ b/server/src/main/java/io/spine/server/delivery/NoOpInboxStorage.java @@ -30,7 +30,7 @@ import com.google.protobuf.Timestamp; import io.spine.server.storage.memory.InMemoryStorageFactory; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/delivery/TargetDelivery.java b/server/src/main/java/io/spine/server/delivery/TargetDelivery.java index 0a2a1fa706..70b5ef99b8 100644 --- a/server/src/main/java/io/spine/server/delivery/TargetDelivery.java +++ b/server/src/main/java/io/spine/server/delivery/TargetDelivery.java @@ -33,7 +33,7 @@ import io.spine.server.tenant.IdInTenant; import io.spine.server.tenant.TenantAwareRunner; import io.spine.server.type.SignalEnvelope; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/io/spine/server/delivery/memory/package-info.java b/server/src/main/java/io/spine/server/delivery/memory/package-info.java index e4c3f9cc98..34ceda64aa 100644 --- a/server/src/main/java/io/spine/server/delivery/memory/package-info.java +++ b/server/src/main/java/io/spine/server/delivery/memory/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.delivery.memory; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/delivery/package-info.java b/server/src/main/java/io/spine/server/delivery/package-info.java index 018150c950..32b07b859a 100644 --- a/server/src/main/java/io/spine/server/delivery/package-info.java +++ b/server/src/main/java/io/spine/server/delivery/package-info.java @@ -28,9 +28,9 @@ * This package is devoted to message delivery mechanism. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.delivery; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/dispatch/package-info.java b/server/src/main/java/io/spine/server/dispatch/package-info.java index 7b547155be..3e95391871 100644 --- a/server/src/main/java/io/spine/server/dispatch/package-info.java +++ b/server/src/main/java/io/spine/server/dispatch/package-info.java @@ -32,10 +32,10 @@ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.dispatch; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/enrich/Enricher.java b/server/src/main/java/io/spine/server/enrich/Enricher.java index 475ab753a1..3534543a9c 100644 --- a/server/src/main/java/io/spine/server/enrich/Enricher.java +++ b/server/src/main/java/io/spine/server/enrich/Enricher.java @@ -30,7 +30,7 @@ import io.spine.core.EnrichableMessageContext; import io.spine.core.Enrichment; import io.spine.server.type.EnrichableMessageEnvelope; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/enrich/Schema.java b/server/src/main/java/io/spine/server/enrich/Schema.java index 6cdc4d05bd..d214a2668e 100644 --- a/server/src/main/java/io/spine/server/enrich/Schema.java +++ b/server/src/main/java/io/spine/server/enrich/Schema.java @@ -31,7 +31,7 @@ import com.google.protobuf.Message; import io.spine.core.EnrichableMessageContext; import io.spine.logging.WithLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/spine/server/enrich/SchemaFn.java b/server/src/main/java/io/spine/server/enrich/SchemaFn.java index 0e83b98445..09d5462133 100644 --- a/server/src/main/java/io/spine/server/enrich/SchemaFn.java +++ b/server/src/main/java/io/spine/server/enrich/SchemaFn.java @@ -32,7 +32,7 @@ import io.spine.core.Enrichment.Container; import io.spine.protobuf.AnyPacker; import io.spine.type.TypeName; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; diff --git a/server/src/main/java/io/spine/server/enrich/package-info.java b/server/src/main/java/io/spine/server/enrich/package-info.java index bbd5047051..dca9c6d325 100644 --- a/server/src/main/java/io/spine/server/enrich/package-info.java +++ b/server/src/main/java/io/spine/server/enrich/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.enrich; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java index bf144c7639..9d5bbd74e6 100644 --- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java +++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java @@ -50,7 +50,7 @@ import io.spine.validate.ConstraintViolation; import io.spine.validate.Validate; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Objects; diff --git a/server/src/main/java/io/spine/server/entity/DefaultEntityFactory.java b/server/src/main/java/io/spine/server/entity/DefaultEntityFactory.java index dc8e45ff46..fa8b113cb0 100644 --- a/server/src/main/java/io/spine/server/entity/DefaultEntityFactory.java +++ b/server/src/main/java/io/spine/server/entity/DefaultEntityFactory.java @@ -29,7 +29,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import io.spine.server.entity.model.AbstractEntityFactory; import io.spine.server.model.ModelError; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/server/src/main/java/io/spine/server/entity/IdField.java b/server/src/main/java/io/spine/server/entity/IdField.java index bf6874c002..8e59029400 100644 --- a/server/src/main/java/io/spine/server/entity/IdField.java +++ b/server/src/main/java/io/spine/server/entity/IdField.java @@ -32,7 +32,7 @@ import io.spine.server.entity.model.EntityClass; import io.spine.validate.ValidatingBuilder; import io.spine.validate.option.Required; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/src/main/java/io/spine/server/entity/InvalidEntityStateException.java b/server/src/main/java/io/spine/server/entity/InvalidEntityStateException.java index ecaf7e1b94..75ed71c850 100644 --- a/server/src/main/java/io/spine/server/entity/InvalidEntityStateException.java +++ b/server/src/main/java/io/spine/server/entity/InvalidEntityStateException.java @@ -38,7 +38,7 @@ import io.spine.validate.ExceptionFactory; import io.spine.validate.ValidationError; import io.spine.validate.ValidationException; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/io/spine/server/entity/Migration.java b/server/src/main/java/io/spine/server/entity/Migration.java index 09b4fce47e..a3b587f8f0 100644 --- a/server/src/main/java/io/spine/server/entity/Migration.java +++ b/server/src/main/java/io/spine/server/entity/Migration.java @@ -36,7 +36,7 @@ import io.spine.system.server.event.MigrationApplied; import io.spine.validate.ValidatingBuilder; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.function.Function; diff --git a/server/src/main/java/io/spine/server/entity/RecordBasedRepository.java b/server/src/main/java/io/spine/server/entity/RecordBasedRepository.java index d032644c47..06d188130f 100644 --- a/server/src/main/java/io/spine/server/entity/RecordBasedRepository.java +++ b/server/src/main/java/io/spine/server/entity/RecordBasedRepository.java @@ -46,7 +46,7 @@ import io.spine.server.storage.QueryConverter; import io.spine.server.storage.RecordWithColumns; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.Deque; diff --git a/server/src/main/java/io/spine/server/entity/Repository.java b/server/src/main/java/io/spine/server/entity/Repository.java index 387aacd736..638ae681bb 100644 --- a/server/src/main/java/io/spine/server/entity/Repository.java +++ b/server/src/main/java/io/spine/server/entity/Repository.java @@ -48,8 +48,8 @@ import io.spine.system.server.RoutingFailed; import io.spine.type.TypeUrl; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import org.checkerframework.dataflow.qual.Pure; import java.util.Iterator; diff --git a/server/src/main/java/io/spine/server/entity/StorageConverter.java b/server/src/main/java/io/spine/server/entity/StorageConverter.java index ea80e09dd8..6fb964b259 100644 --- a/server/src/main/java/io/spine/server/entity/StorageConverter.java +++ b/server/src/main/java/io/spine/server/entity/StorageConverter.java @@ -32,7 +32,7 @@ import io.spine.base.EntityState; import io.spine.base.Identifier; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.io.Serializable; import java.util.Objects; diff --git a/server/src/main/java/io/spine/server/entity/TransactionalEntity.java b/server/src/main/java/io/spine/server/entity/TransactionalEntity.java index 063af34c97..a1cb7dee4b 100644 --- a/server/src/main/java/io/spine/server/entity/TransactionalEntity.java +++ b/server/src/main/java/io/spine/server/entity/TransactionalEntity.java @@ -31,7 +31,7 @@ import io.spine.core.Event; import io.spine.core.Version; import io.spine.validate.ValidatingBuilder; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/server/src/main/java/io/spine/server/entity/model/package-info.java b/server/src/main/java/io/spine/server/entity/model/package-info.java index bba97cb84b..000198a026 100644 --- a/server/src/main/java/io/spine/server/entity/model/package-info.java +++ b/server/src/main/java/io/spine/server/entity/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/entity/package-info.java b/server/src/main/java/io/spine/server/entity/package-info.java index 6127296734..5982440af3 100644 --- a/server/src/main/java/io/spine/server/entity/package-info.java +++ b/server/src/main/java/io/spine/server/entity/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces defining entity-oriented API and base functionality. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/entity/rejection/package-info.java b/server/src/main/java/io/spine/server/entity/rejection/package-info.java index 23935777ea..44a752e4c8 100644 --- a/server/src/main/java/io/spine/server/entity/rejection/package-info.java +++ b/server/src/main/java/io/spine/server/entity/rejection/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.rejection; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/entity/status/package-info.java b/server/src/main/java/io/spine/server/entity/status/package-info.java index 8f5215f811..4ca174f249 100644 --- a/server/src/main/java/io/spine/server/entity/status/package-info.java +++ b/server/src/main/java/io/spine/server/entity/status/package-info.java @@ -30,10 +30,10 @@ @SPI @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.status; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.SPI; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/entity/storage/SpecScanner.java b/server/src/main/java/io/spine/server/entity/storage/SpecScanner.java index 73bdab0421..7790cf895f 100644 --- a/server/src/main/java/io/spine/server/entity/storage/SpecScanner.java +++ b/server/src/main/java/io/spine/server/entity/storage/SpecScanner.java @@ -43,8 +43,8 @@ import io.spine.server.entity.model.EntityClass; import io.spine.server.storage.RecordSpec; import io.spine.server.storage.RecordSpec.ExtractId; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.HashSet; diff --git a/server/src/main/java/io/spine/server/entity/storage/StateColumns.java b/server/src/main/java/io/spine/server/entity/storage/StateColumns.java index d924188f27..025a448b03 100644 --- a/server/src/main/java/io/spine/server/entity/storage/StateColumns.java +++ b/server/src/main/java/io/spine/server/entity/storage/StateColumns.java @@ -32,7 +32,7 @@ import io.spine.query.ColumnName; import io.spine.query.EntityColumn; import io.spine.query.RecordColumn; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.Map; diff --git a/server/src/main/java/io/spine/server/entity/storage/package-info.java b/server/src/main/java/io/spine/server/entity/storage/package-info.java index 02a38e56e1..f57eea493c 100644 --- a/server/src/main/java/io/spine/server/entity/storage/package-info.java +++ b/server/src/main/java/io/spine/server/entity/storage/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.entity.Entity entity} storage representation. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.storage; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/event/EventBus.java b/server/src/main/java/io/spine/server/event/EventBus.java index 233d482a7b..2b9a385c6c 100644 --- a/server/src/main/java/io/spine/server/event/EventBus.java +++ b/server/src/main/java/io/spine/server/event/EventBus.java @@ -48,7 +48,7 @@ import io.spine.server.type.EventClass; import io.spine.server.type.EventEnvelope; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/event/EventOrigin.java b/server/src/main/java/io/spine/server/event/EventOrigin.java index f9712c777f..a58b3eadad 100644 --- a/server/src/main/java/io/spine/server/event/EventOrigin.java +++ b/server/src/main/java/io/spine/server/event/EventOrigin.java @@ -32,7 +32,7 @@ import io.spine.core.EventContext; import io.spine.core.Origin; import io.spine.server.type.MessageEnvelope; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/src/main/java/io/spine/server/event/model/package-info.java b/server/src/main/java/io/spine/server/event/model/package-info.java index 78f422b855..7868f27e1f 100644 --- a/server/src/main/java/io/spine/server/event/model/package-info.java +++ b/server/src/main/java/io/spine/server/event/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/event/package-info.java b/server/src/main/java/io/spine/server/event/package-info.java index 2d3914303f..6a09d4539b 100644 --- a/server/src/main/java/io/spine/server/event/package-info.java +++ b/server/src/main/java/io/spine/server/event/package-info.java @@ -28,9 +28,9 @@ * This package provides classes for server-side event processing. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/event/storage/package-info.java b/server/src/main/java/io/spine/server/event/storage/package-info.java index a22e6d0aac..7592e36041 100644 --- a/server/src/main/java/io/spine/server/event/storage/package-info.java +++ b/server/src/main/java/io/spine/server/event/storage/package-info.java @@ -30,10 +30,10 @@ @SPI @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.storage; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.SPI; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/event/store/MatchFilter.java b/server/src/main/java/io/spine/server/event/store/MatchFilter.java index fb3e5dc6af..e39104ab2d 100644 --- a/server/src/main/java/io/spine/server/event/store/MatchFilter.java +++ b/server/src/main/java/io/spine/server/event/store/MatchFilter.java @@ -36,7 +36,7 @@ import io.spine.server.event.EventFilter; import io.spine.type.TypeName; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.List; diff --git a/server/src/main/java/io/spine/server/event/store/MatchesStreamQuery.java b/server/src/main/java/io/spine/server/event/store/MatchesStreamQuery.java index 1f060e3ed3..e3f749910e 100644 --- a/server/src/main/java/io/spine/server/event/store/MatchesStreamQuery.java +++ b/server/src/main/java/io/spine/server/event/store/MatchesStreamQuery.java @@ -29,7 +29,7 @@ import io.spine.core.Event; import io.spine.server.event.EventFilter; import io.spine.server.event.EventStreamQuery; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.function.Predicate; diff --git a/server/src/main/java/io/spine/server/event/store/package-info.java b/server/src/main/java/io/spine/server/event/store/package-info.java index 8345c658f9..b2e64186d2 100644 --- a/server/src/main/java/io/spine/server/event/store/package-info.java +++ b/server/src/main/java/io/spine/server/event/store/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.store; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/integration/grpc/package-info.java b/server/src/main/java/io/spine/server/integration/grpc/package-info.java index 611c0e36a2..a716306186 100644 --- a/server/src/main/java/io/spine/server/integration/grpc/package-info.java +++ b/server/src/main/java/io/spine/server/integration/grpc/package-info.java @@ -30,10 +30,10 @@ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.integration.grpc; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/integration/package-info.java b/server/src/main/java/io/spine/server/integration/package-info.java index 3fb92b838a..9d4bf01682 100644 --- a/server/src/main/java/io/spine/server/integration/package-info.java +++ b/server/src/main/java/io/spine/server/integration/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces for communications between bounded contexts. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.integration; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/log/package-info.java b/server/src/main/java/io/spine/server/log/package-info.java index ee07f3e354..2cda0f9309 100644 --- a/server/src/main/java/io/spine/server/log/package-info.java +++ b/server/src/main/java/io/spine/server/log/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.log; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/migration/mirror/package-info.java b/server/src/main/java/io/spine/server/migration/mirror/package-info.java index 16ef7dbf44..5bd05814cd 100644 --- a/server/src/main/java/io/spine/server/migration/mirror/package-info.java +++ b/server/src/main/java/io/spine/server/migration/mirror/package-info.java @@ -32,9 +32,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.migration.mirror; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/model/AbstractReceptor.java b/server/src/main/java/io/spine/server/model/AbstractReceptor.java index 92f1734ac8..ac888ce845 100644 --- a/server/src/main/java/io/spine/server/model/AbstractReceptor.java +++ b/server/src/main/java/io/spine/server/model/AbstractReceptor.java @@ -38,7 +38,7 @@ import io.spine.server.log.ReceptorLifecycle; import io.spine.server.type.MessageEnvelope; import io.spine.type.MessageClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/server/src/main/java/io/spine/server/model/ArgumentFilter.java b/server/src/main/java/io/spine/server/model/ArgumentFilter.java index 20036a96f3..a80869f350 100644 --- a/server/src/main/java/io/spine/server/model/ArgumentFilter.java +++ b/server/src/main/java/io/spine/server/model/ArgumentFilter.java @@ -34,7 +34,7 @@ import io.spine.base.FieldPath; import io.spine.base.SignalMessage; import io.spine.core.Where; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; import java.lang.reflect.Parameter; diff --git a/server/src/main/java/io/spine/server/model/CommandEmitter.java b/server/src/main/java/io/spine/server/model/CommandEmitter.java index 20aba35f4a..442af6327e 100644 --- a/server/src/main/java/io/spine/server/model/CommandEmitter.java +++ b/server/src/main/java/io/spine/server/model/CommandEmitter.java @@ -35,7 +35,7 @@ import io.spine.server.type.CommandClass; import io.spine.server.type.MessageEnvelope; import io.spine.type.MessageClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Receptor} which produces commands in response to a signal. diff --git a/server/src/main/java/io/spine/server/model/DispatchKey.java b/server/src/main/java/io/spine/server/model/DispatchKey.java index 253e9922eb..ab450cff16 100644 --- a/server/src/main/java/io/spine/server/model/DispatchKey.java +++ b/server/src/main/java/io/spine/server/model/DispatchKey.java @@ -29,7 +29,7 @@ import com.google.common.base.MoreObjects; import com.google.errorprone.annotations.Immutable; import com.google.protobuf.Message; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/server/src/main/java/io/spine/server/model/EventEmitter.java b/server/src/main/java/io/spine/server/model/EventEmitter.java index da8dd56f62..390e0c0937 100644 --- a/server/src/main/java/io/spine/server/model/EventEmitter.java +++ b/server/src/main/java/io/spine/server/model/EventEmitter.java @@ -36,7 +36,7 @@ import io.spine.server.type.EventClass; import io.spine.server.type.MessageEnvelope; import io.spine.type.MessageClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Receptor} which produces events in response to a signal. diff --git a/server/src/main/java/io/spine/server/model/MatchCriterion.java b/server/src/main/java/io/spine/server/model/MatchCriterion.java index 74665a42da..6b0464db90 100644 --- a/server/src/main/java/io/spine/server/model/MatchCriterion.java +++ b/server/src/main/java/io/spine/server/model/MatchCriterion.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import io.spine.annotation.Internal; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/server/src/main/java/io/spine/server/model/MethodExceptionCheck.java b/server/src/main/java/io/spine/server/model/MethodExceptionCheck.java index a015f393a4..5c44fdff41 100644 --- a/server/src/main/java/io/spine/server/model/MethodExceptionCheck.java +++ b/server/src/main/java/io/spine/server/model/MethodExceptionCheck.java @@ -27,7 +27,7 @@ package io.spine.server.model; import com.google.common.collect.ImmutableList; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; diff --git a/server/src/main/java/io/spine/server/model/MethodParams.java b/server/src/main/java/io/spine/server/model/MethodParams.java index 1d73d82dd6..e6c2fb11e5 100644 --- a/server/src/main/java/io/spine/server/model/MethodParams.java +++ b/server/src/main/java/io/spine/server/model/MethodParams.java @@ -31,7 +31,7 @@ import com.google.errorprone.annotations.Immutable; import io.spine.base.CommandMessage; import io.spine.server.event.model.SubscriberMethod; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; import java.util.List; diff --git a/server/src/main/java/io/spine/server/model/MethodResult.java b/server/src/main/java/io/spine/server/model/MethodResult.java index 3611672935..84506c1a85 100644 --- a/server/src/main/java/io/spine/server/model/MethodResult.java +++ b/server/src/main/java/io/spine/server/model/MethodResult.java @@ -34,7 +34,7 @@ import io.spine.server.event.NoReaction; import io.spine.server.command.DoNothing; import io.spine.type.TypeName; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/model/Receptor.java b/server/src/main/java/io/spine/server/model/Receptor.java index 03c8d93432..1a6fddf8c0 100644 --- a/server/src/main/java/io/spine/server/model/Receptor.java +++ b/server/src/main/java/io/spine/server/model/Receptor.java @@ -33,7 +33,7 @@ import io.spine.server.type.MessageEnvelope; import io.spine.type.MessageClass; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/model/SignatureMismatch.java b/server/src/main/java/io/spine/server/model/SignatureMismatch.java index b46ff5e905..1a68d5d9bc 100644 --- a/server/src/main/java/io/spine/server/model/SignatureMismatch.java +++ b/server/src/main/java/io/spine/server/model/SignatureMismatch.java @@ -29,7 +29,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import io.spine.annotation.Internal; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import java.lang.reflect.Method; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/model/VoidMethod.java b/server/src/main/java/io/spine/server/model/VoidMethod.java index 9d1f7ce314..9ef9cb81a0 100644 --- a/server/src/main/java/io/spine/server/model/VoidMethod.java +++ b/server/src/main/java/io/spine/server/model/VoidMethod.java @@ -31,7 +31,7 @@ import io.spine.server.type.EmptyClass; import io.spine.server.type.MessageEnvelope; import io.spine.type.MessageClass; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static java.lang.String.format; diff --git a/server/src/main/java/io/spine/server/model/package-info.java b/server/src/main/java/io/spine/server/model/package-info.java index 87468e855b..b5b33a0721 100644 --- a/server/src/main/java/io/spine/server/model/package-info.java +++ b/server/src/main/java/io/spine/server/model/package-info.java @@ -30,10 +30,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/package-info.java b/server/src/main/java/io/spine/server/package-info.java index 815f1e0731..3108055241 100644 --- a/server/src/main/java/io/spine/server/package-info.java +++ b/server/src/main/java/io/spine/server/package-info.java @@ -35,9 +35,9 @@ * of an application. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/procman/migration/package-info.java b/server/src/main/java/io/spine/server/procman/migration/package-info.java index b386762460..da6d5cb3fc 100644 --- a/server/src/main/java/io/spine/server/procman/migration/package-info.java +++ b/server/src/main/java/io/spine/server/procman/migration/package-info.java @@ -29,9 +29,9 @@ * available for process managers. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.migration; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/procman/model/package-info.java b/server/src/main/java/io/spine/server/procman/model/package-info.java index 651fdd4739..106e0af728 100644 --- a/server/src/main/java/io/spine/server/procman/model/package-info.java +++ b/server/src/main/java/io/spine/server/procman/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/procman/package-info.java b/server/src/main/java/io/spine/server/procman/package-info.java index 2063e82515..ea44aaa603 100644 --- a/server/src/main/java/io/spine/server/procman/package-info.java +++ b/server/src/main/java/io/spine/server/procman/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/projection/ProjectionRepository.java b/server/src/main/java/io/spine/server/projection/ProjectionRepository.java index 4e37708b93..d59227c7cb 100644 --- a/server/src/main/java/io/spine/server/projection/ProjectionRepository.java +++ b/server/src/main/java/io/spine/server/projection/ProjectionRepository.java @@ -60,7 +60,7 @@ import io.spine.server.type.EventEnvelope; import io.spine.time.TimestampTemporal; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/projection/migration/package-info.java b/server/src/main/java/io/spine/server/projection/migration/package-info.java index 133a5ad7a4..169d24b5c1 100644 --- a/server/src/main/java/io/spine/server/projection/migration/package-info.java +++ b/server/src/main/java/io/spine/server/projection/migration/package-info.java @@ -29,9 +29,9 @@ * available for projections. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.migration; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/projection/model/package-info.java b/server/src/main/java/io/spine/server/projection/model/package-info.java index 20afd80348..e4b37a6f8f 100644 --- a/server/src/main/java/io/spine/server/projection/model/package-info.java +++ b/server/src/main/java/io/spine/server/projection/model/package-info.java @@ -29,10 +29,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.model; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/projection/package-info.java b/server/src/main/java/io/spine/server/projection/package-info.java index 376330be10..e3e1065922 100644 --- a/server/src/main/java/io/spine/server/projection/package-info.java +++ b/server/src/main/java/io/spine/server/projection/package-info.java @@ -28,9 +28,9 @@ * This package provides classes for working with event stream projections. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/route/package-info.java b/server/src/main/java/io/spine/server/route/package-info.java index c28da2bfc4..51ec748de7 100644 --- a/server/src/main/java/io/spine/server/route/package-info.java +++ b/server/src/main/java/io/spine/server/route/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces for obtaining entity identifiers. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.route; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/stand/QueryValidator.java b/server/src/main/java/io/spine/server/stand/QueryValidator.java index 70b1b20965..70a4abba13 100644 --- a/server/src/main/java/io/spine/server/stand/QueryValidator.java +++ b/server/src/main/java/io/spine/server/stand/QueryValidator.java @@ -30,7 +30,7 @@ import io.spine.base.Error; import io.spine.client.Query; import io.spine.client.QueryValidationError; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static io.spine.client.QueryValidationError.INVALID_QUERY; import static io.spine.client.QueryValidationError.UNSUPPORTED_QUERY_TARGET; diff --git a/server/src/main/java/io/spine/server/stand/RequestValidator.java b/server/src/main/java/io/spine/server/stand/RequestValidator.java index 2b119c6f61..64c5455e34 100644 --- a/server/src/main/java/io/spine/server/stand/RequestValidator.java +++ b/server/src/main/java/io/spine/server/stand/RequestValidator.java @@ -33,7 +33,7 @@ import io.spine.validate.Validate; import io.spine.validate.ValidationError; import io.spine.validate.diags.ViolationText; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static java.lang.String.format; diff --git a/server/src/main/java/io/spine/server/stand/Stand.java b/server/src/main/java/io/spine/server/stand/Stand.java index 4a5def5409..828b9f3e60 100644 --- a/server/src/main/java/io/spine/server/stand/Stand.java +++ b/server/src/main/java/io/spine/server/stand/Stand.java @@ -55,7 +55,7 @@ import io.spine.server.type.EventEnvelope; import io.spine.system.server.event.EntityStateChanged; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; diff --git a/server/src/main/java/io/spine/server/stand/SubscriptionValidator.java b/server/src/main/java/io/spine/server/stand/SubscriptionValidator.java index e172d73384..378a094ecb 100644 --- a/server/src/main/java/io/spine/server/stand/SubscriptionValidator.java +++ b/server/src/main/java/io/spine/server/stand/SubscriptionValidator.java @@ -30,7 +30,7 @@ import io.spine.client.Subscription; import io.spine.client.SubscriptionValidationError; import io.spine.server.tenant.TenantAwareFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Objects.requireNonNull; diff --git a/server/src/main/java/io/spine/server/stand/TenantSubscriptionRegistry.java b/server/src/main/java/io/spine/server/stand/TenantSubscriptionRegistry.java index 9ee40192ba..52f60b3e1a 100644 --- a/server/src/main/java/io/spine/server/stand/TenantSubscriptionRegistry.java +++ b/server/src/main/java/io/spine/server/stand/TenantSubscriptionRegistry.java @@ -34,7 +34,7 @@ import io.spine.client.Subscriptions; import io.spine.client.Topic; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Map; import java.util.Set; diff --git a/server/src/main/java/io/spine/server/stand/package-info.java b/server/src/main/java/io/spine/server/stand/package-info.java index fe23fd3808..6a2bc9ed0c 100644 --- a/server/src/main/java/io/spine/server/stand/package-info.java +++ b/server/src/main/java/io/spine/server/stand/package-info.java @@ -30,10 +30,10 @@ @SPI @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.stand; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.SPI; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/storage/ColumnMapping.java b/server/src/main/java/io/spine/server/storage/ColumnMapping.java index 00dda36279..9b43cb6891 100644 --- a/server/src/main/java/io/spine/server/storage/ColumnMapping.java +++ b/server/src/main/java/io/spine/server/storage/ColumnMapping.java @@ -26,7 +26,7 @@ package io.spine.server.storage; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The value mapping rules of record {@linkplain io.spine.query.Column columns}. diff --git a/server/src/main/java/io/spine/server/storage/DefaultColumnMapping.java b/server/src/main/java/io/spine/server/storage/DefaultColumnMapping.java index bfdee67193..0685cbcf53 100644 --- a/server/src/main/java/io/spine/server/storage/DefaultColumnMapping.java +++ b/server/src/main/java/io/spine/server/storage/DefaultColumnMapping.java @@ -28,7 +28,7 @@ import com.google.protobuf.ByteString; import com.google.protobuf.Message; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static io.spine.server.storage.ColumnTypeMapping.identity; diff --git a/server/src/main/java/io/spine/server/storage/FieldMaskApplier.java b/server/src/main/java/io/spine/server/storage/FieldMaskApplier.java index b3b5c40c2c..4bb2b91a33 100644 --- a/server/src/main/java/io/spine/server/storage/FieldMaskApplier.java +++ b/server/src/main/java/io/spine/server/storage/FieldMaskApplier.java @@ -30,7 +30,7 @@ import com.google.protobuf.FieldMask; import com.google.protobuf.Message; import io.spine.server.entity.EntityRecord; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.function.Function; diff --git a/server/src/main/java/io/spine/server/storage/RecordSpec.java b/server/src/main/java/io/spine/server/storage/RecordSpec.java index eb8559d582..7d17c6e7be 100644 --- a/server/src/main/java/io/spine/server/storage/RecordSpec.java +++ b/server/src/main/java/io/spine/server/storage/RecordSpec.java @@ -38,7 +38,7 @@ import io.spine.query.Column; import io.spine.query.ColumnName; import io.spine.query.RecordColumn; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/spine/server/storage/RecordWithColumns.java b/server/src/main/java/io/spine/server/storage/RecordWithColumns.java index 3399b42e34..41f4ef23eb 100644 --- a/server/src/main/java/io/spine/server/storage/RecordWithColumns.java +++ b/server/src/main/java/io/spine/server/storage/RecordWithColumns.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableSet; import com.google.protobuf.Message; import io.spine.query.ColumnName; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collections; import java.util.HashMap; diff --git a/server/src/main/java/io/spine/server/storage/memory/MultitenantStorage.java b/server/src/main/java/io/spine/server/storage/memory/MultitenantStorage.java index fc7e4cfed7..14dc9e2896 100644 --- a/server/src/main/java/io/spine/server/storage/memory/MultitenantStorage.java +++ b/server/src/main/java/io/spine/server/storage/memory/MultitenantStorage.java @@ -28,7 +28,7 @@ import io.spine.core.TenantId; import io.spine.server.tenant.TenantFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/io/spine/server/storage/memory/RecordQueryMatcher.java b/server/src/main/java/io/spine/server/storage/memory/RecordQueryMatcher.java index d151c1081b..73ac75c372 100644 --- a/server/src/main/java/io/spine/server/storage/memory/RecordQueryMatcher.java +++ b/server/src/main/java/io/spine/server/storage/memory/RecordQueryMatcher.java @@ -35,7 +35,7 @@ import io.spine.query.Subject; import io.spine.query.SubjectParameter; import io.spine.server.storage.RecordWithColumns; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.function.Predicate; diff --git a/server/src/main/java/io/spine/server/storage/memory/package-info.java b/server/src/main/java/io/spine/server/storage/memory/package-info.java index 54f880ee24..a1167ba982 100644 --- a/server/src/main/java/io/spine/server/storage/memory/package-info.java +++ b/server/src/main/java/io/spine/server/storage/memory/package-info.java @@ -33,9 +33,9 @@ * in a "slice" represented by a data class prefixed with {@code Tenant}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage.memory; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/storage/package-info.java b/server/src/main/java/io/spine/server/storage/package-info.java index a50ea8e853..59b4fa89a6 100644 --- a/server/src/main/java/io/spine/server/storage/package-info.java +++ b/server/src/main/java/io/spine/server/storage/package-info.java @@ -29,10 +29,10 @@ */ @SPI @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.SPI; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/storage/system/package-info.java b/server/src/main/java/io/spine/server/storage/system/package-info.java index d4e87ac687..bfa9e7707b 100644 --- a/server/src/main/java/io/spine/server/storage/system/package-info.java +++ b/server/src/main/java/io/spine/server/storage/system/package-info.java @@ -31,10 +31,10 @@ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage.system; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/tenant/TenantAware.java b/server/src/main/java/io/spine/server/tenant/TenantAware.java index b9b5b11793..a65a7773f1 100644 --- a/server/src/main/java/io/spine/server/tenant/TenantAware.java +++ b/server/src/main/java/io/spine/server/tenant/TenantAware.java @@ -28,7 +28,7 @@ import io.spine.annotation.Internal; import io.spine.core.TenantId; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.protobuf.Messages.isDefault; diff --git a/server/src/main/java/io/spine/server/tenant/TenantAwareFunction0.java b/server/src/main/java/io/spine/server/tenant/TenantAwareFunction0.java index 09135ae056..5fc350506c 100644 --- a/server/src/main/java/io/spine/server/tenant/TenantAwareFunction0.java +++ b/server/src/main/java/io/spine/server/tenant/TenantAwareFunction0.java @@ -29,7 +29,7 @@ import com.google.protobuf.Empty; import io.spine.annotation.SPI; import io.spine.core.TenantId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A tenant-aware function that takes no parameters. diff --git a/server/src/main/java/io/spine/server/tenant/TenantFunction.java b/server/src/main/java/io/spine/server/tenant/TenantFunction.java index 168c52ba70..1873b21a8d 100644 --- a/server/src/main/java/io/spine/server/tenant/TenantFunction.java +++ b/server/src/main/java/io/spine/server/tenant/TenantFunction.java @@ -28,7 +28,7 @@ import io.spine.annotation.Internal; import io.spine.core.TenantId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.function.Function; diff --git a/server/src/main/java/io/spine/server/tenant/package-info.java b/server/src/main/java/io/spine/server/tenant/package-info.java index c814c45f5d..2b7a97e823 100644 --- a/server/src/main/java/io/spine/server/tenant/package-info.java +++ b/server/src/main/java/io/spine/server/tenant/package-info.java @@ -28,9 +28,9 @@ * This package contains classes and interfaces for supporting multi-tenancy. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.tenant; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/trace/package-info.java b/server/src/main/java/io/spine/server/trace/package-info.java index 6e78db77cc..dd02e62987 100644 --- a/server/src/main/java/io/spine/server/trace/package-info.java +++ b/server/src/main/java/io/spine/server/trace/package-info.java @@ -48,9 +48,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.trace; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/transport/memory/SingleThreadInMemSubscriber.java b/server/src/main/java/io/spine/server/transport/memory/SingleThreadInMemSubscriber.java index e96e954531..c8a62810fe 100644 --- a/server/src/main/java/io/spine/server/transport/memory/SingleThreadInMemSubscriber.java +++ b/server/src/main/java/io/spine/server/transport/memory/SingleThreadInMemSubscriber.java @@ -30,7 +30,7 @@ import io.spine.logging.WithLogging; import io.spine.server.integration.ExternalMessage; import io.spine.server.transport.ChannelId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/server/src/main/java/io/spine/server/transport/memory/package-info.java b/server/src/main/java/io/spine/server/transport/memory/package-info.java index bdd68c6f30..fdd90a2afc 100644 --- a/server/src/main/java/io/spine/server/transport/memory/package-info.java +++ b/server/src/main/java/io/spine/server/transport/memory/package-info.java @@ -31,9 +31,9 @@ *

Should be used in test purposes only. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.transport.memory; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/transport/package-info.java b/server/src/main/java/io/spine/server/transport/package-info.java index 68018f7783..7b7595dc02 100644 --- a/server/src/main/java/io/spine/server/transport/package-info.java +++ b/server/src/main/java/io/spine/server/transport/package-info.java @@ -31,9 +31,9 @@ *

Typical transport options include gRPC servers, messaging system integration etc. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.transport; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/tuple/Pair.java b/server/src/main/java/io/spine/server/tuple/Pair.java index 05de92c900..0184a8277a 100644 --- a/server/src/main/java/io/spine/server/tuple/Pair.java +++ b/server/src/main/java/io/spine/server/tuple/Pair.java @@ -30,7 +30,7 @@ import com.google.protobuf.Message; import io.spine.server.tuple.Element.AValue; import io.spine.server.tuple.Element.BValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/tuple/Quartet.java b/server/src/main/java/io/spine/server/tuple/Quartet.java index bcb297e455..3b70ceded4 100644 --- a/server/src/main/java/io/spine/server/tuple/Quartet.java +++ b/server/src/main/java/io/spine/server/tuple/Quartet.java @@ -32,7 +32,7 @@ import io.spine.server.tuple.Element.BValue; import io.spine.server.tuple.Element.CValue; import io.spine.server.tuple.Element.DValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/tuple/Quintet.java b/server/src/main/java/io/spine/server/tuple/Quintet.java index abbfa428ce..8bbc57db80 100644 --- a/server/src/main/java/io/spine/server/tuple/Quintet.java +++ b/server/src/main/java/io/spine/server/tuple/Quintet.java @@ -33,7 +33,7 @@ import io.spine.server.tuple.Element.CValue; import io.spine.server.tuple.Element.DValue; import io.spine.server.tuple.Element.EValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/tuple/Triplet.java b/server/src/main/java/io/spine/server/tuple/Triplet.java index 804b865a60..41a102fce9 100644 --- a/server/src/main/java/io/spine/server/tuple/Triplet.java +++ b/server/src/main/java/io/spine/server/tuple/Triplet.java @@ -31,7 +31,7 @@ import io.spine.server.tuple.Element.AValue; import io.spine.server.tuple.Element.BValue; import io.spine.server.tuple.Element.CValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/main/java/io/spine/server/tuple/Tuple.java b/server/src/main/java/io/spine/server/tuple/Tuple.java index 531df0609b..44b14fb4b5 100644 --- a/server/src/main/java/io/spine/server/tuple/Tuple.java +++ b/server/src/main/java/io/spine/server/tuple/Tuple.java @@ -32,8 +32,8 @@ import com.google.protobuf.Empty; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Message; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.io.Serializable; import java.util.Iterator; diff --git a/server/src/main/java/io/spine/server/tuple/package-info.java b/server/src/main/java/io/spine/server/tuple/package-info.java index ac97030a82..9f0c010788 100644 --- a/server/src/main/java/io/spine/server/tuple/package-info.java +++ b/server/src/main/java/io/spine/server/tuple/package-info.java @@ -131,9 +131,9 @@ * io.spine.server.tuple.Either) Pair.withEither()}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.tuple; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/server/type/package-info.java b/server/src/main/java/io/spine/server/type/package-info.java index 542f1b73ba..16fcf04c10 100644 --- a/server/src/main/java/io/spine/server/type/package-info.java +++ b/server/src/main/java/io/spine/server/type/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.type; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/system/server/SystemConfig.java b/server/src/main/java/io/spine/system/server/SystemConfig.java index 8f25ec957f..72c268d86c 100644 --- a/server/src/main/java/io/spine/system/server/SystemConfig.java +++ b/server/src/main/java/io/spine/system/server/SystemConfig.java @@ -26,7 +26,7 @@ package io.spine.system.server; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.concurrent.Immutable; import java.util.Objects; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/spine/system/server/SystemRequestFactory.java b/server/src/main/java/io/spine/system/server/SystemRequestFactory.java index 0f5e0461bc..8b8dfb57c7 100644 --- a/server/src/main/java/io/spine/system/server/SystemRequestFactory.java +++ b/server/src/main/java/io/spine/system/server/SystemRequestFactory.java @@ -29,7 +29,7 @@ import io.spine.client.ActorRequestFactory; import io.spine.core.TenantId; import io.spine.server.tenant.TenantFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.system.server.DefaultSystemWriteSide.SYSTEM_USER; diff --git a/server/src/main/java/io/spine/system/server/SystemSettings.java b/server/src/main/java/io/spine/system/server/SystemSettings.java index 878afe0355..e17e5a46f4 100644 --- a/server/src/main/java/io/spine/system/server/SystemSettings.java +++ b/server/src/main/java/io/spine/system/server/SystemSettings.java @@ -31,7 +31,7 @@ import io.spine.environment.Environment; import io.spine.environment.Tests; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; import java.util.concurrent.Executor; import java.util.concurrent.ForkJoinPool; diff --git a/server/src/main/java/io/spine/system/server/event/package-info.java b/server/src/main/java/io/spine/system/server/event/package-info.java index d992d538f9..744b18c876 100644 --- a/server/src/main/java/io/spine/system/server/event/package-info.java +++ b/server/src/main/java/io/spine/system/server/event/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.event; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/main/java/io/spine/system/server/package-info.java b/server/src/main/java/io/spine/system/server/package-info.java index b079053380..80677fb9e2 100644 --- a/server/src/main/java/io/spine/system/server/package-info.java +++ b/server/src/main/java/io/spine/system/server/package-info.java @@ -38,11 +38,11 @@ @Internal @BoundedContext("_System") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/client/ClientBuilderTest.java b/server/src/test/java/io/spine/client/ClientBuilderTest.java index 225a79faab..c9832b3e47 100644 --- a/server/src/test/java/io/spine/client/ClientBuilderTest.java +++ b/server/src/test/java/io/spine/client/ClientBuilderTest.java @@ -34,7 +34,7 @@ import io.spine.testing.TestValues; import io.spine.testing.core.given.GivenTenantId; import io.spine.testing.core.given.GivenUserId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/client/CommandRequestTest.java b/server/src/test/java/io/spine/client/CommandRequestTest.java index 194fb0695c..ba7dc8a016 100644 --- a/server/src/test/java/io/spine/client/CommandRequestTest.java +++ b/server/src/test/java/io/spine/client/CommandRequestTest.java @@ -41,7 +41,7 @@ import io.spine.test.client.users.rejection.Rejections.UserAlreadyLoggedIn; import io.spine.testing.core.given.GivenUserId; import io.spine.testing.logging.mute.MuteLogging; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/client/package-info.java b/server/src/test/java/io/spine/client/package-info.java index 413747c3fd..82c150ee16 100644 --- a/server/src/test/java/io/spine/client/package-info.java +++ b/server/src/test/java/io/spine/client/package-info.java @@ -37,9 +37,9 @@ * to {@code ":server"}, which is not circular but in some cases is not handled by Gradle. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.client; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/server/ServerEnvironmentConfigTest.java b/server/src/test/java/io/spine/server/ServerEnvironmentConfigTest.java index 0231e53fdc..ccfc007b73 100644 --- a/server/src/test/java/io/spine/server/ServerEnvironmentConfigTest.java +++ b/server/src/test/java/io/spine/server/ServerEnvironmentConfigTest.java @@ -46,7 +46,7 @@ import io.spine.server.transport.Subscriber; import io.spine.server.transport.TransportFactory; import io.spine.server.transport.memory.InMemoryTransportFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java b/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java index ddac5ac4eb..14c224ae70 100644 --- a/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java +++ b/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java @@ -58,7 +58,7 @@ import io.spine.testing.server.TestEventFactory; import io.spine.testing.server.model.ModelTests; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/server/aggregate/EventImportTest.java b/server/src/test/java/io/spine/server/aggregate/EventImportTest.java index 54efc0cbf2..b3c74eff31 100644 --- a/server/src/test/java/io/spine/server/aggregate/EventImportTest.java +++ b/server/src/test/java/io/spine/server/aggregate/EventImportTest.java @@ -37,7 +37,7 @@ import io.spine.server.type.EventEnvelope; import io.spine.testing.server.TestEventFactory; import io.spine.testing.server.blackbox.BlackBox; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/server/src/test/java/io/spine/server/aggregate/TestAggregateStorage.java b/server/src/test/java/io/spine/server/aggregate/TestAggregateStorage.java index f9ee1306ec..3226945d63 100644 --- a/server/src/test/java/io/spine/server/aggregate/TestAggregateStorage.java +++ b/server/src/test/java/io/spine/server/aggregate/TestAggregateStorage.java @@ -35,7 +35,7 @@ import io.spine.server.entity.EntityRecord; import io.spine.test.aggregate.AggProject; import io.spine.test.aggregate.ProjectId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.Optional; diff --git a/server/src/test/java/io/spine/server/aggregate/model/ApplierTest.java b/server/src/test/java/io/spine/server/aggregate/model/ApplierTest.java index 139d679d18..d547270d5a 100644 --- a/server/src/test/java/io/spine/server/aggregate/model/ApplierTest.java +++ b/server/src/test/java/io/spine/server/aggregate/model/ApplierTest.java @@ -45,7 +45,7 @@ import io.spine.testdata.Sample; import io.spine.testing.logging.mute.MuteLogging; import io.spine.testing.server.model.ModelTests; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/commandbus/AckRejectionPublisherTest.java b/server/src/test/java/io/spine/server/commandbus/AckRejectionPublisherTest.java index 197c1e3059..2c6e57a3df 100644 --- a/server/src/test/java/io/spine/server/commandbus/AckRejectionPublisherTest.java +++ b/server/src/test/java/io/spine/server/commandbus/AckRejectionPublisherTest.java @@ -34,7 +34,7 @@ import io.spine.test.commandbus.CmdBusCaffetteriaId; import io.spine.test.commandbus.command.CmdBusEntryDenied; import io.spine.testing.client.TestActorRequestFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/commandbus/CommandReceivedTapTest.java b/server/src/test/java/io/spine/server/commandbus/CommandReceivedTapTest.java index ef2219e997..2048edb164 100644 --- a/server/src/test/java/io/spine/server/commandbus/CommandReceivedTapTest.java +++ b/server/src/test/java/io/spine/server/commandbus/CommandReceivedTapTest.java @@ -36,7 +36,7 @@ import io.spine.test.command.CmdCreateProject; import io.spine.test.command.ProjectId; import io.spine.testing.client.TestActorRequestFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/commandbus/CommandValidatorViolationCheckTest.java b/server/src/test/java/io/spine/server/commandbus/CommandValidatorViolationCheckTest.java index f75ace58e1..37ae7899d8 100644 --- a/server/src/test/java/io/spine/server/commandbus/CommandValidatorViolationCheckTest.java +++ b/server/src/test/java/io/spine/server/commandbus/CommandValidatorViolationCheckTest.java @@ -38,7 +38,7 @@ import io.spine.test.commandbus.command.CmdBusCreateProject; import io.spine.testing.client.TestActorRequestFactory; import io.spine.validate.ConstraintViolation; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/event/EventBusTest.java b/server/src/test/java/io/spine/server/event/EventBusTest.java index 1c65ee3b82..fd7d0c9886 100644 --- a/server/src/test/java/io/spine/server/event/EventBusTest.java +++ b/server/src/test/java/io/spine/server/event/EventBusTest.java @@ -53,7 +53,7 @@ import io.spine.testing.logging.mute.MuteLogging; import io.spine.testing.server.TestEventFactory; import io.spine.validate.Validated; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/server/model/contexts/package-info.java b/server/src/test/java/io/spine/server/model/contexts/package-info.java index 01ff1bca9f..265339d213 100644 --- a/server/src/test/java/io/spine/server/model/contexts/package-info.java +++ b/server/src/test/java/io/spine/server/model/contexts/package-info.java @@ -32,9 +32,9 @@ * @see io.spine.server.model.contexts.tasks */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.contexts; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/server/model/handler/package-info.java b/server/src/test/java/io/spine/server/model/handler/package-info.java index 981f07f5c1..b00a2aa408 100644 --- a/server/src/test/java/io/spine/server/model/handler/package-info.java +++ b/server/src/test/java/io/spine/server/model/handler/package-info.java @@ -31,9 +31,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.handler; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/server/package-info.java b/server/src/test/java/io/spine/server/package-info.java index 6445ac5d30..501649552a 100644 --- a/server/src/test/java/io/spine/server/package-info.java +++ b/server/src/test/java/io/spine/server/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/server/projection/e2e/package-info.java b/server/src/test/java/io/spine/server/projection/e2e/package-info.java index 62e7d6e920..8da783894b 100644 --- a/server/src/test/java/io/spine/server/projection/e2e/package-info.java +++ b/server/src/test/java/io/spine/server/projection/e2e/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.e2e; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/test/java/io/spine/server/route/StateUpdateRoutingTest.java b/server/src/test/java/io/spine/server/route/StateUpdateRoutingTest.java index 51c80203ea..f8145c98b8 100644 --- a/server/src/test/java/io/spine/server/route/StateUpdateRoutingTest.java +++ b/server/src/test/java/io/spine/server/route/StateUpdateRoutingTest.java @@ -37,7 +37,7 @@ import io.spine.system.server.event.EntityStateChanged; import io.spine.testing.core.given.GivenVersion; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/stand/StandTest.java b/server/src/test/java/io/spine/server/stand/StandTest.java index b7785dabc0..f724f3fa8b 100644 --- a/server/src/test/java/io/spine/server/stand/StandTest.java +++ b/server/src/test/java/io/spine/server/stand/StandTest.java @@ -64,7 +64,7 @@ import io.spine.testing.logging.mute.MuteLogging; import io.spine.testing.server.tenant.TenantAwareTest; import io.spine.validate.ValidationError; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; diff --git a/server/src/test/java/io/spine/server/storage/EntityRecordStorageTest.java b/server/src/test/java/io/spine/server/storage/EntityRecordStorageTest.java index e490c36270..d4903990b5 100644 --- a/server/src/test/java/io/spine/server/storage/EntityRecordStorageTest.java +++ b/server/src/test/java/io/spine/server/storage/EntityRecordStorageTest.java @@ -44,7 +44,7 @@ import io.spine.server.storage.given.GivenStorageProject; import io.spine.test.storage.StgProject; import io.spine.test.storage.StgProjectId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/io/spine/server/storage/memory/RecordQueryMatcherTest.java b/server/src/test/java/io/spine/server/storage/memory/RecordQueryMatcherTest.java index 669fb56f67..4d6d9c8b6e 100644 --- a/server/src/test/java/io/spine/server/storage/memory/RecordQueryMatcherTest.java +++ b/server/src/test/java/io/spine/server/storage/memory/RecordQueryMatcherTest.java @@ -30,7 +30,7 @@ import io.spine.server.storage.given.GivenStorageProject.StgProjectColumns; import io.spine.test.storage.StgProject; import io.spine.test.storage.StgProjectId; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/server/src/testFixtures/java/com/example/package-info.java b/server/src/testFixtures/java/com/example/package-info.java index 0cb6944477..3db4602f7f 100644 --- a/server/src/testFixtures/java/com/example/package-info.java +++ b/server/src/testFixtures/java/com/example/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for testing invocations from outside the framework package namespace. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package com.example; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/client/given/package-info.java b/server/src/testFixtures/java/io/spine/client/given/package-info.java index dc7f80b913..7a0d84917a 100644 --- a/server/src/testFixtures/java/io/spine/client/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/client/given/package-info.java @@ -28,9 +28,9 @@ * Provides convenience API to create a desired test environment for Spine Client tests. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.client.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/core/given/package-info.java b/server/src/testFixtures/java/io/spine/core/given/package-info.java index e7a6a1722e..4337e45f67 100644 --- a/server/src/testFixtures/java/io/spine/core/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/core/given/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for {@code core} tests. */ -@ParametersAreNonnullByDefault +@NullMarked @CheckReturnValue package io.spine.core.given; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/given/package-info.java b/server/src/testFixtures/java/io/spine/given/package-info.java index 683179563d..3c305d9aaf 100644 --- a/server/src/testFixtures/java/io/spine/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/given/package-info.java @@ -29,9 +29,9 @@ * but belonging to the framework namespace. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/Given.java b/server/src/testFixtures/java/io/spine/server/Given.java index eae4910a9a..aa81a2f2c9 100644 --- a/server/src/testFixtures/java/io/spine/server/Given.java +++ b/server/src/testFixtures/java/io/spine/server/Given.java @@ -74,7 +74,7 @@ import io.spine.testing.client.TestActorRequestFactory; import io.spine.testing.core.given.GivenUserId; import io.spine.time.Now; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.List; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/TaskAggregate.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/TaskAggregate.java index 3bf3cc2157..0ba4e6526f 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/TaskAggregate.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/TaskAggregate.java @@ -42,7 +42,7 @@ import io.spine.test.aggregate.rejection.Rejections; import io.spine.test.aggregate.task.AggTask; import io.spine.test.aggregate.task.AggTaskId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/package-info.java index f429266efb..ba8b9a624f 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/aggregate/package-info.java @@ -28,7 +28,7 @@ * Test environment classes for {@linkplain io.spine.server.aggregate.AggregateTest * Aggregate tests}. */ -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.aggregate; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/dispatch/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/dispatch/package-info.java index 95bd213b81..7600c46edc 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/dispatch/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/dispatch/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.dispatch; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/fibonacci/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/fibonacci/package-info.java index 3dc4065657..9b204f3709 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/fibonacci/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/fibonacci/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.aggregate.AggregateStorage#truncateOlderThan(int) truncation} test. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.fibonacci; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/importado/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/importado/package-info.java index 6ced795239..aba6b05e46 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/importado/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/importado/package-info.java @@ -33,9 +33,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.importado; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/klasse/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/klasse/package-info.java index 0eb2765ce8..fe01665f00 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/klasse/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/klasse/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.klasse; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/package-info.java index 7d15fc253d..29c2f6da34 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/part/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/part/package-info.java index 0d373ffdfd..8552714975 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/part/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/part/package-info.java @@ -30,9 +30,9 @@ * {@link io.spine.server.aggregate.AggregatePartTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.part; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/query/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/query/package-info.java index d3cc16bcf2..1e01252df2 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/query/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/query/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.query; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/ProjectAggregateRepository.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/ProjectAggregateRepository.java index 189d44b857..c0bffe8a67 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/ProjectAggregateRepository.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/ProjectAggregateRepository.java @@ -40,7 +40,7 @@ import io.spine.test.aggregate.ProjectId; import io.spine.test.aggregate.event.AggProjectArchived; import io.spine.test.aggregate.event.AggProjectDeleted; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/package-info.java index c42dab7269..3e4eea5016 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/repo/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for testing {@code AggregateRepository}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.repo; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/aggregate/given/thermometer/package-info.java b/server/src/testFixtures/java/io/spine/server/aggregate/given/thermometer/package-info.java index 833a2fb6bd..7b1073eeda 100644 --- a/server/src/testFixtures/java/io/spine/server/aggregate/given/thermometer/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/aggregate/given/thermometer/package-info.java @@ -30,9 +30,9 @@ * test. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.aggregate.given.thermometer; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/bc/given/package-info.java b/server/src/testFixtures/java/io/spine/server/bc/given/package-info.java index eb868a100f..c7e9d9ced7 100644 --- a/server/src/testFixtures/java/io/spine/server/bc/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/bc/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.bc.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/bc/package-info.java b/server/src/testFixtures/java/io/spine/server/bc/package-info.java index 2be7d5cf95..4490e496a8 100644 --- a/server/src/testFixtures/java/io/spine/server/bc/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/bc/package-info.java @@ -28,9 +28,9 @@ * This package contains tests for {@link io.spine.server.BoundedContext BoundedContext}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.bc; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/bus/given/package-info.java b/server/src/testFixtures/java/io/spine/server/bus/given/package-info.java index 8ced616c11..e073a796d0 100644 --- a/server/src/testFixtures/java/io/spine/server/bus/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/bus/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.bus.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/bus/given/stock/package-info.java b/server/src/testFixtures/java/io/spine/server/bus/given/stock/package-info.java index e534487efa..4b12b35676 100644 --- a/server/src/testFixtures/java/io/spine/server/bus/given/stock/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/bus/given/stock/package-info.java @@ -31,10 +31,10 @@ @BoundedContext("Stock") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.bus.given.stock; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/command/given/package-info.java b/server/src/testFixtures/java/io/spine/server/command/given/package-info.java index 27b1d97fd7..9f2b823548 100644 --- a/server/src/testFixtures/java/io/spine/server/command/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/command/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/command/model/given/handler/package-info.java b/server/src/testFixtures/java/io/spine/server/command/model/given/handler/package-info.java index 08610ff621..954026296b 100644 --- a/server/src/testFixtures/java/io/spine/server/command/model/given/handler/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/command/model/given/handler/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command.model.given.handler; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/command/model/given/reaction/package-info.java b/server/src/testFixtures/java/io/spine/server/command/model/given/reaction/package-info.java index fdfba5608c..c38becff86 100644 --- a/server/src/testFixtures/java/io/spine/server/command/model/given/reaction/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/command/model/given/reaction/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command.model.given.reaction; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/command/package-info.java b/server/src/testFixtures/java/io/spine/server/command/package-info.java index 6b497b9853..e3f64d8507 100644 --- a/server/src/testFixtures/java/io/spine/server/command/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/command/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.command; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/commandbus/given/DirectScheduledExecutor.java b/server/src/testFixtures/java/io/spine/server/commandbus/given/DirectScheduledExecutor.java index ece3bd5b68..fc11302198 100644 --- a/server/src/testFixtures/java/io/spine/server/commandbus/given/DirectScheduledExecutor.java +++ b/server/src/testFixtures/java/io/spine/server/commandbus/given/DirectScheduledExecutor.java @@ -26,7 +26,7 @@ package io.spine.server.commandbus.given; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.List; diff --git a/server/src/testFixtures/java/io/spine/server/commandbus/given/caffetteria/package-info.java b/server/src/testFixtures/java/io/spine/server/commandbus/given/caffetteria/package-info.java index 18a2c6a3f5..e6970f1a6a 100644 --- a/server/src/testFixtures/java/io/spine/server/commandbus/given/caffetteria/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/commandbus/given/caffetteria/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.commandbus.given.caffetteria; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/commandbus/given/package-info.java b/server/src/testFixtures/java/io/spine/server/commandbus/given/package-info.java index 959e71de07..0425895a97 100644 --- a/server/src/testFixtures/java/io/spine/server/commandbus/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/commandbus/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.commandbus.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/MemoizingAction.java b/server/src/testFixtures/java/io/spine/server/delivery/MemoizingAction.java index af1f911409..7058880610 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/MemoizingAction.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/MemoizingAction.java @@ -26,7 +26,7 @@ package io.spine.server.delivery; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/NastyClient.java b/server/src/testFixtures/java/io/spine/server/delivery/NastyClient.java index b5cf84bbfa..bcb0fd5078 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/NastyClient.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/NastyClient.java @@ -38,7 +38,7 @@ import io.spine.test.delivery.NumberImported; import io.spine.test.delivery.NumberReacted; import io.spine.testing.server.blackbox.BlackBox; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.Iterator; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/given/ReceptionFailureTestEnv.java b/server/src/testFixtures/java/io/spine/server/delivery/given/ReceptionFailureTestEnv.java index 4f1ad6f739..114c13fb7a 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/given/ReceptionFailureTestEnv.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/given/ReceptionFailureTestEnv.java @@ -40,7 +40,7 @@ import io.spine.test.delivery.Receptionist; import io.spine.test.delivery.command.TurnConditionerOn; import io.spine.testing.server.blackbox.BlackBox; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.time.Duration; import java.util.Optional; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/given/TestCatchUpJobs.java b/server/src/testFixtures/java/io/spine/server/delivery/given/TestCatchUpJobs.java index 93fdf08a2d..8e920adcba 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/given/TestCatchUpJobs.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/given/TestCatchUpJobs.java @@ -32,7 +32,7 @@ import io.spine.server.delivery.CatchUpId; import io.spine.server.delivery.CatchUpStatus; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/given/WhatToCatchUp.java b/server/src/testFixtures/java/io/spine/server/delivery/given/WhatToCatchUp.java index be77e7777c..02d0c854d9 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/given/WhatToCatchUp.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/given/WhatToCatchUp.java @@ -27,7 +27,7 @@ package io.spine.server.delivery.given; import com.google.protobuf.Timestamp; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/src/testFixtures/java/io/spine/server/delivery/given/package-info.java b/server/src/testFixtures/java/io/spine/server/delivery/given/package-info.java index 2fcb90db1f..da6aa7b298 100644 --- a/server/src/testFixtures/java/io/spine/server/delivery/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/delivery/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.delivery.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/dispatch/given/package-info.java b/server/src/testFixtures/java/io/spine/server/dispatch/given/package-info.java index ed7e56baf2..aa7f1d1a9f 100644 --- a/server/src/testFixtures/java/io/spine/server/dispatch/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/dispatch/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.dispatch.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/enrich/given/event/package-info.java b/server/src/testFixtures/java/io/spine/server/enrich/given/event/package-info.java index 8b9e909b01..9117299e7a 100644 --- a/server/src/testFixtures/java/io/spine/server/enrich/given/event/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/enrich/given/event/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.enrich.given.event; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/enrich/given/package-info.java b/server/src/testFixtures/java/io/spine/server/enrich/given/package-info.java index 0ace979e60..5b137b757e 100644 --- a/server/src/testFixtures/java/io/spine/server/enrich/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/enrich/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.enrich.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/entity/given/entity/package-info.java b/server/src/testFixtures/java/io/spine/server/entity/given/entity/package-info.java index 249f038e79..751e7ea949 100644 --- a/server/src/testFixtures/java/io/spine/server/entity/given/entity/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/entity/given/entity/package-info.java @@ -28,9 +28,9 @@ * Test environment for testing entity classes. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.given.entity; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/entity/given/package-info.java b/server/src/testFixtures/java/io/spine/server/entity/given/package-info.java index 8af024fc18..55135625fb 100644 --- a/server/src/testFixtures/java/io/spine/server/entity/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/entity/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/entity/given/repository/package-info.java b/server/src/testFixtures/java/io/spine/server/entity/given/repository/package-info.java index a5fcc2af66..d10f095883 100644 --- a/server/src/testFixtures/java/io/spine/server/entity/given/repository/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/entity/given/repository/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.given.repository; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/entity/given/tx/package-info.java b/server/src/testFixtures/java/io/spine/server/entity/given/tx/package-info.java index a713899f62..b88c041eb5 100644 --- a/server/src/testFixtures/java/io/spine/server/entity/given/tx/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/entity/given/tx/package-info.java @@ -29,9 +29,9 @@ * and derived test cases. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.given.tx; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/entity/storage/given/package-info.java b/server/src/testFixtures/java/io/spine/server/entity/storage/given/package-info.java index 1f69b5f528..7e0df7a4ae 100644 --- a/server/src/testFixtures/java/io/spine/server/entity/storage/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/entity/storage/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.entity.storage.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/given/bus/package-info.java b/server/src/testFixtures/java/io/spine/server/event/given/bus/package-info.java index 89f1e3fceb..5dd280c0d5 100644 --- a/server/src/testFixtures/java/io/spine/server/event/given/bus/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/given/bus/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.given.bus; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/given/package-info.java b/server/src/testFixtures/java/io/spine/server/event/given/package-info.java index 4ac3419993..9978a159f3 100644 --- a/server/src/testFixtures/java/io/spine/server/event/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/model/given/classes/package-info.java b/server/src/testFixtures/java/io/spine/server/event/model/given/classes/package-info.java index 6a57e0cdbe..bf20d585f2 100644 --- a/server/src/testFixtures/java/io/spine/server/event/model/given/classes/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/model/given/classes/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.model.given.classes; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/model/given/package-info.java b/server/src/testFixtures/java/io/spine/server/event/model/given/package-info.java index 30bb2c6d4e..4ac6001b16 100644 --- a/server/src/testFixtures/java/io/spine/server/event/model/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/model/given/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.model.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/model/given/reactor/package-info.java b/server/src/testFixtures/java/io/spine/server/event/model/given/reactor/package-info.java index 0993571aa7..3b45e610fa 100644 --- a/server/src/testFixtures/java/io/spine/server/event/model/given/reactor/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/model/given/reactor/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.event.model.EventReactorMethodTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.model.given.reactor; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/event/model/given/subscriber/package-info.java b/server/src/testFixtures/java/io/spine/server/event/model/given/subscriber/package-info.java index 0bee031d3f..74a2806895 100644 --- a/server/src/testFixtures/java/io/spine/server/event/model/given/subscriber/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/event/model/given/subscriber/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.event.model.EventSubscriberMethodTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.event.model.given.subscriber; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/context/drawing/event/package-info.java b/server/src/testFixtures/java/io/spine/server/given/context/drawing/event/package-info.java index 935aa8c6b2..7acc8ac9e7 100644 --- a/server/src/testFixtures/java/io/spine/server/given/context/drawing/event/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/context/drawing/event/package-info.java @@ -30,9 +30,9 @@ *

The handcrafted interfaces in this package serve for grouping events */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.context.drawing.event; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/environment/package-info.java b/server/src/testFixtures/java/io/spine/server/given/environment/package-info.java index 07e8d9c830..f81c3bf0cb 100644 --- a/server/src/testFixtures/java/io/spine/server/given/environment/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/environment/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.server.EnvSetting}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.environment; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/groups/package-info.java b/server/src/testFixtures/java/io/spine/server/given/groups/package-info.java index 1c38c8081e..155505d7fc 100644 --- a/server/src/testFixtures/java/io/spine/server/given/groups/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/groups/package-info.java @@ -35,10 +35,10 @@ @BoundedContext("Groups") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.groups; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/organizations/package-info.java b/server/src/testFixtures/java/io/spine/server/given/organizations/package-info.java index 9464e5ebb4..d6465ceab4 100644 --- a/server/src/testFixtures/java/io/spine/server/given/organizations/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/organizations/package-info.java @@ -33,10 +33,10 @@ @BoundedContext("Organizations") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.organizations; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/package-info.java b/server/src/testFixtures/java/io/spine/server/given/package-info.java index 48bc223ef4..1e88f048d6 100644 --- a/server/src/testFixtures/java/io/spine/server/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/service/package-info.java b/server/src/testFixtures/java/io/spine/server/given/service/package-info.java index 70db4343e4..9c9a7811d8 100644 --- a/server/src/testFixtures/java/io/spine/server/given/service/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/service/package-info.java @@ -28,9 +28,9 @@ * Provides test-grade types and interfaces of gRPC services. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.service; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/given/transport/package-info.java b/server/src/testFixtures/java/io/spine/server/given/transport/package-info.java index 952f23c083..9e684e429a 100644 --- a/server/src/testFixtures/java/io/spine/server/given/transport/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/given/transport/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.given.transport; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/integration/given/broker/package-info.java b/server/src/testFixtures/java/io/spine/server/integration/given/broker/package-info.java index 4e9aad7418..8223529490 100644 --- a/server/src/testFixtures/java/io/spine/server/integration/given/broker/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/integration/given/broker/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.integration.given.broker; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/integration/given/package-info.java b/server/src/testFixtures/java/io/spine/server/integration/given/package-info.java index 8153f0e0a6..4d735775bd 100644 --- a/server/src/testFixtures/java/io/spine/server/integration/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/integration/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.integration.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/log/given/package-info.java b/server/src/testFixtures/java/io/spine/server/log/given/package-info.java index 8fc6a24ae7..7610332503 100644 --- a/server/src/testFixtures/java/io/spine/server/log/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/log/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.log.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/migration/mirror/given/package-info.java b/server/src/testFixtures/java/io/spine/server/migration/mirror/given/package-info.java index ccddc92f94..0673046004 100644 --- a/server/src/testFixtures/java/io/spine/server/migration/mirror/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/migration/mirror/given/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.migration.mirror.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/contexts/orders/package-info.java b/server/src/testFixtures/java/io/spine/server/model/contexts/orders/package-info.java index 291050e99d..a873a57c02 100644 --- a/server/src/testFixtures/java/io/spine/server/model/contexts/orders/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/contexts/orders/package-info.java @@ -29,10 +29,10 @@ */ @BoundedContext("Tasks") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.contexts.orders; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/contexts/projects/package-info.java b/server/src/testFixtures/java/io/spine/server/model/contexts/projects/package-info.java index bf44c4fbcc..64783b4e9f 100644 --- a/server/src/testFixtures/java/io/spine/server/model/contexts/projects/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/contexts/projects/package-info.java @@ -31,10 +31,10 @@ @BoundedContext("Projects") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.contexts.projects; import io.spine.core.BoundedContext; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/contexts/tasks/package-info.java b/server/src/testFixtures/java/io/spine/server/model/contexts/tasks/package-info.java index 7a66b65875..f95bb81419 100644 --- a/server/src/testFixtures/java/io/spine/server/model/contexts/tasks/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/contexts/tasks/package-info.java @@ -29,10 +29,10 @@ */ @BoundedContext("Tasks") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.contexts.tasks; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/external/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/external/package-info.java index 5a555780e1..7dff3b2cc9 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/external/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/external/package-info.java @@ -30,9 +30,9 @@ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given.external; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/filter/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/filter/package-info.java index 489f97e784..c7bde3017f 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/filter/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/filter/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for {@link io.spine.server.model.ArgumentFilterTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given.filter; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/map/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/map/package-info.java index a9c0066ef6..4d6c5cf701 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/map/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/map/package-info.java @@ -28,9 +28,9 @@ * Test environment for {@link io.spine.server.model.HandlerMapTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given.map; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/method/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/method/package-info.java index dacac63aaf..7e050bc541 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/method/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/method/package-info.java @@ -28,9 +28,9 @@ * Test environment for testing handler methods. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given.method; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/package-info.java index 510185c3b6..a3bd89298c 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for tests of the {@code io.spine.server.model} package. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/given/storage/package-info.java b/server/src/testFixtures/java/io/spine/server/model/given/storage/package-info.java index 9b1f31feaa..36c3ff042e 100644 --- a/server/src/testFixtures/java/io/spine/server/model/given/storage/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/given/storage/package-info.java @@ -29,9 +29,9 @@ * in model tests. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.given.storage; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/handler/given/event/package-info.java b/server/src/testFixtures/java/io/spine/server/model/handler/given/event/package-info.java index eebb30b53f..cf6176d1bd 100644 --- a/server/src/testFixtures/java/io/spine/server/model/handler/given/event/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/handler/given/event/package-info.java @@ -31,9 +31,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.model.handler.given.event; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/model/handler/given/package-info.java b/server/src/testFixtures/java/io/spine/server/model/handler/given/package-info.java index 33f530065d..9ca5d114ec 100644 --- a/server/src/testFixtures/java/io/spine/server/model/handler/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/model/handler/given/package-info.java @@ -25,11 +25,11 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked @BoundedContext("MovingBot") package io.spine.server.model.handler.given; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/delivery/package-info.java b/server/src/testFixtures/java/io/spine/server/procman/given/delivery/package-info.java index a97f510fee..790e8c4d93 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/delivery/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/delivery/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.given.delivery; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/dispatch/package-info.java b/server/src/testFixtures/java/io/spine/server/procman/given/dispatch/package-info.java index 52aedf2a6a..9925b77f05 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/dispatch/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/dispatch/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.given.dispatch; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/package-info.java b/server/src/testFixtures/java/io/spine/server/procman/given/package-info.java index bf5cc2f5e9..e4dfcc59fc 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/pm/package-info.java b/server/src/testFixtures/java/io/spine/server/procman/given/pm/package-info.java index c9d17f4459..5010bb8963 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/pm/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/pm/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.given.pm; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/repo/RememberingSubscriber.java b/server/src/testFixtures/java/io/spine/server/procman/given/repo/RememberingSubscriber.java index 0f7d5c875f..c20d3af06b 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/repo/RememberingSubscriber.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/repo/RememberingSubscriber.java @@ -29,7 +29,7 @@ import io.spine.core.Subscribe; import io.spine.server.event.AbstractEventSubscriber; import io.spine.test.procman.event.PmTaskAdded; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper event subscriber which remembers an event message. diff --git a/server/src/testFixtures/java/io/spine/server/procman/given/repo/package-info.java b/server/src/testFixtures/java/io/spine/server/procman/given/repo/package-info.java index 1d98461074..43f59bda95 100644 --- a/server/src/testFixtures/java/io/spine/server/procman/given/repo/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/procman/given/repo/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for {@link io.spine.server.procman.ProcessManagerRepositoryTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.procman.given.repo; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/projection/given/cls/package-info.java b/server/src/testFixtures/java/io/spine/server/projection/given/cls/package-info.java index e5a60fa1b9..c9d1de8bc1 100644 --- a/server/src/testFixtures/java/io/spine/server/projection/given/cls/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/projection/given/cls/package-info.java @@ -28,9 +28,9 @@ * Test environment classes for {@link io.spine.server.projection.model.ProjectionClassTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.given.cls; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/projection/given/dispatch/package-info.java b/server/src/testFixtures/java/io/spine/server/projection/given/dispatch/package-info.java index 2a55c78c69..1217a72798 100644 --- a/server/src/testFixtures/java/io/spine/server/projection/given/dispatch/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/projection/given/dispatch/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.given.dispatch; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/projection/given/package-info.java b/server/src/testFixtures/java/io/spine/server/projection/given/package-info.java index 43eb892301..9da8becfea 100644 --- a/server/src/testFixtures/java/io/spine/server/projection/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/projection/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.projection.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/route/given/package-info.java b/server/src/testFixtures/java/io/spine/server/route/given/package-info.java index fcf5d6d5d1..6159de0fcb 100644 --- a/server/src/testFixtures/java/io/spine/server/route/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/route/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.route.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/route/given/sur/package-info.java b/server/src/testFixtures/java/io/spine/server/route/given/sur/package-info.java index da46e350eb..ab58053110 100644 --- a/server/src/testFixtures/java/io/spine/server/route/given/sur/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/route/given/sur/package-info.java @@ -30,10 +30,10 @@ @BoundedContext("Surrealism") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.route.given.sur; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/route/given/switchman/package-info.java b/server/src/testFixtures/java/io/spine/server/route/given/switchman/package-info.java index f327c173fb..a9b5389640 100644 --- a/server/src/testFixtures/java/io/spine/server/route/given/switchman/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/route/given/switchman/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.route.given.switchman; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/stand/given/Given.java b/server/src/testFixtures/java/io/spine/server/stand/given/Given.java index 84de99a77c..a694635545 100644 --- a/server/src/testFixtures/java/io/spine/server/stand/given/Given.java +++ b/server/src/testFixtures/java/io/spine/server/stand/given/Given.java @@ -40,7 +40,7 @@ import io.spine.test.projection.Project; import io.spine.test.projection.ProjectId; import io.spine.test.projection.event.PrjProjectCreated; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.Optional; diff --git a/server/src/testFixtures/java/io/spine/server/stand/given/StandTestEnv.java b/server/src/testFixtures/java/io/spine/server/stand/given/StandTestEnv.java index a8e2e819fa..570516d5ec 100644 --- a/server/src/testFixtures/java/io/spine/server/stand/given/StandTestEnv.java +++ b/server/src/testFixtures/java/io/spine/server/stand/given/StandTestEnv.java @@ -67,7 +67,7 @@ import io.spine.test.projection.ProjectId; import io.spine.testing.core.given.GivenUserId; import io.spine.type.TypeUrl; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/server/src/testFixtures/java/io/spine/server/stand/given/package-info.java b/server/src/testFixtures/java/io/spine/server/stand/given/package-info.java index 1302905aa5..d73808f871 100644 --- a/server/src/testFixtures/java/io/spine/server/stand/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/stand/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.stand.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/storage/given/TestColumnMapping.java b/server/src/testFixtures/java/io/spine/server/storage/given/TestColumnMapping.java index 8cc2400519..ba144196e4 100644 --- a/server/src/testFixtures/java/io/spine/server/storage/given/TestColumnMapping.java +++ b/server/src/testFixtures/java/io/spine/server/storage/given/TestColumnMapping.java @@ -32,7 +32,7 @@ import io.spine.server.storage.AbstractColumnMapping; import io.spine.server.storage.ColumnTypeMapping; import io.spine.test.entity.TaskView; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Defines a mapping where all types are mapped to a {@code String}. diff --git a/server/src/testFixtures/java/io/spine/server/storage/given/package-info.java b/server/src/testFixtures/java/io/spine/server/storage/given/package-info.java index e6b81c29f4..54c33b1596 100644 --- a/server/src/testFixtures/java/io/spine/server/storage/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/storage/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/storage/memory/given/package-info.java b/server/src/testFixtures/java/io/spine/server/storage/memory/given/package-info.java index 73864b9cb7..37230695b7 100644 --- a/server/src/testFixtures/java/io/spine/server/storage/memory/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/storage/memory/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage.memory.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/storage/system/given/package-info.java b/server/src/testFixtures/java/io/spine/server/storage/system/given/package-info.java index d40ecc12cb..c669adc71c 100644 --- a/server/src/testFixtures/java/io/spine/server/storage/system/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/storage/system/given/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.storage.system.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/trace/given/airport/package-info.java b/server/src/testFixtures/java/io/spine/server/trace/given/airport/package-info.java index c2caffa2bf..f32e4094f3 100644 --- a/server/src/testFixtures/java/io/spine/server/trace/given/airport/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/trace/given/airport/package-info.java @@ -26,10 +26,10 @@ @BoundedContext(AirportContext.NAME) @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.trace.given.airport; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/trace/given/package-info.java b/server/src/testFixtures/java/io/spine/server/trace/given/package-info.java index 0affb9a855..490e79edfa 100644 --- a/server/src/testFixtures/java/io/spine/server/trace/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/trace/given/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.trace.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/transport/memory/given/package-info.java b/server/src/testFixtures/java/io/spine/server/transport/memory/given/package-info.java index 8c52f7cbfb..77d0c8ca32 100644 --- a/server/src/testFixtures/java/io/spine/server/transport/memory/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/transport/memory/given/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.transport.memory.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/tuple/given/package-info.java b/server/src/testFixtures/java/io/spine/server/tuple/given/package-info.java index ae24372849..f65a94849d 100644 --- a/server/src/testFixtures/java/io/spine/server/tuple/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/tuple/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.tuple.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/server/type/given/package-info.java b/server/src/testFixtures/java/io/spine/server/type/given/package-info.java index 369855a764..4fe1c48b08 100644 --- a/server/src/testFixtures/java/io/spine/server/type/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/server/type/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.server.type.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/client/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/client/package-info.java index 75c37c3e74..0a0d0277de 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/client/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/client/package-info.java @@ -26,10 +26,10 @@ @BoundedContext("_System") @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given.client; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/command/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/command/package-info.java index 4c1af1fe9c..8f80e19cf8 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/command/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/command/package-info.java @@ -29,8 +29,8 @@ * {@link io.spine.system.server.CommandLifecycleAggregate CommandLog} tests. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given.command; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/diagnostics/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/diagnostics/package-info.java index 7d82e1299a..6fd6b1e016 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/diagnostics/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/diagnostics/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given.diagnostics; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/entity/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/entity/package-info.java index a025240e37..a873d3a626 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/entity/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/entity/package-info.java @@ -29,8 +29,8 @@ * {@link io.spine.system.server.EntityHistoryTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given.entity; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/package-info.java index 24ee87c481..7265fac86c 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/package-info.java @@ -29,8 +29,8 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/system/server/given/schedule/package-info.java b/server/src/testFixtures/java/io/spine/system/server/given/schedule/package-info.java index 2d34711770..5284648d67 100644 --- a/server/src/testFixtures/java/io/spine/system/server/given/schedule/package-info.java +++ b/server/src/testFixtures/java/io/spine/system/server/given/schedule/package-info.java @@ -28,8 +28,8 @@ * This package provides test environment for {@link io.spine.system.server.ScheduledCommandTest}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.system.server.given.schedule; import javax.annotation.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/test/client/package-info.java b/server/src/testFixtures/java/io/spine/test/client/package-info.java index 251768b306..6cf9491d4f 100644 --- a/server/src/testFixtures/java/io/spine/test/client/package-info.java +++ b/server/src/testFixtures/java/io/spine/test/client/package-info.java @@ -28,11 +28,11 @@ * Testing environment for {@link io.spine.client.ClientSpec}. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked @BoundedContext(ClientTestContext.USERS_NAME) package io.spine.test.client; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.core.BoundedContext; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/test/route/package-info.java b/server/src/testFixtures/java/io/spine/test/route/package-info.java index 59ef954ea7..9cba40c2b1 100644 --- a/server/src/testFixtures/java/io/spine/test/route/package-info.java +++ b/server/src/testFixtures/java/io/spine/test/route/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.test.route; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/server/src/testFixtures/java/io/spine/testdata/package-info.java b/server/src/testFixtures/java/io/spine/testdata/package-info.java index 3bf2220713..9d74772203 100644 --- a/server/src/testFixtures/java/io/spine/testdata/package-info.java +++ b/server/src/testFixtures/java/io/spine/testdata/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testdata; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-client/src/main/java/io/spine/testing/client/TestActorRequestFactory.java b/testutil-client/src/main/java/io/spine/testing/client/TestActorRequestFactory.java index 45e05e39ac..93b3bd9028 100644 --- a/testutil-client/src/main/java/io/spine/testing/client/TestActorRequestFactory.java +++ b/testutil-client/src/main/java/io/spine/testing/client/TestActorRequestFactory.java @@ -39,7 +39,7 @@ import io.spine.testing.core.given.GivenUserId; import io.spine.time.ZoneId; import io.spine.time.ZoneIds; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.time.Instant; diff --git a/testutil-client/src/main/java/io/spine/testing/client/grpc/package-info.java b/testutil-client/src/main/java/io/spine/testing/client/grpc/package-info.java index 9570c29d5e..60dd610e1a 100644 --- a/testutil-client/src/main/java/io/spine/testing/client/grpc/package-info.java +++ b/testutil-client/src/main/java/io/spine/testing/client/grpc/package-info.java @@ -29,9 +29,9 @@ * use gRPC for sending commands and querying the backend. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.client.grpc; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-client/src/main/java/io/spine/testing/client/package-info.java b/testutil-client/src/main/java/io/spine/testing/client/package-info.java index 6612d18ea6..ca8a31ced5 100644 --- a/testutil-client/src/main/java/io/spine/testing/client/package-info.java +++ b/testutil-client/src/main/java/io/spine/testing/client/package-info.java @@ -28,9 +28,9 @@ * This package provides utilities for testing client-side code. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.client; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-core/src/main/java/io/spine/testing/core/given/package-info.java b/testutil-core/src/main/java/io/spine/testing/core/given/package-info.java index c4e706a8ed..62fa9520de 100644 --- a/testutil-core/src/main/java/io/spine/testing/core/given/package-info.java +++ b/testutil-core/src/main/java/io/spine/testing/core/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.core.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/CommandSubject.java b/testutil-server/src/main/java/io/spine/testing/server/CommandSubject.java index 446a52d424..81185d3f9e 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/CommandSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/CommandSubject.java @@ -30,7 +30,7 @@ import com.google.common.truth.Subject; import io.spine.base.CommandMessage; import io.spine.core.Command; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.truth.Truth.assertAbout; diff --git a/testutil-server/src/main/java/io/spine/testing/server/EmittedMessageSubject.java b/testutil-server/src/main/java/io/spine/testing/server/EmittedMessageSubject.java index f0122493f3..d6a0471a40 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/EmittedMessageSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/EmittedMessageSubject.java @@ -37,8 +37,8 @@ import io.spine.core.Signal; import io.spine.protobuf.AnyPacker; import io.spine.type.SerializableMessage; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/testutil-server/src/main/java/io/spine/testing/server/EventSubject.java b/testutil-server/src/main/java/io/spine/testing/server/EventSubject.java index 7b07eb775b..b8b68183c0 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/EventSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/EventSubject.java @@ -30,7 +30,7 @@ import com.google.common.truth.Subject; import io.spine.base.EventMessage; import io.spine.core.Event; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.truth.Truth.assertAbout; diff --git a/testutil-server/src/main/java/io/spine/testing/server/TestEventFactory.java b/testutil-server/src/main/java/io/spine/testing/server/TestEventFactory.java index ffe4946144..7927c28c62 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/TestEventFactory.java +++ b/testutil-server/src/main/java/io/spine/testing/server/TestEventFactory.java @@ -40,7 +40,7 @@ import io.spine.server.type.CommandEnvelope; import io.spine.server.type.MessageEnvelope; import io.spine.testing.client.TestActorRequestFactory; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.protobuf.AnyPacker.pack; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java index a42cd1a337..1bf8eeaa39 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java @@ -33,7 +33,7 @@ import io.spine.testing.client.TestActorRequestFactory; import io.spine.time.ZoneId; import io.spine.time.ZoneIds; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static io.spine.validate.Validate.check; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBox.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBox.java index bd43e2dbac..d1a9e17d28 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBox.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBox.java @@ -61,7 +61,7 @@ import io.spine.testing.server.entity.EntitySubject; import io.spine.testing.server.query.QueryResultSubject; import io.spine.time.ZoneId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collection; import java.util.HashSet; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxClients.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxClients.java index 1a08daa510..8a31e89a51 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxClients.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxClients.java @@ -28,7 +28,7 @@ import io.spine.client.Client; import io.spine.core.TenantId; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/ClientFactory.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/ClientFactory.java index 8c4286bbdc..3d3fe4af74 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/ClientFactory.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/ClientFactory.java @@ -36,7 +36,7 @@ import io.spine.server.QueryService; import io.spine.server.SubscriptionService; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.util.ArrayList; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/ContextAwareTest.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/ContextAwareTest.java index 438c73a92b..4e6d8ff399 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/ContextAwareTest.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/ContextAwareTest.java @@ -29,7 +29,7 @@ import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper; import io.spine.base.CommandMessage; import io.spine.server.BoundedContextBuilder; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MtBlackBox.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MtBlackBox.java index 956d76655b..1b1baff7e6 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MtBlackBox.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MtBlackBox.java @@ -37,7 +37,7 @@ import io.spine.testing.server.blackbox.probe.CommandCollector; import io.spine.testing.server.blackbox.probe.EventCollector; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.function.Supplier; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/package-info.java index aca90f6206..f2f0ebb6dc 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/package-info.java @@ -37,9 +37,9 @@ * @see io.spine.testing.server.blackbox.BlackBox */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.blackbox; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/BlackboxProbe.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/BlackboxProbe.java index 4b67f55a1f..9a596c44af 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/BlackboxProbe.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/BlackboxProbe.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableSet; import io.spine.server.BoundedContext; import io.spine.server.event.EventDispatcher; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Set; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/UnsupportedCommandGuard.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/UnsupportedCommandGuard.java index 8f2a917b94..4dea4dd25a 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/UnsupportedCommandGuard.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/UnsupportedCommandGuard.java @@ -36,7 +36,7 @@ import io.spine.server.type.EventEnvelope; import io.spine.system.server.event.CommandErrored; import io.spine.testing.server.blackbox.BlackBox; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static io.spine.core.CommandValidationError.UNSUPPORTED_COMMAND_VALUE; import static io.spine.server.commandbus.CommandException.ATTR_COMMAND_TYPE_NAME; diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/package-info.java index afd6a40519..3a85173a57 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/probe/package-info.java @@ -30,10 +30,10 @@ */ @Internal @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.blackbox.probe; import com.google.errorprone.annotations.CheckReturnValue; import io.spine.annotation.Internal; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/entity/EntitySubject.java b/testutil-server/src/main/java/io/spine/testing/server/entity/EntitySubject.java index d52013449c..55639b5098 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/entity/EntitySubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/entity/EntitySubject.java @@ -35,7 +35,7 @@ import io.spine.core.Version; import io.spine.server.entity.Entity; import io.spine.server.entity.LifecycleFlags; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Fact.simpleFact; diff --git a/testutil-server/src/main/java/io/spine/testing/server/entity/EntityVersionSubject.java b/testutil-server/src/main/java/io/spine/testing/server/entity/EntityVersionSubject.java index 4642b395de..108666fd65 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/entity/EntityVersionSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/entity/EntityVersionSubject.java @@ -31,7 +31,7 @@ import com.google.common.truth.Subject; import com.google.common.truth.extensions.proto.ProtoSubject; import io.spine.core.Version; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; diff --git a/testutil-server/src/main/java/io/spine/testing/server/entity/IterableEntityVersionSubject.java b/testutil-server/src/main/java/io/spine/testing/server/entity/IterableEntityVersionSubject.java index 3348c90d3e..5185a92e1d 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/entity/IterableEntityVersionSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/entity/IterableEntityVersionSubject.java @@ -31,7 +31,7 @@ import com.google.common.truth.Subject; import com.google.common.truth.extensions.proto.IterableOfProtosSubject; import io.spine.core.Version; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.size; diff --git a/testutil-server/src/main/java/io/spine/testing/server/entity/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/entity/package-info.java index c71391ece0..9a69be0cc9 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/entity/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/entity/package-info.java @@ -28,9 +28,9 @@ * This package contains utilities for building test instances of the entities. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.entity; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/model/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/model/package-info.java index dbfc946190..465133ea0d 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/model/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/model/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.model; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/package-info.java index ee10dea699..89dd14c6d5 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/package-info.java @@ -28,9 +28,9 @@ * This package provides test utilities for testing Spine entities. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/query/ResponseStatusSubject.java b/testutil-server/src/main/java/io/spine/testing/server/query/ResponseStatusSubject.java index 5569e03f51..b9e83e327c 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/query/ResponseStatusSubject.java +++ b/testutil-server/src/main/java/io/spine/testing/server/query/ResponseStatusSubject.java @@ -32,7 +32,7 @@ import com.google.common.truth.extensions.proto.ProtoSubject; import io.spine.core.Status; import io.spine.core.Status.StatusCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; diff --git a/testutil-server/src/main/java/io/spine/testing/server/query/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/query/package-info.java index 8e3f6d658a..5cd63f9282 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/query/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/query/package-info.java @@ -29,9 +29,9 @@ * {@link io.spine.client.Query Query} execution. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.query; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/main/java/io/spine/testing/server/tenant/package-info.java b/testutil-server/src/main/java/io/spine/testing/server/tenant/package-info.java index 1773464a54..c3eb136d7b 100644 --- a/testutil-server/src/main/java/io/spine/testing/server/tenant/package-info.java +++ b/testutil-server/src/main/java/io/spine/testing/server/tenant/package-info.java @@ -25,9 +25,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.tenant; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/test/java/io/spine/testing/client/grpc/given/package-info.java b/testutil-server/src/test/java/io/spine/testing/client/grpc/given/package-info.java index 7ad8b86e42..214aaba3ea 100644 --- a/testutil-server/src/test/java/io/spine/testing/client/grpc/given/package-info.java +++ b/testutil-server/src/test/java/io/spine/testing/client/grpc/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.client.grpc.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbInitProcess.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbInitProcess.java index 3136749d78..4f63fbec33 100644 --- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbInitProcess.java +++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbInitProcess.java @@ -40,7 +40,7 @@ import io.spine.testing.server.blackbox.event.BbProjectInitialized; import io.spine.testing.server.blackbox.event.BbScrumMasterAssigned; import io.spine.testing.server.blackbox.event.BbTeamAssigned; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Optional; diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/package-info.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/package-info.java index 5067dd834b..3fed22b26d 100644 --- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/package-info.java +++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/package-info.java @@ -28,9 +28,9 @@ * This package provides test environment for black-box testing of server-side code. */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.blackbox.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/test/java/io/spine/testing/server/entity/given/package-info.java b/testutil-server/src/test/java/io/spine/testing/server/entity/given/package-info.java index 83d63b286a..278f05d8e2 100644 --- a/testutil-server/src/test/java/io/spine/testing/server/entity/given/package-info.java +++ b/testutil-server/src/test/java/io/spine/testing/server/entity/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.entity.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/test/java/io/spine/testing/server/given/package-info.java b/testutil-server/src/test/java/io/spine/testing/server/given/package-info.java index eed9ff86e3..61cf2ab2c8 100644 --- a/testutil-server/src/test/java/io/spine/testing/server/given/package-info.java +++ b/testutil-server/src/test/java/io/spine/testing/server/given/package-info.java @@ -29,9 +29,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; diff --git a/testutil-server/src/test/java/io/spine/testing/server/model/given/package-info.java b/testutil-server/src/test/java/io/spine/testing/server/model/given/package-info.java index 948274889b..8a97cfd881 100644 --- a/testutil-server/src/test/java/io/spine/testing/server/model/given/package-info.java +++ b/testutil-server/src/test/java/io/spine/testing/server/model/given/package-info.java @@ -30,9 +30,9 @@ */ @CheckReturnValue -@ParametersAreNonnullByDefault +@NullMarked package io.spine.testing.server.model.given; import com.google.errorprone.annotations.CheckReturnValue; -import javax.annotation.ParametersAreNonnullByDefault; +import org.jspecify.annotations.NullMarked; From 6c581cce7929618dd69ce9c603eb1dd0efeadbeb Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 18:51:23 +0100 Subject: [PATCH 03/13] Ignore all `.kotlin` directories instead of files in them --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 419020f113..2db5209494 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ .fleet/ # Kotlin temp directories. -**/.kotlin/** +**/.kotlin/ # IntelliJ IDEA modules and interim config files. *.iml From 7d55082bfd5af01e0c17d0b4c529785e520f77b2 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:17:07 +0100 Subject: [PATCH 04/13] Update `config` --- buildSrc/build.gradle.kts | 6 +- buildSrc/src/main/kotlin/BuildExtensions.kt | 18 +++- .../src/main/kotlin/DependencyResolution.kt | 8 +- .../src/main/kotlin/DocumentationSettings.kt | 58 +++++++++++++ buildSrc/src/main/kotlin/DokkaExts.kt | 87 +++++++++++-------- .../main/kotlin/compile-protobuf.gradle.kts | 2 +- .../src/main/kotlin/config-tester.gradle.kts | 2 +- .../kotlin/detekt-code-analysis.gradle.kts | 2 +- .../src/main/kotlin/dokka-for-java.gradle.kts | 18 ++-- .../main/kotlin/dokka-for-kotlin.gradle.kts | 18 ++-- .../spine/dependency/build/AnimalSniffer.kt | 2 +- .../io/spine/dependency/build/CheckStyle.kt | 2 +- .../dependency/build/CheckerFramework.kt | 2 +- .../kotlin/io/spine/dependency/build/Dokka.kt | 4 +- .../io/spine/dependency/build/FindBugs.kt | 2 +- .../io/spine/dependency/build/GradleDoctor.kt | 2 +- .../kotlin/io/spine/dependency/build/Ksp.kt | 2 +- .../spine/dependency/build/LicenseReport.kt | 2 +- .../io/spine/dependency/build/OsDetector.kt | 2 +- .../kotlin/io/spine/dependency/build/Pmd.kt | 11 +-- .../kotlin/io/spine/dependency/lib/Aedile.kt | 4 +- .../io/spine/dependency/lib/ApacheHttp.kt | 2 +- .../io/spine/dependency/lib/AppEngine.kt | 2 +- .../kotlin/io/spine/dependency/lib/Asm.kt | 2 +- .../io/spine/dependency/lib/BouncyCastle.kt | 2 +- .../io/spine/dependency/lib/Caffeine.kt | 4 +- .../kotlin/io/spine/dependency/lib/Clikt.kt | 4 +- .../io/spine/dependency/lib/CommonsCli.kt | 2 +- .../io/spine/dependency/lib/CommonsCodec.kt | 2 +- .../io/spine/dependency/lib/CommonsLogging.kt | 2 +- .../io/spine/dependency/lib/Coroutines.kt | 2 +- .../io/spine/dependency/lib/Firebase.kt | 2 +- .../kotlin/io/spine/dependency/lib/Flogger.kt | 2 +- .../io/spine/dependency/lib/GoogleApis.kt | 2 +- .../io/spine/dependency/lib/GoogleCloud.kt | 2 +- .../kotlin/io/spine/dependency/lib/Grpc.kt | 4 +- .../io/spine/dependency/lib/GrpcKotlin.kt | 4 +- .../kotlin/io/spine/dependency/lib/Gson.kt | 4 +- .../kotlin/io/spine/dependency/lib/Guava.kt | 4 +- .../io/spine/dependency/lib/HttpClient.kt | 2 +- .../io/spine/dependency/lib/IntelliJ.kt | 2 +- .../kotlin/io/spine/dependency/lib/J2ObjC.kt | 2 +- .../kotlin/io/spine/dependency/lib/Jackson.kt | 51 ++++++++--- .../io/spine/dependency/lib/JavaDiffUtils.kt | 2 +- .../kotlin/io/spine/dependency/lib/JavaJwt.kt | 2 +- .../io/spine/dependency/lib/JavaPoet.kt | 2 +- .../kotlin/io/spine/dependency/lib/JavaX.kt | 4 +- .../kotlin/io/spine/dependency/lib/Klaxon.kt | 2 +- .../io/spine/dependency/lib/KotlinSemver.kt | 4 +- .../kotlin/io/spine/dependency/lib/KotlinX.kt | 4 +- .../kotlin/io/spine/dependency/lib/Log4j2.kt | 2 +- .../kotlin/io/spine/dependency/lib/Netty.kt | 2 +- .../kotlin/io/spine/dependency/lib/Okio.kt | 2 +- .../kotlin/io/spine/dependency/lib/Plexus.kt | 2 +- .../io/spine/dependency/lib/Protobuf.kt | 6 +- .../kotlin/io/spine/dependency/lib/Roaster.kt | 4 +- .../kotlin/io/spine/dependency/lib/Slf4J.kt | 2 +- .../spine/dependency/local/ArtifactVersion.kt | 2 +- .../kotlin/io/spine/dependency/local/Base.kt | 4 +- .../io/spine/dependency/local/CoreJava.kt | 2 +- .../spine/dependency/local/ModelCompiler.kt | 2 +- .../io/spine/dependency/local/ProtoData.kt | 4 +- .../io/spine/dependency/local/ProtoTap.kt | 2 +- .../io/spine/dependency/local/Reflect.kt | 2 +- .../kotlin/io/spine/dependency/local/Text.kt | 2 +- .../io/spine/dependency/local/Validation.kt | 2 +- .../io/spine/dependency/test/AssertK.kt | 4 +- .../io/spine/dependency/test/Hamcrest.kt | 4 +- .../kotlin/io/spine/dependency/test/JUnit.kt | 8 +- .../kotlin/io/spine/dependency/test/Jacoco.kt | 4 +- .../kotlin/io/spine/dependency/test/Kover.kt | 4 +- .../io/spine/dependency/test/OpenTest4J.kt | 2 +- .../io/spine/dependency/test/SystemLambda.kt | 2 +- .../io/spine/dependency/test/TestKitTruth.kt | 2 +- .../kotlin/io/spine/dependency/test/Truth.kt | 4 +- .../kotlin/io/spine/docs/MarkdownDocument.kt | 2 +- .../src/main/kotlin/io/spine/gradle/Build.kt | 2 +- .../src/main/kotlin/io/spine/gradle/Clean.kt | 2 +- .../kotlin/io/spine/gradle/ConfigTester.kt | 2 +- .../io/spine/gradle/ProjectExtensions.kt | 4 +- .../main/kotlin/io/spine/gradle/RepoSlug.kt | 2 +- .../kotlin/io/spine/gradle/Repositories.kt | 2 +- .../main/kotlin/io/spine/gradle/RunBuild.kt | 2 +- .../main/kotlin/io/spine/gradle/RunGradle.kt | 2 +- .../main/kotlin/io/spine/gradle/Runtime.kt | 2 +- .../main/kotlin/io/spine/gradle/TaskName.kt | 2 +- .../kotlin/io/spine/gradle/VersionWriter.kt | 2 +- .../main/kotlin/io/spine/gradle/base/Tasks.kt | 2 +- .../io/spine/gradle/dart/DartContext.kt | 2 +- .../io/spine/gradle/dart/DartEnvironment.kt | 2 +- .../io/spine/gradle/dart/DartExtension.kt | 2 +- .../spine/gradle/dart/plugin/DartPlugins.kt | 2 +- .../io/spine/gradle/dart/plugin/Protobuf.kt | 2 +- .../kotlin/io/spine/gradle/dart/task/Build.kt | 2 +- .../io/spine/gradle/dart/task/DartTasks.kt | 2 +- .../spine/gradle/dart/task/IntegrationTest.kt | 2 +- .../io/spine/gradle/dart/task/Publish.kt | 2 +- .../io/spine/gradle/dokka/DokkaExtensions.kt | 2 +- .../gradle/dokka/TaskContainerExtensions.kt | 2 +- .../kotlin/io/spine/gradle/fs/LazyTempPath.kt | 2 +- .../main/kotlin/io/spine/gradle/git/Branch.kt | 2 +- .../kotlin/io/spine/gradle/git/Repository.kt | 2 +- .../kotlin/io/spine/gradle/git/UserInfo.kt | 2 +- .../spine/gradle/github/pages/AuthorEmail.kt | 2 +- .../github/pages/RepositoryExtensions.kt | 2 +- .../io/spine/gradle/github/pages/SshKey.kt | 2 +- .../io/spine/gradle/github/pages/TaskName.kt | 2 +- .../gradle/github/pages/UpdateGitHubPages.kt | 2 +- .../pages/UpdateGitHubPagesExtension.kt | 2 +- .../main/kotlin/io/spine/gradle/java/Tasks.kt | 2 +- .../kotlin/io/spine/gradle/javac/Javac.kt | 2 +- .../io/spine/gradle/javadoc/JavadocConfig.kt | 2 +- .../io/spine/gradle/javadoc/JavadocTag.kt | 2 +- .../gradle/javadoc/TaskContainerExtensions.kt | 2 +- .../spine/gradle/javascript/JsEnvironment.kt | 2 +- .../io/spine/gradle/javascript/JsExtension.kt | 2 +- .../io/spine/gradle/javascript/plugin/Idea.kt | 2 +- .../gradle/javascript/plugin/JsPlugins.kt | 2 +- .../io/spine/gradle/javascript/plugin/McJs.kt | 2 +- .../spine/gradle/javascript/task/Assemble.kt | 2 +- .../io/spine/gradle/javascript/task/Check.kt | 2 +- .../io/spine/gradle/javascript/task/Clean.kt | 2 +- .../gradle/javascript/task/IntegrationTest.kt | 2 +- .../spine/gradle/javascript/task/JsTasks.kt | 2 +- .../gradle/javascript/task/LicenseReport.kt | 2 +- .../spine/gradle/javascript/task/Publish.kt | 2 +- .../spine/gradle/javascript/task/Webpack.kt | 2 +- .../gradle/protobuf/ProtoTaskExtensions.kt | 3 - .../gradle/publish/CloudArtifactRegistry.kt | 2 +- .../io/spine/gradle/publish/CloudRepo.kt | 2 +- .../io/spine/gradle/publish/GitHubPackages.kt | 2 +- .../io/spine/gradle/publish/IncrementGuard.kt | 2 +- .../kotlin/io/spine/gradle/publish/JarDsl.kt | 2 +- .../io/spine/gradle/publish/ProtoExts.kt | 2 +- .../io/spine/gradle/publish/Publications.kt | 2 +- .../io/spine/gradle/publish/PublishingExts.kt | 2 +- .../spine/gradle/publish/PublishingRepos.kt | 2 +- .../gradle/report/coverage/CodebaseFilter.kt | 3 +- .../gradle/report/coverage/FileFilter.kt | 2 +- .../gradle/report/coverage/JacocoConfig.kt | 8 +- .../gradle/report/coverage/PathMarker.kt | 2 +- .../spine/gradle/report/coverage/TaskName.kt | 2 +- .../gradle/report/license/Configuration.kt | 2 +- .../gradle/report/license/LicenseReporter.kt | 12 +-- .../report/license/MarkdownReportRenderer.kt | 2 +- .../report/license/ModuleDataExtensions.kt | 2 +- .../io/spine/gradle/report/license/Paths.kt | 2 +- .../report/license/ProjectDependencies.kt | 2 +- .../io/spine/gradle/report/license/Tasks.kt | 2 +- .../spine/gradle/report/license/Template.kt | 2 +- .../gradle/report/pom/DependencyScope.kt | 2 +- .../gradle/report/pom/DependencyWriter.kt | 2 +- .../spine/gradle/report/pom/InceptionYear.kt | 2 +- .../gradle/report/pom/MarkupExtensions.kt | 2 +- .../gradle/report/pom/ModuleDependency.kt | 2 +- .../spine/gradle/report/pom/PomFormatting.kt | 2 +- .../spine/gradle/report/pom/PomGenerator.kt | 7 +- .../spine/gradle/report/pom/PomXmlWriter.kt | 2 +- .../gradle/report/pom/ProjectMetadata.kt | 2 +- .../spine/gradle/report/pom/SpineLicense.kt | 2 +- .../kotlin/io/spine/gradle/testing/Logging.kt | 2 +- .../io/spine/gradle/testing/Multiproject.kt | 2 +- .../kotlin/io/spine/gradle/testing/Tasks.kt | 9 +- .../main/kotlin/jacoco-kotlin-jvm.gradle.kts | 2 +- .../src/main/kotlin/pmd-settings.gradle.kts | 2 +- gradle.properties | 5 ++ 166 files changed, 407 insertions(+), 265 deletions(-) create mode 100644 buildSrc/src/main/kotlin/DocumentationSettings.kt diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 050edc5ab3..7a3f32f02d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -83,7 +83,7 @@ val kotlinVersion = "2.1.20" * Always use the same version as the one specified in [io.spine.dependency.lib.Guava]. * Otherwise, when testing Gradle plugins, clashes may occur. */ -val guavaVersion = "32.1.3-jre" +val guavaVersion = "33.4.8-jre" /** * The version of ErrorProne Gradle plugin. @@ -103,7 +103,7 @@ val errorPronePluginVersion = "4.1.0" * @see * Protobuf Gradle Plugins Releases */ -val protobufPluginVersion = "0.9.4" +val protobufPluginVersion = "0.9.5" /** * The version of Dokka Gradle Plugins. @@ -113,7 +113,7 @@ val protobufPluginVersion = "0.9.4" * @see * Dokka Releases */ -val dokkaVersion = "1.9.20" +val dokkaVersion = "2.0.0" /** * The version of Detekt Gradle Plugin. diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt index e5b46505a6..24dd0d4bed 100644 --- a/buildSrc/src/main/kotlin/BuildExtensions.kt +++ b/buildSrc/src/main/kotlin/BuildExtensions.kt @@ -221,13 +221,29 @@ fun Project.configureTaskDependencies() { } /** - * Obtains all modules names of which do not have `"-tests"` as the suffix. + * Obtains all modules that do not haveg names ending with the "-tests"` suffix. * * By convention, such modules are for integration tests and should be treated differently. */ val Project.productionModules: Iterable get() = rootProject.subprojects.filter { !it.name.contains("-tests") } +/** + * Obtains the names of the [productionModules]. + * + * The extension could be useful for excluding modules from standard publishing: + * ```kotlin + * spinePublishing { + * val customModule = "my-custom-module" + * modules = productionModuleNames.toSet().minus(customModule) + * modulesWithCustomPublishing = setOf(customModule) + * //... + * } + * ``` + */ +val Project.productionModuleNames: List + get() = productionModules.map { it.name } + /** * Sets the remote debug option for this [JavaExec] task. * diff --git a/buildSrc/src/main/kotlin/DependencyResolution.kt b/buildSrc/src/main/kotlin/DependencyResolution.kt index 490a5d7d3e..e25e8f68ec 100644 --- a/buildSrc/src/main/kotlin/DependencyResolution.kt +++ b/buildSrc/src/main/kotlin/DependencyResolution.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -29,6 +29,7 @@ import io.spine.dependency.build.CheckerFramework import io.spine.dependency.build.Dokka import io.spine.dependency.build.ErrorProne import io.spine.dependency.build.FindBugs +import io.spine.dependency.build.JSpecify import io.spine.dependency.lib.Asm import io.spine.dependency.lib.AutoCommon import io.spine.dependency.lib.AutoService @@ -97,6 +98,7 @@ private fun ResolutionStrategy.forceProductionDependencies() { FindBugs.annotations, Gson.lib, Guava.lib, + JSpecify.annotations, Kotlin.reflect, Kotlin.stdLib, Kotlin.stdLibCommon, @@ -145,8 +147,8 @@ private fun ResolutionStrategy.forceTransitiveDependencies() { Jackson.bom, Jackson.core, Jackson.databind, - Jackson.dataformatXml, - Jackson.dataformatYaml, + Jackson.DataFormat.xml, + Jackson.DataFormat.yaml, Jackson.moduleKotlin, JavaDiffUtils.lib, Kotlin.jetbrainsAnnotations, diff --git a/buildSrc/src/main/kotlin/DocumentationSettings.kt b/buildSrc/src/main/kotlin/DocumentationSettings.kt new file mode 100644 index 0000000000..b538faedfb --- /dev/null +++ b/buildSrc/src/main/kotlin/DocumentationSettings.kt @@ -0,0 +1,58 @@ +/* + * 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 + * + * 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 + * 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. + */ + +/** + * The documentation settings specific to this project. + * + * @see + * Dokka source link configuration + */ +@Suppress("ConstPropertyName") +object DocumentationSettings { + + /** + * Settings passed to Dokka for + * [sourceLink][[org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceLinkSpec] + */ + object SourceLink { + + /** + * The URL of the remote source code + * [location][org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceLinkSpec.remoteUrl]. + */ + const val url: String = "https://github.com/SpineEventEngine/base/tree/master/src" + + /** + * The suffix used to append the source code line number to the URL. + * + * The suffix depends on the online code repository. + * + * @see + * remoteLineSuffix + */ + const val lineSuffix: String = "#L" + } +} diff --git a/buildSrc/src/main/kotlin/DokkaExts.kt b/buildSrc/src/main/kotlin/DokkaExts.kt index ecfbd6683c..b141a228a9 100644 --- a/buildSrc/src/main/kotlin/DokkaExts.kt +++ b/buildSrc/src/main/kotlin/DokkaExts.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -36,13 +36,12 @@ import org.gradle.api.tasks.TaskContainer import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.Jar import org.gradle.kotlin.dsl.DependencyHandlerScope -import org.jetbrains.dokka.DokkaConfiguration -import org.jetbrains.dokka.base.DokkaBase -import org.jetbrains.dokka.base.DokkaBaseConfiguration -import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask import org.jetbrains.dokka.gradle.AbstractDokkaTask +import org.jetbrains.dokka.gradle.DokkaExtension import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.GradleDokkaSourceSetBuilder +import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier +import org.jetbrains.dokka.gradle.engine.plugins.DokkaHtmlPluginParameters /** * To generate the documentation as seen from Java perspective, the `kotlin-as-java` @@ -69,7 +68,7 @@ fun DependencyHandlerScope.useDokkaWithSpineExtensions() { private fun DependencyHandler.dokkaPlugin(dependencyNotation: Any): Dependency? = add("dokkaPlugin", dependencyNotation) -private fun Project.dokkaOutput(language: String): File { +internal fun Project.dokkaOutput(language: String): File { val lng = language.titleCaseFirstChar() return layout.buildDirectory.dir("docs/dokka$lng").get().asFile } @@ -93,51 +92,68 @@ fun Project.dokkaConfigFile(file: String): File { * @see * Dokka modifying frontend assets */ -fun AbstractDokkaTask.configureStyle() { - pluginConfiguration { - customStyleSheets = listOf(project.dokkaConfigFile("styles/custom-styles.css")) - customAssets = listOf(project.dokkaConfigFile("assets/logo-icon.svg")) - separateInheritedMembers = true - footerMessage = "Copyright ${LocalDate.now().year}, TeamDev" - } +fun DokkaHtmlPluginParameters.configureStyle(project: Project) { + customAssets.from(project.dokkaConfigFile("assets/logo-icon.svg")) + customStyleSheets.from(project.dokkaConfigFile("styles/custom-styles.css")) + footerMessage.set("Copyright ${LocalDate.now().year}, TeamDev") + separateInheritedMembers.set(true) + mergeImplicitExpectActualDeclarations.set(false) } -private fun AbstractDokkaLeafTask.configureFor(language: String) { - dokkaSourceSets.configureEach { - /** - * Configures links to the external Java documentation. - */ - jdkVersion.set(BuildSettings.javaVersion.asInt()) +private fun DokkaExtension.configureFor( + project: Project, + language: String, + sourceLinkRemoveUrl: String +) { + dokkaPublications.named("html") { + suppressInheritedMembers.set(true) + failOnWarning.set(true) + } - skipEmptyPackages.set(true) + dokkaSourceSets.named("main") { + val moduleDoc = "Module.md" + if (project.file(moduleDoc).exists()) { + includes.from(moduleDoc) + } + + // Please see Dokka docs for more details: + // https://kotlinlang.org/docs/dokka-gradle.html#source-link-configuration + sourceLink { + localDirectory.set(project.file("src/main/${language.lowercase()}")) + remoteUrl(sourceLinkRemoveUrl) + remoteLineSuffix.set(DocumentationSettings.SourceLink.lineSuffix) + } - includeNonPublic.set(true) + // Configures links to the external Java documentation. + jdkVersion.set(BuildSettings.javaVersion.asInt()) + skipEmptyPackages.set(true) documentedVisibilities.set( setOf( - DokkaConfiguration.Visibility.PUBLIC, - DokkaConfiguration.Visibility.PROTECTED + VisibilityModifier.Public, + VisibilityModifier.Protected ) ) } - outputDirectory.set(project.dokkaOutput(language)) - - configureStyle() + pluginsConfiguration.named("html") { this as DokkaHtmlPluginParameters + configureStyle(project) + } } /** * Configures this [DokkaTask] to accept only Kotlin files. */ -fun AbstractDokkaLeafTask.configureForKotlin() { - configureFor("kotlin") +fun DokkaExtension.configureForKotlin(project: Project, sourceLinkRemoteUrl: String) { + configureFor(project, "kotlin", sourceLinkRemoteUrl) } /** * Configures this [DokkaTask] to accept only Java files. */ -fun AbstractDokkaLeafTask.configureForJava() { - configureFor("java") +@Suppress("unused") +fun DokkaExtension.configureForJava(project: Project, sourceLinkRemoteUrl: String) { + configureFor(project, "java", sourceLinkRemoteUrl) } /** @@ -179,14 +195,17 @@ fun Project.dokkaKotlinJar(): TaskProvider = tasks.getOrCreate("dokkaKotlin } /** - * Tells if this task belongs to the execution graph which contains publishing tasks. + * Tells if this task belongs to the execution graph which contains + * the `publish` and `dokkaGenerate` tasks. * - * The task `"publishToMavenLocal"` is excluded from the check because it is a part of - * the local testing workflow. + * This predicate could be useful for disabling publishing tasks + * when doing, e.g., `publishToMavenLocal` for the purpose of the + * integration tests that (of course) do not test the documentation + * generation proces and its resuults. */ fun AbstractDokkaTask.isInPublishingGraph(): Boolean = project.gradle.taskGraph.allTasks.any { - it.name == "publish" + it.name == "publish" || it.name.contains("dokkaGenerate") } /** diff --git a/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts b/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts index 7de81c3c4b..4acbb8664a 100644 --- a/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts +++ b/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/config-tester.gradle.kts b/buildSrc/src/main/kotlin/config-tester.gradle.kts index c0cb50462e..21d31e3630 100644 --- a/buildSrc/src/main/kotlin/config-tester.gradle.kts +++ b/buildSrc/src/main/kotlin/config-tester.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/detekt-code-analysis.gradle.kts b/buildSrc/src/main/kotlin/detekt-code-analysis.gradle.kts index 503114d7a9..7b0ffd133e 100644 --- a/buildSrc/src/main/kotlin/detekt-code-analysis.gradle.kts +++ b/buildSrc/src/main/kotlin/detekt-code-analysis.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/dokka-for-java.gradle.kts b/buildSrc/src/main/kotlin/dokka-for-java.gradle.kts index 2c10701c54..6bab079156 100644 --- a/buildSrc/src/main/kotlin/dokka-for-java.gradle.kts +++ b/buildSrc/src/main/kotlin/dokka-for-java.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask +import org.jetbrains.dokka.gradle.DokkaTaskPartial plugins { id("org.jetbrains.dokka") // Cannot use `Dokka` dependency object here yet. @@ -35,9 +35,17 @@ dependencies { useDokkaWithSpineExtensions() } -tasks.withType().configureEach { - configureForJava() +afterEvaluate { + dokka { + configureForKotlin( + project, + DocumentationSettings.SourceLink.url + ) + } +} + +tasks.withType().configureEach { onlyIf { - (it as AbstractDokkaLeafTask).isInPublishingGraph() + isInPublishingGraph() } } diff --git a/buildSrc/src/main/kotlin/dokka-for-kotlin.gradle.kts b/buildSrc/src/main/kotlin/dokka-for-kotlin.gradle.kts index 73da35d8e1..c24135e164 100644 --- a/buildSrc/src/main/kotlin/dokka-for-kotlin.gradle.kts +++ b/buildSrc/src/main/kotlin/dokka-for-kotlin.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask +import org.jetbrains.dokka.gradle.DokkaTaskPartial plugins { id("org.jetbrains.dokka") // Cannot use `Dokka` dependency object here yet. @@ -34,9 +34,17 @@ dependencies { useDokkaWithSpineExtensions() } -tasks.withType().configureEach { - configureForKotlin() +afterEvaluate { + dokka { + configureForKotlin( + project, + DocumentationSettings.SourceLink.url + ) + } +} + +tasks.withType().configureEach { onlyIf { - (it as AbstractDokkaLeafTask).isInPublishingGraph() + isInPublishingGraph() } } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/AnimalSniffer.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/AnimalSniffer.kt index 9fe3a89263..825889613f 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/AnimalSniffer.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/AnimalSniffer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckStyle.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckStyle.kt index ab9a08add1..e1e3b2851a 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckStyle.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckStyle.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckerFramework.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckerFramework.kt index dd3f1fb839..5d2140ad5f 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckerFramework.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/CheckerFramework.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt index 41757db3fa..003bf587ff 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt @@ -35,7 +35,7 @@ object Dokka { * When changing the version, also change the version used in the * `buildSrc/build.gradle.kts`. */ - const val version = "1.9.20" + const val version = "2.0.0" object GradlePlugin { const val id = "org.jetbrains.dokka" @@ -78,7 +78,7 @@ object Dokka { object SpineExtensions { private const val group = "io.spine.tools" - const val version = "2.0.0-SNAPSHOT.6" + const val version = "2.0.0-SNAPSHOT.7" const val lib = "$group:spine-dokka-extensions:$version" } } diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/FindBugs.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/FindBugs.kt index ff99a09e02..98003b9836 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/FindBugs.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/FindBugs.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt index c1a6bc5754..89cfb341b1 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt index 991c6c3ca4..cb570a0392 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt @@ -33,7 +33,7 @@ package io.spine.dependency.build */ @Suppress("ConstPropertyName", "unused") object Ksp { - const val version = "2.1.20-1.0.31" + const val version = "2.1.20-2.0.0" const val id = "com.google.devtools.ksp" const val group = "com.google.devtools.ksp" const val symbolProcessingApi = "$group:symbol-processing-api:$version" diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt index cdbfc0416f..a4eb7548e7 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/OsDetector.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/OsDetector.kt index 76d2834238..5b479bf362 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/OsDetector.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/OsDetector.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/Pmd.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/Pmd.kt index 0ec075ec60..dd71b49304 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/build/Pmd.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/Pmd.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -31,12 +31,5 @@ package io.spine.dependency.build // https://github.com/pmd/pmd/releases @Suppress("unused", "ConstPropertyName") object Pmd { - /** - * This is the last version in the 6.x series. - * - * There's a major update to 7.x series. - * - * @see >) { * the generic parameter `T`. */ @Suppress("UNCHECKED_CAST") /* See the method docs. */ -fun Project.findTask(name: String): T { +fun Project.getTask(name: String): T { val task = this.tasks.findByName(name) ?: error("Unable to find a task named `$name` in the project `${this.name}`.") return task as T diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/RepoSlug.kt b/buildSrc/src/main/kotlin/io/spine/gradle/RepoSlug.kt index d7949a70f5..71fbac3752 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/RepoSlug.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/RepoSlug.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/Repositories.kt b/buildSrc/src/main/kotlin/io/spine/gradle/Repositories.kt index 585f7825d5..8ec449ea24 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/Repositories.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/Repositories.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/RunBuild.kt b/buildSrc/src/main/kotlin/io/spine/gradle/RunBuild.kt index 724c5950f7..aa2759dec1 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/RunBuild.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/RunBuild.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/RunGradle.kt b/buildSrc/src/main/kotlin/io/spine/gradle/RunGradle.kt index 0c77c0c501..8942630266 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/RunGradle.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/RunGradle.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt b/buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt index facaf78d09..c5b5f5464e 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/TaskName.kt b/buildSrc/src/main/kotlin/io/spine/gradle/TaskName.kt index 05ab252650..7c7abd129d 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/TaskName.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/TaskName.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/VersionWriter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/VersionWriter.kt index b24c202f41..d3d4323f8b 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/VersionWriter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/VersionWriter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/base/Tasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/base/Tasks.kt index f60b7c5f8a..c77b795601 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/base/Tasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/base/Tasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartContext.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartContext.kt index 6c192e58a5..c32c10f174 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartContext.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartContext.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartEnvironment.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartEnvironment.kt index 48883e17c9..4e4ae839c7 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartEnvironment.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartEnvironment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartExtension.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartExtension.kt index e0913b5d13..57a2bcfd29 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartExtension.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/DartExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/DartPlugins.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/DartPlugins.kt index 3d88bec023..9d76a77f9a 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/DartPlugins.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/DartPlugins.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/Protobuf.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/Protobuf.kt index 54cd9b01d7..bfd503fd13 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/Protobuf.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/Protobuf.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Build.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Build.kt index 97cdf51352..163747e8a5 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Build.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Build.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/DartTasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/DartTasks.kt index 656177b3e5..bc5e1e93ef 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/DartTasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/DartTasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/IntegrationTest.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/IntegrationTest.kt index 65ce4bb351..19f1f14716 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/IntegrationTest.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/IntegrationTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Publish.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Publish.kt index d52799ffa0..2f8df6b4c6 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Publish.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Publish.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dokka/DokkaExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dokka/DokkaExtensions.kt index 52ec7f30e2..727a0793fb 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dokka/DokkaExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dokka/DokkaExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/dokka/TaskContainerExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/dokka/TaskContainerExtensions.kt index 39d9dfb92d..02deead57f 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/dokka/TaskContainerExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/dokka/TaskContainerExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/fs/LazyTempPath.kt b/buildSrc/src/main/kotlin/io/spine/gradle/fs/LazyTempPath.kt index 3b3331805d..f6e177717a 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/fs/LazyTempPath.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/fs/LazyTempPath.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/git/Branch.kt b/buildSrc/src/main/kotlin/io/spine/gradle/git/Branch.kt index 1883677f3a..a10a65f817 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/git/Branch.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/git/Branch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/git/Repository.kt b/buildSrc/src/main/kotlin/io/spine/gradle/git/Repository.kt index 41a12b7099..55ce67f0c0 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/git/Repository.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/git/Repository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/git/UserInfo.kt b/buildSrc/src/main/kotlin/io/spine/gradle/git/UserInfo.kt index 43d8ab1a13..bc9f08d3af 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/git/UserInfo.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/git/UserInfo.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/AuthorEmail.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/AuthorEmail.kt index 0a11eb1205..f0d839f897 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/AuthorEmail.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/AuthorEmail.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/RepositoryExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/RepositoryExtensions.kt index 19021ae3d1..94ab6ac005 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/RepositoryExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/RepositoryExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/SshKey.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/SshKey.kt index 329e81114d..186c474621 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/SshKey.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/SshKey.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/TaskName.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/TaskName.kt index 77d4bc9e9c..f5e3bfc814 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/TaskName.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/TaskName.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPages.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPages.kt index bd1a1b28a3..e46a565f87 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPages.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPages.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPagesExtension.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPagesExtension.kt index 6ead318e33..90eebc2f63 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPagesExtension.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPagesExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/java/Tasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/java/Tasks.kt index e08e64aa2c..12d4d56cf6 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/java/Tasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/java/Tasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javac/Javac.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javac/Javac.kt index 933f5dae62..44223cb611 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javac/Javac.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javac/Javac.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocConfig.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocConfig.kt index 8f1a7f25d3..d2e4c90b74 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocConfig.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocConfig.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocTag.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocTag.kt index ec81567dbd..a6224a5330 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocTag.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocTag.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/TaskContainerExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/TaskContainerExtensions.kt index 9380e7db93..7e5b5178ea 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/TaskContainerExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/TaskContainerExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsEnvironment.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsEnvironment.kt index 38cc649054..c2dc68e41c 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsEnvironment.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsEnvironment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsExtension.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsExtension.kt index d593799640..69c3e26386 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsExtension.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Idea.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Idea.kt index 06a112aa2d..087dd25561 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Idea.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Idea.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/JsPlugins.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/JsPlugins.kt index 6e007df183..b478f649ae 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/JsPlugins.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/JsPlugins.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/McJs.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/McJs.kt index dbc5c42e8b..2efa4a432a 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/McJs.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/McJs.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Assemble.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Assemble.kt index b5ac3f0900..4b57a4e988 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Assemble.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Assemble.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Check.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Check.kt index 7a87f789d7..d25c3c2176 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Check.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Check.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Clean.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Clean.kt index 727553ea63..c5ff835489 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Clean.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Clean.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/IntegrationTest.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/IntegrationTest.kt index a8a61116b8..227e33edba 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/IntegrationTest.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/IntegrationTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/JsTasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/JsTasks.kt index 7d7f709ce8..3cf633585e 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/JsTasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/JsTasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/LicenseReport.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/LicenseReport.kt index a06ff01c55..c3b3a6ad84 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/LicenseReport.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/LicenseReport.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Publish.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Publish.kt index 9f9d570886..7d1baeae14 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Publish.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Publish.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Webpack.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Webpack.kt index 54b69ebcdc..7c82ad7a20 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Webpack.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Webpack.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt index 85ef9fcd23..68166696d1 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt @@ -105,13 +105,10 @@ private fun GenerateProtoTask.generatedDir(language: String = ""): File { fun GenerateProtoTask.setup() { builtins.maybeCreate("kotlin") setupDescriptorSetFileCreation() - doLast { copyGeneratedFiles() } - excludeProtocOutput() - setupKotlinCompile() dependOnProcessResourcesTask() makeDirsForIdeaModule() diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudArtifactRegistry.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudArtifactRegistry.kt index 37f6f23c8b..1cfa7c27dc 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudArtifactRegistry.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudArtifactRegistry.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudRepo.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudRepo.kt index b2410c3e32..7db15aa76c 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudRepo.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudRepo.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/GitHubPackages.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/GitHubPackages.kt index 3250bc2641..1072139dc5 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/GitHubPackages.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/GitHubPackages.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/IncrementGuard.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/IncrementGuard.kt index dbb69a7305..b6683faf99 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/IncrementGuard.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/IncrementGuard.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/JarDsl.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/JarDsl.kt index 8fe6071685..1371184325 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/JarDsl.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/JarDsl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/ProtoExts.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/ProtoExts.kt index 5b50fab5ad..874b7f9961 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/ProtoExts.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/ProtoExts.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/Publications.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/Publications.kt index 1ebe17de30..c9acef8223 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/Publications.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/Publications.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt index d85885f425..62c639bb69 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingRepos.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingRepos.kt index 41cc101a17..f383e68f0d 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingRepos.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingRepos.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/CodebaseFilter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/CodebaseFilter.kt index 59459d3d37..efdf6059be 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/CodebaseFilter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/CodebaseFilter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -29,7 +29,6 @@ package io.spine.gradle.report.coverage import com.google.errorprone.annotations.CanIgnoreReturnValue import io.spine.gradle.report.coverage.FileFilter.generatedOnly import java.io.File -import kotlin.streams.toList import org.gradle.api.Project import org.gradle.api.file.ConfigurableFileTree import org.gradle.api.file.FileTree diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileFilter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileFilter.kt index aa30c8a938..5b26cc7a64 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileFilter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileFilter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt index 826de01d06..5114add756 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -28,7 +28,7 @@ package io.spine.gradle.report.coverage import io.spine.dependency.test.Jacoco import io.spine.gradle.applyPlugin -import io.spine.gradle.findTask +import io.spine.gradle.getTask import io.spine.gradle.report.coverage.TaskName.check import io.spine.gradle.report.coverage.TaskName.copyReports import io.spine.gradle.report.coverage.TaskName.jacocoRootReport @@ -181,7 +181,7 @@ class JacocoConfig( private fun registerCopy(tasks: TaskContainer): TaskProvider { val everyExecData = mutableListOf() projects.forEach { project -> - val jacocoTestReport = project.findTask(jacocoTestReport.name) + val jacocoTestReport = project.getTask(jacocoTestReport.name) val executionData = jacocoTestReport.executionData everyExecData.add(executionData) } @@ -194,7 +194,7 @@ class JacocoConfig( rename { "${UUID.randomUUID()}.exec" } - dependsOn(projects.map { it.findTask(jacocoTestReport.name) }) + dependsOn(projects.map { it.getTask(jacocoTestReport.name) }) } return copyReports } diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/PathMarker.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/PathMarker.kt index 25d81fe129..26bb135641 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/PathMarker.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/PathMarker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/TaskName.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/TaskName.kt index 26ae433c04..7c0e386dd1 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/TaskName.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/TaskName.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Configuration.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Configuration.kt index dbc8f4305c..f6e06fdd2b 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Configuration.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Configuration.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/LicenseReporter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/LicenseReporter.kt index ed7fd9688c..ec86eb582d 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/LicenseReporter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/LicenseReporter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -30,7 +30,7 @@ import com.github.jk1.license.LicenseReportExtension import com.github.jk1.license.LicenseReportExtension.ALL import com.github.jk1.license.LicenseReportPlugin import io.spine.gradle.applyPlugin -import io.spine.gradle.findTask +import io.spine.gradle.getTask import java.io.File import org.gradle.api.Project import org.gradle.api.Task @@ -98,7 +98,7 @@ object LicenseReporter { } /** - * Tells to merge all per-project reports which were previously [generated][generateReportIn] + * Tells to merge all per-project reports that were previously [generated][generateReportIn] * for each of the subprojects of the root Gradle project. * * The merge result is placed according to [Paths]. @@ -109,10 +109,10 @@ object LicenseReporter { val rootProject = project.rootProject val mergeTask = rootProject.tasks.register(mergeTaskName) { val consolidationTask = this - val assembleTask = project.findTask("assemble") + val assembleTask = project.getTask("assemble") val sourceProjects: Iterable = sourceProjects(rootProject) sourceProjects.forEach { - val perProjectTask = it.findTask(projectTaskName) + val perProjectTask = it.getTask(projectTaskName) consolidationTask.dependsOn(perProjectTask) perProjectTask.dependsOn(assembleTask) } @@ -121,7 +121,7 @@ object LicenseReporter { } dependsOn(assembleTask) } - project.findTask("build") + project.getTask("build") .finalizedBy(mergeTask) } diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/MarkdownReportRenderer.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/MarkdownReportRenderer.kt index 5eecfe609a..b158210436 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/MarkdownReportRenderer.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/MarkdownReportRenderer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ModuleDataExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ModuleDataExtensions.kt index fc735a857e..0aca30faef 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ModuleDataExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ModuleDataExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Paths.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Paths.kt index 4a4fa2297d..975a73b0e2 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Paths.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Paths.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ProjectDependencies.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ProjectDependencies.kt index c1c18c27e1..d9e569cb1e 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ProjectDependencies.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/ProjectDependencies.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Tasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Tasks.kt index f88a58c871..05df91adb7 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Tasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Tasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Template.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Template.kt index e758bee6f4..adda37b841 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Template.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/license/Template.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyScope.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyScope.kt index cbe860ece3..1b4f47835e 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyScope.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt index eb6f304a3d..eda249365a 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/InceptionYear.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/InceptionYear.kt index 2e6894202c..cb25b3d680 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/InceptionYear.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/InceptionYear.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/MarkupExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/MarkupExtensions.kt index 750452d329..0612f2e42d 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/MarkupExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/MarkupExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ModuleDependency.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ModuleDependency.kt index 8b20a25556..3d72de1cde 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ModuleDependency.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ModuleDependency.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomFormatting.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomFormatting.kt index ddd284c1ef..ba673bb40f 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomFormatting.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomFormatting.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomGenerator.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomGenerator.kt index 9144e2f21d..48b3233271 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomGenerator.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomGenerator.kt @@ -68,8 +68,11 @@ object PomGenerator { fun applyTo(project: Project) { /** - * In some cases, the `base` plugin, which is by default is added by e.g. `java`, - * is not yet added. `base` plugin defines the `build` task. This generator needs it. + * In some cases, the `base` plugin, which by default is added by e.g. `java`, + * is not yet added. + * + * The `base` plugin defines the `build` task. + * This generator needs it. */ project.apply { plugin(BasePlugin::class.java) diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomXmlWriter.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomXmlWriter.kt index ccb5f3169f..53122196ae 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomXmlWriter.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomXmlWriter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ProjectMetadata.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ProjectMetadata.kt index b1e4e8a7db..ffb89a263f 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ProjectMetadata.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ProjectMetadata.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/SpineLicense.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/SpineLicense.kt index 05addfb0f5..114395e62d 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/SpineLicense.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/SpineLicense.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Logging.kt b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Logging.kt index 1defd9e2ff..6fb7eabca5 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Logging.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Logging.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Multiproject.kt b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Multiproject.kt index 32a19ddd47..1f5ed4963f 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Multiproject.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Multiproject.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Tasks.kt b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Tasks.kt index 7991450dff..30ac810eae 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/testing/Tasks.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/testing/Tasks.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. @@ -29,6 +29,7 @@ package io.spine.gradle.testing import org.gradle.api.tasks.TaskContainer import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.register +import org.gradle.kotlin.dsl.withType /** * Registers [slowTest][SlowTest] and [fastTest][FastTest] tasks in this [TaskContainer]. @@ -45,10 +46,10 @@ import org.gradle.kotlin.dsl.register */ @Suppress("unused") fun TaskContainer.registerTestTasks() { - withType(Test::class.java).configureEach { + withType().configureEach { filter { - // There could be cases with no matching tests. E.g. tests could be based on Kotest, - // which has custom task types and names. + // There could be cases with no matching tests. + // E.g., tests could be based on Kotest, which has custom task types and names. isFailOnNoMatchingTests = false includeTestsMatching("*Test") includeTestsMatching("*Spec") diff --git a/buildSrc/src/main/kotlin/jacoco-kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/jacoco-kotlin-jvm.gradle.kts index 3538024113..48fb126e92 100644 --- a/buildSrc/src/main/kotlin/jacoco-kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-kotlin-jvm.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/pmd-settings.gradle.kts b/buildSrc/src/main/kotlin/pmd-settings.gradle.kts index a3b089032c..0373ee0f6e 100644 --- a/buildSrc/src/main/kotlin/pmd-settings.gradle.kts +++ b/buildSrc/src/main/kotlin/pmd-settings.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/gradle.properties b/gradle.properties index a4ba1dcd8a..d8621e897c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,3 +26,8 @@ # Dokka plugin eats more memory than usual. Therefore, all builds should have enough. org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+UseParallelGC + +# Enables the Dokka migration mode from v1 to v2. +# For details please see: +# https://kotlinlang.org/docs/dokka-migration.html#enable-migration-helpers +org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers From 5f8473e0985413918347ebe594ca2f47b6bfb2e3 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:17:53 +0100 Subject: [PATCH 05/13] Update `config` --- .../io/spine/dependency/build/JSpecify.kt | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 buildSrc/src/main/kotlin/io/spine/dependency/build/JSpecify.kt diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/JSpecify.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/JSpecify.kt new file mode 100644 index 0000000000..d884ffbcd7 --- /dev/null +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/JSpecify.kt @@ -0,0 +1,40 @@ +/* + * 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 + * + * 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 + * 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.dependency.build + +/** + * An artifact of well-specified annotations to power static analysis + * checks and JVM language interop. Developed by consensus of the partner + * organizations listed at [the project site](https://jspecify.org). + * + * @see JSpecify at GitHub + */ +@Suppress("ConstPropertyName") +object JSpecify { + const val version = "1.0.0" + const val annotations = "org.jspecify:jspecify:$version" +} From a2dee6129f490ca9c83a153b4c5422d317b6215f Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:18:15 +0100 Subject: [PATCH 06/13] Update `config` --- buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt | 2 +- buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt | 2 +- buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt | 2 +- .../kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt | 2 +- .../kotlin/io/spine/gradle/report/coverage/FileExtension.kt | 2 +- .../kotlin/io/spine/gradle/report/coverage/FileExtensions.kt | 2 +- .../main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt index 0863dd3c63..a185892098 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt index cfcec70949..0f9a0f5cf5 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt index 8ae089bb3c..052a1aabee 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt index 48da884d8b..541504c110 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtension.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtension.kt index ddd6e9fdf1..ae4734c113 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtension.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtensions.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtensions.kt index 88d3f4094c..89c87890dc 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtensions.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt index 59a95cd76d..7c67a32ca4 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, 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. From 89ff533d7c508a6cba2c9f0f36489c7cc17e8619 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:21:51 +0100 Subject: [PATCH 07/13] Update `config` --- .idea/dictionaries/common.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.idea/dictionaries/common.xml b/.idea/dictionaries/common.xml index e62952a2b1..5e2d460ed3 100644 --- a/.idea/dictionaries/common.xml +++ b/.idea/dictionaries/common.xml @@ -24,6 +24,7 @@ handshaker hohpe idempotency + jspecify lempira liskov melnik @@ -66,4 +67,4 @@ yevsyukov - + \ No newline at end of file From d1f0e0f4708c4b5981c678cf4edf24aeec015346 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:22:32 +0100 Subject: [PATCH 08/13] Bump Jackson in `buildSrc` -> `2.18.3` --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 7a3f32f02d..8a07c77a01 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -53,7 +53,7 @@ repositories { * Please keep this value in sync with [io.spine.dependency.lib.Jackson.version]. * It is not a requirement but would be good in terms of consistency. */ -val jacksonVersion = "2.15.3" +val jacksonVersion = "2.18.3" /** * The version of Google Artifact Registry used by `buildSrc`. From 9c1a703544586c7cf58568121648dbedb7a730f3 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:22:50 +0100 Subject: [PATCH 09/13] Force `CoreJava.server` --- build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index a294625ca6..97759bc8a0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,7 @@ import io.spine.dependency.lib.KotlinPoet import io.spine.dependency.local.Base import io.spine.dependency.local.BaseTypes import io.spine.dependency.local.Change +import io.spine.dependency.local.CoreJava import io.spine.dependency.local.Logging import io.spine.dependency.local.ProtoData import io.spine.dependency.local.Reflect @@ -366,6 +367,7 @@ fun Subproject.forceConfigurations() { TestLib.lib, ToolBase.lib, ToolBase.pluginBase, + CoreJava.server, ProtoData.api, Grpc.core, From 3a5d7dcf0d43fc02b64a4c164b16b5f982f55a7a Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:23:01 +0100 Subject: [PATCH 10/13] Update `config` ref. --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index ed512da1e9..77dbae8e07 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit ed512da1e96e801278fa8c2531081c37c2260d97 +Subproject commit 77dbae8e07ad19ecf7166762edd14f754baab50f From a94954ace288139d4d6a51ef16662fff931da410 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 20:33:44 +0100 Subject: [PATCH 11/13] Bump Base -> `2.0.0-SNAPSHOT.311` --- buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt index 31cfc7bffd..403e92b7b2 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt @@ -33,8 +33,8 @@ package io.spine.dependency.local */ @Suppress("ConstPropertyName") object Base { - const val version = "2.0.0-SNAPSHOT.309" - const val versionForBuildScript = "2.0.0-SNAPSHOT.309" + const val version = "2.0.0-SNAPSHOT.311" + const val versionForBuildScript = "2.0.0-SNAPSHOT.311" const val group = Spine.group const val artifact = "spine-base" const val lib = "$group:$artifact:$version" From 66bb8e8b2dbbe05d4f5ff7fbd21954cb9f649d1d Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 23:32:06 +0100 Subject: [PATCH 12/13] Rollback gRPC Kotlin to `1.4.1` --- buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt b/buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt index a27e9716ba..1dcc7fe210 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt @@ -33,7 +33,7 @@ package io.spine.dependency.lib */ @Suppress("unused") object GrpcKotlin { - const val version = "1.4.2" + const val version = "1.4.1" const val stub = "io.grpc:grpc-kotlin-stub:$version" object ProtocPlugin { From 9e3556502a0537ea17dfa442a8bedca4ed4f1f66 Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Wed, 16 Apr 2025 23:42:16 +0100 Subject: [PATCH 13/13] Update `config` Also: * Sort out dependencies. --- build.gradle.kts | 4 +- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/BuildExtensions.kt | 4 ++ .../src/main/kotlin/DependencyResolution.kt | 1 - .../dependency/build/PluginPublishPlugin.kt | 42 +++++++++++++ .../io/spine/dependency/local/ProtoData.kt | 1 - .../kotlin/io/spine/dependency/test/JUnit.kt | 8 ++- .../io/spine/gradle/publish/PublishingExts.kt | 36 ++++++++--- .../src/main/kotlin/jvm-module.gradle.kts | 60 ++++++++++++------- config | 2 +- gradle.properties | 4 +- 11 files changed, 125 insertions(+), 39 deletions(-) create mode 100644 buildSrc/src/main/kotlin/io/spine/dependency/build/PluginPublishPlugin.kt diff --git a/build.gradle.kts b/build.gradle.kts index 97759bc8a0..12e252733b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -252,8 +252,6 @@ fun Subproject.defineDependencies() { errorprone(core) } implementation(Validation.runtime) - - testImplementation(JUnit.runner) testImplementation(TestLib.lib) } } @@ -346,7 +344,7 @@ fun Subproject.forceConfigurations() { .configureProtocPlugins()` method which sets the version from resources. */ Grpc.ProtocPlugin.artifact, Grpc.api, - JUnit.runner, + JUnit.bom, Coroutines.core, Coroutines.coreJvm, diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 8a07c77a01..c84155191e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -130,7 +130,7 @@ val kotestJvmPluginVersion = "0.4.10" /** * @see [io.spine.dependency.test.Kover] */ -val koverVersion = "0.7.2" +val koverVersion = "0.9.1" /** * The version of the Shadow Plugin. diff --git a/buildSrc/src/main/kotlin/BuildExtensions.kt b/buildSrc/src/main/kotlin/BuildExtensions.kt index 24dd0d4bed..993e47c8d9 100644 --- a/buildSrc/src/main/kotlin/BuildExtensions.kt +++ b/buildSrc/src/main/kotlin/BuildExtensions.kt @@ -29,6 +29,7 @@ import io.spine.dependency.build.ErrorProne import io.spine.dependency.build.GradleDoctor import io.spine.dependency.build.Ksp +import io.spine.dependency.build.PluginPublishPlugin import io.spine.dependency.lib.Protobuf import io.spine.dependency.local.McJava import io.spine.dependency.local.ProtoData @@ -150,6 +151,9 @@ val PluginDependenciesSpec.kover: PluginDependencySpec val PluginDependenciesSpec.ksp: PluginDependencySpec get() = id(Ksp.id).version(Ksp.version) +val PluginDependenciesSpec.`plugin-publish`: PluginDependencySpec + get() = id(PluginPublishPlugin.id).version(PluginPublishPlugin.version) + /** * Configures the dependencies between third-party Gradle tasks * and those defined via ProtoData and Spine Model Compiler. diff --git a/buildSrc/src/main/kotlin/DependencyResolution.kt b/buildSrc/src/main/kotlin/DependencyResolution.kt index e25e8f68ec..584e02fe4a 100644 --- a/buildSrc/src/main/kotlin/DependencyResolution.kt +++ b/buildSrc/src/main/kotlin/DependencyResolution.kt @@ -142,7 +142,6 @@ private fun ResolutionStrategy.forceTransitiveDependencies() { J2ObjC.annotations, JUnit.Platform.engine, JUnit.Platform.suiteApi, - JUnit.runner, Jackson.annotations, Jackson.bom, Jackson.core, diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/build/PluginPublishPlugin.kt b/buildSrc/src/main/kotlin/io/spine/dependency/build/PluginPublishPlugin.kt new file mode 100644 index 0000000000..12c28f80aa --- /dev/null +++ b/buildSrc/src/main/kotlin/io/spine/dependency/build/PluginPublishPlugin.kt @@ -0,0 +1,42 @@ +/* + * 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 + * + * 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 + * 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. + */ + +@file:Suppress("unused") + +package io.spine.dependency.build + +/** + * The Gradle plugin for publishing Gradle plugins to the Gradle Plugin Portal. + * + * @see + * The plugin page at the Portal + * @see Publishing Rules + */ +@Suppress("ConstPropertyName") +object PluginPublishPlugin { + const val version = "1.3.1" + const val id = "com.gradle.plugin-publish" +} diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt index c42eb7c148..1f32d629d7 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt @@ -55,7 +55,6 @@ package io.spine.dependency.local "unused" /* Some subprojects do not use ProtoData directly. */, "ConstPropertyName" /* We use custom convention for artifact properties. */, "MemberVisibilityCanBePrivate" /* The properties are used directly by other subprojects. */, - "KDocUnresolvedReference" /* Referencing private properties in constructor KDoc. */ ) object ProtoData { const val pluginGroup = Spine.group diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt b/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt index 18e47975fd..4fbbdba649 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt @@ -29,7 +29,7 @@ package io.spine.dependency.test // https://junit.org/junit5/ @Suppress("unused", "ConstPropertyName") object JUnit { - const val version = "5.12.2" + const val version = "5.11.4" private const val legacyVersion = "4.13.1" // https://github.com/apiguardian-team/apiguardian @@ -47,14 +47,16 @@ object JUnit { ) const val bom = "org.junit:junit-bom:$version" - const val runner = "org.junit.jupiter:junit-jupiter-engine:$version" +// const val runner = "org.junit.jupiter:junit-jupiter-runner:$version" + const val engine = "org.junit.jupiter:junit-jupiter-engine:$version" + const val launcher = "org.junit.jupiter:junit-jupiter-launcher:$version" const val params = "org.junit.jupiter:junit-jupiter-params:$version" const val pioneer = "org.junit-pioneer:junit-pioneer:$pioneerVersion" object Platform { // https://junit.org/junit5/ - const val version = "1.12.2" + const val version = "1.11.4" internal const val group = "org.junit.platform" const val commons = "$group:junit-platform-commons:$version" const val launcher = "$group:junit-platform-launcher:$version" diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt index 62c639bb69..fd590c1fef 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt @@ -141,13 +141,36 @@ private fun TaskContainer.getOrCreatePublishTask(): TaskProvider = } private fun TaskContainer.registerCheckCredentialsTask( - destinations: Set -): TaskProvider = - register("checkCredentials") { - doLast { - destinations.forEach { it.ensureCredentials(project) } - } + destinations: Set, +): TaskProvider { + val checkCredentials = "checkCredentials" + try { + // The result of this call is ignored intentionally. + // + // We expect this line to fail with the exception + // in case the task with this name is NOT registered. + // + // Otherwise, we need to replace the existing task + // to avoid checking the credentials + // for some previously asked `destinations`. + named(checkCredentials) + val toConfigure = replace(checkCredentials) + toConfigure.doLastCredentialsCheck(destinations) + return named(checkCredentials) + } catch (e: Exception) { + return register(checkCredentials) { doLastCredentialsCheck(destinations) } } +} + +private fun Task.doLastCredentialsCheck(destinations: Set) { + doLast { + val destinationsStr = destinations.joinToString(", ") { it.name } + logger.debug( + "Project '${project.name}': checking the credentials for repos: $destinationsStr." + ) + destinations.forEach { it.ensureCredentials(project) } + } +} private fun Repository.ensureCredentials(project: Project) { val credentials = credentials(project) @@ -275,4 +298,3 @@ internal fun Project.artifacts(jarFlags: JarFlags): Set> { return tasks } - diff --git a/buildSrc/src/main/kotlin/jvm-module.gradle.kts b/buildSrc/src/main/kotlin/jvm-module.gradle.kts index 5b1577ebd4..c9ba3849a1 100644 --- a/buildSrc/src/main/kotlin/jvm-module.gradle.kts +++ b/buildSrc/src/main/kotlin/jvm-module.gradle.kts @@ -28,6 +28,7 @@ import BuildSettings.javaVersion import io.spine.dependency.build.CheckerFramework import io.spine.dependency.build.Dokka import io.spine.dependency.build.ErrorProne +import io.spine.dependency.build.FindBugs import io.spine.dependency.lib.Guava import io.spine.dependency.lib.JavaX import io.spine.dependency.lib.Protobuf @@ -37,6 +38,7 @@ import io.spine.dependency.local.TestLib import io.spine.dependency.test.JUnit import io.spine.dependency.test.Jacoco import io.spine.dependency.test.Kotest +import io.spine.dependency.test.Truth import io.spine.gradle.checkstyle.CheckStyleConfig import io.spine.gradle.github.pages.updateGitHubPages import io.spine.gradle.javac.configureErrorProne @@ -103,14 +105,20 @@ fun Module.configureKotlin(javaVersion: JavaLanguageVersion) { } } - kover { - useJacoco(version = Jacoco.version) + // See: + // https://github.com/Kotlin/kotlinx-kover?tab=readme-ov-file#to-create-report-combining-coverage-info-from-different-gradle-projects + // https://github.com/Kotlin/kotlinx-kover/blob/main/kover-gradle-plugin/examples/jvm/merged/build.gradle.kts + rootProject.dependencies { + kover(this) } - koverReport { - defaults { - xml { - onCheck = true + kover { + useJacoco(version = Jacoco.version) + reports { + total { + xml { + onCheck = true + } } } } @@ -129,22 +137,35 @@ fun Module.addDependencies() = dependencies { Protobuf.libs.forEach { api(it) } api(Guava.lib) - compileOnlyApi(CheckerFramework.annotations) - compileOnlyApi(JavaX.annotations) - ErrorProne.annotations.forEach { compileOnlyApi(it) } + dependencies { + errorprone(ErrorProne.core) - implementation(Logging.lib) + compileOnlyApi(FindBugs.annotations) + compileOnlyApi(CheckerFramework.annotations) + ErrorProne.annotations.forEach { compileOnlyApi(it) } - testImplementation(Guava.testLib) - testImplementation(JUnit.runner) - testImplementation(JUnit.pioneer) - JUnit.api.forEach { testImplementation(it) } + testImplementation(Guava.testLib) + testImplementation(Kotest.assertions) + JUnit.api.forEach { testImplementation(it) } + Truth.libs.forEach { testImplementation(it) } + testRuntimeOnly(JUnit.engine) + } - testImplementation(TestLib.lib) - testImplementation(Kotest.frameworkEngine) - testImplementation(Kotest.datatest) - testImplementation(Kotest.runnerJUnit5Jvm) - testImplementation(JUnit.runner) +// compileOnlyApi(CheckerFramework.annotations) +// ErrorProne.annotations.forEach { compileOnlyApi(it) } +// +// implementation(Logging.lib) +// +// testImplementation(Guava.testLib) +// testImplementation(Kotest.assertions) +// JUnit.api.forEach { testImplementation(it) } +// Truth.libs.forEach { testImplementation(it) } +// testRuntimeOnly(JUnit.engine) +// +// testImplementation(TestLib.lib) +// testImplementation(Kotest.frameworkEngine) +// testImplementation(Kotest.datatest) +// testImplementation(Kotest.runnerJUnit5Jvm) } fun Module.forceConfigurations() { @@ -155,7 +176,6 @@ fun Module.forceConfigurations() { resolutionStrategy { force( JUnit.bom, - JUnit.runner, Dokka.BasePlugin.lib, Reflect.lib, ) diff --git a/config b/config index 77dbae8e07..4f637da209 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 77dbae8e07ad19ecf7166762edd14f754baab50f +Subproject commit 4f637da2095e4fdff7e4ca713984d8263b38254d diff --git a/gradle.properties b/gradle.properties index d8621e897c..39f9075c4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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