From dff06bde307cd89bcb416cf1d270de8011b922c4 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 20 May 2019 16:45:12 +0200
Subject: [PATCH] Moved most exceptions to abstractions. Added abstractions to
 web and tests.

---
 .../ArgumentNullOrEmptyException.cs           |  0
 .../Exceptions/AuthorizationException.cs      |  0
 .../Exceptions/BootFailedException.cs         |  0
 .../Exceptions/ConnectionException.cs         |  2 +-
 .../Exceptions/DataOperationException.cs      |  2 +-
 .../Exceptions/WontImplementException.cs      |  0
 src/Umbraco.Core/Umbraco.Core.csproj          | 28 ++++++++-----------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  4 +++
 src/Umbraco.Web/Umbraco.Web.csproj            |  4 +++
 9 files changed, 21 insertions(+), 19 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/ArgumentNullOrEmptyException.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/AuthorizationException.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/BootFailedException.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/ConnectionException.cs (79%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/DataOperationException.cs (88%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Exceptions/WontImplementException.cs (100%)

diff --git a/src/Umbraco.Core/Exceptions/ArgumentNullOrEmptyException.cs b/src/Umbraco.Abstractions/Exceptions/ArgumentNullOrEmptyException.cs
similarity index 100%
rename from src/Umbraco.Core/Exceptions/ArgumentNullOrEmptyException.cs
rename to src/Umbraco.Abstractions/Exceptions/ArgumentNullOrEmptyException.cs
diff --git a/src/Umbraco.Core/Exceptions/AuthorizationException.cs b/src/Umbraco.Abstractions/Exceptions/AuthorizationException.cs
similarity index 100%
rename from src/Umbraco.Core/Exceptions/AuthorizationException.cs
rename to src/Umbraco.Abstractions/Exceptions/AuthorizationException.cs
diff --git a/src/Umbraco.Core/Exceptions/BootFailedException.cs b/src/Umbraco.Abstractions/Exceptions/BootFailedException.cs
similarity index 100%
rename from src/Umbraco.Core/Exceptions/BootFailedException.cs
rename to src/Umbraco.Abstractions/Exceptions/BootFailedException.cs
diff --git a/src/Umbraco.Core/Exceptions/ConnectionException.cs b/src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
similarity index 79%
rename from src/Umbraco.Core/Exceptions/ConnectionException.cs
rename to src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
index 64fdbeee52..7b38058ec2 100644
--- a/src/Umbraco.Core/Exceptions/ConnectionException.cs
+++ b/src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Exceptions
 {
-    internal class ConnectionException : Exception
+    public class ConnectionException : Exception
     {
         public ConnectionException(string message, Exception innerException) : base(message, innerException)
         {
diff --git a/src/Umbraco.Core/Exceptions/DataOperationException.cs b/src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
similarity index 88%
rename from src/Umbraco.Core/Exceptions/DataOperationException.cs
rename to src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
index 14fefcf9d3..b2025ba8f6 100644
--- a/src/Umbraco.Core/Exceptions/DataOperationException.cs
+++ b/src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Exceptions
 {
-    internal class DataOperationException<T> : Exception
+    public class DataOperationException<T> : Exception
     {
         public T Operation { get; private set; }
 
diff --git a/src/Umbraco.Core/Exceptions/WontImplementException.cs b/src/Umbraco.Abstractions/Exceptions/WontImplementException.cs
similarity index 100%
rename from src/Umbraco.Core/Exceptions/WontImplementException.cs
rename to src/Umbraco.Abstractions/Exceptions/WontImplementException.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 612eccd2ec..0f4402e2dc 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -199,6 +199,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Exceptions\InvalidCompositionException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
@@ -237,6 +238,7 @@
     <Compile Include="PublishedModelFactoryExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
     <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Composing\WeightAttribute.cs" />
     <Compile Include="Composing\WeightedCollectionBuilderBase.cs" />
@@ -639,14 +641,7 @@
     <Compile Include="Events\TransientEventMessagesFactory.cs" />
     <Compile Include="Events\TypedEventHandler.cs" />
     <Compile Include="Events\UninstallPackageEventArgs.cs" />
-    <Compile Include="Exceptions\ArgumentNullOrEmptyException.cs" />
-    <Compile Include="Exceptions\AuthorizationException.cs" />
-    <Compile Include="Exceptions\BootFailedException.cs" />
-    <Compile Include="Exceptions\ConnectionException.cs" />
-    <Compile Include="Exceptions\DataOperationException.cs" />
-    <Compile Include="Exceptions\InvalidCompositionException.cs" />
     <Compile Include="Composing\LightInject\LightInjectException.cs" />
-    <Compile Include="Exceptions\WontImplementException.cs" />
     <Compile Include="ExpressionExtensions.cs" />
     <Compile Include="ExpressionHelper.cs" />
     <Compile Include="FileResources\Files.Designer.cs" />
@@ -1477,7 +1472,6 @@
     <Compile Include="Compose\RelateOnCopyComponent.cs" />
     <Compile Include="Compose\RelateOnTrashComponent.cs" />
     <Compile Include="SimpleMainDom.cs" />
-    <Compile Include="StringExtensions.cs" />
     <Compile Include="Strings\CleanStringType.cs" />
     <Compile Include="Strings\ContentBaseExtensions.cs" />
     <Compile Include="Strings\Css\StylesheetHelper.cs" />
@@ -1524,6 +1518,15 @@
     <Compile Include="WaitHandleExtensions.cs" />
     <Compile Include="WriteLock.cs" />
     <Compile Include="XmlExtensions.cs" />
+    <Compile Include="PackageActions\IPackageAction.cs" />
+    <Compile Include="PackageActions\PackageActionCollection.cs" />
+    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
+    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
     <Compile Include="Xml\DynamicContext.cs" />
     <Compile Include="Xml\UmbracoXPathPathSyntaxParser.cs" />
     <Compile Include="Xml\XmlHelper.cs" />
@@ -1538,15 +1541,6 @@
     <Compile Include="Xml\XPath\MacroNavigator.cs" />
     <Compile Include="Xml\XPath\NavigableNavigator.cs" />
     <Compile Include="Xml\XPath\RenamedRootNavigator.cs" />
-    <Compile Include="PackageActions\IPackageAction.cs" />
-    <Compile Include="PackageActions\PackageActionCollection.cs" />
-    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="FileResources\BlockingWeb.config" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index ddd67df6e5..c10858fb6d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -540,6 +540,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
+      <Name>Umbraco.Abstractions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
       <Name>Umbraco.Core</Name>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e565f354c8..7b757cdf3e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -90,6 +90,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
+      <Name>Umbraco.Abstractions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>
       <Name>Umbraco.Core</Name>