From bbbacf6f6de408d38fafb47f16b10747985ffd34 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Fri, 9 Dec 2022 10:42:39 +0100 Subject: [PATCH] move flavors + utils from zero.Raven to zero --- ...uilder.cs => RavenDocumentConventionsBuilder.cs} | 6 +++--- zero.Raven/ZeroBuilderExtensions.cs | 12 ------------ ...{ZeroPersistenceModule.cs => ZeroRavenModule.cs} | 13 +++++++++++-- .../Models}/Flavors/ConfigureFlavorJsonOptions.cs | 2 +- {zero.Raven => zero/Models}/Flavors/FlavorConfig.cs | 2 +- .../Models}/Flavors/FlavorOptions.cs | 2 +- .../Models}/Flavors/FlavorProvider.cs | 2 +- .../Models}/Flavors/FlavorProviderOptions.cs | 2 +- .../Models}/Flavors/JsonFlavorVariantConverter.cs | 2 +- .../Flavors/JsonFlavorVariantConverterFactory.cs | 2 +- {zero.Raven => zero/Utils}/GenerateIdAttribute.cs | 2 +- {zero.Raven => zero/Utils}/IdGenerator.cs | 2 +- {zero.Raven => zero/Utils}/Safenames.cs | 2 +- 13 files changed, 24 insertions(+), 27 deletions(-) rename zero.Raven/{ZeroDocumentConventionsBuilder.cs => RavenDocumentConventionsBuilder.cs} (95%) delete mode 100644 zero.Raven/ZeroBuilderExtensions.cs rename zero.Raven/{ZeroPersistenceModule.cs => ZeroRavenModule.cs} (82%) rename {zero.Raven => zero/Models}/Flavors/ConfigureFlavorJsonOptions.cs (95%) rename {zero.Raven => zero/Models}/Flavors/FlavorConfig.cs (97%) rename {zero.Raven => zero/Models}/Flavors/FlavorOptions.cs (99%) rename {zero.Raven => zero/Models}/Flavors/FlavorProvider.cs (96%) rename {zero.Raven => zero/Models}/Flavors/FlavorProviderOptions.cs (99%) rename {zero.Raven => zero/Models}/Flavors/JsonFlavorVariantConverter.cs (97%) rename {zero.Raven => zero/Models}/Flavors/JsonFlavorVariantConverterFactory.cs (97%) rename {zero.Raven => zero/Utils}/GenerateIdAttribute.cs (93%) rename {zero.Raven => zero/Utils}/IdGenerator.cs (99%) rename {zero.Raven => zero/Utils}/Safenames.cs (99%) diff --git a/zero.Raven/ZeroDocumentConventionsBuilder.cs b/zero.Raven/RavenDocumentConventionsBuilder.cs similarity index 95% rename from zero.Raven/ZeroDocumentConventionsBuilder.cs rename to zero.Raven/RavenDocumentConventionsBuilder.cs index 3df1c23f..4c60fd9b 100644 --- a/zero.Raven/ZeroDocumentConventionsBuilder.cs +++ b/zero.Raven/RavenDocumentConventionsBuilder.cs @@ -6,7 +6,7 @@ using Rv = Raven.Client; namespace zero.Raven; -public class ZeroDocumentConventionsBuilder : IZeroDocumentConventionsBuilder +public class RavenDocumentConventionsBuilder : IRavenDocumentConventionsBuilder { protected HashSet PolymorphTypes { get; private set; } = new(); @@ -19,7 +19,7 @@ public class ZeroDocumentConventionsBuilder : IZeroDocumentConventionsBuilder protected static ConcurrentDictionary CachedTypeCollectionNameMap = new(); - public ZeroDocumentConventionsBuilder(IZeroOptions options) + public RavenDocumentConventionsBuilder(IZeroOptions options) { Options = options; } @@ -134,7 +134,7 @@ public class ZeroDocumentConventionsBuilder : IZeroDocumentConventionsBuilder } -public interface IZeroDocumentConventionsBuilder +public interface IRavenDocumentConventionsBuilder { /// /// Applies internal rules to the RavenDB document conventions diff --git a/zero.Raven/ZeroBuilderExtensions.cs b/zero.Raven/ZeroBuilderExtensions.cs deleted file mode 100644 index ea6631cc..00000000 --- a/zero.Raven/ZeroBuilderExtensions.cs +++ /dev/null @@ -1,12 +0,0 @@ -using zero.Raven; - -namespace zero; - -public static class ZeroBuilderExtensions -{ - public static ZeroBuilder AddRavenDb(this ZeroBuilder builder) - { - builder.AddModule(); - return builder; - } -} \ No newline at end of file diff --git a/zero.Raven/ZeroPersistenceModule.cs b/zero.Raven/ZeroRavenModule.cs similarity index 82% rename from zero.Raven/ZeroPersistenceModule.cs rename to zero.Raven/ZeroRavenModule.cs index f5893efa..16b20b5d 100644 --- a/zero.Raven/ZeroPersistenceModule.cs +++ b/zero.Raven/ZeroRavenModule.cs @@ -6,11 +6,20 @@ using Raven.Client.Http; namespace zero.Raven; +public static class ZeroBuilderExtensions +{ + public static ZeroBuilder AddRavenDb(this ZeroBuilder builder) + { + builder.AddModule(); + return builder; + } +} + internal class ZeroRavenModule : ZeroModule { public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) { - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(CreateRavenStore); services.AddScoped(); services.AddScoped(); @@ -30,7 +39,7 @@ internal class ZeroRavenModule : ZeroModule { IZeroOptions options = services.GetService(); RavenOptions ravenOptions = options.For(); - IZeroDocumentConventionsBuilder conventionsBuilder = services.GetService(); + IRavenDocumentConventionsBuilder conventionsBuilder = services.GetService(); IZeroDocumentStore store = new ZeroDocumentStore(options) { diff --git a/zero.Raven/Flavors/ConfigureFlavorJsonOptions.cs b/zero/Models/Flavors/ConfigureFlavorJsonOptions.cs similarity index 95% rename from zero.Raven/Flavors/ConfigureFlavorJsonOptions.cs rename to zero/Models/Flavors/ConfigureFlavorJsonOptions.cs index d964bd75..4f5bdf7b 100644 --- a/zero.Raven/Flavors/ConfigureFlavorJsonOptions.cs +++ b/zero/Models/Flavors/ConfigureFlavorJsonOptions.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -namespace zero.Raven; +namespace zero.Models; public class ConfigureFlavorJsonOptions : IConfigureOptions diff --git a/zero.Raven/Flavors/FlavorConfig.cs b/zero/Models/Flavors/FlavorConfig.cs similarity index 97% rename from zero.Raven/Flavors/FlavorConfig.cs rename to zero/Models/Flavors/FlavorConfig.cs index c606fe99..b104bb66 100644 --- a/zero.Raven/Flavors/FlavorConfig.cs +++ b/zero/Models/Flavors/FlavorConfig.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace zero.Raven; +namespace zero.Models; /// /// A flavor config holds information about a flavor implementation diff --git a/zero.Raven/Flavors/FlavorOptions.cs b/zero/Models/Flavors/FlavorOptions.cs similarity index 99% rename from zero.Raven/Flavors/FlavorOptions.cs rename to zero/Models/Flavors/FlavorOptions.cs index d97c55f5..aa26b8d2 100644 --- a/zero.Raven/Flavors/FlavorOptions.cs +++ b/zero/Models/Flavors/FlavorOptions.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace zero.Raven; +namespace zero.Models; public class FlavorOptions { diff --git a/zero.Raven/Flavors/FlavorProvider.cs b/zero/Models/Flavors/FlavorProvider.cs similarity index 96% rename from zero.Raven/Flavors/FlavorProvider.cs rename to zero/Models/Flavors/FlavorProvider.cs index 30567b04..3bba9463 100644 --- a/zero.Raven/Flavors/FlavorProvider.cs +++ b/zero/Models/Flavors/FlavorProvider.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace zero.Raven; +namespace zero.Models; /// /// A flavor provider is attached to an entity (which has ISupportsFlavors) and contains all flavors diff --git a/zero.Raven/Flavors/FlavorProviderOptions.cs b/zero/Models/Flavors/FlavorProviderOptions.cs similarity index 99% rename from zero.Raven/Flavors/FlavorProviderOptions.cs rename to zero/Models/Flavors/FlavorProviderOptions.cs index 71e03559..c4112053 100644 --- a/zero.Raven/Flavors/FlavorProviderOptions.cs +++ b/zero/Models/Flavors/FlavorProviderOptions.cs @@ -1,4 +1,4 @@ -namespace zero.Raven; +namespace zero.Models; public class FlavorProviderOptions where TEntity : class, ISupportsFlavors, new() { diff --git a/zero.Raven/Flavors/JsonFlavorVariantConverter.cs b/zero/Models/Flavors/JsonFlavorVariantConverter.cs similarity index 97% rename from zero.Raven/Flavors/JsonFlavorVariantConverter.cs rename to zero/Models/Flavors/JsonFlavorVariantConverter.cs index 1e278898..ac4194a8 100644 --- a/zero.Raven/Flavors/JsonFlavorVariantConverter.cs +++ b/zero/Models/Flavors/JsonFlavorVariantConverter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace zero.Raven; +namespace zero.Models; internal class JsonFlavorVariantConverter : JsonDiscriminatorConverter where T : class, ISupportsFlavors, new() { diff --git a/zero.Raven/Flavors/JsonFlavorVariantConverterFactory.cs b/zero/Models/Flavors/JsonFlavorVariantConverterFactory.cs similarity index 97% rename from zero.Raven/Flavors/JsonFlavorVariantConverterFactory.cs rename to zero/Models/Flavors/JsonFlavorVariantConverterFactory.cs index a466bac8..2df64a7f 100644 --- a/zero.Raven/Flavors/JsonFlavorVariantConverterFactory.cs +++ b/zero/Models/Flavors/JsonFlavorVariantConverterFactory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace zero.Raven; +namespace zero.Models; public class JsonFlavorVariantConverterFactory : JsonConverterFactory { diff --git a/zero.Raven/GenerateIdAttribute.cs b/zero/Utils/GenerateIdAttribute.cs similarity index 93% rename from zero.Raven/GenerateIdAttribute.cs rename to zero/Utils/GenerateIdAttribute.cs index f26ce683..5659f801 100644 --- a/zero.Raven/GenerateIdAttribute.cs +++ b/zero/Utils/GenerateIdAttribute.cs @@ -1,4 +1,4 @@ -namespace zero.Raven; +namespace zero.Utils; /// /// Automatically generate ID with the specified length and insert it into this property on entity save diff --git a/zero.Raven/IdGenerator.cs b/zero/Utils/IdGenerator.cs similarity index 99% rename from zero.Raven/IdGenerator.cs rename to zero/Utils/IdGenerator.cs index 4011fd62..49367473 100644 --- a/zero.Raven/IdGenerator.cs +++ b/zero/Utils/IdGenerator.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace zero.Raven; +namespace zero.Utils; public class IdGenerator { diff --git a/zero.Raven/Safenames.cs b/zero/Utils/Safenames.cs similarity index 99% rename from zero.Raven/Safenames.cs rename to zero/Utils/Safenames.cs index dfc456ad..0c60aedf 100644 --- a/zero.Raven/Safenames.cs +++ b/zero/Utils/Safenames.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -namespace zero.Raven; +namespace zero.Utils; public class Safenames {