Adjust namespaces

bording · bording · commit 014f0a8ae855 · 2020-03-25T14:42:34.000-04:00
diff --git a/projects/client/RabbitMQ.Client/src/client/api/AmqpVersion.cs b/projects/client/RabbitMQ.Client/src/client/api/AmqpVersion.cs
@@ -38,7 +38,7 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Framing.Impl
 {
     /// <summary>Represents a version of the AMQP specification.</summary>
     /// <remarks>
diff --git a/projects/client/RabbitMQ.Client/src/client/api/BinaryTableValue.cs b/projects/client/RabbitMQ.Client/src/client/api/BinaryTableValue.cs
@@ -38,7 +38,7 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Impl
 {
     /// <summary>Wrapper for a byte[]. May appear as values read from
     ///and written to AMQP field tables.</summary>
diff --git a/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactoryBase.cs b/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactoryBase.cs
@@ -40,6 +40,7 @@
 
 using System;
 using System.Net.Sockets;
+using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client
 {
diff --git a/projects/client/RabbitMQ.Client/src/client/api/SslHelper.cs b/projects/client/RabbitMQ.Client/src/client/api/SslHelper.cs
@@ -44,7 +44,7 @@
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Impl
 {
     /// <summary>
     /// Represents an <see cref="SslHelper"/> which does the actual heavy lifting to set up an SSL connection,
diff --git a/projects/client/RabbitMQ.Client/src/client/api/TopologyRecoveryException.cs b/projects/client/RabbitMQ.Client/src/client/api/TopologyRecoveryException.cs
@@ -40,9 +40,7 @@
 
 using System;
 
-using RabbitMQ.Client.Exceptions;
-
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Exceptions
 {
     public class TopologyRecoveryException : RabbitMQClientException
     {
diff --git a/projects/client/RabbitMQ.Client/src/client/exceptions/ProtocolViolationException.cs b/projects/client/RabbitMQ.Client/src/client/exceptions/ProtocolViolationException.cs
@@ -40,9 +40,7 @@
 
 using System;
 
-using RabbitMQ.Client.Exceptions;
-
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Exceptions
 {
 #if !NETSTANDARD1_5
     [Serializable]
@@ -55,9 +53,8 @@ public ProtocolViolationException(string message) : base(message)
         public ProtocolViolationException(string message, Exception inner) : base(message, inner)
         {
         }
-        public ProtocolViolationException() 
+        public ProtocolViolationException()
         {
         }
-
-    } 
+    }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs b/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs
@@ -46,7 +46,9 @@
 using System.Threading.Tasks;
 
 using RabbitMQ.Client.Events;
+using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Client.Impl;
+using RabbitMQ.Client.Logging;
 
 namespace RabbitMQ.Client.Framing.Impl
 {
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Command.cs b/projects/client/RabbitMQ.Client/src/client/impl/Command.cs
@@ -41,7 +41,7 @@
 using System;
 using System.Buffers;
 using System.Collections.Generic;
-
+using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Client.Framing.Impl;
 
 namespace RabbitMQ.Client.Impl
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
@@ -51,6 +51,7 @@
 using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Client.Impl;
+using RabbitMQ.Client.Logging;
 using RabbitMQ.Util;
 
 namespace RabbitMQ.Client.Framing.Impl
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs b/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs
@@ -3,7 +3,7 @@
 using System.Net.Sockets;
 using System.Threading.Tasks;
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Impl
 {
     /// <summary>
     /// Simple wrapper around TcpClient.
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapterHelper.cs b/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapterHelper.cs
@@ -3,7 +3,7 @@
 using System.Net;
 using System.Net.Sockets;
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Impl
 {
     static class TcpClientAdapterHelper
     {
diff --git a/projects/client/RabbitMQ.Client/src/logging/ESLog.cs b/projects/client/RabbitMQ.Client/src/logging/ESLog.cs
@@ -38,7 +38,7 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Logging
 {
     static class ESLog
     {
diff --git a/projects/client/Unit/src/unit/TestTcpClientAdapter.cs b/projects/client/Unit/src/unit/TestTcpClientAdapter.cs
@@ -42,6 +42,7 @@
 using System.Net.Sockets;
 
 using NUnit.Framework;
+using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client.Unit
 {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`// Copyright (c) 2007-2020 VMware, Inc. All rights reserved.`
`39`	`39`	`//---------------------------------------------------------------------------`
`40`	`40`
`41`		`-namespace RabbitMQ.Client`
	`41`	`+namespace RabbitMQ.Client.Framing.Impl`
`42`	`42`	`{`
`43`	`43`	`/// <summary>Represents a version of the AMQP specification.</summary>`
`44`	`44`	`/// <remarks>`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`
`41`	`41`	`using System;`
`42`	`42`	`using System.Net.Sockets;`
	`43`	`+using RabbitMQ.Client.Impl;`
`43`	`44`
`44`	`45`	`namespace RabbitMQ.Client`
`45`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`using System.Security.Authentication;`
`45`	`45`	`using System.Security.Cryptography.X509Certificates;`
`46`	`46`
`47`		`-namespace RabbitMQ.Client`
	`47`	`+namespace RabbitMQ.Client.Impl`
`48`	`48`	`{`
`49`	`49`	`/// <summary>`
`50`	`50`	`/// Represents an <see cref="SslHelper"/> which does the actual heavy lifting to set up an SSL connection,`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@`
`40`	`40`
`41`	`41`	`using System;`
`42`	`42`
`43`		`-using RabbitMQ.Client.Exceptions;`
`44`		`-`
`45`		`-namespace RabbitMQ.Client`
	`43`	`+namespace RabbitMQ.Client.Exceptions`
`46`	`44`	`{`
`47`	`45`	`public class TopologyRecoveryException : RabbitMQClientException`
`48`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@`
`46`	`46`	`using System.Threading.Tasks;`
`47`	`47`
`48`	`48`	`using RabbitMQ.Client.Events;`
	`49`	`+using RabbitMQ.Client.Exceptions;`
`49`	`50`	`using RabbitMQ.Client.Impl;`
	`51`	`+using RabbitMQ.Client.Logging;`
`50`	`52`
`51`	`53`	`namespace RabbitMQ.Client.Framing.Impl`
`52`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Net.Sockets;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`
`6`		`-namespace RabbitMQ.Client`
	`6`	`+namespace RabbitMQ.Client.Impl`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Simple wrapper around TcpClient.`