wip: base class for states

MikeDobrzan · MikeDobrzan · commit 0fee4974c97d · 2023-07-31T10:49:45.000+02:00
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/Common/CommonSubscribeTypes.cs b/src/Api/PubnubApi/EventEngine/Subscribe/Common/CommonSubscribeTypes.cs
@@ -1,4 +1,6 @@
 ﻿using Newtonsoft.Json;
+using System.Collections.Generic;
+using PubnubApi.EventEngine.Subscribe.Context;
 
 namespace PubnubApi.EventEngine.Subscribe.Common
 {
@@ -82,4 +84,11 @@ public class Message<T>
 		[JsonProperty("p")]
 		public Timetoken Timetoken { get; set; }
 	}
+	
+	public abstract class SubscriptionState : Core.State
+	{
+		public IEnumerable<string> Channels;
+		public IEnumerable<string> ChannelGroups;
+		public ReconnectionConfiguration ReconnectionConfiguration;
+	}
 }
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs
@@ -1,18 +1,15 @@
 ﻿using System;
 using System.Collections.Generic;
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Subscribe.Context;
 using PubnubApi.EventEngine.Subscribe.Invocations;
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class HandshakeFailedState : Core.State
+    public class HandshakeFailedState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
-		public ReconnectionConfiguration ReconnectionConfiguration;
-
-		public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs
@@ -1,16 +1,14 @@
 ﻿using System;
 using System.Collections.Generic;
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Subscribe.Context;
 using PubnubApi.EventEngine.Subscribe.Invocations;
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-	public class HandshakeReconnectingState : Core.State
+	public class HandshakeReconnectingState : SubscriptionState
 	{
-		public IEnumerable<string> Channels;
-		public IEnumerable<string> ChannelGroups;
-		public ReconnectionConfiguration ReconnectionConfiguration;
 		public int AttemptedRetries;
 
 		public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeReconnectInvocation()
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeStoppedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeStoppedState.cs
@@ -1,18 +1,15 @@
 ﻿using System;
 using System.Collections.Generic;
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Subscribe.Context;
 using PubnubApi.EventEngine.Subscribe.Invocations;
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class HandshakeStoppedState : Core.State
+    public class HandshakeStoppedState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
-		public ReconnectionConfiguration ReconnectionConfiguration;
-
-		public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs
@@ -1,19 +1,15 @@
 ﻿using System;
 using System.Collections.Generic;
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Subscribe.Context;
 using PubnubApi.EventEngine.Subscribe.Invocations;
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class HandshakingState : Core.State
+    public class HandshakingState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
-		public ReconnectionConfiguration ReconnectionConfiguration;
-
-
-		public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeInvocation()
+        public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeInvocation()
             { Channels = this.Channels,
             ChannelGroups = this.ChannelGroups }.AsArray();
 
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveFailedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveFailedState.cs
@@ -7,15 +7,12 @@
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class ReceiveFailedState : Core.State
+    public class ReceiveFailedState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
         public SubscriptionCursor Cursor;
-		public ReconnectionConfiguration ReconnectionConfiguration;
 
-		public IEnumerable<IEffectInvocation> OnEntry { get; }
-        public IEnumerable<IEffectInvocation> OnExit { get; }
+        public override IEnumerable<IEffectInvocation> OnEntry { get; }
+        public override IEnumerable<IEffectInvocation> OnExit { get; }
 
         public override TransitionResult Transition(IEvent e)
         {
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveReconnectingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveReconnectingState.cs
@@ -7,7 +7,7 @@
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class ReceiveReconnectingState : Core.State
+    public class ReceiveReconnectingState : SubscriptionState
     {
         public IEnumerable<string> Channels;
         public IEnumerable<string> ChannelGroups;
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveStoppedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveStoppedState.cs
@@ -7,14 +7,11 @@
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class ReceiveStoppedState : Core.State
+    public class ReceiveStoppedState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
         public SubscriptionCursor Cursor;
-		public ReconnectionConfiguration ReconnectionConfiguration;
 
-		public override TransitionResult Transition(IEvent e)
+        public override TransitionResult Transition(IEvent e)
         {
             return e switch
             {
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceivingState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/ReceivingState.cs
@@ -7,14 +7,11 @@
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class ReceivingState : Core.State
+    public class ReceivingState : SubscriptionState
     {
-        public IEnumerable<string> Channels;
-        public IEnumerable<string> ChannelGroups;
         public SubscriptionCursor Cursor;
-		public ReconnectionConfiguration ReconnectionConfiguration;
 
-		public override IEnumerable<IEffectInvocation> OnEntry => new ReceiveMessagesInvocation()
+        public override IEnumerable<IEffectInvocation> OnEntry => new ReceiveMessagesInvocation()
             { Channels = this.Channels,ChannelGroups = this.ChannelGroups, Cursor = this.Cursor }.AsArray();
 
         public override IEnumerable<IEffectInvocation> OnExit { get; } = new CancelReceiveMessagesInvocation().AsArray();
diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/States/UnsubscribedState.cs b/src/Api/PubnubApi/EventEngine/Subscribe/States/UnsubscribedState.cs
@@ -1,15 +1,14 @@
 ﻿using System;
 using System.Collections.Generic;
 using PubnubApi.EventEngine.Core;
+using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Subscribe.Context;
 using PubnubApi.EventEngine.Subscribe.Invocations;
 
 namespace PubnubApi.EventEngine.Subscribe.States
 {
-    public class UnsubscribedState : Core.State
+    public class UnsubscribedState : SubscriptionState
     {
-        public ReconnectionConfiguration ReconnectionConfiguration;
-
         public override TransitionResult Transition(Core.IEvent e)
         {
             return e switch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using Newtonsoft.Json;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using PubnubApi.EventEngine.Subscribe.Context;`
`2`	`4`
`3`	`5`	`namespace PubnubApi.EventEngine.Subscribe.Common`
`4`	`6`	`{`
`@@ -82,4 +84,11 @@ public class Message<T>`
`82`	`84`	`[JsonProperty("p")]`
`83`	`85`	`public Timetoken Timetoken { get; set; }`
`84`	`86`	`}`
	`87`	`+`
	`88`	`+ public abstract class SubscriptionState : Core.State`
	`89`	`+ {`
	`90`	`+ public IEnumerable<string> Channels;`
	`91`	`+ public IEnumerable<string> ChannelGroups;`
	`92`	`+ public ReconnectionConfiguration ReconnectionConfiguration;`
	`93`	`+ }`
`85`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,15 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using PubnubApi.EventEngine.Core;`
	`4`	`+using PubnubApi.EventEngine.Subscribe.Common;`
`4`	`5`	`using PubnubApi.EventEngine.Subscribe.Context;`
`5`	`6`	`using PubnubApi.EventEngine.Subscribe.Invocations;`
`6`	`7`
`7`	`8`	`namespace PubnubApi.EventEngine.Subscribe.States`
`8`	`9`	`{`
`9`		`- public class HandshakeFailedState : Core.State`
	`10`	`+ public class HandshakeFailedState : SubscriptionState`
`10`	`11`	`{`
`11`		`- public IEnumerable<string> Channels;`
`12`		`- public IEnumerable<string> ChannelGroups;`
`13`		`- public ReconnectionConfiguration ReconnectionConfiguration;`
`14`		`-`
`15`		`- public override TransitionResult Transition(IEvent e)`
	`12`	`+ public override TransitionResult Transition(IEvent e)`
`16`	`13`	`{`
`17`	`14`	`return e switch`
`18`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,12 @@`
`7`	`7`
`8`	`8`	`namespace PubnubApi.EventEngine.Subscribe.States`
`9`	`9`	`{`
`10`		`- public class ReceiveFailedState : Core.State`
	`10`	`+ public class ReceiveFailedState : SubscriptionState`
`11`	`11`	`{`
`12`		`- public IEnumerable<string> Channels;`
`13`		`- public IEnumerable<string> ChannelGroups;`
`14`	`12`	`public SubscriptionCursor Cursor;`
`15`		`- public ReconnectionConfiguration ReconnectionConfiguration;`
`16`	`13`
`17`		`- public IEnumerable<IEffectInvocation> OnEntry { get; }`
`18`		`- public IEnumerable<IEffectInvocation> OnExit { get; }`
	`14`	`+ public override IEnumerable<IEffectInvocation> OnEntry { get; }`
	`15`	`+ public override IEnumerable<IEffectInvocation> OnExit { get; }`
`19`	`16`
`20`	`17`	`public override TransitionResult Transition(IEvent e)`
`21`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace PubnubApi.EventEngine.Subscribe.States`
`9`	`9`	`{`
`10`		`- public class ReceiveReconnectingState : Core.State`
	`10`	`+ public class ReceiveReconnectingState : SubscriptionState`
`11`	`11`	`{`
`12`	`12`	`public IEnumerable<string> Channels;`
`13`	`13`	`public IEnumerable<string> ChannelGroups;`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,11 @@`
`7`	`7`
`8`	`8`	`namespace PubnubApi.EventEngine.Subscribe.States`
`9`	`9`	`{`
`10`		`- public class ReceiveStoppedState : Core.State`
	`10`	`+ public class ReceiveStoppedState : SubscriptionState`
`11`	`11`	`{`
`12`		`- public IEnumerable<string> Channels;`
`13`		`- public IEnumerable<string> ChannelGroups;`
`14`	`12`	`public SubscriptionCursor Cursor;`
`15`		`- public ReconnectionConfiguration ReconnectionConfiguration;`
`16`	`13`
`17`		`- public override TransitionResult Transition(IEvent e)`
	`14`	`+ public override TransitionResult Transition(IEvent e)`
`18`	`15`	`{`
`19`	`16`	`return e switch`
`20`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using PubnubApi.EventEngine.Core;`
	`4`	`+using PubnubApi.EventEngine.Subscribe.Common;`
`4`	`5`	`using PubnubApi.EventEngine.Subscribe.Context;`
`5`	`6`	`using PubnubApi.EventEngine.Subscribe.Invocations;`
`6`	`7`
`7`	`8`	`namespace PubnubApi.EventEngine.Subscribe.States`
`8`	`9`	`{`
`9`		`- public class UnsubscribedState : Core.State`
	`10`	`+ public class UnsubscribedState : SubscriptionState`
`10`	`11`	`{`
`11`		`- public ReconnectionConfiguration ReconnectionConfiguration;`
`12`		`-`
`13`	`12`	`public override TransitionResult Transition(Core.IEvent e)`
`14`	`13`	`{`
`15`	`14`	`return e switch`