From 01284da9ed394d0b0d58fa36a8dcbc904cef7fb9 Mon Sep 17 00:00:00 2001 From: vishesh-plivo Date: Mon, 15 Jun 2020 13:42:37 +0530 Subject: [PATCH 1/4] move phlo MPC inside Phlo namespace --- .../Resource/{MultiPartyCall => Phlo}/MultiPartyCall.cs | 2 +- .../{MultiPartyCall => Phlo}/MultiPartyCallInterface.cs | 2 +- src/Plivo/Resource/Phlo/Phlo.cs | 5 ++--- src/Plivo/Resource/Phlo/PhloInterface.cs | 7 +++---- 4 files changed, 7 insertions(+), 9 deletions(-) rename src/Plivo/Resource/{MultiPartyCall => Phlo}/MultiPartyCall.cs (93%) mode change 100755 => 100644 rename src/Plivo/Resource/{MultiPartyCall => Phlo}/MultiPartyCallInterface.cs (98%) mode change 100755 => 100644 diff --git a/src/Plivo/Resource/MultiPartyCall/MultiPartyCall.cs b/src/Plivo/Resource/Phlo/MultiPartyCall.cs old mode 100755 new mode 100644 similarity index 93% rename from src/Plivo/Resource/MultiPartyCall/MultiPartyCall.cs rename to src/Plivo/Resource/Phlo/MultiPartyCall.cs index 283260c1..0daf87e5 --- a/src/Plivo/Resource/MultiPartyCall/MultiPartyCall.cs +++ b/src/Plivo/Resource/Phlo/MultiPartyCall.cs @@ -2,7 +2,7 @@ using Plivo.Exception; using Plivo.Resource.Member; -namespace Plivo.Resource.MultiPartyCall +namespace Plivo.Resource.Phlo.MultiPartyCall { public class MultiPartyCall : Node.Node { diff --git a/src/Plivo/Resource/MultiPartyCall/MultiPartyCallInterface.cs b/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs old mode 100755 new mode 100644 similarity index 98% rename from src/Plivo/Resource/MultiPartyCall/MultiPartyCallInterface.cs rename to src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs index 3d4ee395..3d8ce484 --- a/src/Plivo/Resource/MultiPartyCall/MultiPartyCallInterface.cs +++ b/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs @@ -5,7 +5,7 @@ using Plivo.Exception; using Plivo.Resource.Member; -namespace Plivo.Resource.MultiPartyCall +namespace Plivo.Resource.Phlo.MultiPartyCall { public class MultiPartyCallInterface : ResourceInterface { diff --git a/src/Plivo/Resource/Phlo/Phlo.cs b/src/Plivo/Resource/Phlo/Phlo.cs index 0135d4dd..f246d1e6 100755 --- a/src/Plivo/Resource/Phlo/Phlo.cs +++ b/src/Plivo/Resource/Phlo/Phlo.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Plivo.Exception; -using Plivo.Resource.MultiPartyCall; using Plivo.Resource.Node; namespace Plivo.Resource.Phlo @@ -25,9 +24,9 @@ public class Phlo :Resource public Lazy _node; - public Lazy _multiPartyCall; + public Lazy _multiPartyCall; public NodeInterface NodeI => _node.Value; - public MultiPartyCallInterface MultiPartyCallI => _multiPartyCall.Value; + public MultiPartyCall.MultiPartyCallInterface MultiPartyCallI => _multiPartyCall.Value; public MultiPartyCall.MultiPartyCall MultiPartyCall(string nodeId) { diff --git a/src/Plivo/Resource/Phlo/PhloInterface.cs b/src/Plivo/Resource/Phlo/PhloInterface.cs index 99aac2f8..040173f2 100755 --- a/src/Plivo/Resource/Phlo/PhloInterface.cs +++ b/src/Plivo/Resource/Phlo/PhloInterface.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Plivo.Exception; using Plivo.Client; -using Plivo.Resource.MultiPartyCall; using Plivo.Resource.Node; namespace Plivo.Resource.Phlo @@ -51,7 +50,7 @@ internal PhloInterface(HttpClient client, string authId, string authToken) : bas } private NodeInterface NodeI { get; set; } - private MultiPartyCallInterface MultiPartyCallI { get; set; } + private MultiPartyCall.MultiPartyCallInterface MultiPartyCallI { get; set; } public PhloRunCallResponse Run(Dictionary data = null) { @@ -76,7 +75,7 @@ public MultiPartyCall.MultiPartyCall MultiPartyCall( string nodeId) { throw new PlivoValidationException("nodeId is mandatory, can not be null or empty"); } - return ((MultiPartyCallInterface)MultiPartyCallI) + return ((MultiPartyCall.MultiPartyCallInterface)MultiPartyCallI) .Get(_phloId, nodeId); } @@ -90,7 +89,7 @@ public Phlo Get(string phloId) var phlo = Task.Run(async () => await GetResource("phlo/" + phloId, new Dictionary()).ConfigureAwait(false)).Result; phlo.Interface = this; phlo._node = new Lazy(() => new NodeInterface(Client, phloId)); - phlo._multiPartyCall = new Lazy(() => new MultiPartyCallInterface(Client, phloId)); + phlo._multiPartyCall = new Lazy(() => new MultiPartyCall.MultiPartyCallInterface(Client, phloId)); return phlo; } From 4c85f96550ae302dbe5ed0380d41f5db17ffb4c9 Mon Sep 17 00:00:00 2001 From: vishesh-plivo Date: Mon, 15 Jun 2020 17:19:28 +0530 Subject: [PATCH 2/4] move member inside Phlo --- src/Plivo/Resource/{Member => Phlo}/Member.cs | 2 +- src/Plivo/Resource/{Member => Phlo}/MemberInterface.cs | 2 +- src/Plivo/Resource/Phlo/MultiPartyCall.cs | 5 ++--- src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) rename src/Plivo/Resource/{Member => Phlo}/Member.cs (92%) rename src/Plivo/Resource/{Member => Phlo}/MemberInterface.cs (97%) diff --git a/src/Plivo/Resource/Member/Member.cs b/src/Plivo/Resource/Phlo/Member.cs similarity index 92% rename from src/Plivo/Resource/Member/Member.cs rename to src/Plivo/Resource/Phlo/Member.cs index 9a6e9537..f41997a5 100755 --- a/src/Plivo/Resource/Member/Member.cs +++ b/src/Plivo/Resource/Phlo/Member.cs @@ -1,4 +1,4 @@ -namespace Plivo.Resource.Member +namespace Plivo.Resource.Phlo.Member { public class Member: Resource { diff --git a/src/Plivo/Resource/Member/MemberInterface.cs b/src/Plivo/Resource/Phlo/MemberInterface.cs similarity index 97% rename from src/Plivo/Resource/Member/MemberInterface.cs rename to src/Plivo/Resource/Phlo/MemberInterface.cs index 8847016e..d396dd8c 100755 --- a/src/Plivo/Resource/Member/MemberInterface.cs +++ b/src/Plivo/Resource/Phlo/MemberInterface.cs @@ -1,7 +1,7 @@ using Plivo.Client; using System.Threading.Tasks; -namespace Plivo.Resource.Member +namespace Plivo.Resource.Phlo.Member { public class MemberInterface: ResourceInterface { diff --git a/src/Plivo/Resource/Phlo/MultiPartyCall.cs b/src/Plivo/Resource/Phlo/MultiPartyCall.cs index 0daf87e5..1f3b3e7d 100644 --- a/src/Plivo/Resource/Phlo/MultiPartyCall.cs +++ b/src/Plivo/Resource/Phlo/MultiPartyCall.cs @@ -1,13 +1,12 @@ using System; using Plivo.Exception; -using Plivo.Resource.Member; namespace Plivo.Resource.Phlo.MultiPartyCall { public class MultiPartyCall : Node.Node { - public Lazy _member; - private MemberInterface MemberI => _member.Value; + public Lazy _member; + private Member.MemberInterface MemberI => _member.Value; public BaseResponse Call(string triggerSource, string to, string role) { diff --git a/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs b/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs index 3d8ce484..a4405ef9 100644 --- a/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs +++ b/src/Plivo/Resource/Phlo/MultiPartyCallInterface.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Plivo.Client; using Plivo.Exception; -using Plivo.Resource.Member; namespace Plivo.Resource.Phlo.MultiPartyCall { @@ -22,7 +21,7 @@ public class MultiPartyCallInterface : ResourceInterface /// private string _nodeId; - private MemberInterface MemberI { get; set; } + private Member.MemberInterface MemberI { get; set; } public MultiPartyCallInterface(HttpClient client, string phloId) : base(client) { @@ -41,7 +40,7 @@ public MultiPartyCall Get(string phloId, string nodeId) _nodeId = nodeId; var multiPartyCall = Task.Run(async () => await GetResource($"/{_nodeType}/{_nodeId}", new Dictionary()).ConfigureAwait(false)).Result; multiPartyCall.Interface = this; - multiPartyCall._member = new Lazy(() => new MemberInterface(Client, phloId, _nodeType, _nodeId)); + multiPartyCall._member = new Lazy(() => new Member.MemberInterface(Client, phloId, _nodeType, _nodeId)); return multiPartyCall; } From dc0d5859988fa6e6e5a2f062fc42c186f33e6908 Mon Sep 17 00:00:00 2001 From: vishesh-plivo Date: Wed, 19 Aug 2020 13:35:52 +0530 Subject: [PATCH 3/4] added change logs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6bdcd82..816e4d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log +## [v4.10.2](https://github.com/plivo/plivo-dotnet/tree/v4.10.2) (2020-08-19) +- Internal changes in PHLO for MultiPartyCall component. + ## [v4.10.1](https://github.com/plivo/plivo-dotnet/tree/v4.10.1) (2020-08-14) - Add exception handling for non-JSON error responses and statusCode 401. ## [v4.10.0](https://github.com/plivo/plivo-dotnet/tree/v4.10.0) (2020-08-06) From 3b18373e3fd5bc5d3252a25195e2451b1faddd7d Mon Sep 17 00:00:00 2001 From: Nixon Samuel Date: Fri, 21 Aug 2020 16:18:48 +0530 Subject: [PATCH 4/4] bump version to 4.10.2 --- src/Plivo/Plivo.csproj | 2 +- src/Plivo/Plivo.nuspec | 3 ++- src/Plivo/Version.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Plivo/Plivo.csproj b/src/Plivo/Plivo.csproj index 79933bfc..4c6619d6 100755 --- a/src/Plivo/Plivo.csproj +++ b/src/Plivo/Plivo.csproj @@ -1,7 +1,7 @@ netstandard2.0;netstandard1.3 - 4.10.1 + 4.10.2 Plivo SDKs Team Plivo Inc. diff --git a/src/Plivo/Plivo.nuspec b/src/Plivo/Plivo.nuspec index a00c2803..63dc736f 100755 --- a/src/Plivo/Plivo.nuspec +++ b/src/Plivo/Plivo.nuspec @@ -4,7 +4,7 @@ A .NET SDK to make voice calls and send SMS using Plivo and to generate Plivo XML A .NET SDK to make voice calls and send SMS using Plivo and to generate Plivo XML Plivo - 4.10.1 + 4.10.2 Plivo Plivo SDKs Team Plivo, Inc. @@ -12,6 +12,7 @@ http://github.com/plivo/plivo-dotnet false + * 4.10.2 Internal changes in PHLO for MultiPartyCall component. * 4.10.1 Added exception handling for non json error responses and statuscode 401. * 4.10.0 Add retries to multiple regions for voice requests. * 4.9.1 Fix List Call Details response. diff --git a/src/Plivo/Version.cs b/src/Plivo/Version.cs index eb377f72..67541867 100755 --- a/src/Plivo/Version.cs +++ b/src/Plivo/Version.cs @@ -10,7 +10,7 @@ public class Version /// /// DotNet SDK version /// - public const string SdkVersion = "4.10.1"; + public const string SdkVersion = "4.10.2"; /// /// Plivo API version ///