Move code to appropriate directories that match namespace structure

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

@@ -1,7 +1,39 @@
-using System;
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 2.0.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//---------------------------------------------------------------------------
+
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using RabbitMQ.Client;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Benchmarks
 {

projects/Benchmarks/WireFormatting/MethodFraming.cs

@@ -1,10 +1,40 @@
-using System;
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 2.0.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//---------------------------------------------------------------------------
+
+using System;
 using System.Text;
 
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
-using RabbitMQ.Client.client.impl;
-using RabbitMQ.Client.Framing.Impl;
+using RabbitMQ.Client.Framing;
 using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Benchmarks

projects/Benchmarks/WireFormatting/MethodSerialization.cs

@@ -3,7 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using RabbitMQ.Client;
-using RabbitMQ.Client.Framing.Impl;
+using RabbitMQ.Client.Framing;
 
 namespace RabbitMQ.Benchmarks
 {

projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs → projects/RabbitMQ.Client/AsyncDefaultBasicConsumer.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client
 {

projects/RabbitMQ.Client/client/api/BasicProperties.cs → projects/RabbitMQ.Client/BasicProperties.cs

@@ -32,7 +32,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using RabbitMQ.Client.Framing.Impl;
+using RabbitMQ.Client.Framing;
 using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client

projects/RabbitMQ.Client/client/api/ConnectionFactory.cs → projects/RabbitMQ.Client/ConnectionFactory.cs

@@ -40,7 +40,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using RabbitMQ.Client.Exceptions;
-using RabbitMQ.Client.Framing.Impl;
+using RabbitMQ.Client.Framing;
 using RabbitMQ.Client.Impl;
 
 namespace RabbitMQ.Client

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs → projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherBase.cs

@@ -1,7 +1,39 @@
-using System.Collections.Concurrent;
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 2.0.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//---------------------------------------------------------------------------
+
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client.ConsumerDispatching
 {

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs → projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherChannelBase.cs

@@ -1,8 +1,39 @@
-using System;
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 2.0.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//---------------------------------------------------------------------------
+
+using System;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-
+using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Impl;
 using RabbitMQ.Client.Logging;
 

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs → projects/RabbitMQ.Client/ConsumerDispatching/FallbackConsumer.cs

@@ -1,6 +1,31 @@
-using System;
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
+//---------------------------------------------------------------------------
+
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Logging;
 
 namespace RabbitMQ.Client.ConsumerDispatching

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs → projects/RabbitMQ.Client/ConsumerDispatching/IConsumerDispatcher.cs

@@ -32,6 +32,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client.ConsumerDispatching
 {

projects/RabbitMQ.Client/FrameworkExtension/DictionaryExtension.cs → projects/RabbitMQ.Client/DictionaryExtension.cs

@@ -29,17 +29,17 @@
 //  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
 //---------------------------------------------------------------------------
 
+#if NETSTANDARD
 using System.Collections.Generic;
 
-namespace RabbitMQ
+namespace RabbitMQ.Client
 {
-#if NETSTANDARD
     internal static class DictionaryExtension
     {
         public static bool Remove<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, out TValue value)
         {
             return dictionary.TryGetValue(key, out value) && dictionary.Remove(key);
         }
     }
-#endif
 }
+#endif

projects/RabbitMQ.Client/client/api/ShutdownEventArgs.cs → projects/RabbitMQ.Client/Events/ShutdownEventArgs.cs

@@ -31,17 +31,15 @@
 
 using System;
 using System.Threading;
-using RabbitMQ.Client.Events;
 
-namespace RabbitMQ.Client
+namespace RabbitMQ.Client.Events
 {
     /// <summary>
     /// Information about the reason why a particular channel, session, or connection was destroyed.
     /// </summary>
     /// <remarks>
     /// The <see cref="ClassId"/> and <see cref="Initiator"/> properties should be used to determine the originator of the shutdown event.
     /// </remarks>
-    /// TODO: Should this be moved to the events folder and the namespace be adjusted?
     public class ShutdownEventArgs : AsyncEventArgs
     {
         private readonly Exception? _exception;

projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs → projects/RabbitMQ.Client/Exceptions/AlreadyClosedException.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client.Exceptions
 {

projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs → projects/RabbitMQ.Client/Exceptions/OperationInterruptedException.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client.Exceptions
 {

projects/RabbitMQ.Client/client/exceptions/ProtocolException.cs → projects/RabbitMQ.Client/Exceptions/ProtocolException.cs

@@ -29,6 +29,8 @@
 //  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
 //---------------------------------------------------------------------------
 
+using RabbitMQ.Client.Events;
+
 namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Instances of subclasses of subclasses

projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs → projects/RabbitMQ.Client/Exceptions/UnexpectedMethodException.cs

@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
-using RabbitMQ.Client.client.framing;
+using RabbitMQ.Client.Framing;
 
 namespace RabbitMQ.Client.Exceptions
 {

projects/RabbitMQ.Client/client/impl/AmqpVersion.cs → projects/RabbitMQ.Client/Framing/AmqpVersion.cs

@@ -31,7 +31,7 @@
 
 using System;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     /// <summary>Represents a version of the AMQP specification.</summary>
     /// <remarks>

projects/RabbitMQ.Client/client/framing/BasicAck.cs → projects/RabbitMQ.Client/Framing/BasicAck.cs

@@ -31,11 +31,9 @@
 
 using System;
 using System.Runtime.CompilerServices;
-
-using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     internal readonly struct BasicAck : IOutgoingAmqpMethod
     {

projects/RabbitMQ.Client/client/framing/BasicCancel.cs → projects/RabbitMQ.Client/Framing/BasicCancel.cs

@@ -30,11 +30,9 @@
 //---------------------------------------------------------------------------
 
 using System;
-
-using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     internal readonly struct BasicCancel : IOutgoingAmqpMethod
     {

projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs → projects/RabbitMQ.Client/Framing/BasicCancelOk.cs

@@ -30,11 +30,9 @@
 //---------------------------------------------------------------------------
 
 using System;
-
-using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     internal readonly struct BasicCancelOk : IAmqpMethod
     {

projects/RabbitMQ.Client/client/framing/BasicConsume.cs → projects/RabbitMQ.Client/Framing/BasicConsume.cs

@@ -31,11 +31,9 @@
 
 using System;
 using System.Collections.Generic;
-
-using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     internal readonly struct BasicConsume : IOutgoingAmqpMethod
     {

projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs → projects/RabbitMQ.Client/Framing/BasicConsumeOk.cs

@@ -30,11 +30,9 @@
 //---------------------------------------------------------------------------
 
 using System;
-
-using RabbitMQ.Client.client.framing;
 using RabbitMQ.Client.Impl;
 
-namespace RabbitMQ.Client.Framing.Impl
+namespace RabbitMQ.Client.Framing
 {
     internal readonly struct BasicConsumeOk : IAmqpMethod
     {