Move ClusterConfiguration to legacy

src/Orleans.Core.Abstractions/Concurrency/GrainAttributeConcurrency.cs

@@ -1,4 +1,6 @@
-using System;
+using Orleans.Placement;
+using Orleans.Runtime;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -43,21 +45,16 @@ public sealed class UnorderedAttribute : Attribute
     /// of preservation of grain state between requests and where multiple activations of the same grain are allowed to be created by the runtime.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class)]
-    public sealed class StatelessWorkerAttribute : Attribute
+    public sealed class StatelessWorkerAttribute : PlacementAttribute
     {
-        /// <summary>
-        /// Maximal number of local StatelessWorkers in a single silo.
-        /// </summary>
-        public int MaxLocalWorkers { get; private set; }
-
         public StatelessWorkerAttribute(int maxLocalWorkers)
+            : base(new StatelessWorkerPlacement(maxLocalWorkers))
         {
-            MaxLocalWorkers = maxLocalWorkers;
         }
 
         public StatelessWorkerAttribute()
+            : base(new StatelessWorkerPlacement())
         {
-            MaxLocalWorkers = -1;
         }
     }
 
@@ -91,7 +88,7 @@ public sealed class MayInterleaveAttribute : Attribute
 
         public MayInterleaveAttribute(string callbackMethodName)
         {
-            CallbackMethodName = callbackMethodName;
+            this.CallbackMethodName = callbackMethodName;
         }
     }
 

src/Orleans.Core.Abstractions/Placement/ActivationCountBasedPlacement.cs

@@ -6,18 +6,5 @@ namespace Orleans.Runtime
     internal class ActivationCountBasedPlacement : PlacementStrategy
     {
         internal static ActivationCountBasedPlacement Singleton { get; } = new ActivationCountBasedPlacement();
-
-        private ActivationCountBasedPlacement()
-        {}
-
-        public override bool Equals(object obj)
-        {
-            return obj is ActivationCountBasedPlacement;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Placement/HashBasedPlacement.cs

@@ -1,26 +1,10 @@
-using System;
+using System;
 
 namespace Orleans.Runtime
 {
     [Serializable]
     internal class HashBasedPlacement : PlacementStrategy
     {
-
         internal static HashBasedPlacement Singleton { get; } = new HashBasedPlacement();
-
-
-        public HashBasedPlacement()
-        {
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is HashBasedPlacement;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Placement/PlacementAttribute.cs

@@ -16,7 +16,7 @@ protected PlacementAttribute(PlacementStrategy placement)
         {
             if (placement == null) throw new ArgumentNullException(nameof(placement));
 
-            PlacementStrategy = placement;
+            this.PlacementStrategy = placement;
         }
     }
 

src/Orleans.Core.Abstractions/Placement/PreferLocalPlacement.cs

@@ -6,18 +6,5 @@ namespace Orleans.Runtime
     internal class PreferLocalPlacement : PlacementStrategy
     {
         internal static PreferLocalPlacement Singleton { get; } = new PreferLocalPlacement();
-
-        private PreferLocalPlacement()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is PreferLocalPlacement;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Placement/RandomPlacement.cs

@@ -6,18 +6,5 @@ namespace Orleans.Runtime
     internal class RandomPlacement : PlacementStrategy
     {
         internal static RandomPlacement Singleton { get; } = new RandomPlacement();
-
-        private RandomPlacement()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is RandomPlacement;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Placement/StatelessWorkerPlacement.cs

@@ -5,32 +5,20 @@ namespace Orleans.Runtime
     [Serializable]
     internal class StatelessWorkerPlacement : PlacementStrategy
     {
-        private static readonly int defaultMaxStatelessWorkers = Environment.ProcessorCount;
+        private static readonly int DefaultMaxStatelessWorkers = Environment.ProcessorCount;
 
         public int MaxLocal { get; private set; }
 
         internal StatelessWorkerPlacement(int maxLocal = -1)
         {
             // If maxLocal was not specified on the StatelessWorkerAttribute, 
             // we will use the defaultMaxStatelessWorkers, which is System.Environment.ProcessorCount.
-            MaxLocal = maxLocal > 0 ? maxLocal : defaultMaxStatelessWorkers;
+            this.MaxLocal = maxLocal > 0 ? maxLocal : DefaultMaxStatelessWorkers;
         }
 
         public override string ToString()
         {
-            return String.Format("StatelessWorkerPlacement(max={0})", MaxLocal);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as StatelessWorkerPlacement;
-            return other != null && MaxLocal == other.MaxLocal;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode() ^ MaxLocal.GetHashCode();
+            return string.Format("StatelessWorkerPlacement(max={0})", this.MaxLocal);
         }
     }
-
 }

src/Orleans.Core.Abstractions/Versions/Compatibility/AllVersionsCompatible.cs

@@ -1,23 +1,10 @@
-using System;
+using System;
 
 namespace Orleans.Versions.Compatibility
 {
     [Serializable]
     public class AllVersionsCompatible : CompatibilityStrategy
     {
         public static AllVersionsCompatible Singleton { get; } = new AllVersionsCompatible();
-
-        private AllVersionsCompatible()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is AllVersionsCompatible;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Compatibility/BackwardCompatible.cs

@@ -6,18 +6,5 @@ namespace Orleans.Versions.Compatibility
     public class BackwardCompatible : CompatibilityStrategy
     {
         public static BackwardCompatible Singleton { get; } = new BackwardCompatible();
-
-        private BackwardCompatible()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is BackwardCompatible;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Compatibility/ICompatibilityDirector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Orleans.Versions.Compatibility
 {
@@ -7,22 +7,8 @@ public interface ICompatibilityDirector
         bool IsCompatible(ushort requestedVersion, ushort currentVersion);
     }
 
-    public interface ICompatibilityDirector<TStrategy> : ICompatibilityDirector where TStrategy : CompatibilityStrategy
-    {
-    }
-
     [Serializable]
     public abstract class CompatibilityStrategy
     {
-        public static CompatibilityStrategy Parse(string str)
-        {
-            if (str.Equals(typeof(AllVersionsCompatible).Name))
-                return AllVersionsCompatible.Singleton;
-            if (str.Equals(typeof(BackwardCompatible).Name))
-                return BackwardCompatible.Singleton;
-            if (str.Equals(typeof(StrictVersionCompatible).Name))
-                return StrictVersionCompatible.Singleton;
-            return null;
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Compatibility/StrictVersionCompatible.cs

@@ -1,23 +1,10 @@
-using System;
+using System;
 
 namespace Orleans.Versions.Compatibility
 {
     [Serializable]
     public class StrictVersionCompatible : CompatibilityStrategy
     {
         public static StrictVersionCompatible Singleton { get; } = new StrictVersionCompatible();
-
-        private StrictVersionCompatible()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is StrictVersionCompatible;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Selector/AllCompatibleVersions.cs

@@ -6,18 +6,5 @@ namespace Orleans.Versions.Selector
     public class AllCompatibleVersions : VersionSelectorStrategy
     {
         public static AllCompatibleVersions Singleton { get; } = new AllCompatibleVersions();
-
-        private AllCompatibleVersions()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is AllCompatibleVersions;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Selector/IVersionSelector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Orleans.Versions.Compatibility;
 
@@ -9,22 +9,8 @@ public interface IVersionSelector
         IReadOnlyList<ushort> GetSuitableVersion(ushort requestedVersion, IReadOnlyList<ushort> availableVersions, ICompatibilityDirector compatibilityDirector);
     }
 
-    public interface IVersionSelector<TPolicy> : IVersionSelector where TPolicy : VersionSelectorStrategy
-    {
-    }
-
     [Serializable]
     public abstract class VersionSelectorStrategy
     {
-        public static VersionSelectorStrategy Parse(string str)
-        {
-            if (str.Equals(typeof(AllCompatibleVersions).Name))
-                return AllCompatibleVersions.Singleton;
-            if (str.Equals(typeof(LatestVersion).Name))
-                return LatestVersion.Singleton;
-            if (str.Equals(typeof(MinimumVersion).Name))
-                return MinimumVersion.Singleton;
-            return null;
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Selector/LatestVersion.cs

@@ -1,23 +1,10 @@
-using System;
+using System;
 
 namespace Orleans.Versions.Selector
 {
     [Serializable]
     public class LatestVersion : VersionSelectorStrategy
     {
         public static LatestVersion Singleton { get; } = new LatestVersion();
-
-        private LatestVersion()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is LatestVersion;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }

src/Orleans.Core.Abstractions/Versions/Selector/MinimumVersion.cs

@@ -1,23 +1,10 @@
-using System;
+using System;
 
 namespace Orleans.Versions.Selector
 {
     [Serializable]
     public class MinimumVersion : VersionSelectorStrategy
     {
         public static MinimumVersion Singleton { get; } = new MinimumVersion();
-
-        private MinimumVersion()
-        { }
-
-        public override bool Equals(object obj)
-        {
-            return obj is MinimumVersion;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetType().GetHashCode();
-        }
     }
 }