diff --git a/src/UXI.Serialization.Reactive/Properties/AssemblyInfo.cs b/src/UXI.Serialization.Reactive/Properties/AssemblyInfo.cs index 8e63b36..5d92a69 100644 --- a/src/UXI.Serialization.Reactive/Properties/AssemblyInfo.cs +++ b/src/UXI.Serialization.Reactive/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ [assembly: AssemblyTitle("UXI.Serialization.Reactive")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HP Inc.")] +[assembly: AssemblyCompany("UXI@FIIT")] [assembly: AssemblyProduct("UXI.Serialization.Reactive")] -[assembly: AssemblyCopyright("Copyright © HP Inc. 2018")] +[assembly: AssemblyCopyright("Copyright (c) 2019 Faculty of Informatics and Information Technologies, Slovak University of Technology in Bratislava")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/src/UXI.Serialization/DataIO.cs b/src/UXI.Serialization/DataIO.cs index 2a01f65..38f738f 100644 --- a/src/UXI.Serialization/DataIO.cs +++ b/src/UXI.Serialization/DataIO.cs @@ -89,6 +89,12 @@ public void WriteOutput(IEnumerable data, string filePath, FileFormat fi } + public void WriteOutput(IEnumerable data, string filePath, FileFormat format, object settings) + { + WriteOutput(data?.Cast(), filePath, format, typeof(T), settings); + } + + public void WriteOutput(IEnumerable data, TextWriter writer, FileFormat format, Type dataType, object settings) { using (var dataWriter = GetOutputDataWriter(writer, format, dataType, settings)) @@ -103,6 +109,12 @@ public void WriteOutput(IEnumerable data, TextWriter writer, FileFormat } + public void WriteOutput(IEnumerable data, TextWriter writer, FileFormat format, object settings) + { + WriteOutput(data?.Cast(), writer, format, typeof(T), settings); + } + + public IDataWriter GetOutputDataWriter(TextWriter writer, FileFormat fileType, Type dataType, object settings) { ISerializationFactory factory; diff --git a/src/UXI.Serialization/Formats/Csv/Configurations/CsvConvertersSerializationConfiguration.cs b/src/UXI.Serialization/Formats/Csv/Configurations/CsvConvertersSerializationConfiguration.cs index f042434..619218b 100644 --- a/src/UXI.Serialization/Formats/Csv/Configurations/CsvConvertersSerializationConfiguration.cs +++ b/src/UXI.Serialization/Formats/Csv/Configurations/CsvConvertersSerializationConfiguration.cs @@ -4,9 +4,9 @@ using System.Text; using System.Threading.Tasks; using UXI.Serialization.Configurations; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv.Converters; -namespace UXI.Serialization.Csv.Configurations +namespace UXI.Serialization.Formats.Csv.Configurations { public class CsvConvertersSerializationConfiguration : SerializationConfiguration { diff --git a/src/UXI.Serialization/Formats/Csv/Configurations/CsvHeaderToLowerCaseSerializationConfiguration.cs b/src/UXI.Serialization/Formats/Csv/Configurations/CsvHeaderToLowerCaseSerializationConfiguration.cs index 6b68862..4e49ee8 100644 --- a/src/UXI.Serialization/Formats/Csv/Configurations/CsvHeaderToLowerCaseSerializationConfiguration.cs +++ b/src/UXI.Serialization/Formats/Csv/Configurations/CsvHeaderToLowerCaseSerializationConfiguration.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; using UXI.Serialization.Configurations; -using UXI.Serialization.Csv; +using UXI.Serialization.Formats.Csv; namespace UXI.Serialization.Formats.Csv.Configurations { diff --git a/src/UXI.Serialization/Formats/Csv/Converters/CsvConverter.cs b/src/UXI.Serialization/Formats/Csv/Converters/CsvConverter.cs index c2f4e31..fd6055b 100644 --- a/src/UXI.Serialization/Formats/Csv/Converters/CsvConverter.cs +++ b/src/UXI.Serialization/Formats/Csv/Converters/CsvConverter.cs @@ -7,7 +7,7 @@ using CsvHelper; using UXI.Serialization.Common; -namespace UXI.Serialization.Csv.Converters +namespace UXI.Serialization.Formats.Csv.Converters { public abstract class CsvConverter { diff --git a/src/UXI.Serialization/Formats/Csv/CsvDataReader.cs b/src/UXI.Serialization/Formats/Csv/CsvDataReader.cs index 7019958..4735da2 100644 --- a/src/UXI.Serialization/Formats/Csv/CsvDataReader.cs +++ b/src/UXI.Serialization/Formats/Csv/CsvDataReader.cs @@ -7,7 +7,7 @@ using CsvHelper; using UXI.Serialization.Common; -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { public class CsvDataReader : DisposableBase, IDataReader, IDisposable { diff --git a/src/UXI.Serialization/Formats/Csv/CsvDataWriter.cs b/src/UXI.Serialization/Formats/Csv/CsvDataWriter.cs index 9797835..fb4a6f6 100644 --- a/src/UXI.Serialization/Formats/Csv/CsvDataWriter.cs +++ b/src/UXI.Serialization/Formats/Csv/CsvDataWriter.cs @@ -8,7 +8,7 @@ using CsvHelper; using UXI.Serialization.Common; -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { public class CsvDataWriter : DisposableBase, IDataWriter, IDisposable { diff --git a/src/UXI.Serialization/Formats/Csv/CsvHeaderNamingContext.cs b/src/UXI.Serialization/Formats/Csv/CsvHeaderNamingContext.cs index 5fcd583..0736286 100644 --- a/src/UXI.Serialization/Formats/Csv/CsvHeaderNamingContext.cs +++ b/src/UXI.Serialization/Formats/Csv/CsvHeaderNamingContext.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { public class CsvHeaderNamingContext { diff --git a/src/UXI.Serialization/Formats/Csv/CsvSerializationFactory.cs b/src/UXI.Serialization/Formats/Csv/CsvSerializationFactory.cs index 695052d..09e8bd6 100644 --- a/src/UXI.Serialization/Formats/Csv/CsvSerializationFactory.cs +++ b/src/UXI.Serialization/Formats/Csv/CsvSerializationFactory.cs @@ -7,10 +7,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv.Converters; - -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { public class CsvSerializationFactory : ISerializationFactory { diff --git a/src/UXI.Serialization/Formats/Csv/CsvSerializerContext.cs b/src/UXI.Serialization/Formats/Csv/CsvSerializerContext.cs index e83d21a..f04d839 100644 --- a/src/UXI.Serialization/Formats/Csv/CsvSerializerContext.cs +++ b/src/UXI.Serialization/Formats/Csv/CsvSerializerContext.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using CsvHelper.Configuration; using UXI.Serialization.Common; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv.Converters; -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { public class CsvSerializerContext { diff --git a/src/UXI.Serialization/Formats/Json/Configurations/JsonConvertersSerializationConfiguration.cs b/src/UXI.Serialization/Formats/Json/Configurations/JsonConvertersSerializationConfiguration.cs index 48e55e9..ac7453e 100644 --- a/src/UXI.Serialization/Formats/Json/Configurations/JsonConvertersSerializationConfiguration.cs +++ b/src/UXI.Serialization/Formats/Json/Configurations/JsonConvertersSerializationConfiguration.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using UXI.Serialization.Configurations; -namespace UXI.Serialization.Json.Configurations +namespace UXI.Serialization.Formats.Json.Configurations { public class JsonConvertersSerializationConfiguration : SerializationConfiguration { diff --git a/src/UXI.Serialization/Formats/Json/Converters/GenericJsonConverter`1.cs b/src/UXI.Serialization/Formats/Json/Converters/GenericJsonConverter`1.cs index f6b227b..a58a951 100644 --- a/src/UXI.Serialization/Formats/Json/Converters/GenericJsonConverter`1.cs +++ b/src/UXI.Serialization/Formats/Json/Converters/GenericJsonConverter`1.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq; using UXI.Serialization.Common; -namespace UXI.Serialization.Json.Converters +namespace UXI.Serialization.Formats.Json.Converters { public abstract class GenericJsonConverter : Newtonsoft.Json.JsonConverter { diff --git a/src/UXI.Serialization/Formats/Json/Extensions/JObjectEx.cs b/src/UXI.Serialization/Formats/Json/Extensions/JObjectEx.cs index 316f24c..11e2391 100644 --- a/src/UXI.Serialization/Formats/Json/Extensions/JObjectEx.cs +++ b/src/UXI.Serialization/Formats/Json/Extensions/JObjectEx.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace UXI.Serialization.Json.Extensions +namespace UXI.Serialization.Formats.Json.Extensions { public static class JObjectEx { diff --git a/src/UXI.Serialization/Formats/Json/JsonDataReader.cs b/src/UXI.Serialization/Formats/Json/JsonDataReader.cs index f853f47..5e66425 100644 --- a/src/UXI.Serialization/Formats/Json/JsonDataReader.cs +++ b/src/UXI.Serialization/Formats/Json/JsonDataReader.cs @@ -8,7 +8,7 @@ using Newtonsoft.Json.Linq; using UXI.Serialization.Common; -namespace UXI.Serialization.Json +namespace UXI.Serialization.Formats.Json { public class JsonDataReader : DisposableBase, IDataReader, IDisposable { diff --git a/src/UXI.Serialization/Formats/Json/JsonDataWriter.cs b/src/UXI.Serialization/Formats/Json/JsonDataWriter.cs index d721b96..449a937 100644 --- a/src/UXI.Serialization/Formats/Json/JsonDataWriter.cs +++ b/src/UXI.Serialization/Formats/Json/JsonDataWriter.cs @@ -8,7 +8,7 @@ using Newtonsoft.Json; using UXI.Serialization.Common; -namespace UXI.Serialization.Json +namespace UXI.Serialization.Formats.Json { public class JsonDataWriter : DisposableBase, IDataWriter, IDisposable { diff --git a/src/UXI.Serialization/Formats/Json/JsonSerializationFactory.cs b/src/UXI.Serialization/Formats/Json/JsonSerializationFactory.cs index 1d55db9..ee45bf2 100644 --- a/src/UXI.Serialization/Formats/Json/JsonSerializationFactory.cs +++ b/src/UXI.Serialization/Formats/Json/JsonSerializationFactory.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using UXI.Serialization.Json.Converters; +using UXI.Serialization.Formats.Json.Converters; -namespace UXI.Serialization.Json +namespace UXI.Serialization.Formats.Json { public class JsonSerializationFactory : ISerializationFactory { diff --git a/src/UXI.Serialization/Properties/AssemblyInfo.cs b/src/UXI.Serialization/Properties/AssemblyInfo.cs index 18b1422..41cf113 100644 --- a/src/UXI.Serialization/Properties/AssemblyInfo.cs +++ b/src/UXI.Serialization/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ [assembly: AssemblyTitle("UXI.Serialization")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("UXI Dev")] +[assembly: AssemblyCompany("UXI@FIIT")] [assembly: AssemblyProduct("UXI.Serialization")] -[assembly: AssemblyCopyright("Copyright © UXI 2018")] +[assembly: AssemblyCopyright("Copyright (c) 2019 Faculty of Informatics and Information Technologies, Slovak University of Technology in Bratislava")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/src/UXI.Serialization/SerializationFactoryCollection.cs b/src/UXI.Serialization/SerializationFactoryCollection.cs index 6dc3e6e..16351e4 100644 --- a/src/UXI.Serialization/SerializationFactoryCollection.cs +++ b/src/UXI.Serialization/SerializationFactoryCollection.cs @@ -10,8 +10,5 @@ namespace UXI.Serialization { public class SerializationFactoryCollection : Collection { - - } - } diff --git a/test/UXI.Serialization.Test/DataIOTest.cs b/test/UXI.Serialization.Test/DataIOTest.cs index d31800d..c699988 100644 --- a/test/UXI.Serialization.Test/DataIOTest.cs +++ b/test/UXI.Serialization.Test/DataIOTest.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; -using UXI.Serialization.Csv; -using UXI.Serialization.Json; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Json; namespace UXI.Serialization { diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeObjectCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeObjectCsvConverter.cs index ece9feb..66611b5 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeObjectCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeObjectCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; using UXI.Serialization.Fakes; namespace UXI.Serialization.Fakes.Csv.Converters diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeStructCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeStructCsvConverter.cs index c4f7415..d6c2d38 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeStructCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/CompositeStructCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; namespace UXI.Serialization.Fakes.Csv.Converters { diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/MultipleValueCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/MultipleValueCsvConverter.cs index 5653eca..0377efb 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/MultipleValueCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/MultipleValueCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; using UXI.Serialization.Fakes; namespace UXI.Serialization.Fakes.Csv.Converters diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleIntValueCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleIntValueCsvConverter.cs index 5f52139..b161f85 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleIntValueCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleIntValueCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; using UXI.Serialization.Fakes; namespace UXI.Serialization.Fakes.Csv.Converters diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableIntValueCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableIntValueCsvConverter.cs index e64ce85..f066399 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableIntValueCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableIntValueCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; namespace UXI.Serialization.Fakes.Csv.Converters { diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableStructValueCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableStructValueCsvConverter.cs index 18f270d..4c9c84d 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableStructValueCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleNullableStructValueCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; namespace UXI.Serialization.Fakes.Csv.Converters { diff --git a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleStringValueCsvConverter.cs b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleStringValueCsvConverter.cs index 9573f78..651dc94 100644 --- a/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleStringValueCsvConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Csv/Converters/SingleStringValueCsvConverter.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using CsvHelper; -using UXI.Serialization.Csv; -using UXI.Serialization.Csv.Converters; +using UXI.Serialization.Formats.Csv; +using UXI.Serialization.Formats.Csv.Converters; using UXI.Serialization.Fakes; namespace UXI.Serialization.Fakes.Csv.Converters diff --git a/test/UXI.Serialization.Test/Fakes/Json/Converters/CompositeStructJsonConverter.cs b/test/UXI.Serialization.Test/Fakes/Json/Converters/CompositeStructJsonConverter.cs index fb7d9cb..ba2cecb 100644 --- a/test/UXI.Serialization.Test/Fakes/Json/Converters/CompositeStructJsonConverter.cs +++ b/test/UXI.Serialization.Test/Fakes/Json/Converters/CompositeStructJsonConverter.cs @@ -5,8 +5,8 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UXI.Serialization.Json.Converters; -using UXI.Serialization.Json.Extensions; +using UXI.Serialization.Formats.Json.Converters; +using UXI.Serialization.Formats.Json.Extensions; namespace UXI.Serialization.Fakes.Json.Converters { diff --git a/test/UXI.Serialization.Test/Formats/Csv/Converters/CsvConverterTest.cs b/test/UXI.Serialization.Test/Formats/Csv/Converters/CsvConverterTest.cs index 86c1845..521eed7 100644 --- a/test/UXI.Serialization.Test/Formats/Csv/Converters/CsvConverterTest.cs +++ b/test/UXI.Serialization.Test/Formats/Csv/Converters/CsvConverterTest.cs @@ -9,7 +9,7 @@ using UXI.Serialization.Fakes; using UXI.Serialization.Fakes.Csv.Converters; -namespace UXI.Serialization.Csv.Converters +namespace UXI.Serialization.Formats.Csv.Converters { [TestClass] public class CsvConverterTest diff --git a/test/UXI.Serialization.Test/Formats/Csv/CsvHeaderNamingContextTest.cs b/test/UXI.Serialization.Test/Formats/Csv/CsvHeaderNamingContextTest.cs index ab35643..69ae5c0 100644 --- a/test/UXI.Serialization.Test/Formats/Csv/CsvHeaderNamingContextTest.cs +++ b/test/UXI.Serialization.Test/Formats/Csv/CsvHeaderNamingContextTest.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace UXI.Serialization.Csv +namespace UXI.Serialization.Formats.Csv { [TestClass] public class CsvHeaderNamingContextText diff --git a/test/UXI.Serialization.Test/Formats/Json/Converters/GenericJsonConverterTest.cs b/test/UXI.Serialization.Test/Formats/Json/Converters/GenericJsonConverterTest.cs index a4da282..90bc8e0 100644 --- a/test/UXI.Serialization.Test/Formats/Json/Converters/GenericJsonConverterTest.cs +++ b/test/UXI.Serialization.Test/Formats/Json/Converters/GenericJsonConverterTest.cs @@ -9,7 +9,7 @@ using UXI.Serialization.Fakes; using UXI.Serialization.Fakes.Json.Converters; -namespace UXI.Serialization.Json.Converters +namespace UXI.Serialization.Formats.Json.Converters { [TestClass] public class GenericJsonConverterTest