Browse Source

#4471 Prevent duplicate adding the same normalizer to the same container.

Also made TryAdd returns bool (we don't need it but someone may need)
pull/4513/head
Halil İbrahim Kalkan 6 years ago
parent
commit
f52472438e
  1. 2
      framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs
  2. 2
      framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs
  3. 2
      framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs
  4. 5
      framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs

2
framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs

@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.Azure
Action<AzureBlobProviderConfiguration> azureConfigureAction)
{
containerConfiguration.ProviderType = typeof(AzureBlobProvider);
containerConfiguration.NamingNormalizers.Add<AzureBlobNamingNormalizer>();
containerConfiguration.NamingNormalizers.TryAdd<AzureBlobNamingNormalizer>();
azureConfigureAction(new AzureBlobProviderConfiguration(containerConfiguration));

2
framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs

@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.FileSystem
Action<FileSystemBlobProviderConfiguration> fileSystemConfigureAction)
{
containerConfiguration.ProviderType = typeof(FileSystemBlobProvider);
containerConfiguration.NamingNormalizers.Add<FileSystemBlobNamingNormalizer>();
containerConfiguration.NamingNormalizers.TryAdd<FileSystemBlobNamingNormalizer>();
fileSystemConfigureAction(new FileSystemBlobProviderConfiguration(containerConfiguration));

2
framework/src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs

@ -27,7 +27,7 @@ namespace Volo.Abp.Collections
/// Adds a type to list if it's not already in the list.
/// </summary>
/// <typeparam name="T">Type</typeparam>
void TryAdd<T>() where T : TBaseType;
bool TryAdd<T>() where T : TBaseType;
/// <summary>
/// Checks if a type exists in the list.

5
framework/src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs

@ -60,14 +60,15 @@ namespace Volo.Abp.Collections
_typeList.Add(typeof(T));
}
public void TryAdd<T>() where T : TBaseType
public bool TryAdd<T>() where T : TBaseType
{
if (Contains<T>())
{
return;
return false;
}
Add<T>();
return true;
}
/// <inheritdoc/>

Loading…
Cancel
Save