Re-arrange namespaces.

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.BlobStoring.Containers;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.BlobStoring

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs

@@ -1,6 +1,4 @@
-using Volo.Abp.BlobStoring.Containers;
+namespace Volo.Abp.BlobStoring
-
-namespace Volo.Abp.BlobStoring
 {
     public class AbpBlobStoringOptions
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerConfiguration
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerConfigurationDictionary
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs

@@ -4,11 +4,10 @@ using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Options;
-using Volo.Abp.BlobStoring.Providers;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerFactory : IBlobContainerFactory, ITransientDependency
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public static class BlobContainerFactoryExtensions
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs

@@ -2,7 +2,7 @@
 using System.Reflection;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerNameAttribute : Attribute
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerToProviderAdapter.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerToProviderAdapter.cs

@@ -1,9 +1,8 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.Abp.BlobStoring.Providers;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerToProviderAdapter : IBlobContainer
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderArgs.cs

@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public abstract class BlobProviderArgs
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderDeleteArgs.cs

@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderDeleteArgs : BlobProviderArgs
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderExistsArgs.cs

@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderExistsArgs : BlobProviderArgs
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderGetArgs.cs

@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderGetArgs : BlobProviderArgs
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderSaveArgs.cs

@@ -1,9 +1,8 @@
 using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderSaveArgs
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/DefaultContainer.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs

@@ -1,4 +1,4 @@
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     [BlobContainerName("Default")]
     public class DefaultContainer

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobContainer<TContainer> : IBlobContainer
         where TContainer: class

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobContainerFactory
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/IBlobProvider.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobProvider.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobProvider
     {

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class TypedBlobContainerWrapper<TContainer> : IBlobContainer<TContainer>
         where TContainer: class

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers;
+using Volo.Abp.BlobStoring.Fakes;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.TestObjects;
-using Volo.Abp.BlobStoring.Providers.Fakes;
 using Xunit;
 
 namespace Volo.Abp.BlobStoring

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs

@@ -1,9 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Volo.Abp.Autofac;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.Fakes;
-using Volo.Abp.BlobStoring.Providers;
+using Volo.Abp.BlobStoring.TestObjects;
-using Volo.Abp.BlobStoring.Providers.Fakes;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.BlobStoring

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs

@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using NSubstitute;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.Fakes;
-using Volo.Abp.BlobStoring.Providers;
+using Volo.Abp.BlobStoring.TestObjects;
-using Volo.Abp.BlobStoring.Providers.Fakes;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerFactory_Tests : AbpBlobStoringTestBase
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs

@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerNameAttribute_Tests
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs

@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainer_Injection_Tests : AbpBlobStoringTestBase
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer1.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.BlobStoring.Containers.TestObjects
-{
-    public class TestContainer1
-    {
-        
-    }
-}

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.BlobStoring.Containers.TestObjects
-{
-    public class TestContainer3
-    {
-        
-    }
-}

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.Fakes
 {
     public class FakeBlobProvider1 : IBlobProvider
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.Fakes
 {
     public class FakeBlobProvider2 : IBlobProvider
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.Fakes
 {
     public class FakeProviders : ISingletonDependency
     {

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer1.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.TestObjects
+{
+    public class TestContainer1
+    {
+        
+    }
+}

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs → framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs

@@ -1,4 +1,4 @@
-namespace Volo.Abp.BlobStoring.Containers.TestObjects
+namespace Volo.Abp.BlobStoring.TestObjects
 {
     [BlobContainerName("Test2")]
     public class TestContainer2

framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer3.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.TestObjects
+{
+    public class TestContainer3
+    {
+        
+    }
+}