diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs index 56040fe6ce..f156597d22 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.BlobStoring.Database public Blob(Guid id, Guid containerId, [NotNull]string name, byte[] content, Guid? tenantId) : base(id) { Check.NotNullOrWhiteSpace(name, nameof(name), BlobConsts.MaxNameLength); - CheckContent(content); + CheckContentLength(content); Content = content; ContainerId = containerId; @@ -28,16 +28,16 @@ namespace Volo.Abp.BlobStoring.Database public virtual void SetContent(byte[] content) { - CheckContent(content); + CheckContentLength(content); Content = content; } - protected void CheckContent(byte[] content) + protected virtual void CheckContentLength(byte[] content) { if (content.Length >= BlobConsts.MaxContentLength) { - throw new AbpException("Blob content size cannot be more than 2GB."); + throw new AbpException($"Blob content size cannot be more than {BlobConsts.MaxContentLength} Bytes."); } } } diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainerConfigurationExtensions.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainerConfigurationExtensions.cs index 2746e39352..c302e00634 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainerConfigurationExtensions.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainerConfigurationExtensions.cs @@ -12,11 +12,11 @@ namespace Volo.Abp.BlobStoring.Database public static BlobContainerConfiguration UseDatabase( this BlobContainerConfiguration containerConfiguration, - Action fileSystemConfigureAction) + Action databaseConfigureAction) { containerConfiguration.ProviderType = typeof(DatabaseBlobProvider); - fileSystemConfigureAction(new DatabaseBlobProviderConfiguration(containerConfiguration)); + databaseConfigureAction(new DatabaseBlobProviderConfiguration(containerConfiguration)); return containerConfiguration; } diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseDataSeedContributor.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseDataSeedContributor.cs deleted file mode 100644 index 8dc8ea382a..0000000000 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseDataSeedContributor.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Data; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Guids; - -namespace Volo.Abp.BlobStoring.Database -{ - public class BlobStoringDatabaseDataSeedContributor : IDataSeedContributor, ITransientDependency - { - private readonly IGuidGenerator _guidGenerator; - - public BlobStoringDatabaseDataSeedContributor( - IGuidGenerator guidGenerator) - { - _guidGenerator = guidGenerator; - } - - public Task SeedAsync(DataSeedContext context) - { - /* Instead of returning the Task.CompletedTask, you can insert your test data - * at this point! - */ - - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBaseModule.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBaseModule.cs index 11b23fb0a6..96e3bcaa90 100644 --- a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBaseModule.cs +++ b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBaseModule.cs @@ -1,10 +1,7 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; using Volo.Abp.Authorization; using Volo.Abp.Autofac; -using Volo.Abp.Data; using Volo.Abp.Modularity; -using Volo.Abp.Threading; namespace Volo.Abp.BlobStoring.Database { @@ -29,23 +26,5 @@ namespace Volo.Abp.BlobStoring.Database }); }); } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - SeedTestData(context); - } - - private static void SeedTestData(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(async () => - { - using (var scope = context.ServiceProvider.CreateScope()) - { - await scope.ServiceProvider - .GetRequiredService() - .SeedAsync(); - } - }); - } } }