Browse Source

Refactoring

pull/20747/head
EngincanV 1 year ago
parent
commit
df1705f592
  1. 2
      framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/DefaultGoogleBlobNameCalculator.cs
  2. 4
      framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobContainerConfigurationExtensions.cs
  3. 4
      framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobNamingNormalizer.cs
  4. 3
      framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobProvider.cs
  5. 2
      framework/test/Volo.Abp.BlobStoring.Google.Tests/Volo/Abp/BlobStoring/Google/AbpBlobStoringGoogleTestModule.cs
  6. 8
      framework/test/Volo.Abp.BlobStoring.Google.Tests/Volo/Abp/BlobStoring/Google/GoogleBlobNameCalculator_Tests.cs

2
framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/DefaultGoogleBlobNameCalculator.cs

@ -3,7 +3,7 @@ using Volo.Abp.MultiTenancy;
namespace Volo.Abp.BlobStoring.Google;
public class DefaultGoogleBlobNameCalculator: IGoogleBlobNameCalculator, ITransientDependency
public class DefaultGoogleBlobNameCalculator : IGoogleBlobNameCalculator, ITransientDependency
{
protected ICurrentTenant CurrentTenant { get; }

4
framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobContainerConfigurationExtensions.cs

@ -12,12 +12,12 @@ public static class GoogleBlobContainerConfigurationExtensions
public static BlobContainerConfiguration UseGoogle(
this BlobContainerConfiguration containerConfiguration,
Action<GoogleBlobProviderConfiguration> azureConfigureAction)
Action<GoogleBlobProviderConfiguration> googleConfigureAction)
{
containerConfiguration.ProviderType = typeof(GoogleBlobProvider);
containerConfiguration.NamingNormalizers.TryAdd<GoogleBlobNamingNormalizer>();
azureConfigureAction(new GoogleBlobProviderConfiguration(containerConfiguration));
googleConfigureAction(new GoogleBlobProviderConfiguration(containerConfiguration));
return containerConfiguration;
}

4
framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobNamingNormalizer.cs

@ -5,7 +5,7 @@ using Volo.Abp.Localization;
namespace Volo.Abp.BlobStoring.Google;
public class GoogleBlobNamingNormalizer: IBlobNamingNormalizer, ITransientDependency
public class GoogleBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency
{
/// <summary>
/// https://cloud.google.com/storage/docs/buckets#naming
@ -83,7 +83,7 @@ public class GoogleBlobNamingNormalizer: IBlobNamingNormalizer, ITransientDepend
if (!char.IsLetterOrDigit(containerName[0]))
{
containerName = containerName.Substring(1);
return RemoveInvalidStartEndCharacters( containerName);
return RemoveInvalidStartEndCharacters(containerName);
}
if (!char.IsLetterOrDigit(containerName[containerName.Length - 1]))

3
framework/src/Volo.Abp.BlobStoring.Google/Volo/Abp/BlobStoring/Google/GoogleBlobProvider.cs

@ -27,7 +27,7 @@ public class GoogleBlobProvider : BlobProviderBase, ITransientDependency
var blobName = GoogleBlobNameCalculator.Calculate(args);
var containerName = GetContainerName(args);
if(await BlobExistsAsync(args, blobName) && !args.OverrideExisting)
if (await BlobExistsAsync(args, blobName) && !args.OverrideExisting)
{
throw new BlobAlreadyExistsException($"Saving BLOB '{args.BlobName}' does already exists in the container '{GetContainerName(args)}'! Set {nameof(args.OverrideExisting)} if it should be overwritten.");
}
@ -54,7 +54,6 @@ public class GoogleBlobProvider : BlobProviderBase, ITransientDependency
{
return true;
}
return true;
}

2
framework/test/Volo.Abp.BlobStoring.Google.Tests/Volo/Abp/BlobStoring/Google/AbpBlobStoringGoogleTestModule.cs

@ -10,7 +10,7 @@ namespace Volo.Abp.BlobStoring.Google;
/// <summary>
/// This module will not try to connect to azure.
/// This module will not try to connect to Google Cloud Storage.
/// </summary>
[DependsOn(
typeof(AbpBlobStoringGoogleModule),

8
framework/test/Volo.Abp.BlobStoring.Google.Tests/Volo/Abp/BlobStoring/Google/GoogleBlobNameCalculator_Tests.cs

@ -10,8 +10,8 @@ public class GoogleBlobNameCalculator_Tests : AbpBlobStoringGoogleTestCommonBase
private readonly IGoogleBlobNameCalculator _calculator;
private readonly ICurrentTenant _currentTenant;
private const string AzureContainerName = "/";
private const string AzureSeparator = "/";
private const string GoogleContainerName = "/";
private const string GoogleSeparator = "/";
public GoogleBlobNameCalculator_Tests()
{
@ -24,7 +24,7 @@ public class GoogleBlobNameCalculator_Tests : AbpBlobStoringGoogleTestCommonBase
{
_calculator.Calculate(
GetArgs("my-container", "my-blob")
).ShouldBe($"host{AzureSeparator}my-blob");
).ShouldBe($"host{GoogleSeparator}my-blob");
}
[Fact]
@ -36,7 +36,7 @@ public class GoogleBlobNameCalculator_Tests : AbpBlobStoringGoogleTestCommonBase
{
_calculator.Calculate(
GetArgs("my-container", "my-blob")
).ShouldBe($"tenants{AzureSeparator}{tenantId:D}{AzureSeparator}my-blob");
).ShouldBe($"tenants{GoogleSeparator}{tenantId:D}{GoogleSeparator}my-blob");
}
}

Loading…
Cancel
Save