Skip to content

Commit 3705c8c

Browse files
AarononthewebAaronontheweb
authored
Api/rename app version (#4595)
* renamed AkkaVersion -> AppVersion * approved API change
1 parent d3f457d commit 3705c8c

16 files changed

+103
-102
lines changed

‎src/core/Akka.API.Tests/Akka.API.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup>
66
<AssemblyTitle>Akka.API.Tests</AssemblyTitle>
77
<TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
8+
<UserSecretsId>93253ee8-0410-4483-9809-9bb2d32860fa</UserSecretsId>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎src/core/Akka.API.Tests/CoreAPISpec.ApproveCluster.approved.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ namespace Akka.Cluster
185185
{
186186
public ClusterSettings(Akka.Configuration.Config config, string systemName) { }
187187
public bool AllowWeaklyUpMembers { get; }
188-
public Akka.Util.AkkaVersion AppVersion { get; }
188+
public Akka.Util.AppVersion AppVersion { get; }
189189
public System.Nullable<System.TimeSpan> AutoDownUnreachableAfter { get; }
190190
[System.ObsoleteAttribute("Use Cluster.DowningProvider.DownRemovalMargin [1.1.2]")]
191191
public System.TimeSpan DownRemovalMargin { get; }
@@ -232,7 +232,7 @@ namespace Akka.Cluster
232232
public static readonly System.Collections.Generic.IComparer<Akka.Actor.Address> AddressOrdering;
233233
public static readonly System.Collections.Generic.IComparer<Akka.Cluster.Member> AgeOrdering;
234234
public Akka.Actor.Address Address { get; }
235-
public Akka.Util.AkkaVersion AppVersion { get; }
235+
public Akka.Util.AppVersion AppVersion { get; }
236236
public System.Collections.Immutable.ImmutableHashSet<string> Roles { get; }
237237
public Akka.Cluster.MemberStatus Status { get; }
238238
public Akka.Cluster.UniqueAddress UniqueAddress { get; }

‎src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4677,18 +4677,18 @@ namespace Akka.Serialization
46774677
}
46784678
namespace Akka.Util
46794679
{
4680-
public class AkkaVersion : System.IComparable<Akka.Util.AkkaVersion>, System.IEquatable<Akka.Util.AkkaVersion>
4680+
public class AppVersion : System.IComparable<Akka.Util.AppVersion>, System.IEquatable<Akka.Util.AppVersion>
46814681
{
4682-
public static readonly Akka.Util.AkkaVersion Zero;
4682+
public static readonly Akka.Util.AppVersion Zero;
46834683
public string Version { get; }
4684-
public int CompareTo(Akka.Util.AkkaVersion other) { }
4685-
public static Akka.Util.AkkaVersion Create(string version) { }
4686-
public bool Equals(Akka.Util.AkkaVersion other) { }
4684+
public int CompareTo(Akka.Util.AppVersion other) { }
4685+
public static Akka.Util.AppVersion Create(string version) { }
4686+
public bool Equals(Akka.Util.AppVersion other) { }
46874687
public override bool Equals(object obj) { }
46884688
public override int GetHashCode() { }
46894689
public override string ToString() { }
4690-
public static bool ==(Akka.Util.AkkaVersion first, Akka.Util.AkkaVersion second) { }
4691-
public static bool !=(Akka.Util.AkkaVersion first, Akka.Util.AkkaVersion second) { }
4690+
public static bool ==(Akka.Util.AppVersion first, Akka.Util.AppVersion second) { }
4691+
public static bool !=(Akka.Util.AppVersion first, Akka.Util.AppVersion second) { }
46924692
}
46934693
public class AtomicBoolean
46944694
{

‎src/core/Akka.Cluster.Tests.Performance/Serialization/ClusterMessageSerializerSpec.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public class ClusterMessageSerializerSpec
3737

3838
internal Lazy<InternalClusterAction.Welcome> WelcomeMessage { get; } = new Lazy<InternalClusterAction.Welcome>(() =>
3939
{
40-
var member1 = new Member(new UniqueAddress(new Address("akka.tcp", "system", "some.host.org", 4718), 34), 1, MemberStatus.Joining, ImmutableHashSet<string>.Empty, AkkaVersion.Zero);
41-
var member2 = new Member(new UniqueAddress(new Address("akka.tcp", "system", "some.host.org", 4710), 35), 1, MemberStatus.Joining, ImmutableHashSet<string>.Empty, AkkaVersion.Zero);
40+
var member1 = new Member(new UniqueAddress(new Address("akka.tcp", "system", "some.host.org", 4718), 34), 1, MemberStatus.Joining, ImmutableHashSet<string>.Empty, AppVersion.Zero);
41+
var member2 = new Member(new UniqueAddress(new Address("akka.tcp", "system", "some.host.org", 4710), 35), 1, MemberStatus.Joining, ImmutableHashSet<string>.Empty, AppVersion.Zero);
4242

4343
var node1 = new VectorClock.Node("node1");
4444
var node2 = new VectorClock.Node("node2");

‎src/core/Akka.Cluster.Tests/ClusterConfigSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void Clustering_must_be_able_to_parse_generic_cluster_config_elements()
4646
settings.MinNrOfMembers.Should().Be(1);
4747
settings.MinNrOfMembersOfRole.Should().Equal(ImmutableDictionary<string, int>.Empty);
4848
settings.Roles.Should().BeEquivalentTo(ImmutableHashSet<string>.Empty);
49-
settings.AppVersion.Should().Be(AkkaVersion.Zero);
49+
settings.AppVersion.Should().Be(AppVersion.Zero);
5050
settings.UseDispatcher.Should().Be(Dispatchers.InternalDispatcherId);
5151
settings.GossipDifferentViewProbability.Should().Be(0.8);
5252
settings.ReduceGossipDifferentViewProbability.Should().Be(400);

‎src/core/Akka.Cluster.Tests/ClusterSpec.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public void A_cluster_must_initially_become_singleton_cluster_when_joining_itsel
8080
ClusterView.Members.Select(m => m.Address).ToImmutableHashSet()
8181
.Should().BeEquivalentTo(ImmutableHashSet.Create(_selfAddress));
8282
AwaitAssert(() => ClusterView.Status.Should().Be(MemberStatus.Up));
83-
ClusterView.Self.AppVersion.Should().Be(AkkaVersion.Create("1.2.3"));
84-
ClusterView.Members.FirstOrDefault(i => i.Address == _selfAddress).AppVersion.Should().Be(AkkaVersion.Create("1.2.3"));
83+
ClusterView.Self.AppVersion.Should().Be(AppVersion.Create("1.2.3"));
84+
ClusterView.Members.FirstOrDefault(i => i.Address == _selfAddress).AppVersion.Should().Be(AppVersion.Create("1.2.3"));
8585
ClusterView.State.HasMoreThanOneAppVersion.Should().BeFalse();
8686
}
8787

‎src/core/Akka.Cluster.Tests/MemberOrderingSpec.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void MemberOrdering_must_have_stable_equals_and_hash_code()
5656
{
5757
var address = new Address("akka.tcp", "sys1", "host1", 9000);
5858
var m1 = TestMember.Create(address, MemberStatus.Joining);
59-
var m11 = Member.Create(new UniqueAddress(address, -3), ImmutableHashSet<string>.Empty, AkkaVersion.Zero);
59+
var m11 = Member.Create(new UniqueAddress(address, -3), ImmutableHashSet<string>.Empty, AppVersion.Zero);
6060
var m2 = m1.Copy(status: MemberStatus.Up);
6161
var m22 = m11.Copy(status: MemberStatus.Up);
6262
var m3 = TestMember.Create(address.WithPort(10000), MemberStatus.Up);
@@ -89,7 +89,7 @@ public void MemberOrdering_must_consistent_ordering_and_equals()
8989

9090
//different uid
9191
var a = TestMember.Create(address1, MemberStatus.Joining);
92-
var b = Member.Create(new UniqueAddress(address1, -3), ImmutableHashSet<string>.Empty, AkkaVersion.Zero);
92+
var b = Member.Create(new UniqueAddress(address1, -3), ImmutableHashSet<string>.Empty, AppVersion.Zero);
9393
Member.Ordering.Compare(a, b).Should().Be(1);
9494
Member.Ordering.Compare(b, a).Should().Be(-1);
9595
}

‎src/core/Akka.Cluster.Tests/Serialization/ClusterMessageSerializerSpec.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public ClusterMessageSerializerSpec()
2323
{
2424
}
2525

26-
private static readonly Member a1 = TestMember.Create(new Address("akka.tcp", "sys", "a", 2552), MemberStatus.Joining, appVersion: AkkaVersion.Create("1.0.0"));
27-
private static readonly Member b1 = TestMember.Create(new Address("akka.tcp", "sys", "b", 2552), MemberStatus.Up, ImmutableHashSet.Create("r1"), appVersion: AkkaVersion.Create("1.1.0"));
28-
private static readonly Member c1 = TestMember.Create(new Address("akka.tcp", "sys", "c", 2552), MemberStatus.Leaving, ImmutableHashSet.Create("r2"), appVersion: AkkaVersion.Create("1.1.0"));
26+
private static readonly Member a1 = TestMember.Create(new Address("akka.tcp", "sys", "a", 2552), MemberStatus.Joining, appVersion: AppVersion.Create("1.0.0"));
27+
private static readonly Member b1 = TestMember.Create(new Address("akka.tcp", "sys", "b", 2552), MemberStatus.Up, ImmutableHashSet.Create("r1"), appVersion: AppVersion.Create("1.1.0"));
28+
private static readonly Member c1 = TestMember.Create(new Address("akka.tcp", "sys", "c", 2552), MemberStatus.Leaving, ImmutableHashSet.Create("r2"), appVersion: AppVersion.Create("1.1.0"));
2929
private static readonly Member d1 = TestMember.Create(new Address("akka.tcp", "sys", "d", 2552), MemberStatus.Exiting, ImmutableHashSet.Create("r1", "r2"));
3030
private static readonly Member e1 = TestMember.Create(new Address("akka.tcp", "sys", "e", 2552), MemberStatus.Down, ImmutableHashSet.Create("r3"));
3131

@@ -94,10 +94,10 @@ public void Can_serialize_Join()
9494
{
9595
var address = new Address("akka.tcp", "system", "some.host.org", 4711);
9696
var uniqueAddress = new UniqueAddress(address, 17);
97-
var message = new InternalClusterAction.Join(uniqueAddress, ImmutableHashSet.Create("foo", "bar"), AkkaVersion.Zero);
97+
var message = new InternalClusterAction.Join(uniqueAddress, ImmutableHashSet.Create("foo", "bar"), AppVersion.Zero);
9898
AssertEqual(message);
9999

100-
message = new InternalClusterAction.Join(uniqueAddress, ImmutableHashSet.Create("foo", "bar"), AkkaVersion.Create("1.2.3"));
100+
message = new InternalClusterAction.Join(uniqueAddress, ImmutableHashSet.Create("foo", "bar"), AppVersion.Create("1.2.3"));
101101
AssertEqual(message);
102102
}
103103

‎src/core/Akka.Cluster.Tests/SplitBrainStrategySpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Akka.Cluster.Tests
1818
public class SplitBrainStrategySpec
1919
{
2020
private static Member Member(Address address, int upNumber = 1, MemberStatus status = MemberStatus.Up, string role = null) =>
21-
new Member(new UniqueAddress(address, ThreadLocalRandom.Current.Next()), upNumber, status, role == null ? ImmutableHashSet<string>.Empty : ImmutableHashSet.Create(role), AkkaVersion.Zero);
21+
new Member(new UniqueAddress(address, ThreadLocalRandom.Current.Next()), upNumber, status, role == null ? ImmutableHashSet<string>.Empty : ImmutableHashSet.Create(role), AppVersion.Zero);
2222

2323
private static ImmutableSortedSet<Member> Members(params Member[] members) => ImmutableSortedSet.CreateRange(Akka.Cluster.Member.AgeOrdering, members);
2424

‎src/core/Akka.Cluster.Tests/TestMember.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ namespace Akka.Cluster.Tests
1818
[InternalApi]
1919
public static class TestMember
2020
{
21-
public static Member Create(Address address, MemberStatus status, int uid = 0, AkkaVersion appVersion = null)
21+
public static Member Create(Address address, MemberStatus status, int uid = 0, AppVersion appVersion = null)
2222
{
2323
return Create(address, status, ImmutableHashSet.Create<string>(), uid, appVersion: appVersion);
2424
}
2525

26-
public static Member Create(Address address, MemberStatus status, ImmutableHashSet<string> roles, int uid = 0, int upNumber = 0, AkkaVersion appVersion = null)
26+
public static Member Create(Address address, MemberStatus status, ImmutableHashSet<string> roles, int uid = 0, int upNumber = 0, AppVersion appVersion = null)
2727
{
28-
return Member.Create(new UniqueAddress(address, uid), upNumber, status, roles, appVersion ?? AkkaVersion.Zero);
28+
return Member.Create(new UniqueAddress(address, uid), upNumber, status, roles, appVersion ?? AppVersion.Zero);
2929
}
3030
}
3131
}

‎src/core/Akka.Cluster/ClusterDaemon.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ internal sealed class Join : IClusterMessage
142142
/// <param name="node">the node that wants to join the cluster</param>
143143
/// <param name="roles">TBD</param>
144144
/// <param name="appVersion">Application version</param>
145-
public Join(UniqueAddress node, ImmutableHashSet<string> roles, AkkaVersion appVersion)
145+
public Join(UniqueAddress node, ImmutableHashSet<string> roles, AppVersion appVersion)
146146
{
147147
_node = node;
148148
_roles = roles;
149-
AppVersion = appVersion ?? AkkaVersion.Zero;
149+
AppVersion = appVersion ?? Util.AppVersion.Zero;
150150
}
151151

152152
/// <summary>
@@ -158,7 +158,7 @@ public Join(UniqueAddress node, ImmutableHashSet<string> roles, AkkaVersion appV
158158
/// </summary>
159159
public ImmutableHashSet<string> Roles { get { return _roles; } }
160160

161-
public AkkaVersion AppVersion { get; }
161+
public AppVersion AppVersion { get; }
162162

163163
/// <inheritdoc/>
164164
public override bool Equals(object obj)
@@ -1561,7 +1561,7 @@ public void StopSeedNodeProcess()
15611561
/// </summary>
15621562
/// <param name="node">TBD</param>
15631563
/// <param name="roles">TBD</param>
1564-
public void Joining(UniqueAddress node, ImmutableHashSet<string> roles, AkkaVersion appVersion)
1564+
public void Joining(UniqueAddress node, ImmutableHashSet<string> roles, AppVersion appVersion)
15651565
{
15661566
var selfStatus = _latestGossip.GetMember(SelfUniqueAddress).Status;
15671567
if (!node.Address.Protocol.Equals(_cluster.SelfAddress.Protocol))

‎src/core/Akka.Cluster/ClusterSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ClusterSettings(Config config, string systemName)
6868
AutoDownUnreachableAfter = clusterConfig.GetTimeSpanWithOffSwitch("auto-down-unreachable-after");
6969

7070
Roles = clusterConfig.GetStringList("roles", new string[] { }).ToImmutableHashSet();
71-
AppVersion = AkkaVersion.Create(clusterConfig.GetString("app-version"));
71+
AppVersion = Util.AppVersion.Create(clusterConfig.GetString("app-version"));
7272
MinNrOfMembers = clusterConfig.GetInt("min-nr-of-members", 0);
7373

7474
_useDispatcher = clusterConfig.GetString("use-dispatcher", null);
@@ -194,7 +194,7 @@ public ClusterSettings(Config config, string systemName)
194194
/// <summary>
195195
/// Application version
196196
/// </summary>
197-
public AkkaVersion AppVersion { get; }
197+
public AppVersion AppVersion { get; }
198198

199199
/// <summary>
200200
/// TBD

‎src/core/Akka.Cluster/Member.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Member : IComparable<Member>, IComparable
3232
/// <param name="roles">TBD</param>
3333
/// <param name="appVersion">Application version</param>
3434
/// <returns>TBD</returns>
35-
internal static Member Create(UniqueAddress uniqueAddress, ImmutableHashSet<string> roles, AkkaVersion appVersion)
35+
internal static Member Create(UniqueAddress uniqueAddress, ImmutableHashSet<string> roles, AppVersion appVersion)
3636
{
3737
return new Member(uniqueAddress, int.MaxValue, MemberStatus.Joining, roles, appVersion);
3838
}
@@ -44,7 +44,7 @@ internal static Member Create(UniqueAddress uniqueAddress, ImmutableHashSet<stri
4444
/// <returns>TBD</returns>
4545
internal static Member Removed(UniqueAddress node)
4646
{
47-
return new Member(node, int.MaxValue, MemberStatus.Removed, ImmutableHashSet.Create<string>(), AkkaVersion.Zero);
47+
return new Member(node, int.MaxValue, MemberStatus.Removed, ImmutableHashSet.Create<string>(), Util.AppVersion.Zero);
4848
}
4949

5050
/// <summary>
@@ -70,7 +70,7 @@ internal static Member Removed(UniqueAddress node)
7070
/// <summary>
7171
/// Application version
7272
/// </summary>
73-
public AkkaVersion AppVersion { get; }
73+
public AppVersion AppVersion { get; }
7474

7575
/// <summary>
7676
/// Creates a new <see cref="Member"/>.
@@ -81,7 +81,7 @@ internal static Member Removed(UniqueAddress node)
8181
/// <param name="roles">The roles for this member. Can be empty.</param>
8282
/// <param name="appVersion">Application version</param>
8383
/// <returns>A new member instance.</returns>
84-
internal static Member Create(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, ImmutableHashSet<string> roles, AkkaVersion appVersion)
84+
internal static Member Create(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, ImmutableHashSet<string> roles, AppVersion appVersion)
8585
{
8686
return new Member(uniqueAddress, upNumber, status, roles, appVersion);
8787
}
@@ -94,13 +94,13 @@ internal static Member Create(UniqueAddress uniqueAddress, int upNumber, MemberS
9494
/// <param name="status">The status of this member.</param>
9595
/// <param name="roles">The roles for this member. Can be empty.</param>
9696
/// <param name="appVersion">Application version</param>
97-
internal Member(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, ImmutableHashSet<string> roles, AkkaVersion appVersion)
97+
internal Member(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, ImmutableHashSet<string> roles, AppVersion appVersion)
9898
{
9999
UniqueAddress = uniqueAddress;
100100
UpNumber = upNumber;
101101
Status = status;
102102
Roles = roles;
103-
AppVersion = appVersion ?? AkkaVersion.Zero;
103+
AppVersion = appVersion ?? AppVersion.Zero;
104104
}
105105

106106
/// <summary>
@@ -112,7 +112,7 @@ internal Member(UniqueAddress uniqueAddress, int upNumber, MemberStatus status,
112112
/// <param name="roles">The roles for this member. Can be empty.</param>
113113
/// <param name="appVersion">Application version</param>
114114
[JsonConstructor]
115-
internal Member(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, IEnumerable<string> roles, AkkaVersion appVersion)
115+
internal Member(UniqueAddress uniqueAddress, int upNumber, MemberStatus status, IEnumerable<string> roles, AppVersion appVersion)
116116
: this(uniqueAddress, upNumber, status, roles.ToImmutableHashSet(), appVersion)
117117
{
118118

‎src/core/Akka.Cluster/Serialization/ClusterMessageSerializer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private static byte[] JoinToByteArray(InternalClusterAction.Join join)
106106
private static InternalClusterAction.Join JoinFrom(byte[] bytes)
107107
{
108108
var join = Proto.Msg.Join.Parser.ParseFrom(bytes);
109-
AkkaVersion ver = join.HasAppVersion ? AkkaVersion.Create(join.AppVersion) : AkkaVersion.Zero;
109+
AppVersion ver = join.HasAppVersion ? AppVersion.Create(join.AppVersion) : AppVersion.Zero;
110110
return new InternalClusterAction.Join(UniqueAddressFrom(join.Node), join.Roles.ToImmutableHashSet(), ver);
111111
}
112112

@@ -236,7 +236,7 @@ private static Proto.Msg.Gossip GossipToProto(Gossip gossip)
236236

237237
int MapUniqueAddress(UniqueAddress address) => MapWithErrorMessage(addressMapping, address, "address");
238238

239-
int MapAppVersion(AkkaVersion appVersion) => MapWithErrorMessage(appVersionMapping, appVersion.Version, "appVersion");
239+
int MapAppVersion(AppVersion appVersion) => MapWithErrorMessage(appVersionMapping, appVersion.Version, "appVersion");
240240

241241
Proto.Msg.Member MemberToProto(Member m)
242242
{
@@ -273,15 +273,15 @@ private static Gossip GossipFrom(Proto.Msg.Gossip gossip)
273273
var addressMapping = gossip.AllAddresses.Select(UniqueAddressFrom).ToList();
274274
var roleMapping = gossip.AllRoles.ToList();
275275
var hashMapping = gossip.AllHashes.ToList();
276-
var appVersionMapping = gossip.AllAppVersions.Select(i => AkkaVersion.Create(i)).ToList();
276+
var appVersionMapping = gossip.AllAppVersions.Select(i => AppVersion.Create(i)).ToList();
277277

278278
Member MemberFromProto(Proto.Msg.Member member) =>
279279
Member.Create(
280280
addressMapping[member.AddressIndex],
281281
member.UpNumber,
282282
(MemberStatus)member.Status,
283283
member.RolesIndexes.Select(x => roleMapping[x]).ToImmutableHashSet(),
284-
appVersionMapping.Any() ? appVersionMapping[member.AppVersionIndex] : AkkaVersion.Zero
284+
appVersionMapping.Any() ? appVersionMapping[member.AppVersionIndex] : AppVersion.Zero
285285
);
286286

287287
var members = gossip.Members.Select((Func<Proto.Msg.Member, Member>)MemberFromProto).ToImmutableSortedSet(Member.Ordering);

0 commit comments

Comments
 (0)