allow for custom serialization

Author: giometrix

src/.editorconfig

@@ -0,0 +1,84 @@
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\code\TableStorage.Abstractions.POCO\src codebase based on best match to current usage at 10/1/2021
+# You can modify the rules from these initially generated values to suit your own policies
+# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+[*.cs]
+
+
+#Core editorconfig formatting - indentation
+
+#use hard tabs for indentation
+indent_style = tab
+
+#Formatting - new line options
+
+#place else statements on a new line
+csharp_new_line_before_else = true
+#require braces to be on a new line for methods and types (also known as "Allman" style)
+csharp_new_line_before_open_brace = methods, types
+
+#Formatting - organize using options
+
+#sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+#remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+
+#leave code block on single line
+csharp_preserve_single_line_blocks = true
+
+#Style - Code block preferences
+
+#prefer curly braces even for one line of code
+csharp_prefer_braces = true:suggestion
+
+#Style - expression bodied member options
+
+#prefer block bodies for methods
+csharp_style_expression_bodied_methods = false:suggestion
+
+#Style - implicit and explicit types
+
+#prefer explicit type over var in all cases, unless overridden by another code style rule
+csharp_style_var_elsewhere = false:suggestion
+
+#Style - language keyword and framework type options
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+#Style - Miscellaneous preferences
+
+#prefer anonymous functions over local functions
+csharp_style_pattern_local_over_anonymous_function = false:suggestion
+
+#Style - modifier options
+
+#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+#Style - Modifier preferences
+
+#when this rule is set to a list of modifiers, prefer the specified ordering.
+csharp_preferred_modifier_order = public,private,readonly,static:suggestion
+
+#Style - qualification options
+
+#prefer fields not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_field = false:suggestion
+#prefer properties not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_property = false:suggestion

src/TableStorage.Abstractions.POCO.SecondaryIndexes/TableStorage.Abstractions.POCO.SecondaryIndexes.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TableStorage.Abstractions.POCO" Version="2.7.0" />
+    <PackageReference Include="TableStorage.Abstractions.POCO" Version="2.7.1" />
   </ItemGroup>
 
 </Project>

src/TableStorage.Abstractions.POCO.sln

@@ -11,6 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TableStorage.Abstractions.P
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TableStorage.Abstractions.POCO.Tests", "..\tests\TableStorage.Abstractions.POCO.Tests\TableStorage.Abstractions.POCO.Tests.csproj", "{005D8280-599C-4952-BBAB-EDAF51BFF70F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{511776B6-B4CF-4243-BED5-AE1CB30E461B}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/TableStorage.Abstractions.POCO/CalculatedKeysConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using Microsoft.Azure.Cosmos.Table;
+using Newtonsoft.Json;
 using TableStorage.Abstractions.TableEntityConverters;
 
 namespace TableStorage.Abstractions.POCO
@@ -10,24 +11,30 @@ public class CalculatedKeysConverter<T, TPartitionKey, TRowKey> : IKeysConverter
 	{
 		private readonly KeyMapper<T, TPartitionKey> _partitionMapper;
 		private readonly KeyMapper<T, TRowKey> _rowMapper;
+		private readonly JsonSerializerSettings _jsonSerializerSettings;
 		private readonly Expression<Func<T, object>>[] _ignoredProperties;
 
-		public CalculatedKeysConverter(KeyMapper<T, TPartitionKey> partitionMapper, KeyMapper<T,TRowKey> rowMapper, 
+		public CalculatedKeysConverter(KeyMapper<T, TPartitionKey> partitionMapper, KeyMapper<T,TRowKey> rowMapper, JsonSerializerSettings jsonSerializerSettings,
 			params Expression<Func<T, object>>[] ignoredProperties)
 		{
 			_partitionMapper = partitionMapper;
 			_rowMapper = rowMapper;
+			_jsonSerializerSettings = jsonSerializerSettings;
 			_ignoredProperties = ignoredProperties;
 		}
+		public CalculatedKeysConverter(KeyMapper<T, TPartitionKey> partitionMapper, KeyMapper<T, TRowKey> rowMapper, 
+			params Expression<Func<T, object>>[] ignoredProperties) : this(partitionMapper, rowMapper, new JsonSerializerSettings(), ignoredProperties)
+		{
+		}
 		public DynamicTableEntity ToEntity(T obj)
 		{
-			return obj.ToTableEntity(_partitionMapper.ToKey(obj), _rowMapper.ToKey(obj), _ignoredProperties);
+			return obj.ToTableEntity(_partitionMapper.ToKey(obj), _rowMapper.ToKey(obj), _jsonSerializerSettings, _ignoredProperties);
 		}
 
 		public T FromEntity(DynamicTableEntity entity)
 		{
 			return entity.FromTableEntity(_partitionMapper.KeyProperty, _partitionMapper.FromKey, _rowMapper.KeyProperty,
-				_rowMapper.FromKey);
+				_rowMapper.FromKey, _jsonSerializerSettings);
 		}
 
 		public string PartitionKey(TPartitionKey key)

src/TableStorage.Abstractions.POCO/PocoTableStore.cs

@@ -8,6 +8,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos.Table;
+using Newtonsoft.Json;
 using TableStorage.Abstractions.Models;
 using TableStorage.Abstractions.Store;
 using Useful.Extensions;
@@ -29,7 +30,7 @@ namespace TableStorage.Abstractions.POCO
 		/// <param name="storageConnectionString">The azure storage connection string.</param>
 		/// <param name="partitionProperty">The property to be used as a partition key.</param>
 		/// <param name="rowProperty">The property to be used as a row key.</param>
-		/// <param name="tableStorageOptions">The table storage options.</param>
+		/// <param name="options">The table storage options.</param>
 		/// <param name="ignoredProperties">The properties that should not be serialized.</param>
 		/// <exception cref="ArgumentNullException">tableName
 		/// or
@@ -39,22 +40,19 @@ namespace TableStorage.Abstractions.POCO
 		/// or
 		/// rowProperty</exception>
 		public PocoTableStore(string tableName, string storageConnectionString, Expression<Func<T, object>> partitionProperty,
-			Expression<Func<T, object>> rowProperty, TableStorageOptions tableStorageOptions = null, params Expression<Func<T, object>>[] ignoredProperties)
+			Expression<Func<T, object>> rowProperty, PocoTableStoreOptions options = null, params Expression<Func<T, object>>[] ignoredProperties)
 		{
 			if (tableName == null) throw new ArgumentNullException(nameof(tableName));
 			if (storageConnectionString == null) throw new ArgumentNullException(nameof(storageConnectionString));
 			if (partitionProperty == null) throw new ArgumentNullException(nameof(partitionProperty));
 			if (rowProperty == null) throw new ArgumentNullException(nameof(rowProperty));
 
-
-			_keysConverter = new SimpleKeysConverter<T, TPartitionKey, TRowKey>(partitionProperty, rowProperty, ignoredProperties);
+			options ??= new PocoTableStoreOptions();
+			_keysConverter = new SimpleKeysConverter<T, TPartitionKey, TRowKey>(partitionProperty, rowProperty, options.JsonSerializerSettings, ignoredProperties);
 			_tableName = tableName;
-			tableStorageOptions = tableStorageOptions ?? new TableStorageOptions();
-			_tableStore = new TableStore<DynamicTableEntity>(tableName, storageConnectionString, tableStorageOptions);
-			
-		}
-
+			_tableStore = new TableStore<DynamicTableEntity>(tableName, storageConnectionString, options.TableStorageOptions);
 
+		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="PocoTableStore{T, TPartitionKey, TRowKey}" /> class.
@@ -78,7 +76,7 @@ public PocoTableStore(string tableName, string storageConnectionString,
 
 			_keysConverter = keysConverter;
 			_tableName = tableName;
-			tableStorageOptions = tableStorageOptions ?? new TableStorageOptions();
+			tableStorageOptions ??= new TableStorageOptions();
 			_tableStore = new TableStore<DynamicTableEntity>(tableName, storageConnectionString, tableStorageOptions);
 
 		}

src/TableStorage.Abstractions.POCO/PocoTableStoreOptions.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+using TableStorage.Abstractions.Store;
+
+namespace TableStorage.Abstractions.POCO
+{
+	public class PocoTableStoreOptions
+	{
+		public PocoTableStoreOptions(TableStorageOptions tableStorageOptions, JsonSerializerSettings jsonSerializerSettings)
+		{
+			TableStorageOptions = tableStorageOptions;
+			JsonSerializerSettings = jsonSerializerSettings;
+		}
+		public PocoTableStoreOptions(TableStorageOptions tableStorageOptions) : this(tableStorageOptions, new JsonSerializerSettings())
+		{
+		}
+		public PocoTableStoreOptions(JsonSerializerSettings jsonSerializerSettings) : this(new TableStorageOptions(), jsonSerializerSettings)
+		{
+		}
+
+		public PocoTableStoreOptions() : this(new TableStorageOptions(), new JsonSerializerSettings())
+		{
+		}
+
+		public TableStorageOptions TableStorageOptions { get; }
+		public JsonSerializerSettings JsonSerializerSettings { get; }
+	}
+}

src/TableStorage.Abstractions.POCO/SimpleKeysConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using Microsoft.Azure.Cosmos.Table;
+using Newtonsoft.Json;
 using TableStorage.Abstractions.TableEntityConverters;
 
 namespace TableStorage.Abstractions.POCO
@@ -9,25 +10,27 @@ public class SimpleKeysConverter<T, TPartitionKey, TRowKey> : IKeysConverter<T,
 		where T : new()
 	{
 		private readonly Expression<Func<T, object>>[] _ignoredProperties;
+		private readonly JsonSerializerSettings _jsonSerializerSettings;
 		private readonly Expression<Func<T, object>> _partitionProperty;
 		private readonly Expression<Func<T, object>> _rowProperty;
 
 		public SimpleKeysConverter(Expression<Func<T, object>> partitionProperty,
-			Expression<Func<T, object>> rowProperty, Expression<Func<T, object>>[] ignoredProperties)
+			Expression<Func<T, object>> rowProperty, JsonSerializerSettings jsonSerializerSettings, Expression<Func<T, object>>[] ignoredProperties)
 		{
 			_partitionProperty = partitionProperty;
 			_rowProperty = rowProperty;
 			_ignoredProperties = ignoredProperties;
+			_jsonSerializerSettings = jsonSerializerSettings;
 		}
 
 		public DynamicTableEntity ToEntity(T obj)
 		{
-			return obj.ToTableEntity(_partitionProperty, _rowProperty, _ignoredProperties);
+			return obj.ToTableEntity(_partitionProperty, _rowProperty, _jsonSerializerSettings, _ignoredProperties);
 		}
 
 		public T FromEntity(DynamicTableEntity entity)
 		{
-			return entity.FromTableEntity<T, TPartitionKey, TRowKey>(_partitionProperty, _rowProperty);
+			return entity.FromTableEntity<T, TPartitionKey, TRowKey>(_partitionProperty, _rowProperty, _jsonSerializerSettings);
 		}
 
 		public string PartitionKey(TPartitionKey key)

src/TableStorage.Abstractions.POCO/TableStorage.Abstractions.POCO.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.7.1.0</Version>
+		<Version>3.0.0.0</Version>
 		<Authors>Giovanni Galbo</Authors>
 		<Company>Giovanni Galbo</Company>
 		<Description>
@@ -16,32 +16,33 @@
 
 			The library will convert simple properties to fields in Azure Table Storage. Complex types will serialize as json.
 		</Description>
-		<Copyright>© Giovanni Galbo 2020</Copyright>
+		<Copyright>© Giovanni Galbo 2021</Copyright>
 		<PackageLicenseUrl></PackageLicenseUrl>
 		<PackageProjectUrl>https://github.com/giometrix/TableStorage.Abstractions.POCO</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/giometrix/TableStorage.Abstractions.POCO</RepositoryUrl>
 		<PackageTags>table-storage azure-table-storage poco table-entities tableentity</PackageTags>
-		<PackageReleaseNotes>Added sourcelink</PackageReleaseNotes>
+		<PackageReleaseNotes>Allows for custom json serialization options</PackageReleaseNotes>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
-		<AssemblyVersion>2.7.1.0</AssemblyVersion>
-		<FileVersion>2.7.1.0</FileVersion>
+		<AssemblyVersion>3.0.0.0</AssemblyVersion>
+		<FileVersion>3.0.0.0</FileVersion>
 		<PackageIcon>xtensible-x.png</PackageIcon>
 		<PackageIconUrl />
+		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="TableStorage.Abstractions" Version="3.2.2" />
-		<PackageReference Include="TableStorage.Abstractions.TableEntityConverters" Version="1.3.1" />
+		<PackageReference Include="TableStorage.Abstractions" Version="3.2.4" />
+		<PackageReference Include="TableStorage.Abstractions.TableEntityConverters" Version="1.4.0" />
 		<PackageReference Include="Xtensible.Time.Clock" Version="1.1.0" />
 	</ItemGroup>
 

tests/TableStorage.Abstractions.POCO.SecondaryIndexes.Tests/TableStorage.Abstractions.POCO.SecondaryIndexes.Tests.csproj

@@ -7,10 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

tests/TableStorage.Abstractions.POCO.Tests/JsonKeysConverter.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace TableStorage.Abstractions.POCO.Tests
+{
+	public class KeysJsonConverter : JsonConverter
+	{
+		private readonly Type[] _types;
+
+		public override bool CanRead => false;
+
+		public KeysJsonConverter(params Type[] types)
+		{
+			_types = types;
+		}
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			var t = JToken.FromObject(value);
+
+			if (t.Type != JTokenType.Object)
+			{
+				t.WriteTo(writer);
+			}
+			else
+			{
+				var o = (JObject)t;
+				IList<string> propertyNames = o.Properties().Select(p => p.Name).ToList();
+
+				o.AddFirst(new JProperty("Keys", new JArray(propertyNames)));
+
+				o.WriteTo(writer);
+			}
+		}
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+			JsonSerializer serializer)
+		{
+			throw new NotImplementedException(
+				"Unnecessary because CanRead is false. The type will skip the converter.");
+		}
+
+		public override bool CanConvert(Type objectType)
+		{
+			return _types.Any(t => t == objectType);
+		}
+	}
+}