From 8c9557322566431f5d74002fbcd8b91c1b7c2a42 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 22 Oct 2019 14:22:43 +0200
Subject: [PATCH] AB3267 - Removed unused classes and set some internal

---
 .../Implement/ContentTypeRepositoryBase.cs    |  7 ++--
 .../Building/TextHeaderWriter.cs              |  2 +-
 .../Configuration/ClrNameSource.cs            | 28 ----------------
 .../EnumerableExtensions.cs                   | 33 -------------------
 .../Umbraco.ModelsBuilder.csproj              |  6 ++--
 5 files changed, 8 insertions(+), 68 deletions(-)
 delete mode 100644 src/Umbraco.ModelsBuilder/Configuration/ClrNameSource.cs
 delete mode 100644 src/Umbraco.ModelsBuilder/EnumerableExtensions.cs

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 6385482686..e2c3d8c9b5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -16,7 +16,6 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
-using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -506,7 +505,7 @@ AND umbracoNode.id <> @id",
         /// <summary>
         /// Corrects the property type variations for the given entity
         /// to make sure the property type variation is compatible with the
-        /// variation set on the entity itself.        
+        /// variation set on the entity itself.
         /// </summary>
         /// <param name="entity">Entity to correct properties for</param>
         private void CorrectPropertyTypeVariations(IContentTypeComposition entity)
@@ -754,7 +753,7 @@ AND umbracoNode.id <> @id",
                 //we don't need to move the names! this is because we always keep the invariant names with the name of the default language.
 
                 //however, if we were to move names, we could do this: BUT this doesn't work with SQLCE, for that we'd have to update row by row :(
-                // if we want these SQL statements back, look into GIT history    
+                // if we want these SQL statements back, look into GIT history
             }
         }
 
@@ -1033,7 +1032,7 @@ AND umbracoNode.id <> @id",
 
             //keep track of this node/lang to mark or unmark a culture as edited
             var editedLanguageVersions = new Dictionary<(int nodeId, int? langId), bool>();
-            //keep track of which node to mark or unmark as edited 
+            //keep track of which node to mark or unmark as edited
             var editedDocument = new Dictionary<int, bool>();
             var nodeId = -1;
             var propertyTypeId = -1;
diff --git a/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs b/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs
index d165f03907..27fcb42b35 100644
--- a/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs
+++ b/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs
@@ -3,7 +3,7 @@ using Umbraco.ModelsBuilder.Api;
 
 namespace Umbraco.ModelsBuilder.Building
 {
-    public static class TextHeaderWriter
+    internal static class TextHeaderWriter
     {
         /// <summary>
         /// Outputs an "auto-generated" header to a string builder.
diff --git a/src/Umbraco.ModelsBuilder/Configuration/ClrNameSource.cs b/src/Umbraco.ModelsBuilder/Configuration/ClrNameSource.cs
deleted file mode 100644
index d195846411..0000000000
--- a/src/Umbraco.ModelsBuilder/Configuration/ClrNameSource.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Umbraco.ModelsBuilder.Configuration
-{
-    /// <summary>
-    /// Defines the CLR name sources.
-    /// </summary>
-    public enum ClrNameSource
-    {
-        /// <summary>
-        /// No source.
-        /// </summary>
-        Nothing = 0,
-
-        /// <summary>
-        /// Use the name as source.
-        /// </summary>
-        Name,
-
-        /// <summary>
-        /// Use the alias as source.
-        /// </summary>
-        Alias,
-
-        /// <summary>
-        /// Use the alias directly.
-        /// </summary>
-        RawAlias
-    }
-}
diff --git a/src/Umbraco.ModelsBuilder/EnumerableExtensions.cs b/src/Umbraco.ModelsBuilder/EnumerableExtensions.cs
deleted file mode 100644
index da77bfa958..0000000000
--- a/src/Umbraco.ModelsBuilder/EnumerableExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.ModelsBuilder
-{
-    public static class EnumerableExtensions
-    {
-        public static void RemoveAll<T>(this IList<T> list, Func<T, bool> predicate)
-        {
-            for (var i = 0; i < list.Count; i++)
-            {
-                if (predicate(list[i]))
-                {
-                    list.RemoveAt(i--); // i-- is important here!
-                }
-            }
-        }
-
-        public static IEnumerable<T> And<T>(this IEnumerable<T> enumerable, T item)
-        {
-            foreach (var x in enumerable) yield return x;
-            yield return item;
-        }
-
-        public static IEnumerable<T> AndIfNotNull<T>(this IEnumerable<T> enumerable, T item)
-            where T : class
-        {
-            foreach (var x in enumerable) yield return x;
-            if (item != null)
-                yield return item;
-        }
-    }
-}
diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
index 2791d420db..4dbe606a66 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
+++ b/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
@@ -55,12 +55,10 @@
     <Compile Include="Building\TextHeaderWriter.cs" />
     <Compile Include="Building\TypeModel.cs" />
     <Compile Include="ConfigsExtensions.cs" />
-    <Compile Include="Configuration\ClrNameSource.cs" />
     <Compile Include="Configuration\Config.cs" />
     <Compile Include="Configuration\ModelsMode.cs" />
     <Compile Include="Configuration\ModelsModeExtensions.cs" />
     <Compile Include="Dashboard\BuilderDashboardHelper.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="ImplementPropertyTypeAttribute.cs" />
     <Compile Include="ModelsBuilderAssemblyAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -93,6 +91,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>