Moved to file-scoped namespaces

Crypto_Shredding/.NET/src/CryptoShredding.IntegrationTests/TestSupport/Given_When_Then.cs

@@ -1,33 +1,32 @@
 using System;
 using System.Threading.Tasks;
 
-namespace CryptoShredding.IntegrationTests.TestSupport
+namespace CryptoShredding.IntegrationTests.TestSupport;
+
+public abstract class Given_WhenAsync_Then_Test
+    : IDisposable
 {
-    public abstract class Given_WhenAsync_Then_Test
-        : IDisposable
+    protected Given_WhenAsync_Then_Test()
     {
-        protected Given_WhenAsync_Then_Test()
-        {
-            Task.Run((Func<Task>) (async () => await this.SetupAsync())).Wait();
-        }
+        Task.Run((Func<Task>) (async () => await this.SetupAsync())).Wait();
+    }
 
-        private async Task SetupAsync()
-        {
-            await Given();
-            await When();
-        }
+    private async Task SetupAsync()
+    {
+        await Given();
+        await When();
+    }
 
-        protected abstract Task Given();
+    protected abstract Task Given();
 
-        protected abstract Task When();
+    protected abstract Task When();
 
-        public void Dispose()
-        {
-            Cleanup();
-        }
+    public void Dispose()
+    {
+        Cleanup();
+    }
 
-        protected virtual void Cleanup()
-        {
-        }
+    protected virtual void Cleanup()
+    {
     }
 }

Crypto_Shredding/.NET/src/CryptoShredding/Attributes/DataSubjectIdAttribute.cs

@@ -1,12 +1,11 @@
 using System;
 
-namespace CryptoShredding.Attributes
-{
-    /**
+namespace CryptoShredding.Attributes;
+
+/**
     * Specifies the PII owner (e.g: the person Id)
     */
-    public class DataSubjectIdAttribute 
-        : Attribute
-    {
-    }
+public class DataSubjectIdAttribute 
+    : Attribute
+{
 }

Crypto_Shredding/.NET/src/CryptoShredding/Attributes/PersonalDataAttribute.cs

@@ -1,12 +1,11 @@
 using System;
 
-namespace CryptoShredding.Attributes
-{
-    /**
+namespace CryptoShredding.Attributes;
+
+/**
      * Specifies the property that holds PII
      */
-    public class PersonalDataAttribute
-        : Attribute
-    {
-    }
+public class PersonalDataAttribute
+    : Attribute
+{
 }

Crypto_Shredding/.NET/src/CryptoShredding/Contracts/IEvent.cs

@@ -1,6 +1,5 @@
-namespace CryptoShredding.Contracts
+namespace CryptoShredding.Contracts;
+
+public interface IEvent
 {
-    public interface IEvent
-    {
-    }
 }

Crypto_Shredding/.NET/src/CryptoShredding/EventConverter.cs

@@ -2,36 +2,35 @@
 using CryptoShredding.Serialization;
 using EventStore.Client;
 
-namespace CryptoShredding
+namespace CryptoShredding;
+
+public class EventConverter
 {
-    public class EventConverter
-    {
-        private readonly JsonSerializer _jsonSerializer;
+    private readonly JsonSerializer _jsonSerializer;
 
-        public EventConverter(JsonSerializer jsonSerializer)
-        {
-            _jsonSerializer = jsonSerializer;
-        }
+    public EventConverter(JsonSerializer jsonSerializer)
+    {
+        _jsonSerializer = jsonSerializer;
+    }
 
-        public IEvent ToEvent(ResolvedEvent resolvedEvent)
-        {
-            var data = resolvedEvent.Event.Data;
-            var metadata = resolvedEvent.Event.Metadata;
-            var eventName = resolvedEvent.Event.EventType;
-            var persistableEvent = _jsonSerializer.Deserialize(data, metadata, eventName);
-            return persistableEvent;
-        }
+    public IEvent ToEvent(ResolvedEvent resolvedEvent)
+    {
+        var data = resolvedEvent.Event.Data;
+        var metadata = resolvedEvent.Event.Metadata;
+        var eventName = resolvedEvent.Event.EventType;
+        var persistableEvent = _jsonSerializer.Deserialize(data, metadata, eventName);
+        return persistableEvent;
+    }
 
-        public EventData ToEventData(IEvent @event)
-        {
-            var eventTypeName = @event.GetType().Name;
-            var id = Uuid.NewUuid();
-            var serializedEvent = _jsonSerializer.Serialize(@event);
-            var contentType = serializedEvent.IsJson ? "application/json" : "application/octet-stream";
-            var data = serializedEvent.Data;
-            var metadata = serializedEvent.MetaData;
-            var eventData = new EventData(id, eventTypeName,data, metadata, contentType);
-            return eventData;
-        }
+    public EventData ToEventData(IEvent @event)
+    {
+        var eventTypeName = @event.GetType().Name;
+        var id = Uuid.NewUuid();
+        var serializedEvent = _jsonSerializer.Serialize(@event);
+        var contentType = serializedEvent.IsJson ? "application/json" : "application/octet-stream";
+        var data = serializedEvent.Data;
+        var metadata = serializedEvent.MetaData;
+        var eventData = new EventData(id, eventTypeName,data, metadata, contentType);
+        return eventData;
     }
 }

Crypto_Shredding/.NET/src/CryptoShredding/EventStore.cs

@@ -4,59 +4,58 @@
 using CryptoShredding.Contracts;
 using EventStore.Client;
 
-namespace CryptoShredding
+namespace CryptoShredding;
+
+public class EventStore
 {
-    public class EventStore
-    {
-        private readonly EventStoreClient _eventStoreClient;
-        private readonly EventConverter _eventConverter;
+    private readonly EventStoreClient _eventStoreClient;
+    private readonly EventConverter _eventConverter;
 
-        public EventStore(
-            EventStoreClient eventStoreClient,
-            EventConverter eventConverter)
-        {
-            _eventStoreClient = eventStoreClient;
-            _eventConverter = eventConverter;
-        }
+    public EventStore(
+        EventStoreClient eventStoreClient,
+        EventConverter eventConverter)
+    {
+        _eventStoreClient = eventStoreClient;
+        _eventConverter = eventConverter;
+    }
 
-        public async Task PersistEvents(string streamName, int aggregateVersion, IEnumerable<IEvent> eventsToPersist)
+    public async Task PersistEvents(string streamName, int aggregateVersion, IEnumerable<IEvent> eventsToPersist)
+    {
+        var events = eventsToPersist.ToList();
+        var count = events.Count;
+        if (count == 0)
         {
-            var events = eventsToPersist.ToList();
-            var count = events.Count;
-            if (count == 0)
-            {
-                return;
-            }
-
-            var expectedRevision = GetExpectedRevision(aggregateVersion, count);
-            var eventsData =
-                events.Select(x => _eventConverter.ToEventData(x));
-            if (expectedRevision == null)
-                await _eventStoreClient.AppendToStreamAsync(streamName, StreamState.NoStream, eventsData);
-            else
-                await _eventStoreClient.AppendToStreamAsync(streamName, expectedRevision.Value, eventsData);
+            return;
         }
 
-        public async Task<IEnumerable<IEvent>> GetEvents(string streamName)
-        {
-            const int start = 0;
-            const int count = 4096;
-            const bool resolveLinkTos = false;
-            var sliceEvents =
-                _eventStoreClient.ReadStreamAsync(Direction.Forwards, streamName, start, count, resolveLinkTos: resolveLinkTos);
-            var resolvedEvents = await sliceEvents.ToListAsync();
-            var events =
-                resolvedEvents.Select(x => _eventConverter.ToEvent(x));
-            return events;
-        }
+        var expectedRevision = GetExpectedRevision(aggregateVersion, count);
+        var eventsData =
+            events.Select(x => _eventConverter.ToEventData(x));
+        if (expectedRevision == null)
+            await _eventStoreClient.AppendToStreamAsync(streamName, StreamState.NoStream, eventsData);
+        else
+            await _eventStoreClient.AppendToStreamAsync(streamName, expectedRevision.Value, eventsData);
+    }
+
+    public async Task<IEnumerable<IEvent>> GetEvents(string streamName)
+    {
+        const int start = 0;
+        const int count = 4096;
+        const bool resolveLinkTos = false;
+        var sliceEvents =
+            _eventStoreClient.ReadStreamAsync(Direction.Forwards, streamName, start, count, resolveLinkTos: resolveLinkTos);
+        var resolvedEvents = await sliceEvents.ToListAsync();
+        var events =
+            resolvedEvents.Select(x => _eventConverter.ToEvent(x));
+        return events;
+    }
 
-        private StreamRevision? GetExpectedRevision(int aggregateVersion, int numberOfEvents)
-        {
-            var originalVersion = aggregateVersion - numberOfEvents;
-            var expectedVersion = originalVersion != 0
-                ? StreamRevision.FromInt64(originalVersion - 1)
-                : (StreamRevision?)null;
-            return expectedVersion;
-        }
+    private StreamRevision? GetExpectedRevision(int aggregateVersion, int numberOfEvents)
+    {
+        var originalVersion = aggregateVersion - numberOfEvents;
+        var expectedVersion = originalVersion != 0
+            ? StreamRevision.FromInt64(originalVersion - 1)
+            : (StreamRevision?)null;
+        return expectedVersion;
     }
 }

Crypto_Shredding/.NET/src/CryptoShredding/Repository/CryptoRepository.cs

@@ -1,44 +1,43 @@
 using System;
 using System.Collections.Generic;
 
-namespace CryptoShredding.Repository
+namespace CryptoShredding.Repository;
+
+public class CryptoRepository
 {
-    public class CryptoRepository
+    private readonly IDictionary<string, EncryptionKey> _cryptoStore;
+
+    public CryptoRepository()
     {
-        private readonly IDictionary<string, EncryptionKey> _cryptoStore;
+        _cryptoStore = new Dictionary<string, EncryptionKey>();
+    }
 
-        public CryptoRepository()
+    public EncryptionKey GetExistingOrNew(string id, Func<EncryptionKey> keyGenerator)
+    {
+        var isExisting = _cryptoStore.TryGetValue(id, out var keyStored);
+        if (isExisting)
         {
-            _cryptoStore = new Dictionary<string, EncryptionKey>();
+            return keyStored;
         }
 
-        public EncryptionKey GetExistingOrNew(string id, Func<EncryptionKey> keyGenerator)
-        {
-            var isExisting = _cryptoStore.TryGetValue(id, out var keyStored);
-            if (isExisting)
-            {
-                return keyStored;
-            }
-
-            var newEncryptionKey = keyGenerator.Invoke();
-            _cryptoStore.Add(id, newEncryptionKey);
-            return newEncryptionKey;
-        }
+        var newEncryptionKey = keyGenerator.Invoke();
+        _cryptoStore.Add(id, newEncryptionKey);
+        return newEncryptionKey;
+    }
 
-        public EncryptionKey GetExistingOrDefault(string id)
+    public EncryptionKey GetExistingOrDefault(string id)
+    {
+        var isExisting = _cryptoStore.TryGetValue(id, out var keyStored);
+        if (isExisting)
         {
-            var isExisting = _cryptoStore.TryGetValue(id, out var keyStored);
-            if (isExisting)
-            {
-                return keyStored;
-            }
-
-            return default;
+            return keyStored;
         }
 
-        public void DeleteEncryptionKey(string id)
-        {
-            _cryptoStore.Remove(id);
-        }
+        return default;
+    }
+
+    public void DeleteEncryptionKey(string id)
+    {
+        _cryptoStore.Remove(id);
     }
 }

Crypto_Shredding/.NET/src/CryptoShredding/Repository/EncryptionKey.cs

@@ -1,16 +1,15 @@
-namespace CryptoShredding.Repository
+namespace CryptoShredding.Repository;
+
+public class EncryptionKey
 {
-    public class EncryptionKey
-    {
-        public byte[] Key { get; }
-        public byte[] Nonce { get; }
+    public byte[] Key { get; }
+    public byte[] Nonce { get; }
 
-        public EncryptionKey(
-            byte[] key,
-            byte[] nonce)
-        {
-            Key = key;
-            Nonce = nonce;
-        }
+    public EncryptionKey(
+        byte[] key,
+        byte[] nonce)
+    {
+        Key = key;
+        Nonce = nonce;
     }
 }