Revert namespace changes

testcontainers · Dec 22, 2021 · 6175275 · 6175275
1 parent fc176b6
commit 6175275
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 35 deletions.
diff --git a/src/DotNet.Testcontainers/Builders/ImageFromDockerfileBuilder.cs b/src/DotNet.Testcontainers/Builders/ImageFromDockerfileBuilder.cs
@@ -4,7 +4,7 @@ namespace DotNet.Testcontainers.Builders
   using System.Linq;
   using System.Threading.Tasks;
   using DotNet.Testcontainers.Clients;
-  using DotNet.Testcontainers.Configurations.Images;
+  using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Images;
   using DotNet.Testcontainers.Services;
   using JetBrains.Annotations;

diff --git a/src/DotNet.Testcontainers/Builders/TestcontainersBuilder.cs b/src/DotNet.Testcontainers/Builders/TestcontainersBuilder.cs
@@ -8,8 +8,6 @@ namespace DotNet.Testcontainers.Builders
   using System.Threading.Tasks;
   using DotNet.Testcontainers.Clients;
   using DotNet.Testcontainers.Configurations;
-  using DotNet.Testcontainers.Configurations.Containers;
-  using DotNet.Testcontainers.Configurations.Images;
   using DotNet.Testcontainers.Containers;
   using DotNet.Testcontainers.Images;
   using DotNet.Testcontainers.Network;

diff --git a/src/DotNet.Testcontainers/Clients/DockerContainerOperations.cs b/src/DotNet.Testcontainers/Clients/DockerContainerOperations.cs
@@ -6,7 +6,6 @@ namespace DotNet.Testcontainers.Clients
   using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;

diff --git a/src/DotNet.Testcontainers/Clients/DockerImageOperations.cs b/src/DotNet.Testcontainers/Clients/DockerImageOperations.cs
@@ -7,7 +7,7 @@ namespace DotNet.Testcontainers.Clients
   using System.Threading;
   using System.Threading.Tasks;
   using Docker.DotNet.Models;
-  using DotNet.Testcontainers.Configurations.Images;
+  using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Images;
   using Microsoft.Extensions.Logging;
 

diff --git a/src/DotNet.Testcontainers/Clients/IDockerContainerOperations.cs b/src/DotNet.Testcontainers/Clients/IDockerContainerOperations.cs
@@ -4,7 +4,6 @@ namespace DotNet.Testcontainers.Clients
   using System.IO;
   using System.Threading;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;

diff --git a/src/DotNet.Testcontainers/Clients/IDockerImageOperations.cs b/src/DotNet.Testcontainers/Clients/IDockerImageOperations.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Clients
 {
   using System.Threading;
   using System.Threading.Tasks;
-  using Configurations.Images;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Images;

diff --git a/src/DotNet.Testcontainers/Clients/ITestcontainersClient.cs b/src/DotNet.Testcontainers/Clients/ITestcontainersClient.cs
@@ -3,8 +3,6 @@ namespace DotNet.Testcontainers.Clients
   using System.Collections.Generic;
   using System.Threading;
   using System.Threading.Tasks;
-  using Configurations.Containers;
-  using Configurations.Images;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;

diff --git a/src/DotNet.Testcontainers/Clients/TestcontainersClient.cs b/src/DotNet.Testcontainers/Clients/TestcontainersClient.cs
@@ -10,8 +10,6 @@ namespace DotNet.Testcontainers.Clients
   using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
-  using DotNet.Testcontainers.Configurations.Containers;
-  using DotNet.Testcontainers.Configurations.Images;
   using DotNet.Testcontainers.Containers;
   using DotNet.Testcontainers.Services;
   using ICSharpCode.SharpZipLib.Tar;

diff --git a/src/DotNet.Testcontainers/Clients/TestcontainersConfigurationConverter.cs b/src/DotNet.Testcontainers/Clients/TestcontainersConfigurationConverter.cs
@@ -3,7 +3,6 @@ namespace DotNet.Testcontainers.Clients
   using System;
   using System.Collections.Generic;
   using System.Linq;
-  using Configurations.Containers;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Network;

diff --git a/src/DotNet.Testcontainers/Configurations/Containers/ITestcontainersConfiguration.cs b/src/DotNet.Testcontainers/Configurations/Containers/ITestcontainersConfiguration.cs
@@ -1,10 +1,9 @@
-namespace DotNet.Testcontainers.Configurations.Containers
+namespace DotNet.Testcontainers.Configurations
 {
   using System;
   using System.Collections.Generic;
   using System.Threading;
   using System.Threading.Tasks;
-  using DotNet.Testcontainers.Configurations.Images;
   using DotNet.Testcontainers.Containers;
   using DotNet.Testcontainers.Images;
   using DotNet.Testcontainers.Network;

diff --git a/src/DotNet.Testcontainers/Configurations/Containers/TestcontainersConfiguration.cs b/src/DotNet.Testcontainers/Configurations/Containers/TestcontainersConfiguration.cs
@@ -1,4 +1,4 @@
-namespace DotNet.Testcontainers.Configurations.Containers
+namespace DotNet.Testcontainers.Configurations
 {
   using System;
   using System.Collections.Generic;
@@ -7,7 +7,6 @@ namespace DotNet.Testcontainers.Configurations.Containers
   using DotNet.Testcontainers.Containers;
   using DotNet.Testcontainers.Images;
   using DotNet.Testcontainers.Network;
-  using Images;
 
   /// <inheritdoc cref="ITestcontainersConfiguration" />
   public readonly struct TestcontainersConfiguration : ITestcontainersConfiguration

diff --git a/src/DotNet.Testcontainers/Configurations/Images/DockerRegistryAuthenticationConfiguration.cs b/src/DotNet.Testcontainers/Configurations/Images/DockerRegistryAuthenticationConfiguration.cs
@@ -1,4 +1,4 @@
-namespace DotNet.Testcontainers.Configurations.Images
+namespace DotNet.Testcontainers.Configurations
 {
   using System;
 

diff --git a/...DotNet.Testcontainers/Configurations/Images/IDockerRegistryAuthenticationConfiguration.cs b/...DotNet.Testcontainers/Configurations/Images/IDockerRegistryAuthenticationConfiguration.cs
@@ -1,4 +1,4 @@
-namespace DotNet.Testcontainers.Configurations.Images
+namespace DotNet.Testcontainers.Configurations
 {
   using System;
   using JetBrains.Annotations;

diff --git a/src/DotNet.Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs b/src/DotNet.Testcontainers/Configurations/Images/IImageFromDockerfileConfiguration.cs
@@ -1,4 +1,4 @@
-namespace DotNet.Testcontainers.Configurations.Images
+namespace DotNet.Testcontainers.Configurations
 {
   using System.Collections.Generic;
   using DotNet.Testcontainers.Images;

diff --git a/src/DotNet.Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs b/src/DotNet.Testcontainers/Configurations/Images/ImageFromDockerfileConfiguration.cs
@@ -1,4 +1,4 @@
-namespace DotNet.Testcontainers.Configurations.Images
+namespace DotNet.Testcontainers.Configurations
 {
   using System.Collections.Generic;
   using System.IO;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/CouchDbTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/CouchDbTestcontainer.cs
@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Containers
 {
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/CouchbaseTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/CouchbaseTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/MongoDbTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/MongoDbTestcontainer.cs
@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Containers
 {
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/MsSqlTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/MsSqlTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/MySqlTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/MySqlTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/OracleTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/OracleTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/PostgreSqlTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/PostgreSqlTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/Databases/RedisTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/Databases/RedisTestcontainer.cs
@@ -2,7 +2,6 @@ namespace DotNet.Testcontainers.Containers
 {
   using System.Text;
   using System.Threading.Tasks;
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/HostedServiceContainer.cs b/src/DotNet.Testcontainers/Containers/Modules/HostedServiceContainer.cs
@@ -1,6 +1,6 @@
 namespace DotNet.Testcontainers.Containers.Modules
 {
-  using DotNet.Testcontainers.Configurations.Containers;
+  using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;
 

diff --git a/src/DotNet.Testcontainers/Containers/Modules/MessageBrokers/KafkaTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/MessageBrokers/KafkaTestcontainer.cs
@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Containers
 {
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/MessageBrokers/RabbitMqTestcontainer.cs b/src/DotNet.Testcontainers/Containers/Modules/MessageBrokers/RabbitMqTestcontainer.cs
@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Containers
 {
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/TestcontainerDatabase.cs b/src/DotNet.Testcontainers/Containers/Modules/TestcontainerDatabase.cs
@@ -4,7 +4,6 @@ namespace DotNet.Testcontainers.Containers
   using System.Text;
   using System.Threading.Tasks;
   using DotNet.Testcontainers.Configurations;
-  using DotNet.Testcontainers.Configurations.Containers;
   using DotNet.Testcontainers.Containers.Modules;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;

diff --git a/src/DotNet.Testcontainers/Containers/Modules/TestcontainerMessageBroker.cs b/src/DotNet.Testcontainers/Containers/Modules/TestcontainerMessageBroker.cs
@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Containers
 {
-  using Configurations.Containers;
   using DotNet.Testcontainers.Configurations;
   using Microsoft.Extensions.Logging;
   using Modules;

diff --git a/src/DotNet.Testcontainers/Containers/TestcontainersContainer.cs b/src/DotNet.Testcontainers/Containers/TestcontainersContainer.cs
@@ -8,7 +8,6 @@ namespace DotNet.Testcontainers.Containers
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Clients;
   using DotNet.Testcontainers.Configurations;
-  using DotNet.Testcontainers.Configurations.Containers;
   using JetBrains.Annotations;
   using Microsoft.Extensions.Logging;
 

diff --git a/tests/DotNet.Testcontainers.Tests/Unit/Clients/TestcontainersConfigurationConverterTest.cs b/tests/DotNet.Testcontainers.Tests/Unit/Clients/TestcontainersConfigurationConverterTest.cs
@@ -3,7 +3,7 @@ namespace DotNet.Testcontainers.Tests.Unit.Clients
   using System.Collections.Generic;
   using System.Linq;
   using DotNet.Testcontainers.Clients;
-  using DotNet.Testcontainers.Configurations.Containers;
+  using DotNet.Testcontainers.Configurations;
   using Moq;
   using Xunit;