Revisit docs & blog modules db table prefixes.

modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingConsts.cs

@@ -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";
-    }
-}

modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs

@@ -0,0 +1,20 @@
+namespace Volo.Blogging
+{
+    public static class BloggingDbProperties
+    {
+        /// <summary>
+        /// Default value: "Blg".
+        /// </summary>
+        public static string DbTablePrefix { get; } = "Blg";
+
+        /// <summary>
+        /// Default value: "null".
+        /// </summary>
+        public static string DbSchema { get; } = null;
+
+        /// <summary>
+        /// "Blogging".
+        /// </summary>
+        public const string ConnectionStringName = "Blogging";
+    }
+}

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<BloggingDbContext>, IBloggingDbContext
     {
-        public static string TablePrefix { get; set; } = BloggingConsts.DefaultDbTablePrefix;
-        public static string Schema { get; set; } = BloggingConsts.DefaultDbSchema;
-
         public DbSet<BlogUser> Users { get; set; }
 
         public DbSet<Blog> 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();
         }
     }
 }

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<BlogUser>(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)
         {
         }
     }

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<BlogUser> Users { get; }

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<BlogUser> Users => Collection<BlogUser>();
 
         public IMongoCollection<Blog> Blogs => Collection<Blog>();
@@ -30,10 +25,7 @@ namespace Volo.Blogging.MongoDB
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigureBlogging(options =>
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
+            modelBuilder.ConfigureBlogging();
         }
     }
 }

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);
 

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)
         {
         }
     }

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<BlogUser> Users { get; }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsConsts.cs

@@ -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";
-    }
-}

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";
+    }
+}

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<DocsDbContext>, IDocsDbContext
     {
-        public static string TablePrefix { get; set; } = DocsConsts.DefaultDbTablePrefix;
-        public static string Schema { get; set; } = DocsConsts.DefaultDbSchema;
-
         public DbSet<Project> Projects { get; set; }
 
         public DocsDbContext(DbContextOptions<DocsDbContext> options) 
@@ -23,11 +20,7 @@ namespace Volo.Docs.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigureDocs(options =>
-            {
-                options.TablePrefix = TablePrefix;
-                options.Schema = Schema;
-            });
+            builder.ConfigureDocs();
         }
     }
 }

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<Project>(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)
         {
         }
     }

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<Project> Projects { get; set; }

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<Project> Projects => Collection<Project>();
 
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigureDocs(options =>
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
+            modelBuilder.ConfigureDocs();
         }
     }
 }

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);
 

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)
         {
         }
     }

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
     {