Remove obsolete methods and properties from Akka.Cluster (#6445)

akkadotnet · Feb 27, 2023 · d25b669 · d25b669
1 parent 9c6501c
commit d25b669
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 111 deletions.
diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.Core.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.Core.verified.txt
@@ -193,8 +193,6 @@ namespace Akka.Cluster
         public bool AllowWeaklyUpMembers { get; }
         public Akka.Util.AppVersion AppVersion { get; }
         public System.Nullable<System.TimeSpan> AutoDownUnreachableAfter { get; }
-        [System.ObsoleteAttribute("Use Cluster.DowningProvider.DownRemovalMargin [1.1.2]")]
-        public System.TimeSpan DownRemovalMargin { get; }
         public System.Type DowningProviderType { get; }
         public Akka.Configuration.Config FailureDetectorConfig { get; }
         public string FailureDetectorImplementationClass { get; }
@@ -352,10 +350,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterGroupSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, System.Collections.Generic.IEnumerable<string> routeesPaths) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, string useRole, System.Collections.Immutable.ImmutableHashSet<string> routeesPaths) { }
         public ClusterRouterGroupSettings(int totalInstances, System.Collections.Generic.IEnumerable<string> routeesPaths, bool allowLocalRoutees, string useRole = null) { }
         public System.Collections.Generic.IEnumerable<string> RouteesPaths { get; }
         public static Akka.Cluster.Routing.ClusterRouterGroupSettings FromConfig(Akka.Configuration.Config config) { }
@@ -378,10 +372,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterPoolSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, int maxInstancesPerNode) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, string useRole, int maxInstancesPerNode) { }
         public ClusterRouterPoolSettings(int totalInstances, int maxInstancesPerNode, bool allowLocalRoutees, string useRole = null) { }
         public int MaxInstancesPerNode { get; }
         public override bool Equals(object obj) { }
@@ -406,10 +396,6 @@ namespace Akka.Cluster.SBR
     }
     public sealed class LeaseMajoritySettings
     {
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role) { }
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role, string leaseName) { }
         public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, System.TimeSpan releaseAfter, string role, string leaseName) { }
         public System.TimeSpan AcquireLeaseDelayForMinority { get; }
         public string LeaseImplementation { get; }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.DotNet.verified.txt
@@ -193,8 +193,6 @@ namespace Akka.Cluster
         public bool AllowWeaklyUpMembers { get; }
         public Akka.Util.AppVersion AppVersion { get; }
         public System.Nullable<System.TimeSpan> AutoDownUnreachableAfter { get; }
-        [System.ObsoleteAttribute("Use Cluster.DowningProvider.DownRemovalMargin [1.1.2]")]
-        public System.TimeSpan DownRemovalMargin { get; }
         public System.Type DowningProviderType { get; }
         public Akka.Configuration.Config FailureDetectorConfig { get; }
         public string FailureDetectorImplementationClass { get; }
@@ -352,10 +350,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterGroupSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, System.Collections.Generic.IEnumerable<string> routeesPaths) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, string useRole, System.Collections.Immutable.ImmutableHashSet<string> routeesPaths) { }
         public ClusterRouterGroupSettings(int totalInstances, System.Collections.Generic.IEnumerable<string> routeesPaths, bool allowLocalRoutees, string useRole = null) { }
         public System.Collections.Generic.IEnumerable<string> RouteesPaths { get; }
         public static Akka.Cluster.Routing.ClusterRouterGroupSettings FromConfig(Akka.Configuration.Config config) { }
@@ -378,10 +372,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterPoolSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, int maxInstancesPerNode) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, string useRole, int maxInstancesPerNode) { }
         public ClusterRouterPoolSettings(int totalInstances, int maxInstancesPerNode, bool allowLocalRoutees, string useRole = null) { }
         public int MaxInstancesPerNode { get; }
         public override bool Equals(object obj) { }
@@ -406,10 +396,6 @@ namespace Akka.Cluster.SBR
     }
     public sealed class LeaseMajoritySettings
     {
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role) { }
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role, string leaseName) { }
         public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, System.TimeSpan releaseAfter, string role, string leaseName) { }
         public System.TimeSpan AcquireLeaseDelayForMinority { get; }
         public string LeaseImplementation { get; }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCluster.Net.verified.txt
@@ -193,8 +193,6 @@ namespace Akka.Cluster
         public bool AllowWeaklyUpMembers { get; }
         public Akka.Util.AppVersion AppVersion { get; }
         public System.Nullable<System.TimeSpan> AutoDownUnreachableAfter { get; }
-        [System.ObsoleteAttribute("Use Cluster.DowningProvider.DownRemovalMargin [1.1.2]")]
-        public System.TimeSpan DownRemovalMargin { get; }
         public System.Type DowningProviderType { get; }
         public Akka.Configuration.Config FailureDetectorConfig { get; }
         public string FailureDetectorImplementationClass { get; }
@@ -352,10 +350,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterGroupSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, System.Collections.Generic.IEnumerable<string> routeesPaths) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, string useRole, System.Collections.Immutable.ImmutableHashSet<string> routeesPaths) { }
         public ClusterRouterGroupSettings(int totalInstances, System.Collections.Generic.IEnumerable<string> routeesPaths, bool allowLocalRoutees, string useRole = null) { }
         public System.Collections.Generic.IEnumerable<string> RouteesPaths { get; }
         public static Akka.Cluster.Routing.ClusterRouterGroupSettings FromConfig(Akka.Configuration.Config config) { }
@@ -378,10 +372,6 @@ namespace Akka.Cluster.Routing
     }
     public sealed class ClusterRouterPoolSettings : Akka.Cluster.Routing.ClusterRouterSettingsBase
     {
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, int maxInstancesPerNode) { }
-        [System.ObsoleteAttribute("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, string useRole, int maxInstancesPerNode) { }
         public ClusterRouterPoolSettings(int totalInstances, int maxInstancesPerNode, bool allowLocalRoutees, string useRole = null) { }
         public int MaxInstancesPerNode { get; }
         public override bool Equals(object obj) { }
@@ -406,10 +396,6 @@ namespace Akka.Cluster.SBR
     }
     public sealed class LeaseMajoritySettings
     {
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role) { }
-        [System.ObsoleteAttribute()]
-        public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, string role, string leaseName) { }
         public LeaseMajoritySettings(string leaseImplementation, System.TimeSpan acquireLeaseDelayForMinority, System.TimeSpan releaseAfter, string role, string leaseName) { }
         public System.TimeSpan AcquireLeaseDelayForMinority { get; }
         public string LeaseImplementation { get; }

diff --git a/src/core/Akka.Cluster/ClusterSettings.cs b/src/core/Akka.Cluster/ClusterSettings.cs
@@ -256,11 +256,7 @@ TimeSpan GetWeaklyUpDuration()
         /// </summary>
         public ImmutableDictionary<string, int> MinNrOfMembersOfRole { get; }
 
-        /// <summary>
-        /// Obsolete. Use <see cref="P:Cluster.DowningProvider.DownRemovalMargin"/>.
-        /// </summary>
-        [Obsolete("Use Cluster.DowningProvider.DownRemovalMargin [1.1.2]")]
-        public TimeSpan DownRemovalMargin { get; }
+        internal TimeSpan DownRemovalMargin { get; }
 
         /// <summary>
         /// Determine whether or not to log heartbeat message in verbose mode.

diff --git a/src/core/Akka.Cluster/Routing/ClusterRoutingConfig.cs b/src/core/Akka.Cluster/Routing/ClusterRoutingConfig.cs
@@ -22,33 +22,6 @@ namespace Akka.Cluster.Routing
     /// </summary>
     public sealed class ClusterRouterGroupSettings : ClusterRouterSettingsBase
     {
-        /// <summary>
-        /// Obsolete. This constructor is no longer applicable.
-        /// </summary>
-        /// <param name="totalInstances">N/A</param>
-        /// <param name="allowLocalRoutees">N/A</param>
-        /// <param name="routeesPaths">N/A</param>
-        [Obsolete("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, IEnumerable<string> routeesPaths)
-            : this(totalInstances, routeesPaths, allowLocalRoutees, null)
-        {
-
-        }
-
-        /// <summary>
-        /// Obsolete. This constructor is no longer applicable.
-        /// </summary>
-        /// <param name="totalInstances">N/A</param>
-        /// <param name="allowLocalRoutees">N/A</param>
-        /// <param name="useRole">N/A</param>
-        /// <param name="routeesPaths">N/A</param>
-        [Obsolete("This method is deprecated [1.1.0]")]
-        public ClusterRouterGroupSettings(int totalInstances, bool allowLocalRoutees, string useRole, ImmutableHashSet<string> routeesPaths)
-            : this(totalInstances, routeesPaths, allowLocalRoutees, useRole)
-        {
-
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ClusterRouterGroupSettings"/> class.
         /// </summary>
@@ -108,31 +81,6 @@ public static ClusterRouterGroupSettings FromConfig(Config config)
     /// </summary>
     public sealed class ClusterRouterPoolSettings : ClusterRouterSettingsBase
     {
-        /// <summary>
-        /// Obsolete. This constructor is no longer applicable.
-        /// </summary>
-        /// <param name="totalInstances">N/A</param>
-        /// <param name="allowLocalRoutees">N/A</param>
-        /// <param name="maxInstancesPerNode">N/A</param>
-        [Obsolete("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, int maxInstancesPerNode)
-            : this(totalInstances, maxInstancesPerNode, allowLocalRoutees)
-        {
-        }
-
-        /// <summary>
-        /// Obsolete. This constructor is no longer applicable.
-        /// </summary>
-        /// <param name="totalInstances">N/A</param>
-        /// <param name="allowLocalRoutees">N/A</param>
-        /// <param name="useRole">N/A</param>
-        /// <param name="maxInstancesPerNode">N/A</param>
-        [Obsolete("This method is deprecated [1.1.0]")]
-        public ClusterRouterPoolSettings(int totalInstances, bool allowLocalRoutees, string useRole, int maxInstancesPerNode) 
-            : this(totalInstances, maxInstancesPerNode, allowLocalRoutees, useRole)
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ClusterRouterPoolSettings"/> class.
         /// </summary>

diff --git a/src/core/Akka.Cluster/SBR/SplitBrainResolverSettings.cs b/src/core/Akka.Cluster/SBR/SplitBrainResolverSettings.cs
@@ -166,18 +166,6 @@ public KeepOldestSettings(bool downIfAlone, string role)
 
     public sealed class LeaseMajoritySettings
     {
-        [Obsolete]
-        public LeaseMajoritySettings(string leaseImplementation, TimeSpan acquireLeaseDelayForMinority, string role)
-            : this(leaseImplementation, acquireLeaseDelayForMinority, role, null)
-        {
-        }
-
-        [Obsolete]
-        public LeaseMajoritySettings(string leaseImplementation, TimeSpan acquireLeaseDelayForMinority, string role, string leaseName)
-            : this(leaseImplementation, acquireLeaseDelayForMinority, TimeSpan.FromSeconds(40), role, leaseName)
-        {
-        }
-
         public LeaseMajoritySettings(string leaseImplementation, TimeSpan acquireLeaseDelayForMinority, TimeSpan releaseAfter, string role, string leaseName)
         {
             LeaseImplementation = leaseImplementation;