diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingConsts.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingConsts.cs deleted file mode 100644 index 431a7d2cb0..0000000000 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingConsts.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.Blogging -{ - public static class BloggingConsts - { - public const string DefaultDbTablePrefix = "Blg"; - public const string DefaultDbSchema = null; - public const string ConnectionStringName = "Blogging"; - } -} diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs new file mode 100644 index 0000000000..abd32c10ed --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs @@ -0,0 +1,20 @@ +namespace Volo.Blogging +{ + public static class BloggingDbProperties + { + /// + /// Default value: "Blg". + /// + public static string DbTablePrefix { get; } = "Blg"; + + /// + /// Default value: "null". + /// + public static string DbSchema { get; } = null; + + /// + /// "Blogging". + /// + public const string ConnectionStringName = "Blogging"; + } +} diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs index 1795c8aae3..4ab71a0222 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs @@ -9,12 +9,9 @@ using Volo.Blogging.Users; namespace Volo.Blogging.EntityFrameworkCore { - [ConnectionStringName(BloggingConsts.ConnectionStringName)] + [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] public class BloggingDbContext : AbpDbContext, IBloggingDbContext { - public static string TablePrefix { get; set; } = BloggingConsts.DefaultDbTablePrefix; - public static string Schema { get; set; } = BloggingConsts.DefaultDbSchema; - public DbSet Users { get; set; } public DbSet Blogs { get; set; } @@ -37,11 +34,7 @@ namespace Volo.Blogging.EntityFrameworkCore { base.OnModelCreating(builder); - builder.ConfigureBlogging(options => - { - options.TablePrefix = TablePrefix; - options.Schema = Schema; - }); + builder.ConfigureBlogging(); } } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs index acc400ef3f..00fd20dbdc 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs @@ -20,7 +20,11 @@ namespace Volo.Blogging.EntityFrameworkCore { Check.NotNull(builder, nameof(builder)); - var options = new BloggingModelBuilderConfigurationOptions(); + var options = new BloggingModelBuilderConfigurationOptions( + BloggingDbProperties.DbTablePrefix, + BloggingDbProperties.DbSchema + ); + optionsAction?.Invoke(options); builder.Entity(b => diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs index 255e2abf54..278208ced6 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs @@ -1,11 +1,14 @@ -using Volo.Abp.EntityFrameworkCore.Modeling; +using JetBrains.Annotations; +using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Blogging.EntityFrameworkCore { public class BloggingModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions { - public BloggingModelBuilderConfigurationOptions() - : base(BloggingConsts.DefaultDbTablePrefix, BloggingConsts.DefaultDbSchema) + public BloggingModelBuilderConfigurationOptions( + [NotNull] string tablePrefix = "", + [CanBeNull] string schema = null) + : base(tablePrefix, schema) { } } diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs index 7e851c2cee..dcdb6c78e1 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs @@ -9,7 +9,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.EntityFrameworkCore { - [ConnectionStringName(BloggingConsts.ConnectionStringName)] + [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] public interface IBloggingDbContext : IEfCoreDbContext { DbSet Users { get; } diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs index dd17cfb548..fa265b3e67 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using MongoDB.Driver; +using MongoDB.Driver; using Volo.Abp.Data; using Volo.Abp.MongoDB; using Volo.Blogging.Blogs; @@ -11,11 +8,9 @@ using Volo.Blogging.Users; namespace Volo.Blogging.MongoDB { - [ConnectionStringName(BloggingConsts.ConnectionStringName)] + [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] public class BloggingMongoDbContext : AbpMongoDbContext, IBloggingMongoDbContext { - public static string CollectionPrefix { get; set; } = BloggingConsts.DefaultDbTablePrefix; - public IMongoCollection Users => Collection(); public IMongoCollection Blogs => Collection(); @@ -30,10 +25,7 @@ namespace Volo.Blogging.MongoDB { base.CreateModel(modelBuilder); - modelBuilder.ConfigureBlogging(options => - { - options.CollectionPrefix = CollectionPrefix; - }); + modelBuilder.ConfigureBlogging(); } } } diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs index bb6bf8775e..ecb9b45a33 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Volo.Abp; using Volo.Abp.MongoDB; using Volo.Blogging.Blogs; @@ -18,7 +16,9 @@ namespace Volo.Blogging.MongoDB { Check.NotNull(builder, nameof(builder)); - var options = new BloggingMongoModelBuilderConfigurationOptions(); + var options = new BloggingMongoModelBuilderConfigurationOptions( + BloggingDbProperties.DbTablePrefix + ); optionsAction?.Invoke(options); diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs index c913106c3f..2e73f1a00c 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs @@ -1,15 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; -using JetBrains.Annotations; +using JetBrains.Annotations; using Volo.Abp.MongoDB; namespace Volo.Blogging.MongoDB { public class BloggingMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions { - public BloggingMongoModelBuilderConfigurationOptions([NotNull] string tablePrefix = BloggingConsts.DefaultDbTablePrefix) - : base(tablePrefix) + public BloggingMongoModelBuilderConfigurationOptions( + [NotNull] string collectionPrefix = "") + : base(collectionPrefix) { } } diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs index 7e68f7b791..8366e87d74 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs @@ -8,7 +8,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.MongoDB { - [ConnectionStringName(BloggingConsts.ConnectionStringName)] + [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] public interface IBloggingMongoDbContext : IAbpMongoDbContext { IMongoCollection Users { get; } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsConsts.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsConsts.cs deleted file mode 100644 index bcfd85852d..0000000000 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsConsts.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.Docs -{ - public static class DocsConsts - { - public const string DefaultDbTablePrefix = "Docs"; - - public const string DefaultDbSchema = null; - - public const string ConnectionStringName = "Docs"; - } -} diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs new file mode 100644 index 0000000000..d30118bd32 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs @@ -0,0 +1,11 @@ +namespace Volo.Docs +{ + public static class DocsDbProperties + { + public const string DbTablePrefix = "Docs"; + + public const string DbSchema = null; + + public const string ConnectionStringName = "Docs"; + } +} diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs index d2a7f41756..1f6a43b825 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs @@ -5,12 +5,9 @@ using Volo.Docs.Projects; namespace Volo.Docs.EntityFrameworkCore { - [ConnectionStringName(DocsConsts.ConnectionStringName)] + [ConnectionStringName(DocsDbProperties.ConnectionStringName)] public class DocsDbContext: AbpDbContext, IDocsDbContext { - public static string TablePrefix { get; set; } = DocsConsts.DefaultDbTablePrefix; - public static string Schema { get; set; } = DocsConsts.DefaultDbSchema; - public DbSet Projects { get; set; } public DocsDbContext(DbContextOptions options) @@ -23,11 +20,7 @@ namespace Volo.Docs.EntityFrameworkCore { base.OnModelCreating(builder); - builder.ConfigureDocs(options => - { - options.TablePrefix = TablePrefix; - options.Schema = Schema; - }); + builder.ConfigureDocs(); } } } diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs index 967938fbae..b9cada3e4d 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs @@ -15,7 +15,11 @@ namespace Volo.Docs.EntityFrameworkCore { Check.NotNull(builder, nameof(builder)); - var options = new DocsModelBuilderConfigurationOptions(); + var options = new DocsModelBuilderConfigurationOptions( + DocsDbProperties.DbTablePrefix, + DocsDbProperties.DbSchema + ); + optionsAction?.Invoke(options); builder.Entity(b => diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs index 822fab4b9e..217345eee2 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs @@ -1,11 +1,14 @@ -using Volo.Abp.EntityFrameworkCore.Modeling; +using JetBrains.Annotations; +using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Docs.EntityFrameworkCore { public class DocsModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions { - public DocsModelBuilderConfigurationOptions() - : base(DocsConsts.DefaultDbTablePrefix, DocsConsts.DefaultDbSchema) + public DocsModelBuilderConfigurationOptions( + [NotNull] string tablePrefix, + [CanBeNull] string schema) + : base(tablePrefix, schema) { } } diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs index 1414d1bff8..4f11d438e7 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs @@ -5,7 +5,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.EntityFrameworkCore { - [ConnectionStringName(DocsConsts.ConnectionStringName)] + [ConnectionStringName(DocsDbProperties.ConnectionStringName)] public interface IDocsDbContext : IEfCoreDbContext { DbSet Projects { get; set; } diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs index faa8b6bfa7..cc65e9ab3e 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs @@ -5,21 +5,16 @@ using Volo.Abp.MongoDB; namespace Volo.Docs.MongoDB { - [ConnectionStringName(DocsConsts.ConnectionStringName)] + [ConnectionStringName(DocsDbProperties.ConnectionStringName)] public class DocsMongoDbContext : AbpMongoDbContext, IDocsMongoDbContext { - public static string CollectionPrefix { get; set; } = DocsConsts.DefaultDbTablePrefix; - public IMongoCollection Projects => Collection(); protected override void CreateModel(IMongoModelBuilder modelBuilder) { base.CreateModel(modelBuilder); - modelBuilder.ConfigureDocs(options => - { - options.CollectionPrefix = CollectionPrefix; - }); + modelBuilder.ConfigureDocs(); } } } diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs index 8975dd4de5..865da90981 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs @@ -1,5 +1,4 @@ - -using System; +using System; using Volo.Abp; using Volo.Abp.MongoDB; using Volo.Docs.Projects; @@ -14,7 +13,9 @@ namespace Volo.Docs.MongoDB { Check.NotNull(builder, nameof(builder)); - var options = new DocsMongoModelBuilderConfigurationOptions(); + var options = new DocsMongoModelBuilderConfigurationOptions( + DocsDbProperties.DbTablePrefix + ); optionsAction?.Invoke(options); diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs index 1afc610d5e..20a67382a1 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs @@ -1,15 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; -using JetBrains.Annotations; +using JetBrains.Annotations; using Volo.Abp.MongoDB; namespace Volo.Docs.MongoDB { public class DocsMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions { - public DocsMongoModelBuilderConfigurationOptions([NotNull] string tablePrefix = DocsConsts.DefaultDbTablePrefix) - : base(tablePrefix) + public DocsMongoModelBuilderConfigurationOptions( + [NotNull] string collectionPrefix) + : base(collectionPrefix) { } } diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs index ec4f3b1fde..78b3be8484 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs @@ -5,7 +5,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.MongoDB { - [ConnectionStringName(DocsConsts.ConnectionStringName)] + [ConnectionStringName(DocsDbProperties.ConnectionStringName)] public interface IDocsMongoDbContext : IAbpMongoDbContext {