get rid of functional extensions

Yuck · Jun 27, 2024 · 948d070 · 948d070
1 parent cbf135b
commit 948d070
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 35 deletions.
diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/CreationHandler.cs b/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/CreationHandler.cs
@@ -1,5 +1,4 @@
 using Amazon.DynamoDBv2.DataModel;
-using CSharpFunctionalExtensions;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
 using YuckQi.Domain.Aspects.Abstract;
@@ -57,7 +56,7 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
         return list;
     }
 
-    protected override Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope)
+    protected override TIdentifier? DoCreate(TEntity entity, TScope? scope)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
@@ -68,7 +67,7 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
         return result;
     }
 
-    protected override async Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
+    protected override async Task<TIdentifier?> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
@@ -78,6 +77,6 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
 
         await table.PutItemAsync(scope.ToDocument(document), cancellationToken);
 
-        return Maybe<TIdentifier?>.From(entity.Identifier);
+        return entity.Identifier;
     }
 }
diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj b/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for Amazon DynamoDB databases.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/CreationHandler.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/CreationHandler.cs
@@ -1,5 +1,4 @@
-using CSharpFunctionalExtensions;
-using MongoDB.Driver;
+using MongoDB.Driver;
 using YuckQi.Data.DocumentDb.MongoDb.Extensions;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
@@ -54,7 +53,7 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
         return list;
     }
 
-    protected override Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope)
+    protected override TIdentifier? DoCreate(TEntity entity, TScope? scope)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
@@ -68,7 +67,7 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
         return document.GetIdentifier<TDocument, TIdentifier>();
     }
 
-    protected override async Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
+    protected override async Task<TIdentifier?> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj b/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for MongoDB databases.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.MemDb/Handlers/CreationHandler.cs b/src/YuckQi.Data.MemDb/Handlers/CreationHandler.cs
@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using CSharpFunctionalExtensions;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
 using YuckQi.Domain.Aspects.Abstract;
@@ -16,13 +15,13 @@ public CreationHandler(ConcurrentDictionary<TIdentifier, TEntity> entities, Crea
         _entities = entities ?? throw new ArgumentNullException(nameof(entities));
     }
 
-    protected override Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope)
+    protected override TIdentifier? DoCreate(TEntity entity, TScope? scope)
     {
         if (entity.Identifier == null)
             throw new InvalidOperationException();
 
-        return _entities.TryAdd(entity.Identifier, entity) ? entity.Identifier : Maybe<TIdentifier?>.None;
+        return _entities.TryAdd(entity.Identifier, entity) ? entity.Identifier : default;
     }
 
-    protected override Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken) => Task.FromResult(DoCreate(entity, scope));
+    protected override Task<TIdentifier?> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken) => Task.FromResult(DoCreate(entity, scope));
 }
diff --git a/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj b/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for a in-memory "database" (ConcurrentDictionary), ideal for rapid development without external dependencies.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj b/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for MySQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj b/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for Oracle databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj b/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for MSSQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper/Handlers/CreationHandler.cs b/src/YuckQi.Data.Sql.Dapper/Handlers/CreationHandler.cs
@@ -1,5 +1,4 @@
 using System.Data;
-using CSharpFunctionalExtensions;
 using Dapper;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
@@ -22,23 +21,23 @@ public CreationHandler(IMapper? mapper) : base(mapper) { }
 
     public CreationHandler(CreationOptions<TIdentifier>? options, IMapper? mapper) : base(options, mapper) { }
 
-    protected override Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope)
+    protected override TIdentifier? DoCreate(TEntity entity, TScope? scope)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
 
         var record = MapToData<TRecord>(entity) ?? throw new InvalidOperationException();
 
-        return Maybe.From(scope.Connection.Insert<TIdentifier?, TRecord>(record, scope));
+        return scope.Connection.Insert<TIdentifier?, TRecord>(record, scope);
     }
 
-    protected override async Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
+    protected override Task<TIdentifier?> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
 
         var record = MapToData<TRecord>(entity) ?? throw new InvalidOperationException();
 
-        return Maybe.From(await scope.Connection.InsertAsync<TIdentifier?, TRecord>(record, scope));
+        return scope.Connection.InsertAsync<TIdentifier?, TRecord>(record, scope);
     }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj b/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj b/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Entity Framework.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data/Handlers/Abstract/CreationHandlerBase.cs b/src/YuckQi.Data/Handlers/Abstract/CreationHandlerBase.cs
@@ -1,5 +1,4 @@
-using CSharpFunctionalExtensions;
-using YuckQi.Data.Exceptions;
+using YuckQi.Data.Exceptions;
 using YuckQi.Data.Handlers.Options;
 using YuckQi.Domain.Aspects.Abstract;
 using YuckQi.Domain.Entities.Abstract;
@@ -37,10 +36,10 @@ public TEntity Create(TEntity entity, TScope? scope)
             revised.RevisionMomentUtc = entity.CreationMomentUtc;
 
         var identifier = DoCreate(entity, scope);
-        if (identifier.HasNoValue)
+        if (identifier == null)
             throw new CreationException<TEntity>();
 
-        entity.Identifier = identifier.Value;
+        entity.Identifier = identifier;
 
         return entity;
     }
@@ -65,10 +64,10 @@ public async Task<TEntity> Create(TEntity entity, TScope? scope, CancellationTok
             revised.RevisionMomentUtc = entity.CreationMomentUtc;
 
         var identifier = await DoCreate(entity, scope, cancellationToken);
-        if (identifier.HasNoValue)
+        if (identifier == null)
             throw new CreationException<TEntity>();
 
-        entity.Identifier = identifier.Value;
+        entity.Identifier = identifier;
 
         return entity;
     }
@@ -81,7 +80,7 @@ public virtual async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> enti
         return results;
     }
 
-    protected abstract Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope);
+    protected abstract TIdentifier? DoCreate(TEntity entity, TScope? scope);
 
-    protected abstract Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken);
+    protected abstract Task<TIdentifier?> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken);
 }
diff --git a/src/YuckQi.Data/YuckQi.Data.csproj b/src/YuckQi.Data/YuckQi.Data.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.5.0</Version>
+    <Version>6.5.1</Version>
     <Description>A .NET library of lightweight data access handlers which can be used to compose repositories and domain services.</Description>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpFunctionalExtensions" Version="2.40.3" />
     <PackageReference Include="YuckQi.Domain" Version="6.4.2" />
     <PackageReference Include="YuckQi.Extensions.Mapping.Abstractions" Version="6.0.0" />
   </ItemGroup>