CODE RUB: Replaced the abstract classes with interfaces

The-Standard-Organization · Feb 2, 2024 · 671f7e8 · 671f7e8
1 parent bb55d59
commit 671f7e8
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 106 deletions.
diff --git a/...ialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestDependencyException.cs b/...ialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestDependencyException.cs
@@ -2,12 +2,12 @@
 // Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
 // ----------------------------------------------------------------------------------
 
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
+using STX.Serialization.Providers.Abstractions.Models.Exceptions;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Tests.Unit.Models.Exceptions
 {
-    internal class TestDependencyException : SerializationDependencyExceptionBase
+    internal class TestDependencyException : Xeption, ISerializationDependencyException
     {
         public TestDependencyException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/....Providers.Abstractions.Tests.Unit/Models/Exceptions/TestDependencyValidationException.cs b/....Providers.Abstractions.Tests.Unit/Models/Exceptions/TestDependencyValidationException.cs
@@ -2,12 +2,12 @@
 // Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
 // ----------------------------------------------------------------------------------
 
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
+using STX.Serialization.Providers.Abstractions.Models.Exceptions;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Tests.Unit.Models.Exceptions
 {
-    internal class TestDependencyValidationException : SerializationDependencyValidationExceptionBase
+    internal class TestDependencyValidationException : Xeption, ISerializationDependencyValidationException
     {
         public TestDependencyValidationException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...Serialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestServiceException.cs b/...Serialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestServiceException.cs
@@ -2,12 +2,12 @@
 // Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
 // ----------------------------------------------------------------------------------
 
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
+using STX.Serialization.Providers.Abstractions.Models.Exceptions;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Tests.Unit.Models.Exceptions
 {
-    internal class TestServiceException : SerializationServiceExceptionBase
+    internal class TestServiceException : Xeption, ISerializationServiceException
     {
         public TestServiceException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...ialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestValidationException.cs b/...ialization.Providers.Abstractions.Tests.Unit/Models/Exceptions/TestValidationException.cs
@@ -2,12 +2,12 @@
 // Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
 // ----------------------------------------------------------------------------------
 
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
+using STX.Serialization.Providers.Abstractions.Models.Exceptions;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Tests.Unit.Models.Exceptions
 {
-    internal class TestValidationException : SerializationValidationExceptionBase
+    internal class TestValidationException : Xeption, ISerializationValidationException
     {
         public TestValidationException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...on.Providers.Abstractions/Models/Exceptions/Bases/SerializationDependencyExceptionBase.cs b/...on.Providers.Abstractions/Models/Exceptions/Bases/SerializationDependencyExceptionBase.cs
diff --git a/...rs.Abstractions/Models/Exceptions/Bases/SerializationDependencyValidationExceptionBase.cs b/...rs.Abstractions/Models/Exceptions/Bases/SerializationDependencyValidationExceptionBase.cs
diff --git a/...ation.Providers.Abstractions/Models/Exceptions/Bases/SerializationServiceExceptionBase.cs b/...ation.Providers.Abstractions/Models/Exceptions/Bases/SerializationServiceExceptionBase.cs
diff --git a/...on.Providers.Abstractions/Models/Exceptions/Bases/SerializationValidationExceptionBase.cs b/...on.Providers.Abstractions/Models/Exceptions/Bases/SerializationValidationExceptionBase.cs
diff --git a/...rialization.Providers.Abstractions/Models/Exceptions/ISerializationDependencyException.cs b/...rialization.Providers.Abstractions/Models/Exceptions/ISerializationDependencyException.cs
@@ -0,0 +1,9 @@
+// ----------------------------------------------------------------------------------
+// Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
+// ----------------------------------------------------------------------------------
+
+namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
+{
+    public interface ISerializationDependencyException
+    { }
+}
diff --git a/...ialization.Providers.Abstractions/Models/Exceptions/ISerializationDependencyValidation.cs b/...ialization.Providers.Abstractions/Models/Exceptions/ISerializationDependencyValidation.cs
@@ -0,0 +1,9 @@
+// ----------------------------------------------------------------------------------
+// Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
+// ----------------------------------------------------------------------------------
+
+namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
+{
+    public interface ISerializationDependencyValidationException
+    { }
+}
diff --git a/STX.Serialization.Providers.Abstractions/Models/Exceptions/ISerializationServiceException.cs b/STX.Serialization.Providers.Abstractions/Models/Exceptions/ISerializationServiceException.cs
@@ -0,0 +1,9 @@
+// ----------------------------------------------------------------------------------
+// Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
+// ----------------------------------------------------------------------------------
+
+namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
+{
+    public interface ISerializationServiceException
+    { }
+}
diff --git a/...rialization.Providers.Abstractions/Models/Exceptions/ISerializationValidationException.cs b/...rialization.Providers.Abstractions/Models/Exceptions/ISerializationValidationException.cs
@@ -0,0 +1,9 @@
+// ----------------------------------------------------------------------------------
+// Copyright (c) The Standard Organization: A coalition of the Good-Hearted Engineers
+// ----------------------------------------------------------------------------------
+
+namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
+{
+    public interface ISerializationValidationException
+    { }
+}
diff --git a/...tion.Providers.Abstractions/Models/Exceptions/SerializationDependencyProviderException.cs b/...tion.Providers.Abstractions/Models/Exceptions/SerializationDependencyProviderException.cs
@@ -3,12 +3,11 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections;
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
 {
-    public class SerializationDependencyProviderException : SerializationDependencyExceptionBase
+    public class SerializationDependencyProviderException : Xeption
     {
         public SerializationDependencyProviderException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...ization.Providers.Abstractions/Models/Exceptions/SerializationServiceProviderException.cs b/...ization.Providers.Abstractions/Models/Exceptions/SerializationServiceProviderException.cs
@@ -3,12 +3,11 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections;
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
 {
-    public class SerializationServiceProviderException : SerializationServiceExceptionBase
+    public class SerializationServiceProviderException : Xeption
     {
         public SerializationServiceProviderException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...tion.Providers.Abstractions/Models/Exceptions/SerializationValidationProviderException.cs b/...tion.Providers.Abstractions/Models/Exceptions/SerializationValidationProviderException.cs
@@ -3,12 +3,11 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections;
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
 {
-    public class SerializationValidationProviderException : SerializationValidationExceptionBase
+    public class SerializationValidationProviderException : Xeption
     {
         public SerializationValidationProviderException(string message, Xeption innerException)
             : base(message, innerException)

diff --git a/...n.Providers.Abstractions/Models/Exceptions/UncatagorizedSerializationProviderException.cs b/...n.Providers.Abstractions/Models/Exceptions/UncatagorizedSerializationProviderException.cs
@@ -8,7 +8,7 @@
 
 namespace STX.Serialization.Providers.Abstractions.Models.Exceptions
 {
-    public class UncatagorizedSerializationProviderException : Xeption
+    internal class UncatagorizedSerializationProviderException : Xeption
     {
         public UncatagorizedSerializationProviderException(string message, Exception innerException)
             : base(message, innerException)

diff --git a/STX.Serialization.Providers.Abstractions/STX.Serialization.Providers.Abstractions.csproj b/STX.Serialization.Providers.Abstractions/STX.Serialization.Providers.Abstractions.csproj
@@ -32,6 +32,11 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
 		<PackageReference Include="Xeption" Version="2.6.0" />
 	</ItemGroup>
+
+	<ItemGroup>
+		<InternalsVisibleTo Include="STX.Serialization.Providers.Abstractions.Tests.Unit" />
+		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+	</ItemGroup>
 
 	<ItemGroup>
 		<None Include="..\README.md">

diff --git a/STX.Serialization.Providers.Abstractions/SerializationAbstractionProvider.Exceptions.cs b/STX.Serialization.Providers.Abstractions/SerializationAbstractionProvider.Exceptions.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Threading.Tasks;
 using STX.Serialization.Providers.Abstractions.Models.Exceptions;
-using STX.Serialization.Providers.Abstractions.Models.Exceptions.Bases;
 using Xeptions;
 
 namespace STX.Serialization.Providers.Abstractions
@@ -19,19 +18,19 @@ private async ValueTask<TOutput> TryCatch<TInput, TOutput>(
             {
                 return await asyncFunction();
             }
-            catch (Xeption ex) when (ex is SerializationValidationExceptionBase)
+            catch (Exception ex) when (ex is ISerializationValidationException)
             {
                 throw CreateValidationException(ex);
             }
-            catch (Xeption ex) when (ex is SerializationDependencyValidationExceptionBase)
+            catch (Exception ex) when (ex is ISerializationDependencyValidationException)
             {
                 throw CreateValidationException(ex);
             }
-            catch (Xeption ex) when (ex is SerializationDependencyExceptionBase)
+            catch (Exception ex) when (ex is ISerializationDependencyException)
             {
                 throw CreateDependencyException(ex);
             }
-            catch (Xeption ex) when (ex is SerializationServiceExceptionBase)
+            catch (Exception ex) when (ex is ISerializationServiceException)
             {
                 throw CreateServiceException(ex);
             }
@@ -49,34 +48,34 @@ private async ValueTask<TOutput> TryCatch<TInput, TOutput>(
         }
 
         private SerializationValidationProviderException CreateValidationException(
-            Xeption exception)
+            Exception exception)
         {
             var serializationValidationException =
                 new SerializationValidationProviderException(
                     message: "Serialization validation errors occurred, please try again.",
-                    innerException: exception,
+                    innerException: exception as Xeption,
                     data: exception.Data);
 
             return serializationValidationException;
         }
 
         private SerializationDependencyProviderException CreateDependencyException(
-            Xeption exception)
+            Exception exception)
         {
             var serializationDependencyException = new SerializationDependencyProviderException(
                 message: "Serialization dependency error occurred, contact support.",
-                innerException: exception,
+                innerException: exception as Xeption,
                 data: exception.Data);
 
             return serializationDependencyException;
         }
 
         private SerializationServiceProviderException CreateServiceException(
-            Xeption exception)
+            Exception exception)
         {
             var serializationServiceException = new SerializationServiceProviderException(
                 message: "Serialization service error occurred, contact support.",
-                innerException: exception,
+                innerException: exception as Xeption,
                 data: exception.Data);
 
             return serializationServiceException;