mirror of https://github.com/dapr/dotnet-sdk.git
Making ActorId string only as Actions only support strigns as Id.
This commit is contained in:
Aman Bhardwaj
parent
6f349cba09
commit
a268182116
|
|
@ -17,31 +17,7 @@ namespace Microsoft.Actions.Actors
|
|||
{
|
||||
private static readonly Random Rand = new Random();
|
||||
private static readonly object RandLock = new object();
|
||||
private readonly long longId;
|
||||
private readonly Guid guidId;
|
||||
private readonly string stringId;
|
||||
private volatile string stringRepresentation;
|
||||
private volatile string traceId;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ActorId"/> class with Id value of type <see cref="long"/>.
|
||||
/// </summary>
|
||||
/// <param name="id">Value for actor id.</param>
|
||||
public ActorId(long id)
|
||||
{
|
||||
this.Kind = ActorIdKind.Long;
|
||||
this.longId = id;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ActorId"/> class with Id value of type <see cref="System.Guid"/>.
|
||||
/// </summary>
|
||||
/// <param name="id">Value for actor id.</param>
|
||||
public ActorId(Guid id)
|
||||
{
|
||||
this.Kind = ActorIdKind.Guid;
|
||||
this.guidId = id;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ActorId"/> class with Id value of type <see cref="string"/>.
|
||||
|
|
@ -49,22 +25,15 @@ namespace Microsoft.Actions.Actors
|
|||
/// <param name="id">Value for actor id.</param>
|
||||
public ActorId(string id)
|
||||
{
|
||||
this.Kind = ActorIdKind.String;
|
||||
this.stringId = id ?? throw new ArgumentNullException("id");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the <see cref="ActorIdKind"/> for the ActorId.
|
||||
/// </summary>
|
||||
/// <value><see cref="ActorIdKind"/> for the ActorId.</value>
|
||||
public ActorIdKind Kind { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether two specified actorIds have the same id and <see cref="ActorIdKind"/>.
|
||||
/// Determines whether two specified actorIds have the same id.
|
||||
/// </summary>
|
||||
/// <param name="x">The first actorId to compare, or null. </param>
|
||||
/// <param name="y">The second actorId to compare, or null. </param>
|
||||
/// <returns>true if the id and <see cref="ActorIdKind"/> is same for both objects; otherwise, false.</returns>
|
||||
/// <returns>true if the id is same for both objects; otherwise, false.</returns>
|
||||
public static bool operator ==(ActorId x, ActorId y)
|
||||
{
|
||||
if (ReferenceEquals(x, null) && ReferenceEquals(y, null))
|
||||
|
|
@ -82,18 +51,18 @@ namespace Microsoft.Actions.Actors
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether two specified actorIds have different values for id and <see cref="ActorIdKind"/>.
|
||||
/// Determines whether two specified actorIds have different values for id./>.
|
||||
/// </summary>
|
||||
/// <param name="x">The first actorId to compare, or null. </param>
|
||||
/// <param name="y">The second actorId to compare, or null. </param>
|
||||
/// <returns>true if the id or <see cref="ActorIdKind"/> is different for both objects; otherwise, true.</returns>
|
||||
/// <returns>true if the id is different for both objects; otherwise, true.</returns>
|
||||
public static bool operator !=(ActorId x, ActorId y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Create a new instance of the <see cref="ActorId"/> of kind <see cref="ActorIdKind.Long"/>
|
||||
/// Create a new instance of the <see cref="ActorId"/>./>
|
||||
/// with a random <see cref="long"/> id value.
|
||||
/// </summary>
|
||||
/// <returns>A new ActorId object.</returns>
|
||||
|
|
@ -106,52 +75,16 @@ namespace Microsoft.Actions.Actors
|
|||
Rand.NextBytes(buffer);
|
||||
}
|
||||
|
||||
return new ActorId(BitConverter.ToInt64(buffer, 0));
|
||||
return new ActorId(BitConverter.ToString(buffer, 0));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets id for ActorId whose <see cref="ActorIdKind"/> is <see cref="ActorIdKind.Long"/>.
|
||||
/// </summary>
|
||||
/// <returns><see cref="long"/>The id value for ActorId.</returns>
|
||||
/// <exception cref="InvalidOperationException">The <see cref="Kind"/> is not <see cref="ActorIdKind.Long"/>.</exception>
|
||||
public long GetLongId()
|
||||
{
|
||||
if (this.Kind == ActorIdKind.Long)
|
||||
{
|
||||
return this.longId;
|
||||
}
|
||||
|
||||
throw new InvalidOperationException($"Invalid actor kind {this.Kind.ToString()}.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets id for ActorId whose <see cref="ActorIdKind"/> is <see cref="ActorIdKind.Guid"/>.
|
||||
/// </summary>
|
||||
/// <returns><see cref="Guid"/>The id value for ActorId.</returns>
|
||||
/// <exception cref="InvalidOperationException">The <see cref="Kind"/> is not <see cref="ActorIdKind.Guid"/>.</exception>
|
||||
public Guid GetGuidId()
|
||||
{
|
||||
if (this.Kind == ActorIdKind.Guid)
|
||||
{
|
||||
return this.guidId;
|
||||
}
|
||||
|
||||
throw new InvalidOperationException($"Invalid actor kind {this.Kind.ToString()}.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets id for ActorId whose <see cref="ActorIdKind"/> is <see cref="ActorIdKind.String"/>.
|
||||
/// Gets id./>.
|
||||
/// </summary>
|
||||
/// <returns><see cref="string"/>The id value for ActorId.</returns>
|
||||
/// <exception cref="InvalidOperationException">The <see cref="Kind"/> is not <see cref="ActorIdKind.Guid"/>.</exception>
|
||||
public string GetStringId()
|
||||
public string GetId()
|
||||
{
|
||||
if (this.Kind == ActorIdKind.String)
|
||||
{
|
||||
return this.stringId;
|
||||
}
|
||||
|
||||
throw new InvalidOperationException($"Invalid actor kind {this.Kind.ToString()}.");
|
||||
return this.stringId;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -160,33 +93,7 @@ namespace Microsoft.Actions.Actors
|
|||
/// <returns>Returns a string that represents the current object.</returns>
|
||||
public override string ToString()
|
||||
{
|
||||
if (this.stringRepresentation != null)
|
||||
{
|
||||
return this.stringRepresentation;
|
||||
}
|
||||
|
||||
var actorIdAsString = string.Empty;
|
||||
switch (this.Kind)
|
||||
{
|
||||
case ActorIdKind.Long:
|
||||
actorIdAsString = this.longId.ToString(CultureInfo.InvariantCulture);
|
||||
break;
|
||||
|
||||
case ActorIdKind.Guid:
|
||||
actorIdAsString = this.guidId.ToString();
|
||||
break;
|
||||
|
||||
case ActorIdKind.String:
|
||||
actorIdAsString = this.stringId;
|
||||
break;
|
||||
|
||||
default:
|
||||
Environment.FailFast($"The ActorIdKind value {this.Kind} is invalid");
|
||||
break;
|
||||
}
|
||||
|
||||
this.stringRepresentation = actorIdAsString;
|
||||
return actorIdAsString;
|
||||
return this.stringId;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -195,21 +102,7 @@ namespace Microsoft.Actions.Actors
|
|||
/// <returns>Hash code for the current object.</returns>
|
||||
public override int GetHashCode()
|
||||
{
|
||||
switch (this.Kind)
|
||||
{
|
||||
case ActorIdKind.Long:
|
||||
return this.longId.GetHashCode();
|
||||
|
||||
case ActorIdKind.Guid:
|
||||
return this.guidId.GetHashCode();
|
||||
|
||||
case ActorIdKind.String:
|
||||
return this.stringId.GetHashCode();
|
||||
|
||||
default:
|
||||
Environment.FailFast($"The ActorIdKind value {this.Kind} is invalid");
|
||||
return 0; // this fails the process, so unreachable code
|
||||
}
|
||||
return this.stringId.GetHashCode();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -239,8 +132,8 @@ namespace Microsoft.Actions.Actors
|
|||
/// Determines whether this instance and another specified <see cref="ActorId"/> object have the same value.
|
||||
/// </summary>
|
||||
/// <param name="other">The actorId to compare to this instance. </param>
|
||||
/// <returns>true if the <see cref="ActorIdKind"/> and id of the other parameter is the same as the
|
||||
/// <see cref="ActorIdKind"/> and id of this instance; otherwise, false.
|
||||
/// <returns>true if the id of the other parameter is the same as the
|
||||
/// id of this instance; otherwise, false.
|
||||
/// If other is null, the method returns false.</returns>
|
||||
public bool Equals(ActorId other)
|
||||
{
|
||||
|
|
@ -261,96 +154,20 @@ namespace Microsoft.Actions.Actors
|
|||
/// <param name="other">The actorId to compare with this instance. </param>
|
||||
/// <returns>A 32-bit signed integer that indicates whether this instance precedes, follows, or appears
|
||||
/// in the same position in the sort order as the other parameter.</returns>
|
||||
/// <remarks>The comparison is done based on the id if both the instances have same <see cref="ActorIdKind"/>.
|
||||
/// If <see cref="ActorIdKind"/> is different, then comparison is done based on string representation of the actor id.</remarks>
|
||||
/// <remarks>The comparison is done based on the id if both the instances.</remarks>
|
||||
public int CompareTo(ActorId other)
|
||||
{
|
||||
return ReferenceEquals(other, null) ? 1 : CompareContents(this, other);
|
||||
}
|
||||
|
||||
internal string GetTraceId()
|
||||
{
|
||||
if (this.traceId == null)
|
||||
{
|
||||
// Needs InvariantCulture for key.
|
||||
string key;
|
||||
switch (this.Kind)
|
||||
{
|
||||
case ActorIdKind.Long:
|
||||
key = string.Format(CultureInfo.InvariantCulture, "{0}_{1}", this.Kind.ToString(), this.longId);
|
||||
break;
|
||||
|
||||
case ActorIdKind.Guid:
|
||||
key = string.Format(CultureInfo.InvariantCulture, "{0}_{1}", this.Kind.ToString(), this.guidId);
|
||||
break;
|
||||
|
||||
case ActorIdKind.String:
|
||||
key = string.Format(
|
||||
CultureInfo.InvariantCulture,
|
||||
"{0}_{1}",
|
||||
this.Kind.ToString(),
|
||||
this.stringId);
|
||||
break;
|
||||
|
||||
default:
|
||||
Environment.FailFast($"The ActorIdKind value {this.Kind} is invalid");
|
||||
key = null; // unreachable
|
||||
break;
|
||||
}
|
||||
|
||||
this.traceId = key;
|
||||
}
|
||||
|
||||
return this.traceId;
|
||||
}
|
||||
|
||||
private static bool EqualsContents(ActorId x, ActorId y)
|
||||
{
|
||||
if (x.Kind != y.Kind)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (x.Kind)
|
||||
{
|
||||
case ActorIdKind.Long:
|
||||
return (x.longId == y.longId);
|
||||
|
||||
case ActorIdKind.Guid:
|
||||
return (x.guidId == y.guidId);
|
||||
|
||||
case ActorIdKind.String:
|
||||
return string.Equals(x.stringId, y.stringId, StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
return string.Equals(x.stringId, y.stringId, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private static int CompareContents(ActorId x, ActorId y)
|
||||
{
|
||||
if (x.Kind == y.Kind)
|
||||
{
|
||||
switch (x.Kind)
|
||||
{
|
||||
case ActorIdKind.Long:
|
||||
return (x.longId.CompareTo(y.longId));
|
||||
|
||||
case ActorIdKind.Guid:
|
||||
return (x.guidId.CompareTo(y.guidId));
|
||||
|
||||
case ActorIdKind.String:
|
||||
return string.Compare(x.stringId, y.stringId, StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
default:
|
||||
Environment.FailFast($"The ActorIdKind value {x.Kind} is invalid");
|
||||
return 0; // unreachable code
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return string.Compare(x.GetTraceId(), y.GetTraceId(), StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
return string.Compare(x.stringId, y.stringId, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
// ------------------------------------------------------------
|
||||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
// Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
|
||||
// ------------------------------------------------------------
|
||||
|
||||
namespace Microsoft.Actions.Actors
|
||||
{
|
||||
/// <summary>
|
||||
/// Specifies the type of the ID value for an <see cref="ActorId"/>.
|
||||
/// </summary>
|
||||
public enum ActorIdKind
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents ID value of type <see cref="long"/>.
|
||||
/// </summary>
|
||||
Long = 0,
|
||||
|
||||
/// <summary>
|
||||
/// Represents ID value of type <see cref="System.Guid"/>.
|
||||
/// </summary>
|
||||
Guid = 1,
|
||||
|
||||
/// <summary>
|
||||
/// Represents ID value of type <see cref="string"/>.
|
||||
/// </summary>
|
||||
String = 2,
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue