Make event translators obsolete

disruptor-net · Aug 31, 2019 · 38f50b0 · 38f50b0
1 parent d2b52c6
commit 38f50b0
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 353 deletions.
diff --git a/src/Disruptor.PerfTests/Translator/OneToOneTranslatorThroughputTest.cs b/src/Disruptor.PerfTests/Translator/OneToOneTranslatorThroughputTest.cs
diff --git a/src/Disruptor.Tests/BatchingTest.cs b/src/Disruptor.Tests/BatchingTest.cs
diff --git a/src/Disruptor.Tests/BatchingTests.cs b/src/Disruptor.Tests/BatchingTests.cs
@@ -69,12 +69,13 @@ public void ShouldBatch()
 
             var buffer = d.Start();
 
-            IEventTranslator<LongEvent> translator = new EventTranslator<LongEvent>();
-
             const int eventCount = 10000;
             for (var i = 0; i < eventCount; i++)
             {
-                buffer.PublishEvent(translator);
+                using (var scope = buffer.PublishEvent())
+                {
+                    scope.Event().Value = scope.Sequence;
+                }
             }
 
             while (Volatile.Read(ref handler1.Processed) != eventCount - 1 ||
@@ -88,13 +89,5 @@ public void ShouldBatch()
             Assert.That(handler2.PublishedValue, Is.EqualTo((long)eventCount - 1));
             Assert.That(handler2.EventCount, Is.EqualTo((long)eventCount / 2));
         }
-
-        private class EventTranslator<T> : IEventTranslator<LongEvent>
-        {
-            public void TranslateTo(LongEvent eventData, long sequence)
-            {
-                eventData.Value = sequence;
-            }
-        }
     }
 }
diff --git a/src/Disruptor.Tests/EventPublisherTests.cs b/src/Disruptor.Tests/EventPublisherTests.cs
@@ -1,6 +1,9 @@
+using System;
 using Disruptor.Tests.Support;
 using NUnit.Framework;
 
+#pragma warning disable 618
+
 namespace Disruptor.Tests
 {
     [TestFixture]

diff --git a/src/Disruptor.Tests/Example/MutliProducerWithTranslator.cs b/src/Disruptor.Tests/Example/MutliProducerWithTranslator.cs
diff --git a/src/Disruptor.Tests/RingBufferTests.Obsolete.cs b/src/Disruptor.Tests/RingBufferTests.Obsolete.cs
@@ -2,6 +2,8 @@
 using NUnit.Framework;
 using static Disruptor.Tests.RingBufferEqualsConstraint;
 
+#pragma warning disable 618
+
 namespace Disruptor.Tests
 {
     partial class RingBufferTests

diff --git a/src/Disruptor.Tests/ShutdownOnFatalExceptionTest.cs b/src/Disruptor.Tests/ShutdownOnFatalExceptionTest.cs
@@ -32,28 +32,16 @@ public void ShouldShutdownGracefulEvenWithFatalExceptionHandler()
                 {
                     var bytes = new byte[32];
                     _random.NextBytes(bytes);
-                    _disruptor.PublishEvent(new ByteArrayTranslator(bytes));
+                    using (var scope = _disruptor.PublishEvent())
+                    {
+                        bytes.CopyTo(scope.Event(), 0);
+                    }
                 }
             });
 
             Assert.IsTrue(task.Wait(1000));
         }
 
-        public class ByteArrayTranslator : IEventTranslator<byte[]>
-        {
-            private readonly byte[] _bytes;
-
-            public ByteArrayTranslator(byte[] bytes)
-            {
-                _bytes = bytes;
-            }
-
-            public void TranslateTo(byte[] eventData, long sequence)
-            {
-                _bytes.CopyTo(eventData, 0);
-            }
-        }
-
         [TearDown]
         public void Teardown()
         {

diff --git a/src/Disruptor.Tests/Support/ActionEventTranslator.cs b/src/Disruptor.Tests/Support/ActionEventTranslator.cs