Merge pull request #103 from aosunlana/users/aosunlana/code-rub-upgra…

…de-test-to-standard2101 CODE RUB: Upgrade Test to Standard `2.10.1`
The-Standard-Organization · Apr 14, 2024 · 44e9f40 · 44e9f40
2 parents d485075 + 1995e99
commit 44e9f40
Show file tree

Hide file tree

Showing 27 changed files with 185 additions and 142 deletions.
diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FailedFileSerializationException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FailedFileSerializationException.cs
@@ -11,11 +11,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FailedFileSerializationException : Xeption
     {
-        public FailedFileSerializationException(Exception innerException)
-            : base(message: "Failed file serialization error occurred, contact support.",
-                innerException: innerException)
-        { }
-
         public FailedFileSerializationException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FailedFileServiceException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FailedFileServiceException.cs
@@ -11,11 +11,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FailedFileServiceException : Xeption
     {
-        public FailedFileServiceException(Exception innerException)
-            : base(message: "Failed file service error occurred, contact support.",
-                innerException: innerException)
-        { }
-
         public FailedFileServiceException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FileDependencyException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FileDependencyException.cs
@@ -10,11 +10,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FileDependencyException : Xeption
     {
-        public FileDependencyException(Xeption innerException)
-            : base(message: "File dependency error occurred, contact support.",
-                innerException: innerException)
-        { }
-
         public FileDependencyException(string message, Xeption innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FileDependencyValidationException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FileDependencyValidationException.cs
@@ -4,18 +4,14 @@
 // See License.txt in the project root for license information.
 // ---------------------------------------------------------------
 
+using System;
 using Xeptions;
 
 namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FileDependencyValidationException : Xeption
     {
-        public FileDependencyValidationException(Xeption innerException)
-            : base(message: "File dependency validation error occurred, fix the errors and try again.",
-                innerException: innerException)
-        { }
-
-        public FileDependencyValidationException(string message, Xeption innerException)
+        public FileDependencyValidationException(string message, Exception innerException)
             : base(message, innerException)
         { }
     }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FileServiceException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FileServiceException.cs
@@ -10,11 +10,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FileServiceException : Xeption
     {
-        public FileServiceException(Xeption innerException)
-            : base(message: "File service error occurred, contact support.",
-                innerException: innerException)
-        { }
-
         public FileServiceException(string message, Xeption innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/FileValidationException.cs b/ADotNet/Models/Foundations/Files/Exceptions/FileValidationException.cs
@@ -10,11 +10,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class FileValidationException : Xeption
     {
-        public FileValidationException(Xeption innerException)
-            : base(message: "File validation error occurred, fix the errors and try again.",
-                innerException: innerException)
-        { }
-
         public FileValidationException(string message, Xeption innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/InvalidFileContentException.cs b/ADotNet/Models/Foundations/Files/Exceptions/InvalidFileContentException.cs
@@ -10,10 +10,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class InvalidFileContentException : Xeption
     {
-        public InvalidFileContentException()
-            : base(message: "Invalid file content, fix errors and try again.")
-        { }
-
         public InvalidFileContentException(string message)
             : base(message)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/InvalidFileDependencyException.cs b/ADotNet/Models/Foundations/Files/Exceptions/InvalidFileDependencyException.cs
@@ -11,11 +11,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class InvalidFileException : Xeption
     {
-        public InvalidFileException(Exception innerException)
-            : base(message: "Invalid file error occurred.",
-                innerException: innerException)
-        { }
-
         public InvalidFileException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Foundations/Files/Exceptions/InvalidFilePathException.cs b/ADotNet/Models/Foundations/Files/Exceptions/InvalidFilePathException.cs
@@ -10,10 +10,6 @@ namespace ADotNet.Models.Foundations.Files.Exceptions
 {
     public class InvalidFilePathException : Xeption
     {
-        public InvalidFilePathException()
-            : base(message: "Invalid file path, fix the errors and try again.")
-        { }
-
         public InvalidFilePathException(string message)
             : base(message)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoDependencyException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoDependencyException.cs
@@ -6,15 +6,10 @@
 
 using System;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
     public class AdoDependencyException : Exception
     {
-        public AdoDependencyException(Exception innerException)
-            : base(message: "Ado dependency error occured, contact support.",
-                innerException: innerException)
-        { }
-
         public AdoDependencyException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoDependencyValidationException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoDependencyValidationException.cs
@@ -6,15 +6,10 @@
 
 using System;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
     public class AdoDependencyValidationException : Exception
     {
-        public AdoDependencyValidationException(Exception innerException)
-            : base(message: "Ado dependency validation error occured, try again.",
-                innerException: innerException)
-        { }
-
         public AdoDependencyValidationException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoValidationException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/AdoValidationException.cs
@@ -6,15 +6,10 @@
 
 using System;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
     public class AdoValidationException : Exception
     {
-        public AdoValidationException(Exception innerException)
-            : base(message: "Ado validation exception occurred, try again",
-                innerException: innerException)
-        { }
-
         public AdoValidationException(string message,Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/BuildServiceException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/BuildServiceException.cs
@@ -6,15 +6,10 @@
 
 using System;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
     public class BuildServiceException : Exception
     {
-        public BuildServiceException(Exception innerException)
-            : base(message: "Build service exception occured, contact support.",
-                innerException: innerException)
-        { }
-
         public BuildServiceException(string message, Exception innerException)
             : base(message, innerException)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/NullPathException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/NullPathException.cs
@@ -4,16 +4,12 @@
 // See License.txt in the project root for license information.
 // ---------------------------------------------------------------------------
 
-using System;
+using Xeptions;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
-    public class NullPathException : Exception
+    public class NullPathException : Xeption
     {
-        public NullPathException()
-            : base(message: "Path is null")
-        { }
-
         public NullPathException(string message)
             : base(message)
         { }

diff --git a/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/NullPipelineException.cs b/ADotNet/Models/Pipelines/AdoPipelines/Exceptions/NullPipelineException.cs
@@ -5,15 +5,12 @@
 // ---------------------------------------------------------------------------
 
 using System;
+using Xeptions;
 
-namespace ADotNet.Models.Pipelines.Exceptions
+namespace ADotNet.Models.Pipelines.AdoPipelines.Exceptions
 {
-    public class NullPipelineException : Exception
+    public class NullPipelineException : Xeption
     {
-        public NullPipelineException()
-            : base(message: "Pipeline is null")
-        { }
-
         public NullPipelineException(string message)
             : base(message)
         { }

diff --git a/ADotNet/Services/Builds/BuildService.Exceptions.cs b/ADotNet/Services/Builds/BuildService.Exceptions.cs
@@ -7,7 +7,8 @@
 using System;
 using System.IO;
 using System.Security;
-using ADotNet.Models.Pipelines.Exceptions;
+using ADotNet.Models.Pipelines.AdoPipelines.Exceptions;
+using Xeptions;
 
 namespace ADotNet.Services.Builds
 {
@@ -23,49 +24,78 @@ private static void TryCatch(ReturningNothingFunction returningNothingFunction)
             }
             catch (NullPipelineException nullPipelineException)
             {
-                throw new AdoValidationException(nullPipelineException);
+                throw CreateAdoValidationException(nullPipelineException);
             }
             catch (NullPathException nullPathException)
             {
-                throw new AdoValidationException(nullPathException);
+                throw CreateAdoValidationException(nullPathException);
             }
             catch (ArgumentNullException argumentNullException)
             {
-                throw new AdoDependencyValidationException(argumentNullException);
+                throw CreateAdoDependencyValidationException(argumentNullException);
             }
             catch (ArgumentException argumentException)
             {
-                throw new AdoDependencyValidationException(argumentException);
+                throw CreateAdoDependencyValidationException(argumentException);
             }
             catch (PathTooLongException pathTooLongException)
             {
-                throw new AdoDependencyValidationException(pathTooLongException);
+                throw CreateAdoDependencyValidationException(pathTooLongException);
             }
             catch (DirectoryNotFoundException directoryNotFoundException)
             {
-                throw new AdoDependencyValidationException(
-                    directoryNotFoundException);
+                throw CreateAdoDependencyValidationException(directoryNotFoundException);
             }
             catch (IOException ioException)
             {
-                throw new AdoDependencyException(ioException);
+                throw CreateAdoDependencyException(ioException);
             }
             catch (SecurityException securityException)
             {
-                throw new AdoDependencyException(securityException);
+                throw CreateAdoDependencyException(securityException);
             }
             catch (UnauthorizedAccessException unauthorizedAccessException)
             {
-                throw new AdoDependencyException(unauthorizedAccessException);
+                throw CreateAdoDependencyException(unauthorizedAccessException);
             }
             catch (NotSupportedException notSupportedException)
             {
-                throw new AdoDependencyException(notSupportedException);
+                throw CreateAdoDependencyException(notSupportedException);
             }
             catch (Exception exception)
             {
-                throw new BuildServiceException(exception);
+                throw CreateBuildServiceException(exception);
             }
         }
+
+        private static AdoValidationException CreateAdoValidationException(Xeption innerException)
+        {
+            return new AdoValidationException(
+                message: "Ado validation exception occurred, try again",
+                innerException: innerException);
+        }
+
+        private static AdoDependencyValidationException CreateAdoDependencyValidationException(
+            Exception innerException)
+        {
+            return new AdoDependencyValidationException(
+                message: "Ado dependency validation error occurs, try again.",
+                innerException: innerException);
+        }
+
+        private static AdoDependencyException CreateAdoDependencyException(
+            Exception innerException)
+        {
+            return new AdoDependencyException(
+                message: "Ado dependency error occured, contact support.",
+                innerException: innerException);
+        }
+
+        private static Exception CreateBuildServiceException(Exception innerException)
+        {
+            return new BuildServiceException(
+                message: "Build service exception occured, contact support.",
+                innerException: innerException);
+        }
     }
-}
+}
diff --git a/ADotNet/Services/Builds/BuildService.Validations.cs b/ADotNet/Services/Builds/BuildService.Validations.cs
@@ -4,7 +4,7 @@
 // See License.txt in the project root for license information.
 // ---------------------------------------------------------------------------
 
-using ADotNet.Models.Pipelines.Exceptions;
+using ADotNet.Models.Pipelines.AdoPipelines.Exceptions;
 
 namespace ADotNet.Services.Builds
 {
@@ -15,10 +15,11 @@ public static void ValidateInputs(string path, object pipeline)
             switch (path, pipeline)
             {
                 case (_, null):
-                    throw new NullPipelineException();
+                    throw new NullPipelineException(
+                        message: "Pipeline is null");
 
                 case (null, _):
-                    throw new NullPathException();
+                    throw new NullPathException(message: "Path is null");
             }
         }
     }