Merge pull request #127 from Code-Sharp/develop

darkl · darkl · commit 7bfc94cabf42 · 2016-03-12T09:54:25.000+02:00
Making contracts serializable
diff --git a/src/mono/WampSharp/WampSharp.csproj b/src/mono/WampSharp/WampSharp.csproj
@@ -260,6 +260,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\Method.cs">
       <Link>Core\Utilities\Method.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Utilities\SerializableAttribute.cs">
+      <Link>Core\Utilities\SerializableAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\ReadOnlyDictionary.cs">
       <Link>Core\Utilities\ReadOnlyDictionary.cs</Link>
     </Compile>
diff --git a/src/net40/WampSharp/WampSharp.csproj b/src/net40/WampSharp/WampSharp.csproj
@@ -264,6 +264,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\Method.cs">
       <Link>Core\Utilities\Method.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Utilities\SerializableAttribute.cs">
+      <Link>Core\Utilities\SerializableAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\ReadOnlyDictionary.cs">
       <Link>Core\Utilities\ReadOnlyDictionary.cs</Link>
     </Compile>
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Api/Server/WampRequestContext.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Api/Server/WampRequestContext.cs
@@ -5,9 +5,7 @@
 
 namespace WampSharp.V1
 {
-#if !PCL
     [Serializable]
-#endif
     public class WampRequestContext
     {
         #region Static Members
diff --git a/src/net45/WampSharp/Core/Utilities/SerializableAttribute.cs b/src/net45/WampSharp/Core/Utilities/SerializableAttribute.cs
@@ -0,0 +1,16 @@
+#if PCL
+
+namespace System
+{
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    internal sealed class SerializableAttribute : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class NonSerializedAttribute : Attribute
+    {
+    }
+}
+
+#endif
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/WampEventContext.cs b/src/net45/WampSharp/WAMP2/V2/Api/WampEventContext.cs
@@ -9,9 +9,7 @@ namespace WampSharp.V2
     /// <summary>
     /// Includes information about the current event.
     /// </summary>
-#if !PCL
     [Serializable]
-#endif
     public class WampEventContext
     {
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/WampInvocationContext.cs b/src/net45/WampSharp/WAMP2/V2/Api/WampInvocationContext.cs
@@ -10,9 +10,7 @@ namespace WampSharp.V2
     /// <summary>
     /// Includes information about the current invocation.
     /// </summary>
-#if !PCL
     [Serializable]
-#endif
     public class WampInvocationContext
     {
         #region Static Members
diff --git a/src/net45/WampSharp/WAMP2/V2/Authentication/WampAuthenticationException.cs b/src/net45/WampSharp/WAMP2/V2/Authentication/WampAuthenticationException.cs
@@ -7,9 +7,7 @@ namespace WampSharp.V2.Authentication
     /// An exception that can be thrown if can't authenticate with router.
     /// This sends an ABORT message to the router.
     /// </summary>
-#if !PCL
     [Serializable]
-#endif
     public class WampAuthenticationException : Exception
     {
         protected const string DefaultMessage = "sorry, I cannot authenticate (onchallenge handler raised an exception)";
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/Session/WampAuthenticationNotImplementedException.cs b/src/net45/WampSharp/WAMP2/V2/Client/Session/WampAuthenticationNotImplementedException.cs
@@ -8,9 +8,7 @@ namespace WampSharp.V2.Client
     /// Occurs when an CHALLENGE message has been received, 
     /// but no <see cref="IWampClientAuthenticator"/> has been provided.
     /// </summary>
-#if !PCL
     [Serializable]
-#endif
     public class WampAuthenticationNotImplementedException : WampAuthenticationException
     {
         /// <summary>
diff --git a/src/net45/WampSharp/WAMP2/V2/Client/WampSessionNotEstablishedException.cs b/src/net45/WampSharp/WAMP2/V2/Client/WampSessionNotEstablishedException.cs
@@ -3,9 +3,7 @@
 
 namespace WampSharp.V2.Client
 {
-#if !PCL
     [Serializable]
-#endif
     public class WampSessionNotEstablishedException : Exception
     {
         public WampSessionNotEstablishedException() : this("No connection to router is currently available.")
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/EventDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/EventDetails.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
@@ -7,6 +8,7 @@ namespace WampSharp.V2.Core.Contracts
     /// Represents details for EVENT message.
     /// </summary>
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Event)]
     public class EventDetails : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/PublishOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/PublishOptions.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Publish)]
     public class PublishOptions : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/PublishOptionsExtended.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/PublishOptionsExtended.cs
@@ -1,8 +1,10 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     public class PublishOptionsExtended : PublishOptions
     {
         public PublishOptionsExtended(PublishOptions options) : base(options)
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/SubscribeOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/PubSub/SubscribeOptions.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Subscribe)]
     public class SubscribeOptions : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/CallOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/CallOptions.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Call)]
     public class CallOptions : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/CancelOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/CancelOptions.cs
@@ -1,8 +1,12 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
+using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
+    [WampDetailsOptions(WampMessageType.v2Cancel)]
     public class CancelOptions : WampDetailsOptions
     {
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/InvocationDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/InvocationDetails.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Invocation)]
     public class InvocationDetails : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/InvocationDetailsExtended.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/InvocationDetailsExtended.cs
@@ -1,8 +1,10 @@
+using System;
 using System.Runtime.Serialization;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     public class InvocationDetailsExtended : InvocationDetails
     {
         public InvocationDetailsExtended()
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/RegisterOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/RegisterOptions.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Register)]
     public class RegisterOptions : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/ResultDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/ResultDetails.cs
@@ -1,9 +1,11 @@
+using System;
 using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Result)]
     public class ResultDetails : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/YieldOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Rpc/YieldOptions.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Yield)]
     public class YieldOptions : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/AbortDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/AbortDetails.cs
@@ -1,11 +1,15 @@
+using System;
 using System.Runtime.Serialization;
+using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     /// <summary>
     /// Represents details of an ABORT message.
     /// </summary>
     [DataContract]
+    [Serializable]
+    [WampDetailsOptions(WampMessageType.v2Abort)]
     public class AbortDetails : GoodbyeAbortDetails
     {
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/AuthenticateExtraData.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/AuthenticateExtraData.cs
@@ -1,7 +1,11 @@
+using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
+    [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Authenticate)]
     public class AuthenticateExtraData : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/ChallengeDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/ChallengeDetails.cs
@@ -1,8 +1,12 @@
+using System;
 using System.Runtime.Serialization;
+using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
+    [WampDetailsOptions(WampMessageType.v2Challenge)]
     public class ChallengeDetails : WampDetailsOptions
     {
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/GoodbyeAbortDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/GoodbyeAbortDetails.cs
@@ -1,8 +1,10 @@
+using System;
 using System.Runtime.Serialization;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     public abstract class GoodbyeAbortDetails : WampDetailsOptions
     {
         /// <summary>
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/GoodbyeDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/GoodbyeDetails.cs
@@ -1,11 +1,15 @@
+using System;
 using System.Runtime.Serialization;
+using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     /// <summary>
     /// Represents details of a GOODBYE message.
     /// </summary>
     [DataContract]
+    [Serializable]
+    [WampDetailsOptions(WampMessageType.v2Goodbye)]
     public class GoodbyeDetails : GoodbyeAbortDetails
     {
     }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/HelloDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/HelloDetails.cs
@@ -1,10 +1,12 @@
+using System;
 using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 using WampSharp.V2.MetaApi;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Hello)]
     public class HelloDetails : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/WelcomeDetails.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Session/WelcomeDetails.cs
@@ -1,9 +1,11 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 using WampSharp.Core.Message;
 
 namespace WampSharp.V2.Core.Contracts
 {
     [DataContract]
+    [Serializable]
     [WampDetailsOptions(WampMessageType.v2Welcome)]
     public class WelcomeDetails : WampDetailsOptions
     {
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampConnectionBrokenException.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampConnectionBrokenException.cs
@@ -4,9 +4,7 @@
 
 namespace WampSharp.V2.Core.Contracts
 {
-#if !PCL
     [Serializable]
-#endif
     public class WampConnectionBrokenException : Exception
     {
         private readonly WampSessionCloseEventArgs mEventArgs;
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampDetailsOptions.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampDetailsOptions.cs
@@ -1,21 +1,26 @@
-﻿using System.Runtime.Serialization;
+﻿using System;
+using System.Runtime.Serialization;
 
 namespace WampSharp.V2.Core.Contracts
 {
     /// <summary>
     /// An abstract class for WampDetails/WampOptions types.
     /// </summary>
+    [Serializable]
     [DataContract]
     public abstract class WampDetailsOptions
     {
+        [NonSerialized]
+        private ISerializedValue mOriginalValue;
+
         /// <summary>
         /// The original (serialized) received value.
         /// </summary>
         [IgnoreDataMember]
         public ISerializedValue OriginalValue
         {
-            get; 
-            set;
+            get { return mOriginalValue; }
+            set { mOriginalValue = value; }
         }
     }
 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampException.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/WampException.cs
@@ -5,9 +5,7 @@
 
 namespace WampSharp.V2.Core.Contracts
 {
-#if !PCL
     [Serializable]
-#endif
     public class WampException : Exception
     {
         private readonly string mErrorUri;
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/WampRpcRuntimeException.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/WampRpcRuntimeException.cs
@@ -5,9 +5,7 @@
 
 namespace WampSharp.V2.Rpc
 {
-#if !PCL
     [Serializable]
-#endif
     public class WampRpcRuntimeException : WampException
     {
         private const string ErrorUri = "wamp.error.runtime_error";
diff --git a/src/net45/WampSharp/WampSharp.csproj b/src/net45/WampSharp/WampSharp.csproj
diff --git a/src/pcl/WampSharp/WampSharp.csproj b/src/pcl/WampSharp/WampSharp.csproj

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace WampSharp.V1`
`7`	`7`	`{`
`8`		`-#if !PCL`
`9`	`8`	`[Serializable]`
`10`		`-#endif`
`11`	`9`	`public class WampRequestContext`
`12`	`10`	`{`
`13`	`11`	`#region Static Members`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@ namespace WampSharp.V2`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Includes information about the current event.`
`11`	`11`	`/// </summary>`
`12`		`-#if !PCL`
`13`	`12`	`[Serializable]`
`14`		`-#endif`
`15`	`13`	`public class WampEventContext`
`16`	`14`	`{`
`17`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace WampSharp.V2.Client`
`5`	`5`	`{`
`6`		`-#if !PCL`
`7`	`6`	`[Serializable]`
`8`		`-#endif`
`9`	`7`	`public class WampSessionNotEstablishedException : Exception`
`10`	`8`	`{`
`11`	`9`	`public WampSessionNotEstablishedException() : this("No connection to router is currently available.")`