Module classes renamed

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/DatabaseDomainSharedModule.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDomainSharedModule.cs

@@ -11,26 +11,26 @@ namespace Volo.Abp.BlobStoring.Database
     [DependsOn(
         typeof(AbpValidationModule)
     )]
-    public class DatabaseDomainSharedModule : AbpModule
+    public class BlobStoringDatabaseDomainSharedModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<DatabaseDomainSharedModule>("Volo.Abp.BlobStoring.Database");
+                options.FileSets.AddEmbedded<BlobStoringDatabaseDomainSharedModule>("Volo.Abp.BlobStoring.Database");
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Add<DatabaseResource>("en")
+                    .Add<BlobStoringDatabaseResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/Database");
+                    .AddVirtualJson("/Localization/BlobStoringDatabase");
             });
 
             Configure<AbpExceptionLocalizationOptions>(options =>
             {
-                options.MapCodeNamespace("Database", typeof(DatabaseResource));
+                options.MapCodeNamespace("BlobStoringDatabase", typeof(BlobStoringDatabaseResource));
             });
         }
     }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/DatabaseErrorCodes.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseErrorCodes.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.BlobStoring.Database
 {
-    public static class DatabaseErrorCodes
+    public static class BlobStoringDatabaseErrorCodes
     {
         //Add your business exception error codes here...
     }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/Localization/DatabaseResource.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain.Shared/Volo/Abp/BlobStoring/Database/Localization/BlobStoringDatabaseResource.cs

@@ -2,8 +2,8 @@
 
 namespace Volo.Abp.BlobStoring.Database.Localization
 {
-    [LocalizationResourceName("Database")]
+    [LocalizationResourceName("BlobStoringDatabase")]
-    public class DatabaseResource
+    public class BlobStoringDatabaseResource
     {
         
     }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo.Abp.BlobStoring.Database.Domain.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\abp\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\abp\framework\src\Volo.Abp.BlobStoring\Volo.Abp.BlobStoring.csproj" />
     <ProjectReference Include="..\Volo.Abp.BlobStoring.Database.Domain.Shared\Volo.Abp.BlobStoring.Database.Domain.Shared.csproj" />
   </ItemGroup>
 

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDbProperties.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.Data;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    public static class BlobStoringDatabaseDbProperties
+    {
+        public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix;
+
+        public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema;
+
+        public const string ConnectionStringName = "AbpBlobStoring";
+    }
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDomainModule.cs

@@ -0,0 +1,15 @@
+using Volo.Abp.Domain;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    [DependsOn(
+        typeof(AbpDddDomainModule),
+        typeof(AbpBlobStoringModule),
+        typeof(BlobStoringDatabaseDomainSharedModule)
+        )]
+    public class BlobStoringDatabaseDomainModule : AbpModule
+    {
+
+    }
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseDbProperties.cs

@@ -1,11 +0,0 @@
-namespace Volo.Abp.BlobStoring.Database
-{
-    public static class DatabaseDbProperties
-    {
-        public static string DbTablePrefix { get; set; } = "Database";
-
-        public static string DbSchema { get; set; } = null;
-
-        public const string ConnectionStringName = "Database";
-    }
-}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseDomainModule.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.BlobStoring.Database
-{
-    [DependsOn(
-        typeof(DatabaseDomainSharedModule)
-        )]
-    public class DatabaseDomainModule : AbpModule
-    {
-
-    }
-}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Settings/DatabaseSettingDefinitionProvider.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Settings/BlobStoringDatabaseSettingDefinitionProvider.cs

@@ -2,12 +2,12 @@
 
 namespace Volo.Abp.BlobStoring.Database.Settings
 {
-    public class DatabaseSettingDefinitionProvider : SettingDefinitionProvider
+    public class BlobStoringDatabaseSettingDefinitionProvider : SettingDefinitionProvider
     {
         public override void Define(ISettingDefinitionContext context)
         {
             /* Define module settings here.
-             * Use names from DatabaseSettings class.
+             * Use names from BlobStoringDatabaseSettings class.
              */
         }
     }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Settings/DatabaseSettings.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Settings/BlobStoringDatabaseSettings.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.BlobStoring.Database.Settings
 {
-    public static class DatabaseSettings
+    public static class BlobStoringDatabaseSettings
     {
         public const string GroupName = "Database";
 

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/DatabaseDbContext.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDatabaseDbContext.cs

@@ -4,14 +4,14 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
-    [ConnectionStringName(DatabaseDbProperties.ConnectionStringName)]
+    [ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
-    public class DatabaseDbContext : AbpDbContext<DatabaseDbContext>, IDatabaseDbContext
+    public class BlobStoringDatabaseDbContext : AbpDbContext<BlobStoringDatabaseDbContext>, IBlobStoringDatabaseDbContext
     {
         /* Add DbSet for each Aggregate Root here. Example:
          * public DbSet<Question> Questions { get; set; }
          */
 
-        public DatabaseDbContext(DbContextOptions<DatabaseDbContext> options) 
+        public BlobStoringDatabaseDbContext(DbContextOptions<BlobStoringDatabaseDbContext> options) 
             : base(options)
         {
 

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/DatabaseDbContextModelCreatingExtensions.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDatabaseDbContextModelCreatingExtensions.cs

@@ -4,17 +4,17 @@ using Volo.Abp;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
-    public static class DatabaseDbContextModelCreatingExtensions
+    public static class BlobStoringDatabaseDbContextModelCreatingExtensions
     {
         public static void ConfigureDatabase(
             this ModelBuilder builder,
-            Action<DatabaseModelBuilderConfigurationOptions> optionsAction = null)
+            Action<BlobStoringDatabaseModelBuilderConfigurationOptions> optionsAction = null)
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new DatabaseModelBuilderConfigurationOptions(
+            var options = new BlobStoringDatabaseModelBuilderConfigurationOptions(
-                DatabaseDbProperties.DbTablePrefix,
+                BlobStoringDatabaseDbProperties.DbTablePrefix,
-                DatabaseDbProperties.DbSchema
+                BlobStoringDatabaseDbProperties.DbSchema
             );
 
             optionsAction?.Invoke(options);

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/DatabaseEntityFrameworkCoreModule.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDatabaseEntityFrameworkCoreModule.cs

@@ -5,14 +5,14 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(DatabaseDomainModule),
+        typeof(BlobStoringDatabaseDomainModule),
         typeof(AbpEntityFrameworkCoreModule)
     )]
-    public class DatabaseEntityFrameworkCoreModule : AbpModule
+    public class BlobStoringDatabaseEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAbpDbContext<DatabaseDbContext>(options =>
+            context.Services.AddAbpDbContext<BlobStoringDatabaseDbContext>(options =>
             {
                 /* Add custom repositories here. Example:
                  * options.AddRepository<Question, EfCoreQuestionRepository>();

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/DatabaseModelBuilderConfigurationOptions.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDatabaseModelBuilderConfigurationOptions.cs

@@ -3,9 +3,9 @@ using Volo.Abp.EntityFrameworkCore.Modeling;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
-    public class DatabaseModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions
+    public class BlobStoringDatabaseModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions
     {
-        public DatabaseModelBuilderConfigurationOptions(
+        public BlobStoringDatabaseModelBuilderConfigurationOptions(
             [NotNull] string tablePrefix = "",
             [CanBeNull] string schema = null)
             : base(

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IDatabaseDbContext.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IBlobStoringDatabaseDbContext.cs

@@ -3,8 +3,8 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
-    [ConnectionStringName(DatabaseDbProperties.ConnectionStringName)]
+    [ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
-    public interface IDatabaseDbContext : IEfCoreDbContext
+    public interface IBlobStoringDatabaseDbContext : IEfCoreDbContext
     {
         /* Add DbSet for each Aggregate Root here. Example:
          * DbSet<Question> Questions { get; }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/DatabaseMongoDbContext.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringDatabaseMongoDbContext.cs

@@ -3,8 +3,8 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
-    [ConnectionStringName(DatabaseDbProperties.ConnectionStringName)]
+    [ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
-    public class DatabaseMongoDbContext : AbpMongoDbContext, IDatabaseMongoDbContext
+    public class BlobStoringDatabaseMongoDbContext : AbpMongoDbContext, IBlobStoringDatabaseMongoDbContext
     {
         /* Add mongo collections here. Example:
          * public IMongoCollection<Question> Questions => Collection<Question>();

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/DatabaseMongoDbContextExtensions.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringDatabaseMongoDbContextExtensions.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
-    public static class DatabaseMongoDbContextExtensions
+    public static class BlobStoringDatabaseMongoDbContextExtensions
     {
         public static void ConfigureDatabase(
             this IMongoModelBuilder builder,
@@ -12,8 +12,8 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new DatabaseMongoModelBuilderConfigurationOptions(
+            var options = new BlobStoringDatabaseMongoModelBuilderConfigurationOptions(
-                DatabaseDbProperties.DbTablePrefix
+                BlobStoringDatabaseDbProperties.DbTablePrefix
             );
 
             optionsAction?.Invoke(options);

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/DatabaseMongoDbModule.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringDatabaseMongoDbModule.cs

@@ -5,14 +5,14 @@ using Volo.Abp.MongoDB;
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
     [DependsOn(
-        typeof(DatabaseDomainModule),
+        typeof(BlobStoringDatabaseDomainModule),
         typeof(AbpMongoDbModule)
         )]
-    public class DatabaseMongoDbModule : AbpModule
+    public class BlobStoringDatabaseMongoDbModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddMongoDbContext<DatabaseMongoDbContext>(options =>
+            context.Services.AddMongoDbContext<BlobStoringDatabaseMongoDbContext>(options =>
             {
                 /* Add custom repositories here. Example:
                  * options.AddRepository<Question, MongoQuestionRepository>();

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/DatabaseMongoModelBuilderConfigurationOptions.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringDatabaseMongoModelBuilderConfigurationOptions.cs

@@ -3,9 +3,9 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
-    public class DatabaseMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions
+    public class BlobStoringDatabaseMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions
     {
-        public DatabaseMongoModelBuilderConfigurationOptions(
+        public BlobStoringDatabaseMongoModelBuilderConfigurationOptions(
             [NotNull] string collectionPrefix = "")
             : base(collectionPrefix)
         {

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IDatabaseMongoDbContext.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringDatabaseMongoDbContext.cs

@@ -3,8 +3,8 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
-    [ConnectionStringName(DatabaseDbProperties.ConnectionStringName)]
+    [ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)]
-    public interface IDatabaseMongoDbContext : IAbpMongoDbContext
+    public interface IBlobStoringDatabaseMongoDbContext : IAbpMongoDbContext
     {
         /* Define mongo collections here. Example:
          * IMongoCollection<Question> Questions { get; }

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/DatabaseEntityFrameworkCoreTestModule.cs

@@ -9,7 +9,7 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
     [DependsOn(
         typeof(DatabaseTestBaseModule),
-        typeof(DatabaseEntityFrameworkCoreModule)
+        typeof(BlobStoringDatabaseEntityFrameworkCoreModule)
         )]
     public class DatabaseEntityFrameworkCoreTestModule : AbpModule
     {
@@ -31,8 +31,8 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
             var connection = new SqliteConnection("Data Source=:memory:");
             connection.Open();
 
-            new DatabaseDbContext(
+            new BlobStoringDatabaseDbContext(
-                new DbContextOptionsBuilder<DatabaseDbContext>().UseSqlite(connection).Options
+                new DbContextOptionsBuilder<BlobStoringDatabaseDbContext>().UseSqlite(connection).Options
             ).GetService<IRelationalDatabaseCreator>().CreateTables();
             
             return connection;

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/DatabaseMongoDbTestModule.cs

@@ -6,7 +6,7 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
     [DependsOn(
         typeof(DatabaseTestBaseModule),
-        typeof(DatabaseMongoDbModule)
+        typeof(BlobStoringDatabaseMongoDbModule)
         )]
     public class DatabaseMongoDbTestModule : AbpModule
     {

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/DatabaseTestBaseModule.cs

@@ -12,7 +12,7 @@ namespace Volo.Abp.BlobStoring.Database
         typeof(AbpAutofacModule),
         typeof(AbpTestBaseModule),
         typeof(AbpAuthorizationModule),
-        typeof(DatabaseDomainModule)
+        typeof(BlobStoringDatabaseDomainModule)
         )]
     public class DatabaseTestBaseModule : AbpModule
     {