From 750acb3203fb7334f97b00e6cf3466a3c4419779 Mon Sep 17 00:00:00 2001 From: Gregorius Soedharmo Date: Mon, 27 Feb 2023 23:12:44 +0700 Subject: [PATCH] Revert obsolete DData constructor changes (#6451) * Remove obsolete methods from Akka.DistributedData * Revert commit, obsolete attribute is too recent --- .../ReplicatorSettings.cs | 34 +++++++++++++++++++ ...c.ApproveDistributedData.Core.verified.txt | 3 ++ ...ApproveDistributedData.DotNet.verified.txt | 3 ++ ...ec.ApproveDistributedData.Net.verified.txt | 3 ++ 4 files changed, 43 insertions(+) diff --git a/src/contrib/cluster/Akka.DistributedData/ReplicatorSettings.cs b/src/contrib/cluster/Akka.DistributedData/ReplicatorSettings.cs index f1cd8651c0f..81d96e8f795 100644 --- a/src/contrib/cluster/Akka.DistributedData/ReplicatorSettings.cs +++ b/src/contrib/cluster/Akka.DistributedData/ReplicatorSettings.cs @@ -166,6 +166,40 @@ public static ReplicatorSettings Create(Config config) /// public bool VerboseDebugLogging { get; } + [Obsolete("Use constructor with `verboseDebugLogging` argument. Obsolete since v1.5.0-alpha2")] + public ReplicatorSettings(string role, + TimeSpan gossipInterval, + TimeSpan notifySubscribersInterval, + int maxDeltaElements, + string dispatcher, + TimeSpan pruningInterval, + TimeSpan maxPruningDissemination, + IImmutableSet durableKeys, + Props durableStoreProps, + TimeSpan pruningMarkerTimeToLive, + TimeSpan durablePruningMarkerTimeToLive, + int maxDeltaSize, + bool restartReplicatorOnFailure, + bool preferOldest) : this( + role, + gossipInterval, + notifySubscribersInterval, + maxDeltaElements, + dispatcher, + pruningInterval, + maxPruningDissemination, + durableKeys, + durableStoreProps, + pruningMarkerTimeToLive, + durablePruningMarkerTimeToLive, + maxDeltaSize, + restartReplicatorOnFailure, + preferOldest, + false + ) + { + } + public ReplicatorSettings(string role, TimeSpan gossipInterval, TimeSpan notifySubscribersInterval, diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Core.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Core.verified.txt index 4ab52ca0df8..806a4dc53d9 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Core.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Core.verified.txt @@ -773,6 +773,9 @@ namespace Akka.DistributedData } public sealed class ReplicatorSettings { + [System.ObsoleteAttribute("Use constructor with `verboseDebugLogging` argument. Obsolete since v1.5.0-alpha2" + + "")] + public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest) { } public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest, bool verboseDebugLogging) { } public string Dispatcher { get; } public System.Collections.Immutable.IImmutableSet DurableKeys { get; } diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.DotNet.verified.txt index 562ca36a989..c8372f709ba 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.DotNet.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.DotNet.verified.txt @@ -773,6 +773,9 @@ namespace Akka.DistributedData } public sealed class ReplicatorSettings { + [System.ObsoleteAttribute("Use constructor with `verboseDebugLogging` argument. Obsolete since v1.5.0-alpha2" + + "")] + public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest) { } public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest, bool verboseDebugLogging) { } public string Dispatcher { get; } public System.Collections.Immutable.IImmutableSet DurableKeys { get; } diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Net.verified.txt index 4ab52ca0df8..806a4dc53d9 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Net.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveDistributedData.Net.verified.txt @@ -773,6 +773,9 @@ namespace Akka.DistributedData } public sealed class ReplicatorSettings { + [System.ObsoleteAttribute("Use constructor with `verboseDebugLogging` argument. Obsolete since v1.5.0-alpha2" + + "")] + public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest) { } public ReplicatorSettings(string role, System.TimeSpan gossipInterval, System.TimeSpan notifySubscribersInterval, int maxDeltaElements, string dispatcher, System.TimeSpan pruningInterval, System.TimeSpan maxPruningDissemination, System.Collections.Immutable.IImmutableSet durableKeys, Akka.Actor.Props durableStoreProps, System.TimeSpan pruningMarkerTimeToLive, System.TimeSpan durablePruningMarkerTimeToLive, int maxDeltaSize, bool restartReplicatorOnFailure, bool preferOldest, bool verboseDebugLogging) { } public string Dispatcher { get; } public System.Collections.Immutable.IImmutableSet DurableKeys { get; }