cleaned up the whole project

CoreHelpers · Sep 4, 2022 · 4e1d593 · 4e1d593
1 parent 691d6f0
commit 4e1d593
Show file tree

Hide file tree

Showing 21 changed files with 451 additions and 503 deletions.
diff --git a/...pers.WindowsAzure.Storage.Table.Tests/CoreHelpers.WindowsAzure.Storage.Table.Tests.csproj b/...pers.WindowsAzure.Storage.Table.Tests/CoreHelpers.WindowsAzure.Storage.Table.Tests.csproj
@@ -32,12 +32,14 @@
     <None Remove="Xunit.DependencyInjection" />
     <None Remove="TestEnvironments\" />
     <None Remove="Extensions\" />
+    <None Remove="Delegates\" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\" />
     <Folder Include="Contracts\" />
     <Folder Include="TestEnvironments\" />
     <Folder Include="Extensions\" />
+    <Folder Include="Delegates\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CoreHelpers.WindowsAzure.Storage.Table\CoreHelpers.WindowsAzure.Storage.Table.csproj" />

diff --git a/.../Delegates/StorageContextStatsDelegate.cs → .../Delegates/StorageContextStatsDelegate.cs b/.../Delegates/StorageContextStatsDelegate.cs → .../Delegates/StorageContextStatsDelegate.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace CoreHelpers.WindowsAzure.Storage.Table.Delegates
+namespace CoreHelpers.WindowsAzure.Storage.Table.Tests.Delegates
 {
 	public class StorageContextStatsDelegate : IStorageContextDelegate
 	{

diff --git a/CoreHelpers.WindowsAzure.Storage.Table.Tests/ITS001StoreWithStaticEntityMapper.cs b/CoreHelpers.WindowsAzure.Storage.Table.Tests/ITS001StoreWithStaticEntityMapper.cs
@@ -1,6 +1,6 @@
 using System;
-using CoreHelpers.WindowsAzure.Storage.Table.Delegates;
 using CoreHelpers.WindowsAzure.Storage.Table.Tests.Contracts;
+using CoreHelpers.WindowsAzure.Storage.Table.Tests.Delegates;
 using CoreHelpers.WindowsAzure.Storage.Table.Tests.Extensions;
 using CoreHelpers.WindowsAzure.Storage.Table.Tests.Models;
 using Xunit.DependencyInjection;

diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Attributes/StoreAsAttribute.cs b/CoreHelpers.WindowsAzure.Storage.Table/Attributes/StoreAsAttribute.cs
diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Attributes/StoreAsJsonObjectAttribute.cs b/CoreHelpers.WindowsAzure.Storage.Table/Attributes/StoreAsJsonObjectAttribute.cs
@@ -7,7 +7,7 @@
 namespace CoreHelpers.WindowsAzure.Storage.Table.Attributes
 {
 	[AttributeUsage(AttributeTargets.Property)]
-	public class StoreAsJsonObjectAttribute : StoreAsAttribute, IVirtualTypeAttribute
+	public class StoreAsJsonObjectAttribute : Attribute, IVirtualTypeAttribute
     {	
 		protected Type ObjectType { get; set; }
 

diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Attributes/VirtualListAttribute.cs b/CoreHelpers.WindowsAzure.Storage.Table/Attributes/VirtualListAttribute.cs
@@ -9,7 +9,7 @@
 namespace CoreHelpers.WindowsAzure.Storage.Table.Attributes
 {
 	[AttributeUsage(AttributeTargets.Property)]
-	public class VirtualListAttribute : VirtualTypeAttribute, IVirtualTypeAttribute
+	public class VirtualListAttribute : Attribute, IVirtualTypeAttribute
     {
 		private HandlebarsTemplate<object, string> TemplateFunction { get; set; }
 		private string DigitFormat { get; set; }

diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Attributes/VirtualTypeAttribute.cs b/CoreHelpers.WindowsAzure.Storage.Table/Attributes/VirtualTypeAttribute.cs
diff --git a/CoreHelpers.WindowsAzure.Storage.Table/CoreHelpers.WindowsAzure.Storage.Table.csproj b/CoreHelpers.WindowsAzure.Storage.Table/CoreHelpers.WindowsAzure.Storage.Table.csproj
@@ -40,7 +40,6 @@
   <ItemGroup>
     <Folder Include="Attributes\" />
     <Folder Include="Extensions\" />
-    <Folder Include="Delegates\" />
     <Folder Include="Internal\" />
     <Folder Include="Serialization\" />
   </ItemGroup>

diff --git a/CoreHelpers.WindowsAzure.Storage.Table/IStorageLogger.cs b/CoreHelpers.WindowsAzure.Storage.Table/IStorageLogger.cs
diff --git a/...e.Table/Models/ImportExportTableEntity.cs → ...Table/Internal/ImportExportTableEntity.cs b/...e.Table/Models/ImportExportTableEntity.cs → ...Table/Internal/ImportExportTableEntity.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace CoreHelpers.WindowsAzure.Storage.Table.Models
+namespace CoreHelpers.WindowsAzure.Storage.Table.Internal
 {
     internal class ImportExportTableEntity
     {

diff --git a/...Table/Models/ImportExportTableProperty.cs → ...ble/Internal/ImportExportTableProperty.cs b/...Table/Models/ImportExportTableProperty.cs → ...ble/Internal/ImportExportTableProperty.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace CoreHelpers.WindowsAzure.Storage.Table.Models
+namespace CoreHelpers.WindowsAzure.Storage.Table.Internal
 {
     internal class ImportExportTablePropertyEntity
     {

diff --git a/...dowsAzure.Storage.Table/TableConstants.cs → ....Storage.Table/Internal/TableConstants.cs b/...dowsAzure.Storage.Table/TableConstants.cs → ....Storage.Table/Internal/TableConstants.cs
@@ -15,7 +15,7 @@
 // </copyright>
 // -----------------------------------------------------------------------------------------
 
-namespace CoreHelpers.WindowsAzure.Storage.Table
+namespace CoreHelpers.WindowsAzure.Storage.Table.Internal
 {		
 	using System;
 

diff --git a/CoreHelpers.WindowsAzure.Storage.Table/PagedTableEntityWriter.cs b/CoreHelpers.WindowsAzure.Storage.Table/PagedTableEntityWriter.cs
diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs b/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs
@@ -6,11 +6,12 @@
 using Azure.Data.Tables;
 using CoreHelpers.WindowsAzure.Storage.Table.Attributes;
 using CoreHelpers.WindowsAzure.Storage.Table.Extensions;
+using CoreHelpers.WindowsAzure.Storage.Table.Internal;
 using HandlebarsDotNet;
 
 namespace CoreHelpers.WindowsAzure.Storage.Table.Serialization
 {
-    public static class TableEntityDynamic
+    internal static class TableEntityDynamic
     {        
         public static TableEntity ToEntity<T>(T model, StorageEntityMapper entityMapper) where T: new()
         {