Make client api throw on too big timespans

jageall · jageall · commit c296154d234e · 2017-03-14T19:26:00.000+02:00
diff --git a/src/EventStore.ClientAPI.NetCore/PersistentSubscriptionSettings.cs b/src/EventStore.ClientAPI.NetCore/PersistentSubscriptionSettings.cs
@@ -101,9 +101,11 @@ public static PersistentSubscriptionSettingsBuilder Create()
         /// </summary>
         internal PersistentSubscriptionSettings(bool resolveLinkTos, int startFrom, bool extraStatistics, TimeSpan messageTimeout,
                                                 int maxRetryCount, int liveBufferSize, int readBatchSize, int historyBufferSize,
-                                                TimeSpan checkPointAfter, int minCheckPointCount, int maxCheckPointCount, 
+                                                TimeSpan checkPointAfter, int minCheckPointCount, int maxCheckPointCount,
                                                 int maxSubscriberCount, string namedConsumerStrategy)
         {
+            if(messageTimeout.TotalMilliseconds > Int32.MaxValue) throw new ArgumentException("messageTimeout", "milliseconds must be less or equal to than int32.MaxValue");
+            if(checkPointAfter.TotalMilliseconds > Int32.MaxValue) throw new ArgumentException("checkPointAfter", "milliseconds must be less or equal to than int32.MaxValue");
             MessageTimeout = messageTimeout;
             ResolveLinkTos = resolveLinkTos;
             StartFrom = startFrom;
diff --git a/src/EventStore.ClientAPI.NetCore/PersistentSubscriptionSettingsBuilder.cs b/src/EventStore.ClientAPI.NetCore/PersistentSubscriptionSettingsBuilder.cs
@@ -134,7 +134,7 @@ public PersistentSubscriptionSettingsBuilder WithMessageTimeoutOf(TimeSpan timeo
         /// <returns>A new <see cref="PersistentSubscriptionSettingsBuilder"></see></returns>
         public PersistentSubscriptionSettingsBuilder DontTimeoutMessages()
         {
-            _timeout = TimeSpan.MaxValue;
+            _timeout = TimeSpan.Zero;
             return this;
         }
 
diff --git a/test/EventStore.ClientAPI.NetCore.Tests/create_persistent_subscription_with_too_big_message_timeout.cs b/test/EventStore.ClientAPI.NetCore.Tests/create_persistent_subscription_with_too_big_message_timeout.cs
@@ -0,0 +1,22 @@
+using System;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace Eventstore.ClientAPI.Tests
+{
+    [TestFixture, Category("LongRunning")]
+    public class create_persistent_subscription_with_too_big_message_timeout : SpecificationWithConnection
+    {
+ 
+        protected override void When()
+        {
+ 
+        }
+ 
+        [Test]
+        public void the_build_fails_with_argument_exception()
+        {
+            Assert.Throws<ArgumentException>(() => PersistentSubscriptionSettings.Create().WithMessageTimeoutOf(TimeSpan.FromDays(25 * 365)).Build());
+        }
+    }
+}
diff --git a/test/EventStore.ClientAPI.NetCore.Tests/create_persistent_subscription_with_too_big_retry_after.cs b/test/EventStore.ClientAPI.NetCore.Tests/create_persistent_subscription_with_too_big_retry_after.cs
@@ -0,0 +1,22 @@
+using System;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace Eventstore.ClientAPI.Tests
+{
+    [TestFixture, Category("LongRunning")]
+    public class create_persistent_subscription_with_too_big_retry_after : SpecificationWithConnection
+    {
+ 
+        protected override void When()
+        {
+ 
+        }
+ 
+        [Test]
+        public void the_build_fails_with_argument_exception()
+        {
+            Assert.Throws<ArgumentException>(() => PersistentSubscriptionSettings.Create().CheckPointAfter(TimeSpan.FromDays(25 * 365)).Build());
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public PersistentSubscriptionSettingsBuilder WithMessageTimeoutOf(TimeSpan timeo`
`134`	`134`	`/// <returns>A new <see cref="PersistentSubscriptionSettingsBuilder"></see></returns>`
`135`	`135`	`public PersistentSubscriptionSettingsBuilder DontTimeoutMessages()`
`136`	`136`	`{`
`137`		`- _timeout = TimeSpan.MaxValue;`
	`137`	`+ _timeout = TimeSpan.Zero;`
`138`	`138`	`return this;`
`139`	`139`	`}`
`140`	`140`