Events cleanup.

Squidex · Jan 15, 2025 · d65ce1f · d65ce1f
1 parent c7d4fc1
commit d65ce1f
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 117 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,7 +11,7 @@
     <PackageProjectUrl>https://github.com/squidex/squidex</PackageProjectUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>6.24.0</Version>
+    <Version>6.25.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

diff --git a/assets/Squidex.Assets.Tests/MongoGridFsAssetStoreTests.cs b/assets/Squidex.Assets.Tests/MongoGridFsAssetStoreTests.cs
@@ -5,7 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Assets.TusAdapter;
 using Xunit;
 
 namespace Squidex.Assets;

diff --git a/assets/Squidex.Assets.TusAdapter/AssetsServiceExtensions.cs b/assets/Squidex.Assets.TusAdapter/AssetsServiceExtensions.cs
@@ -5,7 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Squidex.Assets;
 using Squidex.Assets.TusAdapter;
 using Squidex.Assets.TusAdapter.Internal;
 using tusdotnet.Interfaces;

diff --git a/assets/TusTestServer/Utils.cs b/assets/TusTestServer/Utils.cs
@@ -6,7 +6,6 @@
 // ==========================================================================
 
 using Squidex.Assets;
-using Squidex.Assets.Internal;
 using Squidex.Assets.TusAdapter;
 using Squidex.Assets.TusAdapter.Internal;
 using tusdotnet;

diff --git a/events/Squidex.Events.Tests/EventStoreTests.cs b/events/Squidex.Events.Tests/EventStoreTests.cs
@@ -7,7 +7,6 @@
 
 using System.Globalization;
 using FluentAssertions;
-using Squidex.Events.EntityFramework;
 using Xunit;
 
 #pragma warning disable MA0040 // Forward the CancellationToken parameter to methods that take one

diff --git a/events/Squidex.Events.Tests/MariaDbEventStoreFixture.cs b/events/Squidex.Events.Tests/MariaDbEventStoreFixture.cs
@@ -8,7 +8,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Squidex.Hosting;
 using Testcontainers.MariaDb;

diff --git a/events/Squidex.Events.Tests/MysqlEventStoreFixture.cs b/events/Squidex.Events.Tests/MysqlEventStoreFixture.cs
@@ -8,7 +8,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Squidex.Hosting;
 using Testcontainers.MySql;

diff --git a/events/Squidex.Events.Tests/PostgresEventStoreFixture.cs b/events/Squidex.Events.Tests/PostgresEventStoreFixture.cs
@@ -8,7 +8,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Squidex.Hosting;
 using Testcontainers.PostgreSql;

diff --git a/events/Squidex.Events.Tests/SqlServerEventStoreFixture.cs b/events/Squidex.Events.Tests/SqlServerEventStoreFixture.cs
@@ -8,7 +8,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Squidex.Hosting;
 using Testcontainers.MsSql;

diff --git a/events/Squidex.Events/CollectionNameAttribute.cs b/events/Squidex.Events/CollectionNameAttribute.cs
diff --git a/events/Squidex.Events/CommonHeaders.cs b/events/Squidex.Events/CommonHeaders.cs
diff --git a/events/Squidex.Events/EnvelopeExtensions.cs b/events/Squidex.Events/EnvelopeExtensions.cs
@@ -11,26 +11,6 @@ namespace Squidex.Events;
 
 public static class EnvelopeExtensions
 {
-    public static long EventStreamNumber(this EnvelopeHeaders headers)
-    {
-        return headers.GetLong(CommonHeaders.EventStreamNumber);
-    }
-
-    public static Guid CommitId(this EnvelopeHeaders headers)
-    {
-        return headers.GetGuid(CommonHeaders.CommitId);
-    }
-
-    public static Guid EventId(this EnvelopeHeaders headers)
-    {
-        return headers.GetGuid(CommonHeaders.EventId);
-    }
-
-    public static DateTime Timestamp(this EnvelopeHeaders headers)
-    {
-        return headers.GetInstant(CommonHeaders.Timestamp);
-    }
-
     public static long GetLong(this EnvelopeHeaders obj, string key)
     {
         if (obj.TryGetValue(key, out var found))
@@ -48,26 +28,6 @@ public static long GetLong(this EnvelopeHeaders obj, string key)
         return 0;
     }
 
-    public static Guid GetGuid(this EnvelopeHeaders obj, string key)
-    {
-        if (obj.TryGetValue(key, out var found) && found is HeaderStringValue s && Guid.TryParse(s.Value, out var guid))
-        {
-            return guid;
-        }
-
-        return default;
-    }
-
-    public static DateTime GetInstant(this EnvelopeHeaders obj, string key)
-    {
-        if (obj.TryGetValue(key, out var found) && found is HeaderStringValue s && DateTime.TryParseExact(s.Value, "o", CultureInfo.InvariantCulture, DateTimeStyles.None, out var instant))
-        {
-            return instant;
-        }
-
-        return default;
-    }
-
     public static string GetString(this EnvelopeHeaders obj, string key)
     {
         if (obj.TryGetValue(key, out var found))

diff --git a/...uidex.Events/EventHeaderValueConverter.cs → events/Squidex.Events/EventHeaderValue.cs b/...uidex.Events/EventHeaderValueConverter.cs → events/Squidex.Events/EventHeaderValue.cs
diff --git a/events/Squidex.Events/Telemetry.cs → events/Squidex.Events/EventsTelemetry.cs b/events/Squidex.Events/Telemetry.cs → events/Squidex.Events/EventsTelemetry.cs
@@ -9,7 +9,7 @@
 
 namespace Squidex.Events;
 
-public static class Telemetry
+public static class EventsTelemetry
 {
     public static readonly ActivitySource Activities = new ActivitySource("Squidex");
 }
diff --git a/events/Squidex.Events/IOnRead.cs b/events/Squidex.Events/IOnRead.cs
diff --git a/events/Squidex.Events/InconsistentStateException.cs b/events/Squidex.Events/InconsistentStateException.cs