Skip to content

Commit e857bb1

Browse files
tgiachitgiachi
committed
Merge branch 'develop' into feat/messaging-rabbitmq
# Conflicts: # src/SquidStd.Messaging.Abstractions/JsonMessageSerializer.cs # src/SquidStd.Messaging.Abstractions/MessageQueue.cs # src/SquidStd.Messaging.Abstractions/MessagingMetricsProvider.cs # src/SquidStd.Messaging/JsonMessageSerializer.cs # src/SquidStd.Messaging/MessageQueue.cs # src/SquidStd.Messaging/MessagingMetricsProvider.cs # src/SquidStd.Messaging/Services/JsonMessageSerializer.cs # src/SquidStd.Messaging/Services/MessageQueue.cs # src/SquidStd.Messaging/Services/MessagingMetricsProvider.cs # tests/SquidStd.Tests/Messaging/JsonMessageSerializerTests.cs # tests/SquidStd.Tests/Messaging/MessagingMetricsProviderTests.cs
2 parents 48eda72 + bfbebd4 commit e857bb1

21 files changed

Lines changed: 40 additions & 28 deletions

‎CODE_CONVENTION.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public enum DirectoryType { Scripts, Logs, Plugins, Configs }
9999

100100
## 7. Strings
101101

102-
- Always use `""` instead of `string.Empty`.
102+
- Always use `string.Empty` instead of `""`.
103103

104104
## 8. Logging
105105

@@ -201,7 +201,7 @@ tests/SquidStd.Tests/Support/FakeSourcePlugin.cs → namespace SquidStd.Tests
201201
- No TODO comments without a tracked follow-up.
202202
- No inconsistent naming across domains.
203203
- Keep warnings under control; do not normalize noisy warnings.
204-
- No `string.Empty` — use `""`.
204+
- No literal `""` — use `string.Empty`.
205205
- No primary constructors.
206206
- No expression-bodied constructors.
207207

‎src/SquidStd.Database/Data/FreeSqlDataAccess.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using SquidStd.Database.Abstractions.Data;
55
using SquidStd.Database.Abstractions.Data.Entities;
66
using SquidStd.Database.Abstractions.Interfaces.Data;
7-
using SquidStd.Database.Services;
7+
using SquidStd.Database.Interfaces.Services;
88

99
namespace SquidStd.Database.Data;
1010

‎src/SquidStd.Database/Extensions/RegisterDatabaseExtension.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using SquidStd.Database.Abstractions.Data.Database;
55
using SquidStd.Database.Abstractions.Interfaces.Data;
66
using SquidStd.Database.Data;
7+
using SquidStd.Database.Interfaces.Services;
78
using SquidStd.Database.Services;
89

910
namespace SquidStd.Database.Extensions;

src/SquidStd.Database/Services/IDatabaseService.cs renamed to src/SquidStd.Database/Interfaces/Services/IDatabaseService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using FreeSql;
22
using SquidStd.Abstractions.Interfaces.Services;
33

4-
namespace SquidStd.Database.Services;
4+
namespace SquidStd.Database.Interfaces.Services;
55

66
/// <summary>
77
/// Owns the application's singleton FreeSql instance and its lifecycle.

‎src/SquidStd.Database/Services/DatabaseService.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using SquidStd.Database.Abstractions.Data.Database;
44
using SquidStd.Database.Abstractions.Types.Data;
55
using SquidStd.Database.Connection;
6+
using SquidStd.Database.Interfaces.Services;
67

78
namespace SquidStd.Database.Services;
89

src/SquidStd.Messaging.Abstractions/MessagingConnectionString.cs renamed to src/SquidStd.Messaging.Abstractions/Data/Config/MessagingConnectionString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Frozen;
22
using System.Web;
33

4-
namespace SquidStd.Messaging.Abstractions;
4+
namespace SquidStd.Messaging.Abstractions.Data.Config;
55

66
/// <summary>
77
/// Parsed messaging connection string of the form <c>scheme://[user:pass@]host[:port][/vhost][?params]</c>.

src/SquidStd.Messaging.Abstractions/MessagingOptions.cs renamed to src/SquidStd.Messaging.Abstractions/Data/Config/MessagingOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace SquidStd.Messaging.Abstractions;
1+
namespace SquidStd.Messaging.Abstractions.Data.Config;
22

33
/// <summary>
44
/// Configuration for the messaging system.

src/SquidStd.Messaging.Abstractions/JsonMessageSerializer.cs renamed to src/SquidStd.Messaging.Abstractions/Services/JsonMessageSerializer.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Text.Json;
33
using SquidStd.Messaging.Abstractions.Interfaces;
44

5-
namespace SquidStd.Messaging.Abstractions;
5+
namespace SquidStd.Messaging.Abstractions.Services;
66

77
/// <summary>
88
/// Default JSON message serializer based on System.Text.Json.
@@ -16,13 +16,13 @@ public JsonMessageSerializer()
1616
_options = new(JsonSerializerDefaults.Web);
1717
}
1818

19-
[RequiresUnreferencedCode("JSON serialization may require types that cannot be statically analyzed.")]
20-
[RequiresDynamicCode("JSON serialization may require runtime code generation.")]
19+
[RequiresUnreferencedCode("JSON serialization may require types that cannot be statically analyzed."),
20+
RequiresDynamicCode("JSON serialization may require runtime code generation.")]
2121
public ReadOnlyMemory<byte> Serialize<TMessage>(TMessage message)
2222
=> JsonSerializer.SerializeToUtf8Bytes(message, _options);
2323

24-
[RequiresUnreferencedCode("JSON deserialization may require types that cannot be statically analyzed.")]
25-
[RequiresDynamicCode("JSON deserialization may require runtime code generation.")]
24+
[RequiresUnreferencedCode("JSON deserialization may require types that cannot be statically analyzed."),
25+
RequiresDynamicCode("JSON deserialization may require runtime code generation.")]
2626
public TMessage Deserialize<TMessage>(ReadOnlyMemory<byte> payload)
2727
=> JsonSerializer.Deserialize<TMessage>(payload.Span, _options) ??
2828
throw new InvalidOperationException($"Deserialization returned null for type {typeof(TMessage).Name}.");

src/SquidStd.Messaging.Abstractions/MessageQueue.cs renamed to src/SquidStd.Messaging.Abstractions/Services/MessageQueue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using SquidStd.Messaging.Abstractions.Interfaces;
22

3-
namespace SquidStd.Messaging.Abstractions;
3+
namespace SquidStd.Messaging.Abstractions.Services;
44

55
/// <summary>
66
/// Typed facade over an <see cref="IQueueProvider" />: serializes outgoing messages and

src/SquidStd.Messaging.Abstractions/MessagingMetricsProvider.cs renamed to src/SquidStd.Messaging.Abstractions/Services/MessagingMetricsProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using SquidStd.Core.Types.Metrics;
55
using SquidStd.Messaging.Abstractions.Interfaces;
66

7-
namespace SquidStd.Messaging.Abstractions;
7+
namespace SquidStd.Messaging.Abstractions.Services;
88

99
/// <summary>
1010
/// Accumulates messaging metrics and exposes them to the metrics collection system.

0 commit comments

Comments
 (0)