up

src/Concelier/__Libraries/StellaOps.Concelier.Connector.CertBund/CertBundConnector.cs

@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using StellaOps.Concelier.Bson;
+using StellaOps.Concelier.Documents;
 using StellaOps.Concelier.Connector.CertBund.Configuration;
 using StellaOps.Concelier.Connector.CertBund.Internal;
 using StellaOps.Concelier.Connector.Common;
@@ -286,7 +286,7 @@ public sealed class CertBundConnector : IFeedConnector
             _diagnostics.ParseSuccess(dto.Products.Count, dto.CveIds.Count);
             parsedCount++;
 
-            var bson = BsonDocument.Parse(JsonSerializer.Serialize(dto, SerializerOptions));
+            var bson = DocumentObject.Parse(JsonSerializer.Serialize(dto, SerializerOptions));
             var dtoRecord = new DtoRecord(Guid.NewGuid(), document.Id, SourceName, "cert-bund.detail.v1", bson, now);
             await _dtoStore.UpsertAsync(dtoRecord, cancellationToken).ConfigureAwait(false);
             await _documentStore.UpdateStatusAsync(document.Id, DocumentStatuses.PendingMap, cancellationToken).ConfigureAwait(false);
@@ -428,7 +428,7 @@ public sealed class CertBundConnector : IFeedConnector
 
     private Task UpdateCursorAsync(CertBundCursor cursor, CancellationToken cancellationToken)
     {
-        var document = cursor.ToBsonDocument();
+        var document = cursor.ToDocumentObject();
         var completedAt = cursor.LastFetchAt ?? _timeProvider.GetUtcNow();
         return _stateRepository.UpdateCursorAsync(SourceName, document, completedAt, cancellationToken);
     }

src/Concelier/__Libraries/StellaOps.Concelier.Connector.CertBund/Internal/CertBundCursor.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using StellaOps.Concelier.Bson;
+using StellaOps.Concelier.Documents;
 
 namespace StellaOps.Concelier.Connector.CertBund.Internal;
 
@@ -31,13 +31,13 @@ internal sealed record CertBundCursor(
     public CertBundCursor WithLastFetch(DateTimeOffset? timestamp)
         => this with { LastFetchAt = timestamp };
 
-    public BsonDocument ToBsonDocument()
+    public DocumentObject ToDocumentObject()
     {
-        var document = new BsonDocument
+        var document = new DocumentObject
         {
-            ["pendingDocuments"] = new BsonArray(PendingDocuments.Select(id => id.ToString())),
-            ["pendingMappings"] = new BsonArray(PendingMappings.Select(id => id.ToString())),
-            ["knownAdvisories"] = new BsonArray(KnownAdvisories),
+            ["pendingDocuments"] = new DocumentArray(PendingDocuments.Select(id => id.ToString())),
+            ["pendingMappings"] = new DocumentArray(PendingMappings.Select(id => id.ToString())),
+            ["knownAdvisories"] = new DocumentArray(KnownAdvisories),
         };
 
         if (LastPublished.HasValue)
@@ -53,7 +53,7 @@ internal sealed record CertBundCursor(
         return document;
     }
 
-    public static CertBundCursor FromBson(BsonDocument? document)
+    public static CertBundCursor FromBson(DocumentObject? document)
     {
         if (document is null || document.ElementCount == 0)
         {
@@ -76,9 +76,9 @@ internal sealed record CertBundCursor(
     private static IReadOnlyCollection<Guid> Distinct(IEnumerable<Guid>? values)
         => values?.Distinct().ToArray() ?? EmptyGuids;
 
-    private static IReadOnlyCollection<Guid> ReadGuidArray(BsonDocument document, string field)
+    private static IReadOnlyCollection<Guid> ReadGuidArray(DocumentObject document, string field)
     {
-        if (!document.TryGetValue(field, out var value) || value is not BsonArray array)
+        if (!document.TryGetValue(field, out var value) || value is not DocumentArray array)
         {
             return EmptyGuids;
         }
@@ -95,9 +95,9 @@ internal sealed record CertBundCursor(
         return items;
     }
 
-    private static IReadOnlyCollection<string> ReadStringArray(BsonDocument document, string field)
+    private static IReadOnlyCollection<string> ReadStringArray(DocumentObject document, string field)
     {
-        if (!document.TryGetValue(field, out var value) || value is not BsonArray array)
+        if (!document.TryGetValue(field, out var value) || value is not DocumentArray array)
         {
             return EmptyStrings;
         }
@@ -108,11 +108,11 @@ internal sealed record CertBundCursor(
             .ToArray();
     }
 
-    private static DateTimeOffset? ParseDate(BsonValue value)
-        => value.BsonType switch
+    private static DateTimeOffset? ParseDate(DocumentValue value)
+        => value.DocumentType switch
         {
-            BsonType.DateTime => DateTime.SpecifyKind(value.ToUniversalTime(), DateTimeKind.Utc),
-            BsonType.String when DateTimeOffset.TryParse(value.AsString, out var parsed) => parsed.ToUniversalTime(),
+            DocumentType.DateTime => DateTime.SpecifyKind(value.ToUniversalTime(), DateTimeKind.Utc),
+            DocumentType.String when DateTimeOffset.TryParse(value.AsString, out var parsed) => parsed.ToUniversalTime(),
             _ => null,
         };
 }