diff --git a/projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs b/projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs index 541b826ba9..86ed09de93 100644 --- a/projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs +++ b/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 { diff --git a/projects/Benchmarks/WireFormatting/MethodFraming.cs b/projects/Benchmarks/WireFormatting/MethodFraming.cs index 7e66796e5f..e9c9e36e1e 100644 --- a/projects/Benchmarks/WireFormatting/MethodFraming.cs +++ b/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 diff --git a/projects/Benchmarks/WireFormatting/MethodSerialization.cs b/projects/Benchmarks/WireFormatting/MethodSerialization.cs index 1a67657c80..85fd225488 100644 --- a/projects/Benchmarks/WireFormatting/MethodSerialization.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs b/projects/RabbitMQ.Client/AmqpTcpEndpoint.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs rename to projects/RabbitMQ.Client/AmqpTcpEndpoint.cs diff --git a/projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs b/projects/RabbitMQ.Client/AmqpTimestamp.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs rename to projects/RabbitMQ.Client/AmqpTimestamp.cs diff --git a/projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs b/projects/RabbitMQ.Client/AsyncDefaultBasicConsumer.cs similarity index 99% rename from projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs rename to projects/RabbitMQ.Client/AsyncDefaultBasicConsumer.cs index 4194495394..644110fc98 100644 --- a/projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/api/BasicCredentialsProvider.cs b/projects/RabbitMQ.Client/BasicCredentialsProvider.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/BasicCredentialsProvider.cs rename to projects/RabbitMQ.Client/BasicCredentialsProvider.cs diff --git a/projects/RabbitMQ.Client/client/api/BasicGetResult.cs b/projects/RabbitMQ.Client/BasicGetResult.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/BasicGetResult.cs rename to projects/RabbitMQ.Client/BasicGetResult.cs diff --git a/projects/RabbitMQ.Client/client/api/BasicProperties.cs b/projects/RabbitMQ.Client/BasicProperties.cs similarity index 99% rename from projects/RabbitMQ.Client/client/api/BasicProperties.cs rename to projects/RabbitMQ.Client/BasicProperties.cs index b39d9a361b..35a65b6881 100644 --- a/projects/RabbitMQ.Client/client/api/BasicProperties.cs +++ b/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 diff --git a/projects/RabbitMQ.Client/client/api/BinaryTableValue.cs b/projects/RabbitMQ.Client/BinaryTableValue.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/BinaryTableValue.cs rename to projects/RabbitMQ.Client/BinaryTableValue.cs diff --git a/projects/RabbitMQ.Client/client/api/CachedString.cs b/projects/RabbitMQ.Client/CachedString.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/CachedString.cs rename to projects/RabbitMQ.Client/CachedString.cs diff --git a/projects/RabbitMQ.Client/client/api/ConnectionConfig.cs b/projects/RabbitMQ.Client/ConnectionConfig.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ConnectionConfig.cs rename to projects/RabbitMQ.Client/ConnectionConfig.cs diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs b/projects/RabbitMQ.Client/ConnectionFactory.cs similarity index 99% rename from projects/RabbitMQ.Client/client/api/ConnectionFactory.cs rename to projects/RabbitMQ.Client/ConnectionFactory.cs index 360d3c9c73..f723ae8e49 100644 --- a/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs +++ b/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 diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs b/projects/RabbitMQ.Client/ConnectionFactoryBase.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs rename to projects/RabbitMQ.Client/ConnectionFactoryBase.cs diff --git a/projects/RabbitMQ.Client/client/framing/Constants.cs b/projects/RabbitMQ.Client/Constants.cs similarity index 100% rename from projects/RabbitMQ.Client/client/framing/Constants.cs rename to projects/RabbitMQ.Client/Constants.cs diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/AsyncConsumerDispatcher.cs b/projects/RabbitMQ.Client/ConsumerDispatching/AsyncConsumerDispatcher.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/ConsumerDispatching/AsyncConsumerDispatcher.cs rename to projects/RabbitMQ.Client/ConsumerDispatching/AsyncConsumerDispatcher.cs diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs b/projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherBase.cs similarity index 58% rename from projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs rename to projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherBase.cs index 05dd59044a..19462c945f 100644 --- a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs b/projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherChannelBase.cs similarity index 87% rename from projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs rename to projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherChannelBase.cs index 1de847c928..eb01959e4f 100644 --- a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs +++ b/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; diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs b/projects/RabbitMQ.Client/ConsumerDispatching/FallbackConsumer.cs similarity index 61% rename from projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs rename to projects/RabbitMQ.Client/ConsumerDispatching/FallbackConsumer.cs index 061be4d5ba..31f31b115c 100644 --- a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs +++ b/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 diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs b/projects/RabbitMQ.Client/ConsumerDispatching/IConsumerDispatcher.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs rename to projects/RabbitMQ.Client/ConsumerDispatching/IConsumerDispatcher.cs index 5d297fdf5b..d3fb5fc32c 100644 --- a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/api/DefaultEndpointResolver.cs b/projects/RabbitMQ.Client/DefaultEndpointResolver.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/DefaultEndpointResolver.cs rename to projects/RabbitMQ.Client/DefaultEndpointResolver.cs diff --git a/projects/RabbitMQ.Client/client/api/DeliveryModes.cs b/projects/RabbitMQ.Client/DeliveryModes.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/DeliveryModes.cs rename to projects/RabbitMQ.Client/DeliveryModes.cs diff --git a/projects/RabbitMQ.Client/FrameworkExtension/DictionaryExtension.cs b/projects/RabbitMQ.Client/DictionaryExtension.cs similarity index 98% rename from projects/RabbitMQ.Client/FrameworkExtension/DictionaryExtension.cs rename to projects/RabbitMQ.Client/DictionaryExtension.cs index 3a7766b51c..a6abf0633a 100644 --- a/projects/RabbitMQ.Client/FrameworkExtension/DictionaryExtension.cs +++ b/projects/RabbitMQ.Client/DictionaryExtension.cs @@ -29,11 +29,11 @@ // 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(this IDictionary dictionary, TKey key, out TValue value) @@ -41,5 +41,5 @@ public static bool Remove(this IDictionary dictionar return dictionary.TryGetValue(key, out value) && dictionary.Remove(key); } } -#endif } +#endif diff --git a/projects/RabbitMQ.Client/client/events/AsyncEventArgs.cs b/projects/RabbitMQ.Client/Events/AsyncEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/AsyncEventArgs.cs rename to projects/RabbitMQ.Client/Events/AsyncEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/AsyncEventHandler.cs b/projects/RabbitMQ.Client/Events/AsyncEventHandler.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/AsyncEventHandler.cs rename to projects/RabbitMQ.Client/Events/AsyncEventHandler.cs diff --git a/projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs b/projects/RabbitMQ.Client/Events/AsyncEventingBasicConsumer.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs rename to projects/RabbitMQ.Client/Events/AsyncEventingBasicConsumer.cs diff --git a/projects/RabbitMQ.Client/client/events/BasicAckEventArgs.cs b/projects/RabbitMQ.Client/Events/BasicAckEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/BasicAckEventArgs.cs rename to projects/RabbitMQ.Client/Events/BasicAckEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/BasicDeliverEventArgs.cs b/projects/RabbitMQ.Client/Events/BasicDeliverEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/BasicDeliverEventArgs.cs rename to projects/RabbitMQ.Client/Events/BasicDeliverEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/BasicNackEventArgs.cs b/projects/RabbitMQ.Client/Events/BasicNackEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/BasicNackEventArgs.cs rename to projects/RabbitMQ.Client/Events/BasicNackEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/BasicReturnEventArgs.cs b/projects/RabbitMQ.Client/Events/BasicReturnEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/BasicReturnEventArgs.cs rename to projects/RabbitMQ.Client/Events/BasicReturnEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/CallbackExceptionEventArgs.cs b/projects/RabbitMQ.Client/Events/CallbackExceptionEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/CallbackExceptionEventArgs.cs rename to projects/RabbitMQ.Client/Events/CallbackExceptionEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/ConnectionBlockedEventArgs.cs b/projects/RabbitMQ.Client/Events/ConnectionBlockedEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/ConnectionBlockedEventArgs.cs rename to projects/RabbitMQ.Client/Events/ConnectionBlockedEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/ConnectionRecoveryErrorEventArgs.cs b/projects/RabbitMQ.Client/Events/ConnectionRecoveryErrorEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/ConnectionRecoveryErrorEventArgs.cs rename to projects/RabbitMQ.Client/Events/ConnectionRecoveryErrorEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/ConsumerEventArgs.cs b/projects/RabbitMQ.Client/Events/ConsumerEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/ConsumerEventArgs.cs rename to projects/RabbitMQ.Client/Events/ConsumerEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/ConsumerTagChangedAfterRecoveryEventArgs.cs b/projects/RabbitMQ.Client/Events/ConsumerTagChangedAfterRecoveryEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/ConsumerTagChangedAfterRecoveryEventArgs.cs rename to projects/RabbitMQ.Client/Events/ConsumerTagChangedAfterRecoveryEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/FlowControlEventArgs.cs b/projects/RabbitMQ.Client/Events/FlowControlEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/FlowControlEventArgs.cs rename to projects/RabbitMQ.Client/Events/FlowControlEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/QueueNameChangedAfterRecoveryEventArgs.cs b/projects/RabbitMQ.Client/Events/QueueNameChangedAfterRecoveryEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/QueueNameChangedAfterRecoveryEventArgs.cs rename to projects/RabbitMQ.Client/Events/QueueNameChangedAfterRecoveryEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/events/RecoveringConsumerEventArgs.cs b/projects/RabbitMQ.Client/Events/RecoveringConsumerEventArgs.cs similarity index 100% rename from projects/RabbitMQ.Client/client/events/RecoveringConsumerEventArgs.cs rename to projects/RabbitMQ.Client/Events/RecoveringConsumerEventArgs.cs diff --git a/projects/RabbitMQ.Client/client/api/ShutdownEventArgs.cs b/projects/RabbitMQ.Client/Events/ShutdownEventArgs.cs similarity index 97% rename from projects/RabbitMQ.Client/client/api/ShutdownEventArgs.cs rename to projects/RabbitMQ.Client/Events/ShutdownEventArgs.cs index 9f84b2347b..cf8ed5b3cd 100644 --- a/projects/RabbitMQ.Client/client/api/ShutdownEventArgs.cs +++ b/projects/RabbitMQ.Client/Events/ShutdownEventArgs.cs @@ -31,9 +31,8 @@ using System; using System.Threading; -using RabbitMQ.Client.Events; -namespace RabbitMQ.Client +namespace RabbitMQ.Client.Events { /// /// Information about the reason why a particular channel, session, or connection was destroyed. @@ -41,7 +40,6 @@ namespace RabbitMQ.Client /// /// The and properties should be used to determine the originator of the shutdown event. /// - /// TODO: Should this be moved to the events folder and the namespace be adjusted? public class ShutdownEventArgs : AsyncEventArgs { private readonly Exception? _exception; diff --git a/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs b/projects/RabbitMQ.Client/Exceptions/AlreadyClosedException.cs similarity index 98% rename from projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs rename to projects/RabbitMQ.Client/Exceptions/AlreadyClosedException.cs index 726c16ca5f..e0e7104932 100644 --- a/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs +++ b/projects/RabbitMQ.Client/Exceptions/AlreadyClosedException.cs @@ -30,6 +30,7 @@ //--------------------------------------------------------------------------- using System; +using RabbitMQ.Client.Events; namespace RabbitMQ.Client.Exceptions { diff --git a/projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs b/projects/RabbitMQ.Client/Exceptions/AuthenticationFailureException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs rename to projects/RabbitMQ.Client/Exceptions/AuthenticationFailureException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs b/projects/RabbitMQ.Client/Exceptions/BrokerUnreachableException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs rename to projects/RabbitMQ.Client/Exceptions/BrokerUnreachableException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs b/projects/RabbitMQ.Client/Exceptions/ChannelAllocationException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs rename to projects/RabbitMQ.Client/Exceptions/ChannelAllocationException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs b/projects/RabbitMQ.Client/Exceptions/ConnectFailureException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs rename to projects/RabbitMQ.Client/Exceptions/ConnectFailureException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/HardProtocolException.cs b/projects/RabbitMQ.Client/Exceptions/HardProtocolException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/HardProtocolException.cs rename to projects/RabbitMQ.Client/Exceptions/HardProtocolException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/MalformedFrameException.cs b/projects/RabbitMQ.Client/Exceptions/MalformedFrameException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/MalformedFrameException.cs rename to projects/RabbitMQ.Client/Exceptions/MalformedFrameException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs b/projects/RabbitMQ.Client/Exceptions/OperationInterruptedException.cs similarity index 99% rename from projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs rename to projects/RabbitMQ.Client/Exceptions/OperationInterruptedException.cs index 8877b50cfa..e1cb60e593 100644 --- a/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs +++ b/projects/RabbitMQ.Client/Exceptions/OperationInterruptedException.cs @@ -30,6 +30,7 @@ //--------------------------------------------------------------------------- using System; +using RabbitMQ.Client.Events; namespace RabbitMQ.Client.Exceptions { diff --git a/projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs b/projects/RabbitMQ.Client/Exceptions/PacketNotRecognizedException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs rename to projects/RabbitMQ.Client/Exceptions/PacketNotRecognizedException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs b/projects/RabbitMQ.Client/Exceptions/PossibleAuthenticationFailureException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs rename to projects/RabbitMQ.Client/Exceptions/PossibleAuthenticationFailureException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolException.cs b/projects/RabbitMQ.Client/Exceptions/ProtocolException.cs similarity index 98% rename from projects/RabbitMQ.Client/client/exceptions/ProtocolException.cs rename to projects/RabbitMQ.Client/Exceptions/ProtocolException.cs index f0fd153271..18575c63c6 100644 --- a/projects/RabbitMQ.Client/client/exceptions/ProtocolException.cs +++ b/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 { /// Instances of subclasses of subclasses diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs b/projects/RabbitMQ.Client/Exceptions/ProtocolVersionMismatchException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs rename to projects/RabbitMQ.Client/Exceptions/ProtocolVersionMismatchException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs b/projects/RabbitMQ.Client/Exceptions/ProtocolViolationException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs rename to projects/RabbitMQ.Client/Exceptions/ProtocolViolationException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs b/projects/RabbitMQ.Client/Exceptions/RabbitMQClientException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs rename to projects/RabbitMQ.Client/Exceptions/RabbitMQClientException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/SyntaxErrorException.cs b/projects/RabbitMQ.Client/Exceptions/SyntaxErrorException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/SyntaxErrorException.cs rename to projects/RabbitMQ.Client/Exceptions/SyntaxErrorException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/TopologyRecoveryException.cs b/projects/RabbitMQ.Client/Exceptions/TopologyRecoveryException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/TopologyRecoveryException.cs rename to projects/RabbitMQ.Client/Exceptions/TopologyRecoveryException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/UnexpectedFrameException.cs b/projects/RabbitMQ.Client/Exceptions/UnexpectedFrameException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/UnexpectedFrameException.cs rename to projects/RabbitMQ.Client/Exceptions/UnexpectedFrameException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs b/projects/RabbitMQ.Client/Exceptions/UnexpectedMethodException.cs similarity index 98% rename from projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs rename to projects/RabbitMQ.Client/Exceptions/UnexpectedMethodException.cs index cf2cf6d350..5e925053db 100644 --- a/projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/exceptions/UnknownClassOrMethodException.cs b/projects/RabbitMQ.Client/Exceptions/UnknownClassOrMethodException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/UnknownClassOrMethodException.cs rename to projects/RabbitMQ.Client/Exceptions/UnknownClassOrMethodException.cs diff --git a/projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs b/projects/RabbitMQ.Client/Exceptions/WireFormattingException.cs similarity index 100% rename from projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs rename to projects/RabbitMQ.Client/Exceptions/WireFormattingException.cs diff --git a/projects/RabbitMQ.Client/client/api/ExchangeType.cs b/projects/RabbitMQ.Client/ExchangeType.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ExchangeType.cs rename to projects/RabbitMQ.Client/ExchangeType.cs diff --git a/projects/RabbitMQ.Client/client/api/ExternalMechanism.cs b/projects/RabbitMQ.Client/ExternalMechanism.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ExternalMechanism.cs rename to projects/RabbitMQ.Client/ExternalMechanism.cs diff --git a/projects/RabbitMQ.Client/client/api/ExternalMechanismFactory.cs b/projects/RabbitMQ.Client/ExternalMechanismFactory.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ExternalMechanismFactory.cs rename to projects/RabbitMQ.Client/ExternalMechanismFactory.cs diff --git a/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs b/projects/RabbitMQ.Client/Framing/AmqpVersion.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AmqpVersion.cs rename to projects/RabbitMQ.Client/Framing/AmqpVersion.cs index 5297c5d362..335e7eb4aa 100644 --- a/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs +++ b/projects/RabbitMQ.Client/Framing/AmqpVersion.cs @@ -31,7 +31,7 @@ using System; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { /// Represents a version of the AMQP specification. /// diff --git a/projects/RabbitMQ.Client/client/framing/BasicAck.cs b/projects/RabbitMQ.Client/Framing/BasicAck.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicAck.cs rename to projects/RabbitMQ.Client/Framing/BasicAck.cs index aa7bc7f745..8710403bb7 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicAck.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/framing/BasicCancel.cs b/projects/RabbitMQ.Client/Framing/BasicCancel.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/BasicCancel.cs rename to projects/RabbitMQ.Client/Framing/BasicCancel.cs index 7eae54d0b4..8a5cdc75c9 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicCancel.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs b/projects/RabbitMQ.Client/Framing/BasicCancelOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs rename to projects/RabbitMQ.Client/Framing/BasicCancelOk.cs index 7266679235..0efd12dfe3 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicCancelOk.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/framing/BasicConsume.cs b/projects/RabbitMQ.Client/Framing/BasicConsume.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/BasicConsume.cs rename to projects/RabbitMQ.Client/Framing/BasicConsume.cs index 78da4b86fa..45cb84b836 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicConsume.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs b/projects/RabbitMQ.Client/Framing/BasicConsumeOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs rename to projects/RabbitMQ.Client/Framing/BasicConsumeOk.cs index 77ae494a9d..97da24fb75 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicConsumeOk.cs +++ b/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 { diff --git a/projects/RabbitMQ.Client/client/framing/BasicDeliver.cs b/projects/RabbitMQ.Client/Framing/BasicDeliver.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicDeliver.cs rename to projects/RabbitMQ.Client/Framing/BasicDeliver.cs index aa1cfe51b9..4e7f8f37d7 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicDeliver.cs +++ b/projects/RabbitMQ.Client/Framing/BasicDeliver.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 BasicDeliver : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicGet.cs b/projects/RabbitMQ.Client/Framing/BasicGet.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicGet.cs rename to projects/RabbitMQ.Client/Framing/BasicGet.cs index 310e68070d..956ac5b0bc 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicGet.cs +++ b/projects/RabbitMQ.Client/Framing/BasicGet.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 BasicGet : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicGetOk.cs b/projects/RabbitMQ.Client/Framing/BasicGetOk.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicGetOk.cs rename to projects/RabbitMQ.Client/Framing/BasicGetOk.cs index 9b67c6f807..c19db27fbb 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicGetOk.cs +++ b/projects/RabbitMQ.Client/Framing/BasicGetOk.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 BasicGetOk : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicMethodConstants.cs b/projects/RabbitMQ.Client/Framing/BasicMethodConstants.cs similarity index 98% rename from projects/RabbitMQ.Client/client/framing/BasicMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/BasicMethodConstants.cs index 2d5dd4d580..416c4e2fed 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/BasicMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class BasicMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/BasicNack.cs b/projects/RabbitMQ.Client/Framing/BasicNack.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/BasicNack.cs rename to projects/RabbitMQ.Client/Framing/BasicNack.cs index be254a61c5..4122eb3397 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicNack.cs +++ b/projects/RabbitMQ.Client/Framing/BasicNack.cs @@ -30,10 +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 BasicNack : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicPublish.cs b/projects/RabbitMQ.Client/Framing/BasicPublish.cs similarity index 98% rename from projects/RabbitMQ.Client/client/framing/BasicPublish.cs rename to projects/RabbitMQ.Client/Framing/BasicPublish.cs index f084894e7e..3fceb20b4d 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicPublish.cs +++ b/projects/RabbitMQ.Client/Framing/BasicPublish.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 BasicPublish : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicQos.cs b/projects/RabbitMQ.Client/Framing/BasicQos.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicQos.cs rename to projects/RabbitMQ.Client/Framing/BasicQos.cs index 203d0aa978..67ed69ba75 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicQos.cs +++ b/projects/RabbitMQ.Client/Framing/BasicQos.cs @@ -30,10 +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 BasicQos : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicReject.cs b/projects/RabbitMQ.Client/Framing/BasicReject.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicReject.cs rename to projects/RabbitMQ.Client/Framing/BasicReject.cs index 2969b78bbd..568f79433b 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicReject.cs +++ b/projects/RabbitMQ.Client/Framing/BasicReject.cs @@ -30,10 +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 BasicReject : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/BasicReturn.cs b/projects/RabbitMQ.Client/Framing/BasicReturn.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/BasicReturn.cs rename to projects/RabbitMQ.Client/Framing/BasicReturn.cs index e09e6a2895..830f5d0a68 100644 --- a/projects/RabbitMQ.Client/client/framing/BasicReturn.cs +++ b/projects/RabbitMQ.Client/Framing/BasicReturn.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 BasicReturn : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/Channel.cs b/projects/RabbitMQ.Client/Framing/Channel.cs similarity index 98% rename from projects/RabbitMQ.Client/client/framing/Channel.cs rename to projects/RabbitMQ.Client/Framing/Channel.cs index 31aa1b56bc..ddb1394bdd 100644 --- a/projects/RabbitMQ.Client/client/framing/Channel.cs +++ b/projects/RabbitMQ.Client/Framing/Channel.cs @@ -31,10 +31,9 @@ using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.client.framing; using RabbitMQ.Client.Impl; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal class Channel : ChannelBase { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelClose.cs b/projects/RabbitMQ.Client/Framing/ChannelClose.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ChannelClose.cs rename to projects/RabbitMQ.Client/Framing/ChannelClose.cs index 3d30faf9c5..176b4a6a36 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelClose.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelClose.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 ChannelClose : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelCloseOk.cs b/projects/RabbitMQ.Client/Framing/ChannelCloseOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/ChannelCloseOk.cs rename to projects/RabbitMQ.Client/Framing/ChannelCloseOk.cs index 4c2dfe3706..379f8760fb 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelCloseOk.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelCloseOk.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct ChannelCloseOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelFlow.cs b/projects/RabbitMQ.Client/Framing/ChannelFlow.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/ChannelFlow.cs rename to projects/RabbitMQ.Client/Framing/ChannelFlow.cs index 7cade44007..9abd6d9ed1 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelFlow.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelFlow.cs @@ -30,10 +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 ChannelFlow : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelFlowOk.cs b/projects/RabbitMQ.Client/Framing/ChannelFlowOk.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ChannelFlowOk.cs rename to projects/RabbitMQ.Client/Framing/ChannelFlowOk.cs index 4a4ce7a140..87ac10a285 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelFlowOk.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelFlowOk.cs @@ -30,10 +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 ChannelFlowOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelMethodConstants.cs b/projects/RabbitMQ.Client/Framing/ChannelMethodConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ChannelMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/ChannelMethodConstants.cs index 49cc0940ac..728419f8d2 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class ChannelMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/ChannelOpen.cs b/projects/RabbitMQ.Client/Framing/ChannelOpen.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ChannelOpen.cs rename to projects/RabbitMQ.Client/Framing/ChannelOpen.cs index 30e5632a3f..ab5ad35678 100644 --- a/projects/RabbitMQ.Client/client/framing/ChannelOpen.cs +++ b/projects/RabbitMQ.Client/Framing/ChannelOpen.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct ChannelOpen : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ClassConstants.cs b/projects/RabbitMQ.Client/Framing/ClassConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ClassConstants.cs rename to projects/RabbitMQ.Client/Framing/ClassConstants.cs index 3d7b540ce4..320b1846ef 100644 --- a/projects/RabbitMQ.Client/client/framing/ClassConstants.cs +++ b/projects/RabbitMQ.Client/Framing/ClassConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class ClassConstants { diff --git a/projects/RabbitMQ.Client/client/framing/ConfirmMethodConstants.cs b/projects/RabbitMQ.Client/Framing/ConfirmMethodConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ConfirmMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/ConfirmMethodConstants.cs index 9639004403..a291be47c6 100644 --- a/projects/RabbitMQ.Client/client/framing/ConfirmMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/ConfirmMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class ConfirmMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/ConfirmSelect.cs b/projects/RabbitMQ.Client/Framing/ConfirmSelect.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConfirmSelect.cs rename to projects/RabbitMQ.Client/Framing/ConfirmSelect.cs index e0c629ad9d..781636c942 100644 --- a/projects/RabbitMQ.Client/client/framing/ConfirmSelect.cs +++ b/projects/RabbitMQ.Client/Framing/ConfirmSelect.cs @@ -30,10 +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 ConfirmSelect : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionBlocked.cs b/projects/RabbitMQ.Client/Framing/ConnectionBlocked.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/ConnectionBlocked.cs rename to projects/RabbitMQ.Client/Framing/ConnectionBlocked.cs index 590139385b..62864afaf1 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionBlocked.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionBlocked.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 ConnectionBlocked : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionClose.cs b/projects/RabbitMQ.Client/Framing/ConnectionClose.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ConnectionClose.cs rename to projects/RabbitMQ.Client/Framing/ConnectionClose.cs index d037b1d203..73275d1389 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionClose.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionClose.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 ConnectionClose : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionCloseOk.cs b/projects/RabbitMQ.Client/Framing/ConnectionCloseOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/ConnectionCloseOk.cs rename to projects/RabbitMQ.Client/Framing/ConnectionCloseOk.cs index 061a8686e1..9b48e30193 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionCloseOk.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionCloseOk.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct ConnectionCloseOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionMethodConstants.cs b/projects/RabbitMQ.Client/Framing/ConnectionMethodConstants.cs similarity index 98% rename from projects/RabbitMQ.Client/client/framing/ConnectionMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/ConnectionMethodConstants.cs index 2ae5f9a74f..b2a3af9598 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class ConnectionMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionOpen.cs b/projects/RabbitMQ.Client/Framing/ConnectionOpen.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionOpen.cs rename to projects/RabbitMQ.Client/Framing/ConnectionOpen.cs index 95b5ee2c3e..fe3f26e88e 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionOpen.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionOpen.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 ConnectionOpen : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionSecure.cs b/projects/RabbitMQ.Client/Framing/ConnectionSecure.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/ConnectionSecure.cs rename to projects/RabbitMQ.Client/Framing/ConnectionSecure.cs index 42cb3b483a..0daad6d554 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionSecure.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionSecure.cs @@ -30,10 +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 ConnectionSecure : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionSecureOk.cs b/projects/RabbitMQ.Client/Framing/ConnectionSecureOk.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionSecureOk.cs rename to projects/RabbitMQ.Client/Framing/ConnectionSecureOk.cs index 9da24af2dc..cae9437b25 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionSecureOk.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionSecureOk.cs @@ -30,10 +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 ConnectionSecureOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionStart.cs b/projects/RabbitMQ.Client/Framing/ConnectionStart.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionStart.cs rename to projects/RabbitMQ.Client/Framing/ConnectionStart.cs index acfae7f144..da8d3e3ce3 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionStart.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionStart.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 ConnectionStart : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionStartOk.cs b/projects/RabbitMQ.Client/Framing/ConnectionStartOk.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ConnectionStartOk.cs rename to projects/RabbitMQ.Client/Framing/ConnectionStartOk.cs index e2e2bc2cb4..293bb1ac10 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionStartOk.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionStartOk.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 ConnectionStartOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionTune.cs b/projects/RabbitMQ.Client/Framing/ConnectionTune.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionTune.cs rename to projects/RabbitMQ.Client/Framing/ConnectionTune.cs index e75ac8bbaf..9e07faee97 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionTune.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionTune.cs @@ -30,10 +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 ConnectionTune : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionTuneOk.cs b/projects/RabbitMQ.Client/Framing/ConnectionTuneOk.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionTuneOk.cs rename to projects/RabbitMQ.Client/Framing/ConnectionTuneOk.cs index 26e4c41a71..0146238797 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionTuneOk.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionTuneOk.cs @@ -30,10 +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 ConnectionTuneOk : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ConnectionUpdateSecret.cs b/projects/RabbitMQ.Client/Framing/ConnectionUpdateSecret.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/ConnectionUpdateSecret.cs rename to projects/RabbitMQ.Client/Framing/ConnectionUpdateSecret.cs index 997c9f30fb..c6a06e3b8f 100644 --- a/projects/RabbitMQ.Client/client/framing/ConnectionUpdateSecret.cs +++ b/projects/RabbitMQ.Client/Framing/ConnectionUpdateSecret.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 ConnectionUpdateSecret : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeBind.cs b/projects/RabbitMQ.Client/Framing/ExchangeBind.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ExchangeBind.cs rename to projects/RabbitMQ.Client/Framing/ExchangeBind.cs index 5d0625dccf..f91be18fc5 100644 --- a/projects/RabbitMQ.Client/client/framing/ExchangeBind.cs +++ b/projects/RabbitMQ.Client/Framing/ExchangeBind.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 ExchangeBind : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeDeclare.cs b/projects/RabbitMQ.Client/Framing/ExchangeDeclare.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ExchangeDeclare.cs rename to projects/RabbitMQ.Client/Framing/ExchangeDeclare.cs index d99dbc994a..ffcd17d72f 100644 --- a/projects/RabbitMQ.Client/client/framing/ExchangeDeclare.cs +++ b/projects/RabbitMQ.Client/Framing/ExchangeDeclare.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 ExchangeDeclare : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeDelete.cs b/projects/RabbitMQ.Client/Framing/ExchangeDelete.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ExchangeDelete.cs rename to projects/RabbitMQ.Client/Framing/ExchangeDelete.cs index 6d2142b8fc..5e9d6dd2a3 100644 --- a/projects/RabbitMQ.Client/client/framing/ExchangeDelete.cs +++ b/projects/RabbitMQ.Client/Framing/ExchangeDelete.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 ExchangeDelete : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeMethodConstants.cs b/projects/RabbitMQ.Client/Framing/ExchangeMethodConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ExchangeMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/ExchangeMethodConstants.cs index d63584473b..f583862e10 100644 --- a/projects/RabbitMQ.Client/client/framing/ExchangeMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/ExchangeMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class ExchangeMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/ExchangeUnbind.cs b/projects/RabbitMQ.Client/Framing/ExchangeUnbind.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/ExchangeUnbind.cs rename to projects/RabbitMQ.Client/Framing/ExchangeUnbind.cs index 2479f33faa..129808106d 100644 --- a/projects/RabbitMQ.Client/client/framing/ExchangeUnbind.cs +++ b/projects/RabbitMQ.Client/Framing/ExchangeUnbind.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 ExchangeUnbind : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/Framing/IAmqpMethod.cs b/projects/RabbitMQ.Client/Framing/IAmqpMethod.cs new file mode 100644 index 0000000000..f7dc16f676 --- /dev/null +++ b/projects/RabbitMQ.Client/Framing/IAmqpMethod.cs @@ -0,0 +1,42 @@ +// 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. +//--------------------------------------------------------------------------- + +namespace RabbitMQ.Client.Framing +{ + internal interface IAmqpMethod + { + ProtocolCommandId ProtocolCommandId { get; } + } + + internal interface IOutgoingAmqpMethod : IAmqpMethod, IAmqpWriteable + { + } +} diff --git a/projects/RabbitMQ.Client/client/framing/Protocol.cs b/projects/RabbitMQ.Client/Framing/Protocol.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/Protocol.cs rename to projects/RabbitMQ.Client/Framing/Protocol.cs index 0485005149..758398af07 100644 --- a/projects/RabbitMQ.Client/client/framing/Protocol.cs +++ b/projects/RabbitMQ.Client/Framing/Protocol.cs @@ -30,9 +30,7 @@ //--------------------------------------------------------------------------- using System; - -using RabbitMQ.Client.client.framing; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Framing { diff --git a/projects/RabbitMQ.Client/client/framing/ProtocolCommandId.cs b/projects/RabbitMQ.Client/Framing/ProtocolCommandId.cs similarity index 79% rename from projects/RabbitMQ.Client/client/framing/ProtocolCommandId.cs rename to projects/RabbitMQ.Client/Framing/ProtocolCommandId.cs index 454346fdf9..5c65b3dbd6 100644 --- a/projects/RabbitMQ.Client/client/framing/ProtocolCommandId.cs +++ b/projects/RabbitMQ.Client/Framing/ProtocolCommandId.cs @@ -1,6 +1,35 @@ -using RabbitMQ.Client.Framing.Impl; +// 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. +//--------------------------------------------------------------------------- -namespace RabbitMQ.Client.client.framing +namespace RabbitMQ.Client.Framing { internal enum ProtocolCommandId : uint { diff --git a/projects/RabbitMQ.Client/client/framing/QueueBind.cs b/projects/RabbitMQ.Client/Framing/QueueBind.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/QueueBind.cs rename to projects/RabbitMQ.Client/Framing/QueueBind.cs index a182f81ef7..ca1aabd732 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueBind.cs +++ b/projects/RabbitMQ.Client/Framing/QueueBind.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 QueueBind : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueDeclare.cs b/projects/RabbitMQ.Client/Framing/QueueDeclare.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/QueueDeclare.cs rename to projects/RabbitMQ.Client/Framing/QueueDeclare.cs index fc40d330d3..c9e5cc3ca4 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueDeclare.cs +++ b/projects/RabbitMQ.Client/Framing/QueueDeclare.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 QueueDeclare : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueDeclareOk.cs b/projects/RabbitMQ.Client/Framing/QueueDeclareOk.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/QueueDeclareOk.cs rename to projects/RabbitMQ.Client/Framing/QueueDeclareOk.cs index de0f9cf1bb..c51164ddff 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueDeclareOk.cs +++ b/projects/RabbitMQ.Client/Framing/QueueDeclareOk.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 QueueDeclareOk : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueDelete.cs b/projects/RabbitMQ.Client/Framing/QueueDelete.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/QueueDelete.cs rename to projects/RabbitMQ.Client/Framing/QueueDelete.cs index d33a0c83d2..ceb839cd38 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueDelete.cs +++ b/projects/RabbitMQ.Client/Framing/QueueDelete.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 QueueDelete : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueDeleteOk.cs b/projects/RabbitMQ.Client/Framing/QueueDeleteOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/QueueDeleteOk.cs rename to projects/RabbitMQ.Client/Framing/QueueDeleteOk.cs index c762d88a65..edaded22a4 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueDeleteOk.cs +++ b/projects/RabbitMQ.Client/Framing/QueueDeleteOk.cs @@ -30,10 +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 QueueDeleteOk : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueMethodConstants.cs b/projects/RabbitMQ.Client/Framing/QueueMethodConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/QueueMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/QueueMethodConstants.cs index 5dcf468d90..d9a39aba98 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/QueueMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class QueueMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/QueuePurge.cs b/projects/RabbitMQ.Client/Framing/QueuePurge.cs similarity index 96% rename from projects/RabbitMQ.Client/client/framing/QueuePurge.cs rename to projects/RabbitMQ.Client/Framing/QueuePurge.cs index a2c62b4ced..5b6f0d1f47 100644 --- a/projects/RabbitMQ.Client/client/framing/QueuePurge.cs +++ b/projects/RabbitMQ.Client/Framing/QueuePurge.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 QueuePurge : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueuePurgeOk.cs b/projects/RabbitMQ.Client/Framing/QueuePurgeOk.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/QueuePurgeOk.cs rename to projects/RabbitMQ.Client/Framing/QueuePurgeOk.cs index c0575ae99b..b477781710 100644 --- a/projects/RabbitMQ.Client/client/framing/QueuePurgeOk.cs +++ b/projects/RabbitMQ.Client/Framing/QueuePurgeOk.cs @@ -30,10 +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 QueuePurgeOk : IAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/QueueUnbind.cs b/projects/RabbitMQ.Client/Framing/QueueUnbind.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/QueueUnbind.cs rename to projects/RabbitMQ.Client/Framing/QueueUnbind.cs index 17eb131008..b8a775d964 100644 --- a/projects/RabbitMQ.Client/client/framing/QueueUnbind.cs +++ b/projects/RabbitMQ.Client/Framing/QueueUnbind.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 QueueUnbind : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/TxCommit.cs b/projects/RabbitMQ.Client/Framing/TxCommit.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/TxCommit.cs rename to projects/RabbitMQ.Client/Framing/TxCommit.cs index e353fe00b5..f48c9618cf 100644 --- a/projects/RabbitMQ.Client/client/framing/TxCommit.cs +++ b/projects/RabbitMQ.Client/Framing/TxCommit.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct TxCommit : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/TxMethodConstants.cs b/projects/RabbitMQ.Client/Framing/TxMethodConstants.cs similarity index 97% rename from projects/RabbitMQ.Client/client/framing/TxMethodConstants.cs rename to projects/RabbitMQ.Client/Framing/TxMethodConstants.cs index 58c2c24f85..292f1dbe8d 100644 --- a/projects/RabbitMQ.Client/client/framing/TxMethodConstants.cs +++ b/projects/RabbitMQ.Client/Framing/TxMethodConstants.cs @@ -29,7 +29,7 @@ // Copyright (c) 2007-2024 Broadcom. All Rights Reserved. //--------------------------------------------------------------------------- -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal static class TxMethodConstants { diff --git a/projects/RabbitMQ.Client/client/framing/TxRollback.cs b/projects/RabbitMQ.Client/Framing/TxRollback.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/TxRollback.cs rename to projects/RabbitMQ.Client/Framing/TxRollback.cs index 30236f3994..023a61e12d 100644 --- a/projects/RabbitMQ.Client/client/framing/TxRollback.cs +++ b/projects/RabbitMQ.Client/Framing/TxRollback.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct TxRollback : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/framing/TxSelect.cs b/projects/RabbitMQ.Client/Framing/TxSelect.cs similarity index 95% rename from projects/RabbitMQ.Client/client/framing/TxSelect.cs rename to projects/RabbitMQ.Client/Framing/TxSelect.cs index 7a32db4fef..3d62ddd229 100644 --- a/projects/RabbitMQ.Client/client/framing/TxSelect.cs +++ b/projects/RabbitMQ.Client/Framing/TxSelect.cs @@ -30,9 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal readonly struct TxSelect : IOutgoingAmqpMethod { diff --git a/projects/RabbitMQ.Client/client/api/Headers.cs b/projects/RabbitMQ.Client/Headers.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/Headers.cs rename to projects/RabbitMQ.Client/Headers.cs diff --git a/projects/RabbitMQ.Client/client/api/IAmqpHeader.cs b/projects/RabbitMQ.Client/IAmqpHeader.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IAmqpHeader.cs rename to projects/RabbitMQ.Client/IAmqpHeader.cs diff --git a/projects/RabbitMQ.Client/client/api/IAmqpWriteable.cs b/projects/RabbitMQ.Client/IAmqpWriteable.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IAmqpWriteable.cs rename to projects/RabbitMQ.Client/IAmqpWriteable.cs diff --git a/projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs b/projects/RabbitMQ.Client/IAsyncBasicConsumer.cs similarity index 70% rename from projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs rename to projects/RabbitMQ.Client/IAsyncBasicConsumer.cs index eb1d006d35..a581757ae8 100644 --- a/projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs +++ b/projects/RabbitMQ.Client/IAsyncBasicConsumer.cs @@ -1,6 +1,38 @@ +// 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.Events; namespace RabbitMQ.Client { diff --git a/projects/RabbitMQ.Client/client/api/IAuthMechanism.cs b/projects/RabbitMQ.Client/IAuthMechanism.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IAuthMechanism.cs rename to projects/RabbitMQ.Client/IAuthMechanism.cs diff --git a/projects/RabbitMQ.Client/client/api/IAuthMechanismFactory.cs b/projects/RabbitMQ.Client/IAuthMechanismFactory.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IAuthMechanismFactory.cs rename to projects/RabbitMQ.Client/IAuthMechanismFactory.cs diff --git a/projects/RabbitMQ.Client/client/api/IBasicProperties.cs b/projects/RabbitMQ.Client/IBasicProperties.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IBasicProperties.cs rename to projects/RabbitMQ.Client/IBasicProperties.cs diff --git a/projects/RabbitMQ.Client/client/api/IChannel.cs b/projects/RabbitMQ.Client/IChannel.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IChannel.cs rename to projects/RabbitMQ.Client/IChannel.cs diff --git a/projects/RabbitMQ.Client/client/api/IChannelExtensions.cs b/projects/RabbitMQ.Client/IChannelExtensions.cs similarity index 99% rename from projects/RabbitMQ.Client/client/api/IChannelExtensions.cs rename to projects/RabbitMQ.Client/IChannelExtensions.cs index 82379f4eb1..c7359e0db2 100644 --- a/projects/RabbitMQ.Client/client/api/IChannelExtensions.cs +++ b/projects/RabbitMQ.Client/IChannelExtensions.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.client.impl; +using RabbitMQ.Client.Impl; namespace RabbitMQ.Client { diff --git a/projects/RabbitMQ.Client/client/api/IConnection.cs b/projects/RabbitMQ.Client/IConnection.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IConnection.cs rename to projects/RabbitMQ.Client/IConnection.cs diff --git a/projects/RabbitMQ.Client/client/api/IConnectionExtensions.cs b/projects/RabbitMQ.Client/IConnectionExtensions.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IConnectionExtensions.cs rename to projects/RabbitMQ.Client/IConnectionExtensions.cs diff --git a/projects/RabbitMQ.Client/client/api/IConnectionFactory.cs b/projects/RabbitMQ.Client/IConnectionFactory.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IConnectionFactory.cs rename to projects/RabbitMQ.Client/IConnectionFactory.cs diff --git a/projects/RabbitMQ.Client/client/api/ICredentialsProvider.cs b/projects/RabbitMQ.Client/ICredentialsProvider.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ICredentialsProvider.cs rename to projects/RabbitMQ.Client/ICredentialsProvider.cs diff --git a/projects/RabbitMQ.Client/client/api/IEndpointResolver.cs b/projects/RabbitMQ.Client/IEndpointResolver.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IEndpointResolver.cs rename to projects/RabbitMQ.Client/IEndpointResolver.cs diff --git a/projects/RabbitMQ.Client/client/api/IEndpointResolverExtensions.cs b/projects/RabbitMQ.Client/IEndpointResolverExtensions.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IEndpointResolverExtensions.cs rename to projects/RabbitMQ.Client/IEndpointResolverExtensions.cs diff --git a/projects/RabbitMQ.Client/client/api/INetworkConnection.cs b/projects/RabbitMQ.Client/INetworkConnection.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/INetworkConnection.cs rename to projects/RabbitMQ.Client/INetworkConnection.cs diff --git a/projects/RabbitMQ.Client/client/api/IProtocol.cs b/projects/RabbitMQ.Client/IProtocol.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IProtocol.cs rename to projects/RabbitMQ.Client/IProtocol.cs diff --git a/projects/RabbitMQ.Client/client/api/IRecordedBinding.cs b/projects/RabbitMQ.Client/IRecordedBinding.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IRecordedBinding.cs rename to projects/RabbitMQ.Client/IRecordedBinding.cs diff --git a/projects/RabbitMQ.Client/client/api/IRecordedConsumer.cs b/projects/RabbitMQ.Client/IRecordedConsumer.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IRecordedConsumer.cs rename to projects/RabbitMQ.Client/IRecordedConsumer.cs diff --git a/projects/RabbitMQ.Client/client/api/IRecordedExchange.cs b/projects/RabbitMQ.Client/IRecordedExchange.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IRecordedExchange.cs rename to projects/RabbitMQ.Client/IRecordedExchange.cs diff --git a/projects/RabbitMQ.Client/client/api/IRecordedQueue.cs b/projects/RabbitMQ.Client/IRecordedQueue.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IRecordedQueue.cs rename to projects/RabbitMQ.Client/IRecordedQueue.cs diff --git a/projects/RabbitMQ.Client/client/api/IRecoverable.cs b/projects/RabbitMQ.Client/IRecoverable.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/IRecoverable.cs rename to projects/RabbitMQ.Client/IRecoverable.cs diff --git a/projects/RabbitMQ.Client/client/api/ITcpClient.cs b/projects/RabbitMQ.Client/ITcpClient.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ITcpClient.cs rename to projects/RabbitMQ.Client/ITcpClient.cs diff --git a/projects/RabbitMQ.Client/client/impl/AsyncEventingWrapper.cs b/projects/RabbitMQ.Client/Impl/AsyncEventingWrapper.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/AsyncEventingWrapper.cs rename to projects/RabbitMQ.Client/Impl/AsyncEventingWrapper.cs diff --git a/projects/RabbitMQ.Client/client/impl/AsyncManualResetEvent.cs b/projects/RabbitMQ.Client/Impl/AsyncManualResetEvent.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AsyncManualResetEvent.cs rename to projects/RabbitMQ.Client/Impl/AsyncManualResetEvent.cs index c667f70442..d2394afb6a 100644 --- a/projects/RabbitMQ.Client/client/impl/AsyncManualResetEvent.cs +++ b/projects/RabbitMQ.Client/Impl/AsyncManualResetEvent.cs @@ -35,7 +35,7 @@ using System.Threading.Tasks; using System.Threading.Tasks.Sources; -namespace RabbitMQ.Client.client.impl +namespace RabbitMQ.Client.Impl { sealed class AsyncManualResetEvent : IValueTaskSource { diff --git a/projects/RabbitMQ.Client/client/impl/AsyncRpcContinuations.cs b/projects/RabbitMQ.Client/Impl/AsyncRpcContinuations.cs similarity index 96% rename from projects/RabbitMQ.Client/client/impl/AsyncRpcContinuations.cs rename to projects/RabbitMQ.Client/Impl/AsyncRpcContinuations.cs index 74e7431197..6c57555cfc 100644 --- a/projects/RabbitMQ.Client/client/impl/AsyncRpcContinuations.cs +++ b/projects/RabbitMQ.Client/Impl/AsyncRpcContinuations.cs @@ -34,10 +34,10 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.client.framing; using RabbitMQ.Client.ConsumerDispatching; +using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { @@ -211,7 +211,7 @@ public override async Task HandleCommandAsync(IncomingCommand cmd) if (cmd.CommandId == ProtocolCommandId.BasicCancelOk) { _tcs.TrySetResult(true); - Debug.Assert(_consumerTag == new Client.Framing.Impl.BasicCancelOk(cmd.MethodSpan)._consumerTag); + Debug.Assert(_consumerTag == new BasicCancelOk(cmd.MethodSpan)._consumerTag); await _consumerDispatcher.HandleBasicCancelOkAsync(_consumerTag, CancellationToken) .ConfigureAwait(false); } @@ -239,7 +239,7 @@ public override async Task HandleCommandAsync(IncomingCommand cmd) { if (cmd.CommandId == ProtocolCommandId.BasicConsumeOk) { - var method = new Client.Framing.Impl.BasicConsumeOk(cmd.MethodSpan); + var method = new BasicConsumeOk(cmd.MethodSpan); _tcs.TrySetResult(method._consumerTag); await _consumerDispatcher.HandleBasicConsumeOkAsync(_consumer, method._consumerTag, CancellationToken) .ConfigureAwait(false); @@ -268,7 +268,7 @@ public override Task HandleCommandAsync(IncomingCommand cmd) { if (cmd.CommandId == ProtocolCommandId.BasicGetOk) { - var method = new Client.Framing.Impl.BasicGetOk(cmd.MethodSpan); + var method = new BasicGetOk(cmd.MethodSpan); var header = new ReadOnlyBasicProperties(cmd.HeaderSpan); var result = new BasicGetResult( @@ -381,7 +381,7 @@ public override Task HandleCommandAsync(IncomingCommand cmd) { if (cmd.CommandId == ProtocolCommandId.QueueDeclareOk) { - var method = new Client.Framing.Impl.QueueDeclareOk(cmd.MethodSpan); + var method = new Client.Framing.QueueDeclareOk(cmd.MethodSpan); var result = new QueueDeclareOk(method._queue, method._messageCount, method._consumerCount); _tcs.TrySetResult(result); } @@ -421,7 +421,7 @@ public override Task HandleCommandAsync(IncomingCommand cmd) { if (cmd.CommandId == ProtocolCommandId.QueueDeleteOk) { - var method = new Client.Framing.Impl.QueueDeleteOk(cmd.MethodSpan); + var method = new QueueDeleteOk(cmd.MethodSpan); _tcs.TrySetResult(method._messageCount); } else @@ -444,7 +444,7 @@ public override Task HandleCommandAsync(IncomingCommand cmd) { if (cmd.CommandId == ProtocolCommandId.QueuePurgeOk) { - var method = new Client.Framing.Impl.QueuePurgeOk(cmd.MethodSpan); + var method = new QueuePurgeOk(cmd.MethodSpan); _tcs.TrySetResult(method._messageCount); } else diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs rename to projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs index ce88dd71a6..9dabda5c1a 100644 --- a/projects/RabbitMQ.Client/client/impl/AutorecoveringChannel.cs +++ b/projects/RabbitMQ.Client/Impl/AutorecoveringChannel.cs @@ -36,7 +36,7 @@ using System.Threading.Tasks; using RabbitMQ.Client.ConsumerDispatching; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recording.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs rename to projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recording.cs index db5dffc909..ef8f21c358 100644 --- a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recording.cs +++ b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recording.cs @@ -36,7 +36,7 @@ using System.Threading.Tasks; using RabbitMQ.Client.Impl; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class AutorecoveringConnection { diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs rename to projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs index d3e086ae7a..644f19e553 100644 --- a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs +++ b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs @@ -39,7 +39,7 @@ using RabbitMQ.Client.Impl; using RabbitMQ.Client.Logging; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class AutorecoveringConnection { diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs rename to projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs index 19ee70efe2..e766d10e74 100644 --- a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs +++ b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs @@ -38,7 +38,7 @@ using RabbitMQ.Client.Exceptions; using RabbitMQ.Client.Impl; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class AutorecoveringConnection : IConnection { diff --git a/projects/RabbitMQ.Client/client/impl/ChannelBase.cs b/projects/RabbitMQ.Client/Impl/ChannelBase.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/ChannelBase.cs rename to projects/RabbitMQ.Client/Impl/ChannelBase.cs index e12d7014e5..b3f38ef034 100644 --- a/projects/RabbitMQ.Client/client/impl/ChannelBase.cs +++ b/projects/RabbitMQ.Client/Impl/ChannelBase.cs @@ -38,13 +38,10 @@ using System.Text; using System.Threading; using System.Threading.Tasks; - -using RabbitMQ.Client.client.framing; -using RabbitMQ.Client.client.impl; using RabbitMQ.Client.ConsumerDispatching; using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { @@ -610,7 +607,7 @@ await HandleAckNack(nack._deliveryTag, nack._multiple, true, cancellationToken) protected async Task HandleBasicCancelAsync(IncomingCommand cmd, CancellationToken cancellationToken) { - string consumerTag = new Client.Framing.Impl.BasicCancel(cmd.MethodSpan)._consumerTag; + string consumerTag = new BasicCancel(cmd.MethodSpan)._consumerTag; await ConsumerDispatcher.HandleBasicCancelAsync(consumerTag, cancellationToken) .ConfigureAwait(false); return true; @@ -618,7 +615,7 @@ await ConsumerDispatcher.HandleBasicCancelAsync(consumerTag, cancellationToken) protected async Task HandleBasicDeliverAsync(IncomingCommand cmd, CancellationToken cancellationToken) { - var method = new Client.Framing.Impl.BasicDeliver(cmd.MethodSpan); + var method = new BasicDeliver(cmd.MethodSpan); var header = new ReadOnlyBasicProperties(cmd.HeaderSpan); await ConsumerDispatcher.HandleBasicDeliverAsync( method._consumerTag, @@ -896,7 +893,7 @@ await _rpcSemaphore.WaitAsync(k.CancellationToken) { enqueued = Enqueue(k); - var method = new Client.Framing.Impl.BasicConsume(queue, consumerTag, noLocal, autoAck, exclusive, false, arguments); + var method = new BasicConsume(queue, consumerTag, noLocal, autoAck, exclusive, false, arguments); await ModelSendAsync(in method, k.CancellationToken) .ConfigureAwait(false); diff --git a/projects/RabbitMQ.Client/client/impl/CommandAssembler.cs b/projects/RabbitMQ.Client/Impl/CommandAssembler.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/CommandAssembler.cs rename to projects/RabbitMQ.Client/Impl/CommandAssembler.cs index 47be525c64..3d6331db82 100644 --- a/projects/RabbitMQ.Client/client/impl/CommandAssembler.cs +++ b/projects/RabbitMQ.Client/Impl/CommandAssembler.cs @@ -31,11 +31,10 @@ using System; using System.Buffers; -using RabbitMQ.Client.client.framing; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Logging; -using RabbitMQ.Util; +using RabbitMQ.Client.Util; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs b/projects/RabbitMQ.Client/Impl/Connection.Commands.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/Connection.Commands.cs rename to projects/RabbitMQ.Client/Impl/Connection.Commands.cs index 08bbfdbaed..259746e44c 100644 --- a/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs +++ b/projects/RabbitMQ.Client/Impl/Connection.Commands.cs @@ -38,7 +38,7 @@ using RabbitMQ.Client.Exceptions; using RabbitMQ.Client.Impl; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class Connection { diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Heartbeat.cs b/projects/RabbitMQ.Client/Impl/Connection.Heartbeat.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/Connection.Heartbeat.cs rename to projects/RabbitMQ.Client/Impl/Connection.Heartbeat.cs index 881d7c2c46..ee76db9aee 100644 --- a/projects/RabbitMQ.Client/client/impl/Connection.Heartbeat.cs +++ b/projects/RabbitMQ.Client/Impl/Connection.Heartbeat.cs @@ -32,8 +32,9 @@ using System; using System.IO; using System.Threading; +using RabbitMQ.Client.Events; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class Connection { diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Receive.cs b/projects/RabbitMQ.Client/Impl/Connection.Receive.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/Connection.Receive.cs rename to projects/RabbitMQ.Client/Impl/Connection.Receive.cs index 16c4ce5bb9..9a3ad49b16 100644 --- a/projects/RabbitMQ.Client/client/impl/Connection.Receive.cs +++ b/projects/RabbitMQ.Client/Impl/Connection.Receive.cs @@ -33,10 +33,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; using RabbitMQ.Client.Impl; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class Connection { diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/Impl/Connection.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/Connection.cs rename to projects/RabbitMQ.Client/Impl/Connection.cs index f871847421..7bb14ab2c3 100644 --- a/projects/RabbitMQ.Client/client/impl/Connection.cs +++ b/projects/RabbitMQ.Client/Impl/Connection.cs @@ -42,7 +42,7 @@ using RabbitMQ.Client.Impl; using RabbitMQ.Client.Logging; -namespace RabbitMQ.Client.Framing.Impl +namespace RabbitMQ.Client.Framing { internal sealed partial class Connection : IConnection { diff --git a/projects/RabbitMQ.Client/client/impl/ConnectionSecureOrTune.cs b/projects/RabbitMQ.Client/Impl/ConnectionSecureOrTune.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/ConnectionSecureOrTune.cs rename to projects/RabbitMQ.Client/Impl/ConnectionSecureOrTune.cs diff --git a/projects/RabbitMQ.Client/client/impl/ConnectionStartDetails.cs b/projects/RabbitMQ.Client/Impl/ConnectionStartDetails.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/ConnectionStartDetails.cs rename to projects/RabbitMQ.Client/Impl/ConnectionStartDetails.cs diff --git a/projects/RabbitMQ.Client/client/impl/EmptyBasicProperty.cs b/projects/RabbitMQ.Client/Impl/EmptyBasicProperty.cs similarity index 58% rename from projects/RabbitMQ.Client/client/impl/EmptyBasicProperty.cs rename to projects/RabbitMQ.Client/Impl/EmptyBasicProperty.cs index e037324a47..20cc3d4ca2 100644 --- a/projects/RabbitMQ.Client/client/impl/EmptyBasicProperty.cs +++ b/projects/RabbitMQ.Client/Impl/EmptyBasicProperty.cs @@ -1,9 +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.Collections.Generic; -using RabbitMQ.Client.Framing.Impl; -using RabbitMQ.Client.Impl; +using RabbitMQ.Client.Framing; -namespace RabbitMQ.Client.client.impl +namespace RabbitMQ.Client.Impl { internal sealed class EmptyBasicProperty : IReadOnlyBasicProperties, IAmqpHeader { diff --git a/projects/RabbitMQ.Client/client/impl/EventingWrapper.cs b/projects/RabbitMQ.Client/Impl/EventingWrapper.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/EventingWrapper.cs rename to projects/RabbitMQ.Client/Impl/EventingWrapper.cs diff --git a/projects/RabbitMQ.Client/client/impl/Frame.cs b/projects/RabbitMQ.Client/Impl/Frame.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/Frame.cs rename to projects/RabbitMQ.Client/Impl/Frame.cs index 64835fe27e..52802de905 100644 --- a/projects/RabbitMQ.Client/client/impl/Frame.cs +++ b/projects/RabbitMQ.Client/Impl/Frame.cs @@ -37,9 +37,9 @@ using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Logging; -using RabbitMQ.Util; +using RabbitMQ.Client.Util; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/IFrameHandler.cs b/projects/RabbitMQ.Client/Impl/IFrameHandler.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/IFrameHandler.cs rename to projects/RabbitMQ.Client/Impl/IFrameHandler.cs diff --git a/projects/RabbitMQ.Client/client/impl/IRpcContinuation.cs b/projects/RabbitMQ.Client/Impl/IRpcContinuation.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/IRpcContinuation.cs rename to projects/RabbitMQ.Client/Impl/IRpcContinuation.cs index c29e4ce696..5af80fba0f 100644 --- a/projects/RabbitMQ.Client/client/impl/IRpcContinuation.cs +++ b/projects/RabbitMQ.Client/Impl/IRpcContinuation.cs @@ -31,6 +31,7 @@ using System; using System.Threading.Tasks; +using RabbitMQ.Client.Events; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/ISession.cs b/projects/RabbitMQ.Client/Impl/ISession.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/ISession.cs rename to projects/RabbitMQ.Client/Impl/ISession.cs index 9532b217f6..535f2b7725 100644 --- a/projects/RabbitMQ.Client/client/impl/ISession.cs +++ b/projects/RabbitMQ.Client/Impl/ISession.cs @@ -33,7 +33,7 @@ using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/IncomingCommand.cs b/projects/RabbitMQ.Client/Impl/IncomingCommand.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/IncomingCommand.cs rename to projects/RabbitMQ.Client/Impl/IncomingCommand.cs index 804c259272..7f3cd9da9a 100644 --- a/projects/RabbitMQ.Client/client/impl/IncomingCommand.cs +++ b/projects/RabbitMQ.Client/Impl/IncomingCommand.cs @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ.Client.client.framing; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/MainSession.cs b/projects/RabbitMQ.Client/Impl/MainSession.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/MainSession.cs rename to projects/RabbitMQ.Client/Impl/MainSession.cs index 85aeb34fc5..74baa36d97 100644 --- a/projects/RabbitMQ.Client/client/impl/MainSession.cs +++ b/projects/RabbitMQ.Client/Impl/MainSession.cs @@ -37,8 +37,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.client.framing; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/ProtocolBase.cs b/projects/RabbitMQ.Client/Impl/ProtocolBase.cs similarity index 97% rename from projects/RabbitMQ.Client/client/impl/ProtocolBase.cs rename to projects/RabbitMQ.Client/Impl/ProtocolBase.cs index 4a67104f93..65c108b739 100644 --- a/projects/RabbitMQ.Client/client/impl/ProtocolBase.cs +++ b/projects/RabbitMQ.Client/Impl/ProtocolBase.cs @@ -31,10 +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 abstract class ProtocolBase : IProtocol { diff --git a/projects/RabbitMQ.Client/client/impl/RabbitMQActivitySource.cs b/projects/RabbitMQ.Client/Impl/RabbitMQActivitySource.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/RabbitMQActivitySource.cs rename to projects/RabbitMQ.Client/Impl/RabbitMQActivitySource.cs diff --git a/projects/RabbitMQ.Client/client/impl/RecordedBinding.cs b/projects/RabbitMQ.Client/Impl/RecordedBinding.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/RecordedBinding.cs rename to projects/RabbitMQ.Client/Impl/RecordedBinding.cs diff --git a/projects/RabbitMQ.Client/client/impl/RecordedConsumer.cs b/projects/RabbitMQ.Client/Impl/RecordedConsumer.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/RecordedConsumer.cs rename to projects/RabbitMQ.Client/Impl/RecordedConsumer.cs diff --git a/projects/RabbitMQ.Client/client/impl/RecordedExchange.cs b/projects/RabbitMQ.Client/Impl/RecordedExchange.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/RecordedExchange.cs rename to projects/RabbitMQ.Client/Impl/RecordedExchange.cs diff --git a/projects/RabbitMQ.Client/client/impl/RecordedQueue.cs b/projects/RabbitMQ.Client/Impl/RecordedQueue.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/RecordedQueue.cs rename to projects/RabbitMQ.Client/Impl/RecordedQueue.cs diff --git a/projects/RabbitMQ.Client/client/impl/RecoveryAwareChannel.cs b/projects/RabbitMQ.Client/Impl/RecoveryAwareChannel.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/RecoveryAwareChannel.cs rename to projects/RabbitMQ.Client/Impl/RecoveryAwareChannel.cs index d4acbcceca..ab1cefecbf 100644 --- a/projects/RabbitMQ.Client/client/impl/RecoveryAwareChannel.cs +++ b/projects/RabbitMQ.Client/Impl/RecoveryAwareChannel.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/RpcContinuationQueue.cs b/projects/RabbitMQ.Client/Impl/RpcContinuationQueue.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/RpcContinuationQueue.cs rename to projects/RabbitMQ.Client/Impl/RpcContinuationQueue.cs index b59e2416f7..f5ec4dc12f 100644 --- a/projects/RabbitMQ.Client/client/impl/RpcContinuationQueue.cs +++ b/projects/RabbitMQ.Client/Impl/RpcContinuationQueue.cs @@ -33,6 +33,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; +using RabbitMQ.Client.Events; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/Session.cs b/projects/RabbitMQ.Client/Impl/Session.cs similarity index 98% rename from projects/RabbitMQ.Client/client/impl/Session.cs rename to projects/RabbitMQ.Client/Impl/Session.cs index 9a3e28457c..4c160987df 100644 --- a/projects/RabbitMQ.Client/client/impl/Session.cs +++ b/projects/RabbitMQ.Client/Impl/Session.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/SessionBase.cs b/projects/RabbitMQ.Client/Impl/SessionBase.cs similarity index 97% rename from projects/RabbitMQ.Client/client/impl/SessionBase.cs rename to projects/RabbitMQ.Client/Impl/SessionBase.cs index f72823f63e..863881efd5 100644 --- a/projects/RabbitMQ.Client/client/impl/SessionBase.cs +++ b/projects/RabbitMQ.Client/Impl/SessionBase.cs @@ -35,10 +35,9 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.client.framing; using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Logging; namespace RabbitMQ.Client.Impl @@ -124,7 +123,7 @@ public Task NotifyAsync(CancellationToken cancellationToken) public virtual ValueTask TransmitAsync(in T cmd, CancellationToken cancellationToken) where T : struct, IOutgoingAmqpMethod { - if (!IsOpen && cmd.ProtocolCommandId != client.framing.ProtocolCommandId.ChannelCloseOk) + if (!IsOpen && cmd.ProtocolCommandId != ProtocolCommandId.ChannelCloseOk) { ThrowAlreadyClosedException(); } diff --git a/projects/RabbitMQ.Client/client/impl/SessionManager.cs b/projects/RabbitMQ.Client/Impl/SessionManager.cs similarity index 97% rename from projects/RabbitMQ.Client/client/impl/SessionManager.cs rename to projects/RabbitMQ.Client/Impl/SessionManager.cs index 3157919b07..28d28dada7 100644 --- a/projects/RabbitMQ.Client/client/impl/SessionManager.cs +++ b/projects/RabbitMQ.Client/Impl/SessionManager.cs @@ -31,9 +31,10 @@ using System.Collections.Generic; using System.Threading.Tasks; +using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; -using RabbitMQ.Util; +using RabbitMQ.Client.Framing; +using RabbitMQ.Client.Util; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/SocketFactory.cs b/projects/RabbitMQ.Client/Impl/SocketFactory.cs similarity index 74% rename from projects/RabbitMQ.Client/client/impl/SocketFactory.cs rename to projects/RabbitMQ.Client/Impl/SocketFactory.cs index 3c63f626a3..dd0773b99e 100644 --- a/projects/RabbitMQ.Client/client/impl/SocketFactory.cs +++ b/projects/RabbitMQ.Client/Impl/SocketFactory.cs @@ -1,11 +1,42 @@ -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.Net; using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client.Exceptions; -namespace RabbitMQ.Client.client.impl +namespace RabbitMQ.Client.Impl { internal static class SocketFactory { diff --git a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs b/projects/RabbitMQ.Client/Impl/SocketFrameHandler.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs rename to projects/RabbitMQ.Client/Impl/SocketFrameHandler.cs index 6f6cbf3435..f9a413d273 100644 --- a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs +++ b/projects/RabbitMQ.Client/Impl/SocketFrameHandler.cs @@ -37,7 +37,6 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; -using RabbitMQ.Client.client.impl; using RabbitMQ.Client.Logging; namespace RabbitMQ.Client.Impl diff --git a/projects/RabbitMQ.Client/client/impl/SslHelper.cs b/projects/RabbitMQ.Client/Impl/SslHelper.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/SslHelper.cs rename to projects/RabbitMQ.Client/Impl/SslHelper.cs diff --git a/projects/RabbitMQ.Client/client/impl/WireFormatting.Read.cs b/projects/RabbitMQ.Client/Impl/WireFormatting.Read.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/WireFormatting.Read.cs rename to projects/RabbitMQ.Client/Impl/WireFormatting.Read.cs index 07eb0c3b87..4698369579 100644 --- a/projects/RabbitMQ.Client/client/impl/WireFormatting.Read.cs +++ b/projects/RabbitMQ.Client/Impl/WireFormatting.Read.cs @@ -33,9 +33,8 @@ using System.Collections; using System.Collections.Generic; using System.Runtime.CompilerServices; - using RabbitMQ.Client.Exceptions; -using RabbitMQ.Util; +using RabbitMQ.Client.Util; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/WireFormatting.Write.cs b/projects/RabbitMQ.Client/Impl/WireFormatting.Write.cs similarity index 99% rename from projects/RabbitMQ.Client/client/impl/WireFormatting.Write.cs rename to projects/RabbitMQ.Client/Impl/WireFormatting.Write.cs index 85e86ac65b..97002edf43 100644 --- a/projects/RabbitMQ.Client/client/impl/WireFormatting.Write.cs +++ b/projects/RabbitMQ.Client/Impl/WireFormatting.Write.cs @@ -35,7 +35,7 @@ using System.Runtime.CompilerServices; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Util; +using RabbitMQ.Client.Util; namespace RabbitMQ.Client.Impl { diff --git a/projects/RabbitMQ.Client/client/impl/WireFormatting.cs b/projects/RabbitMQ.Client/Impl/WireFormatting.cs similarity index 100% rename from projects/RabbitMQ.Client/client/impl/WireFormatting.cs rename to projects/RabbitMQ.Client/Impl/WireFormatting.cs diff --git a/projects/RabbitMQ.Client/client/api/InternalConstants.cs b/projects/RabbitMQ.Client/InternalConstants.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/InternalConstants.cs rename to projects/RabbitMQ.Client/InternalConstants.cs diff --git a/projects/RabbitMQ.Client/client/logging/ESLog.cs b/projects/RabbitMQ.Client/Logging/ESLog.cs similarity index 100% rename from projects/RabbitMQ.Client/client/logging/ESLog.cs rename to projects/RabbitMQ.Client/Logging/ESLog.cs diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.Counters.cs b/projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.Counters.cs similarity index 100% rename from projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.Counters.cs rename to projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.Counters.cs diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs b/projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.cs similarity index 100% rename from projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs rename to projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.cs diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqExceptionDetail.cs b/projects/RabbitMQ.Client/Logging/RabbitMqExceptionDetail.cs similarity index 100% rename from projects/RabbitMQ.Client/client/logging/RabbitMqExceptionDetail.cs rename to projects/RabbitMQ.Client/Logging/RabbitMqExceptionDetail.cs diff --git a/projects/RabbitMQ.Client/client/api/PlainMechanism.cs b/projects/RabbitMQ.Client/PlainMechanism.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/PlainMechanism.cs rename to projects/RabbitMQ.Client/PlainMechanism.cs diff --git a/projects/RabbitMQ.Client/client/api/PlainMechanismFactory.cs b/projects/RabbitMQ.Client/PlainMechanismFactory.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/PlainMechanismFactory.cs rename to projects/RabbitMQ.Client/PlainMechanismFactory.cs diff --git a/projects/RabbitMQ.Client/client/api/Protocols.cs b/projects/RabbitMQ.Client/Protocols.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/Protocols.cs rename to projects/RabbitMQ.Client/Protocols.cs diff --git a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt index 6c26eab606..9b4e290f26 100644 --- a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt +++ b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt @@ -60,7 +60,6 @@ override RabbitMQ.Client.AmqpTcpEndpoint.ToString() -> string override RabbitMQ.Client.AmqpTimestamp.Equals(object obj) -> bool override RabbitMQ.Client.AmqpTimestamp.GetHashCode() -> int override RabbitMQ.Client.AmqpTimestamp.ToString() -> string -override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleChannelShutdownAsync(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task override RabbitMQ.Client.Exceptions.MalformedFrameException.ReplyCode.get -> ushort override RabbitMQ.Client.Exceptions.SyntaxErrorException.ReplyCode.get -> ushort override RabbitMQ.Client.Exceptions.UnexpectedFrameException.ReplyCode.get -> ushort @@ -68,7 +67,6 @@ override RabbitMQ.Client.Exceptions.UnknownClassOrMethodException.ReplyCode.get override RabbitMQ.Client.Exceptions.UnknownClassOrMethodException.ToString() -> string override RabbitMQ.Client.Logging.RabbitMqExceptionDetail.ToString() -> string override RabbitMQ.Client.PublicationAddress.ToString() -> string -override RabbitMQ.Client.ShutdownEventArgs.ToString() -> string override RabbitMQ.Client.ShutdownReportEntry.ToString() -> string RabbitMQ.Client.AmqpTcpEndpoint RabbitMQ.Client.AmqpTcpEndpoint.AddressFamily.get -> System.Net.Sockets.AddressFamily @@ -97,7 +95,6 @@ RabbitMQ.Client.AsyncDefaultBasicConsumer.AsyncDefaultBasicConsumer(RabbitMQ.Cli RabbitMQ.Client.AsyncDefaultBasicConsumer.Channel.get -> RabbitMQ.Client.IChannel RabbitMQ.Client.AsyncDefaultBasicConsumer.ConsumerTags.get -> string[] RabbitMQ.Client.AsyncDefaultBasicConsumer.IsRunning.get -> bool -RabbitMQ.Client.AsyncDefaultBasicConsumer.ShutdownReason.get -> RabbitMQ.Client.ShutdownEventArgs RabbitMQ.Client.BasicGetResult RabbitMQ.Client.BasicGetResult.BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, string routingKey, uint messageCount, RabbitMQ.Client.IReadOnlyBasicProperties basicProperties, System.ReadOnlyMemory body) -> void RabbitMQ.Client.BasicProperties @@ -262,7 +259,6 @@ RabbitMQ.Client.Events.RecoveringConsumerEventArgs RabbitMQ.Client.Events.RecoveringConsumerEventArgs.ConsumerArguments.get -> System.Collections.Generic.IDictionary RabbitMQ.Client.Events.RecoveringConsumerEventArgs.ConsumerTag.get -> string RabbitMQ.Client.Exceptions.AlreadyClosedException -RabbitMQ.Client.Exceptions.AlreadyClosedException.AlreadyClosedException(RabbitMQ.Client.ShutdownEventArgs reason) -> void RabbitMQ.Client.Exceptions.AuthenticationFailureException RabbitMQ.Client.Exceptions.AuthenticationFailureException.AuthenticationFailureException(string msg) -> void RabbitMQ.Client.Exceptions.BrokerUnreachableException @@ -282,11 +278,8 @@ RabbitMQ.Client.Exceptions.MalformedFrameException.MalformedFrameException(strin RabbitMQ.Client.Exceptions.MalformedFrameException.MalformedFrameException(string message, bool canShutdownCleanly) -> void RabbitMQ.Client.Exceptions.OperationInterruptedException RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException() -> void -RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(RabbitMQ.Client.ShutdownEventArgs reason) -> void -RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(RabbitMQ.Client.ShutdownEventArgs reason, string prefix) -> void RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(string message) -> void RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(string message, System.Exception inner) -> void -RabbitMQ.Client.Exceptions.OperationInterruptedException.ShutdownReason.get -> RabbitMQ.Client.ShutdownEventArgs RabbitMQ.Client.Exceptions.OperationInterruptedException.ShutdownReason.set -> void RabbitMQ.Client.Exceptions.PacketNotRecognizedException RabbitMQ.Client.Exceptions.PacketNotRecognizedException.PacketNotRecognizedException(int transportHigh, int transportLow, int serverMajor, int serverMinor) -> void @@ -348,7 +341,6 @@ RabbitMQ.Client.IAmqpWriteable.GetRequiredBufferSize() -> int RabbitMQ.Client.IAmqpWriteable.WriteTo(System.Span span) -> int RabbitMQ.Client.IAsyncBasicConsumer RabbitMQ.Client.IAsyncBasicConsumer.Channel.get -> RabbitMQ.Client.IChannel -RabbitMQ.Client.IAsyncBasicConsumer.HandleChannelShutdownAsync(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task RabbitMQ.Client.IAuthMechanism RabbitMQ.Client.IAuthMechanismFactory RabbitMQ.Client.IAuthMechanismFactory.GetInstance() -> RabbitMQ.Client.IAuthMechanism @@ -408,8 +400,6 @@ RabbitMQ.Client.IChannel.BasicNacksAsync -> RabbitMQ.Client.Events.AsyncEventHan RabbitMQ.Client.IChannel.BasicReturnAsync -> RabbitMQ.Client.Events.AsyncEventHandler RabbitMQ.Client.IChannel.CallbackExceptionAsync -> RabbitMQ.Client.Events.AsyncEventHandler RabbitMQ.Client.IChannel.ChannelNumber.get -> int -RabbitMQ.Client.IChannel.ChannelShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler -RabbitMQ.Client.IChannel.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs RabbitMQ.Client.IChannel.ContinuationTimeout.get -> System.TimeSpan RabbitMQ.Client.IChannel.ContinuationTimeout.set -> void RabbitMQ.Client.IChannel.CurrentQueue.get -> string @@ -424,7 +414,6 @@ RabbitMQ.Client.IConnection RabbitMQ.Client.IConnection.ChannelMax.get -> ushort RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.IDictionary RabbitMQ.Client.IConnection.ClientProvidedName.get -> string -RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs RabbitMQ.Client.IConnection.Endpoint.get -> RabbitMQ.Client.AmqpTcpEndpoint RabbitMQ.Client.IConnection.FrameMax.get -> uint RabbitMQ.Client.IConnection.Heartbeat.get -> System.TimeSpan @@ -585,14 +574,6 @@ RabbitMQ.Client.ReadOnlyBasicProperties.ReplyToAddress.get -> RabbitMQ.Client.Pu RabbitMQ.Client.ReadOnlyBasicProperties.Timestamp.get -> RabbitMQ.Client.AmqpTimestamp RabbitMQ.Client.ReadOnlyBasicProperties.Type.get -> string RabbitMQ.Client.ReadOnlyBasicProperties.UserId.get -> string -RabbitMQ.Client.ShutdownEventArgs -RabbitMQ.Client.ShutdownEventArgs.Cause.get -> object -RabbitMQ.Client.ShutdownEventArgs.ClassId.get -> ushort -RabbitMQ.Client.ShutdownEventArgs.Exception.get -> System.Exception -RabbitMQ.Client.ShutdownEventArgs.Initiator.get -> RabbitMQ.Client.ShutdownInitiator -RabbitMQ.Client.ShutdownEventArgs.MethodId.get -> ushort -RabbitMQ.Client.ShutdownEventArgs.ReplyCode.get -> ushort -RabbitMQ.Client.ShutdownEventArgs.ReplyText.get -> string RabbitMQ.Client.ShutdownInitiator RabbitMQ.Client.ShutdownInitiator.Application = 0 -> RabbitMQ.Client.ShutdownInitiator RabbitMQ.Client.ShutdownInitiator.Library = 1 -> RabbitMQ.Client.ShutdownInitiator @@ -735,8 +716,6 @@ static readonly RabbitMQ.Client.ConnectionFactory.DefaultHeartbeat -> System.Tim static readonly RabbitMQ.Client.Protocols.AMQP_0_9_1 -> RabbitMQ.Client.IProtocol static readonly RabbitMQ.Client.Protocols.DefaultProtocol -> RabbitMQ.Client.IProtocol static readonly RabbitMQ.Client.PublicationAddress.PSEUDO_URI_PARSER -> System.Text.RegularExpressions.Regex -virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleChannelShutdownAsync(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task -virtual RabbitMQ.Client.Exceptions.ProtocolException.ShutdownReason.get -> RabbitMQ.Client.ShutdownEventArgs virtual RabbitMQ.Client.TcpClientAdapter.Client.get -> System.Net.Sockets.Socket virtual RabbitMQ.Client.TcpClientAdapter.Close() -> void virtual RabbitMQ.Client.TcpClientAdapter.ConnectAsync(System.Net.IPAddress ep, int port, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task @@ -760,7 +739,6 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void ~RabbitMQ.Client.IChannel.BasicGetAsync(string queue, bool autoAck, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task ~RabbitMQ.Client.IChannel.BasicQosAsync(uint prefetchSize, ushort prefetchCount, bool global, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task ~RabbitMQ.Client.IChannel.BasicRejectAsync(ulong deliveryTag, bool requeue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -~RabbitMQ.Client.IChannel.CloseAsync(RabbitMQ.Client.ShutdownEventArgs reason, bool abort, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task ~RabbitMQ.Client.IChannel.CloseAsync(ushort replyCode, string replyText, bool abort, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task ~RabbitMQ.Client.IChannel.ConsumerCountAsync(string queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task ~RabbitMQ.Client.IChannel.ExchangeBindAsync(string destination, string source, string routingKey, System.Collections.Generic.IDictionary arguments = null, bool noWait = false, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task @@ -853,7 +831,6 @@ readonly RabbitMQ.Client.ConnectionConfig.ConsumerDispatchConcurrency -> ushort RabbitMQ.Client.IConnection.CreateChannelAsync(ushort? consumerDispatchConcurrency = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! RabbitMQ.Client.IConnection.CallbackExceptionAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IConnection.ConnectionBlockedAsync -> RabbitMQ.Client.Events.AsyncEventHandler! -RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IConnection.ConnectionRecoveryErrorAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IConnection.QueueNameChangedAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler! @@ -884,9 +861,6 @@ RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliverAsync(string! consumerTag, RabbitMQ.Client.IConnection.ConnectionUnblockedAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IConnection.RecoverySucceededAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.IRecoverable.RecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler! -RabbitMQ.Client.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, object? cause = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void -RabbitMQ.Client.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, System.Exception! exception, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void -RabbitMQ.Client.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, ushort classId, ushort methodId, object? cause = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void static RabbitMQ.Client.Events.AsyncEventArgs.CreateOrDefault(System.Threading.CancellationToken cancellationToken) -> RabbitMQ.Client.Events.AsyncEventArgs! static RabbitMQ.Client.Events.CallbackExceptionEventArgs.Build(System.Exception! e, string! context, object! consumer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> RabbitMQ.Client.Events.CallbackExceptionEventArgs! static RabbitMQ.Client.Events.CallbackExceptionEventArgs.Build(System.Exception! e, string! context, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> RabbitMQ.Client.Events.CallbackExceptionEventArgs! @@ -896,7 +870,33 @@ virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicCancelOkAsync(strin virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicConsumeOkAsync(string! consumerTag, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicDeliverAsync(string! consumerTag, ulong deliveryTag, bool redelivered, string! exchange, string! routingKey, RabbitMQ.Client.IReadOnlyBasicProperties! properties, System.ReadOnlyMemory body, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.OnCancelAsync(string![]! consumerTags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! -RabbitMQ.Client.Events.AsyncEventingBasicConsumer.ShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.Events.AsyncEventingBasicConsumer.UnregisteredAsync -> RabbitMQ.Client.Events.AsyncEventHandler! RabbitMQ.Client.Events.AsyncEventingBasicConsumer.RegisteredAsync -> RabbitMQ.Client.Events.AsyncEventHandler! +override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleChannelShutdownAsync(object! channel, RabbitMQ.Client.Events.ShutdownEventArgs! reason) -> System.Threading.Tasks.Task! +override RabbitMQ.Client.Events.ShutdownEventArgs.ToString() -> string! +RabbitMQ.Client.AsyncDefaultBasicConsumer.ShutdownReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs? +RabbitMQ.Client.Events.AsyncEventingBasicConsumer.ShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler! +RabbitMQ.Client.Events.ShutdownEventArgs +RabbitMQ.Client.Events.ShutdownEventArgs.Cause.get -> object? +RabbitMQ.Client.Events.ShutdownEventArgs.ClassId.get -> ushort +RabbitMQ.Client.Events.ShutdownEventArgs.Exception.get -> System.Exception? +RabbitMQ.Client.Events.ShutdownEventArgs.Initiator.get -> RabbitMQ.Client.ShutdownInitiator +RabbitMQ.Client.Events.ShutdownEventArgs.MethodId.get -> ushort +RabbitMQ.Client.Events.ShutdownEventArgs.ReplyCode.get -> ushort +RabbitMQ.Client.Events.ShutdownEventArgs.ReplyText.get -> string! +RabbitMQ.Client.Events.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, object? cause = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +RabbitMQ.Client.Events.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, System.Exception! exception, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +RabbitMQ.Client.Events.ShutdownEventArgs.ShutdownEventArgs(RabbitMQ.Client.ShutdownInitiator initiator, ushort replyCode, string! replyText, ushort classId, ushort methodId, object? cause = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +RabbitMQ.Client.Exceptions.AlreadyClosedException.AlreadyClosedException(RabbitMQ.Client.Events.ShutdownEventArgs! reason) -> void +RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(RabbitMQ.Client.Events.ShutdownEventArgs? reason) -> void +RabbitMQ.Client.Exceptions.OperationInterruptedException.OperationInterruptedException(RabbitMQ.Client.Events.ShutdownEventArgs? reason, string! prefix) -> void +RabbitMQ.Client.Exceptions.OperationInterruptedException.ShutdownReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs? +RabbitMQ.Client.IAsyncBasicConsumer.HandleChannelShutdownAsync(object! channel, RabbitMQ.Client.Events.ShutdownEventArgs! reason) -> System.Threading.Tasks.Task! +RabbitMQ.Client.IChannel.ChannelShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler! +RabbitMQ.Client.IChannel.CloseAsync(RabbitMQ.Client.Events.ShutdownEventArgs! reason, bool abort, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task! +RabbitMQ.Client.IChannel.CloseReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs? +RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs? +RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler! +virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleChannelShutdownAsync(object! channel, RabbitMQ.Client.Events.ShutdownEventArgs! reason) -> System.Threading.Tasks.Task! +virtual RabbitMQ.Client.Exceptions.ProtocolException.ShutdownReason.get -> RabbitMQ.Client.Events.ShutdownEventArgs! RabbitMQ.Client.Events.AsyncEventingBasicConsumer.ReceivedAsync -> RabbitMQ.Client.Events.AsyncEventHandler! diff --git a/projects/RabbitMQ.Client/client/api/PublicationAddress.cs b/projects/RabbitMQ.Client/PublicationAddress.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/PublicationAddress.cs rename to projects/RabbitMQ.Client/PublicationAddress.cs diff --git a/projects/RabbitMQ.Client/client/api/QueueDeclareOk.cs b/projects/RabbitMQ.Client/QueueDeclareOk.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/QueueDeclareOk.cs rename to projects/RabbitMQ.Client/QueueDeclareOk.cs diff --git a/projects/RabbitMQ.Client/client/api/ReadonlyBasicProperties.cs b/projects/RabbitMQ.Client/ReadonlyBasicProperties.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ReadonlyBasicProperties.cs rename to projects/RabbitMQ.Client/ReadonlyBasicProperties.cs diff --git a/projects/RabbitMQ.Client/client/RentedMemory.cs b/projects/RabbitMQ.Client/RentedMemory.cs similarity index 100% rename from projects/RabbitMQ.Client/client/RentedMemory.cs rename to projects/RabbitMQ.Client/RentedMemory.cs diff --git a/projects/RabbitMQ.Client/client/api/ShutdownInitiator.cs b/projects/RabbitMQ.Client/ShutdownInitiator.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ShutdownInitiator.cs rename to projects/RabbitMQ.Client/ShutdownInitiator.cs diff --git a/projects/RabbitMQ.Client/client/api/ShutdownReportEntry.cs b/projects/RabbitMQ.Client/ShutdownReportEntry.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/ShutdownReportEntry.cs rename to projects/RabbitMQ.Client/ShutdownReportEntry.cs diff --git a/projects/RabbitMQ.Client/client/api/SslOption.cs b/projects/RabbitMQ.Client/SslOption.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/SslOption.cs rename to projects/RabbitMQ.Client/SslOption.cs diff --git a/projects/RabbitMQ.Client/client/TaskExtensions.cs b/projects/RabbitMQ.Client/TaskExtensions.cs similarity index 100% rename from projects/RabbitMQ.Client/client/TaskExtensions.cs rename to projects/RabbitMQ.Client/TaskExtensions.cs diff --git a/projects/RabbitMQ.Client/client/api/TcpClientAdapter.cs b/projects/RabbitMQ.Client/TcpClientAdapter.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/TcpClientAdapter.cs rename to projects/RabbitMQ.Client/TcpClientAdapter.cs diff --git a/projects/RabbitMQ.Client/client/api/TopologyRecoveryExceptionHandler.cs b/projects/RabbitMQ.Client/TopologyRecoveryExceptionHandler.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/TopologyRecoveryExceptionHandler.cs rename to projects/RabbitMQ.Client/TopologyRecoveryExceptionHandler.cs diff --git a/projects/RabbitMQ.Client/client/api/TopologyRecoveryFilter.cs b/projects/RabbitMQ.Client/TopologyRecoveryFilter.cs similarity index 100% rename from projects/RabbitMQ.Client/client/api/TopologyRecoveryFilter.cs rename to projects/RabbitMQ.Client/TopologyRecoveryFilter.cs diff --git a/projects/RabbitMQ.Client/util/TypeExtensions.cs b/projects/RabbitMQ.Client/TypeExtensions.cs similarity index 55% rename from projects/RabbitMQ.Client/util/TypeExtensions.cs rename to projects/RabbitMQ.Client/TypeExtensions.cs index 906bca1293..ee1e4f916e 100644 --- a/projects/RabbitMQ.Client/util/TypeExtensions.cs +++ b/projects/RabbitMQ.Client/TypeExtensions.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.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace RabbitMQ +namespace RabbitMQ.Client { internal static class TypeExtensions { @@ -24,12 +55,6 @@ public static ref byte GetStart(this Span span) return ref MemoryMarshal.GetReference(span); } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref byte GetOffset(this ReadOnlySpan span, int offset) - { - return ref span.GetStart().GetOffset(offset); - } - [MethodImpl(MethodImplOptions.AggressiveInlining)] public static ref byte GetOffset(this Span span, int offset) { @@ -59,11 +84,5 @@ public static byte ToByte(this ref bool source) { return Unsafe.As(ref source); } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool ToBool(this ref byte source) - { - return Unsafe.As(ref source); - } } } diff --git a/projects/RabbitMQ.Client/util/IntAllocator.cs b/projects/RabbitMQ.Client/Util/IntAllocator.cs similarity index 99% rename from projects/RabbitMQ.Client/util/IntAllocator.cs rename to projects/RabbitMQ.Client/Util/IntAllocator.cs index 0b911689ac..ed8bf0a170 100644 --- a/projects/RabbitMQ.Client/util/IntAllocator.cs +++ b/projects/RabbitMQ.Client/Util/IntAllocator.cs @@ -32,7 +32,7 @@ using System; using System.Diagnostics; -namespace RabbitMQ.Util +namespace RabbitMQ.Client.Util { /** * A class for allocating integer IDs in a given range. diff --git a/projects/RabbitMQ.Client/util/NetworkOrderDeserializer.cs b/projects/RabbitMQ.Client/Util/NetworkOrderDeserializer.cs similarity index 66% rename from projects/RabbitMQ.Client/util/NetworkOrderDeserializer.cs rename to projects/RabbitMQ.Client/Util/NetworkOrderDeserializer.cs index 1540b66cdb..77e0791704 100644 --- a/projects/RabbitMQ.Client/util/NetworkOrderDeserializer.cs +++ b/projects/RabbitMQ.Client/Util/NetworkOrderDeserializer.cs @@ -1,9 +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.Buffers; using System.Buffers.Binary; using System.Runtime.CompilerServices; -namespace RabbitMQ.Util +namespace RabbitMQ.Client.Util { internal static class NetworkOrderDeserializer { diff --git a/projects/RabbitMQ.Client/util/NetworkOrderSerializer.cs b/projects/RabbitMQ.Client/Util/NetworkOrderSerializer.cs similarity index 63% rename from projects/RabbitMQ.Client/util/NetworkOrderSerializer.cs rename to projects/RabbitMQ.Client/Util/NetworkOrderSerializer.cs index 20cb7bc2c5..5dad955b19 100644 --- a/projects/RabbitMQ.Client/util/NetworkOrderSerializer.cs +++ b/projects/RabbitMQ.Client/Util/NetworkOrderSerializer.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.Buffers.Binary; using System.Runtime.CompilerServices; -namespace RabbitMQ.Util +namespace RabbitMQ.Client.Util { internal static class NetworkOrderSerializer { diff --git a/projects/RabbitMQ.Client/client/framing/IAmqpMethod.cs b/projects/RabbitMQ.Client/client/framing/IAmqpMethod.cs deleted file mode 100644 index 550af226e4..0000000000 --- a/projects/RabbitMQ.Client/client/framing/IAmqpMethod.cs +++ /dev/null @@ -1,13 +0,0 @@ -using RabbitMQ.Client.client.framing; - -namespace RabbitMQ.Client.Framing.Impl -{ - internal interface IAmqpMethod - { - ProtocolCommandId ProtocolCommandId { get; } - } - - internal interface IOutgoingAmqpMethod : IAmqpMethod, IAmqpWriteable - { - } -} diff --git a/projects/Test/Applications/MassPublish/Program.cs b/projects/Test/Applications/MassPublish/Program.cs index 8bb649b71e..c01fa8c940 100644 --- a/projects/Test/Applications/MassPublish/Program.cs +++ b/projects/Test/Applications/MassPublish/Program.cs @@ -1,4 +1,35 @@ -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.Collections.Generic; using System.Diagnostics; using System.Net.Sockets; diff --git a/projects/Test/Common/IntegrationFixture.cs b/projects/Test/Common/IntegrationFixture.cs index 272d6e8d0e..c6d6265d3f 100644 --- a/projects/Test/Common/IntegrationFixture.cs +++ b/projects/Test/Common/IntegrationFixture.cs @@ -40,8 +40,9 @@ using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client; +using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Common/TestConnectionRecoveryBase.cs b/projects/Test/Common/TestConnectionRecoveryBase.cs index 201861752f..8b2e7edc30 100644 --- a/projects/Test/Common/TestConnectionRecoveryBase.cs +++ b/projects/Test/Common/TestConnectionRecoveryBase.cs @@ -34,7 +34,7 @@ using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoveringConsumerEventHandlers.cs b/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoveringConsumerEventHandlers.cs index 2146370438..fb5d50c738 100644 --- a/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoveringConsumerEventHandlers.cs +++ b/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoveringConsumerEventHandlers.cs @@ -34,7 +34,7 @@ using System.Threading.Tasks; using RabbitMQ.Client; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoverySucceededEventHandlers.cs b/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoverySucceededEventHandlers.cs index c6d64fd7c9..0d5c09b4c7 100644 --- a/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoverySucceededEventHandlers.cs +++ b/projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoverySucceededEventHandlers.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Threading.Tasks; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/ConnectionRecovery/TestConsumerRecovery.cs b/projects/Test/Integration/ConnectionRecovery/TestConsumerRecovery.cs index 4f627cfc87..60735445b3 100644 --- a/projects/Test/Integration/ConnectionRecovery/TestConsumerRecovery.cs +++ b/projects/Test/Integration/ConnectionRecovery/TestConsumerRecovery.cs @@ -32,7 +32,7 @@ using System.Threading.Tasks; using RabbitMQ.Client; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/ConnectionRecovery/TestDeclaration.cs b/projects/Test/Integration/ConnectionRecovery/TestDeclaration.cs index 138f7faf08..af65cc5940 100644 --- a/projects/Test/Integration/ConnectionRecovery/TestDeclaration.cs +++ b/projects/Test/Integration/ConnectionRecovery/TestDeclaration.cs @@ -33,7 +33,7 @@ using System.Threading.Tasks; using RabbitMQ.Client; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; using QueueDeclareOk = RabbitMQ.Client.QueueDeclareOk; diff --git a/projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs b/projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs index dd21340be8..2795836cc5 100644 --- a/projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs +++ b/projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using RabbitMQ.Client; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; using QueueDeclareOk = RabbitMQ.Client.QueueDeclareOk; diff --git a/projects/Test/Integration/TestAsyncConsumer.cs b/projects/Test/Integration/TestAsyncConsumer.cs index 0a0bde8a73..ada76173ec 100644 --- a/projects/Test/Integration/TestAsyncConsumer.cs +++ b/projects/Test/Integration/TestAsyncConsumer.cs @@ -590,7 +590,7 @@ public async Task TestDeclarationOfManyAutoDeleteQueuesWithTransientConsumer() { await ValidateConsumerDispatchConcurrency(); - AssertRecordedQueues((RabbitMQ.Client.Framing.Impl.AutorecoveringConnection)_conn, 0); + AssertRecordedQueues((RabbitMQ.Client.Framing.AutorecoveringConnection)_conn, 0); var tasks = new List(); for (int i = 0; i < 256; i++) { @@ -604,7 +604,7 @@ public async Task TestDeclarationOfManyAutoDeleteQueuesWithTransientConsumer() })); } await Task.WhenAll(tasks); - AssertRecordedQueues((RabbitMQ.Client.Framing.Impl.AutorecoveringConnection)_conn, 0); + AssertRecordedQueues((RabbitMQ.Client.Framing.AutorecoveringConnection)_conn, 0); } [Fact] diff --git a/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs b/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs index aba99c7d54..d13be6e569 100644 --- a/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs +++ b/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs @@ -35,7 +35,7 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/TestConnectionShutdown.cs b/projects/Test/Integration/TestConnectionShutdown.cs index ec5099fd6f..daa26af1a8 100644 --- a/projects/Test/Integration/TestConnectionShutdown.cs +++ b/projects/Test/Integration/TestConnectionShutdown.cs @@ -34,7 +34,7 @@ using System.Threading.Tasks; using RabbitMQ.Client; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Impl; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/TestConnectionTopologyRecovery.cs b/projects/Test/Integration/TestConnectionTopologyRecovery.cs index bf53ed987a..212da3f8ce 100644 --- a/projects/Test/Integration/TestConnectionTopologyRecovery.cs +++ b/projects/Test/Integration/TestConnectionTopologyRecovery.cs @@ -36,7 +36,7 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/TestFloodPublishing.cs b/projects/Test/Integration/TestFloodPublishing.cs index 38c73123b2..7cef7d9001 100644 --- a/projects/Test/Integration/TestFloodPublishing.cs +++ b/projects/Test/Integration/TestFloodPublishing.cs @@ -63,7 +63,7 @@ public async Task TestUnthrottledFloodPublishing() _connFactory.RequestedHeartbeat = TimeSpan.FromSeconds(60); _connFactory.AutomaticRecoveryEnabled = false; _conn = await _connFactory.CreateConnectionAsync(); - Assert.IsNotType(_conn); + Assert.IsNotType(_conn); _channel = await _conn.CreateChannelAsync(); _conn.ConnectionShutdownAsync += (_, ea) => @@ -124,7 +124,7 @@ public async Task TestMultithreadFloodPublishing() _connFactory.AutomaticRecoveryEnabled = false; _conn = await _connFactory.CreateConnectionAsync(); - Assert.IsNotType(_conn); + Assert.IsNotType(_conn); _channel = await _conn.CreateChannelAsync(); string message = "Hello from test TestMultithreadFloodPublishing"; diff --git a/projects/Test/Integration/TestInitialConnection.cs b/projects/Test/Integration/TestInitialConnection.cs index 0900585e0b..37229cff19 100644 --- a/projects/Test/Integration/TestInitialConnection.cs +++ b/projects/Test/Integration/TestInitialConnection.cs @@ -33,7 +33,7 @@ using System.Threading.Tasks; using RabbitMQ.Client; using RabbitMQ.Client.Exceptions; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/TestInvalidAck.cs b/projects/Test/Integration/TestInvalidAck.cs index d17fb7b59e..82688f8939 100644 --- a/projects/Test/Integration/TestInvalidAck.cs +++ b/projects/Test/Integration/TestInvalidAck.cs @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------- using System.Threading.Tasks; -using RabbitMQ.Client; +using RabbitMQ.Client.Events; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Integration/TestPublishSharedChannelAsync.cs b/projects/Test/Integration/TestPublishSharedChannelAsync.cs index 939ac65558..abfbb04054 100644 --- a/projects/Test/Integration/TestPublishSharedChannelAsync.cs +++ b/projects/Test/Integration/TestPublishSharedChannelAsync.cs @@ -77,7 +77,7 @@ public async Task MultiThreadPublishOnSharedChannel() { try { - Assert.IsNotType(conn); + Assert.IsNotType(conn); conn.ConnectionShutdownAsync += HandleConnectionShutdownAsync; using (IChannel channel = await conn.CreateChannelAsync()) diff --git a/projects/Test/SequentialIntegration/TestConnectionRecovery.cs b/projects/Test/SequentialIntegration/TestConnectionRecovery.cs index ce66f0c291..13ae62e76e 100644 --- a/projects/Test/SequentialIntegration/TestConnectionRecovery.cs +++ b/projects/Test/SequentialIntegration/TestConnectionRecovery.cs @@ -33,7 +33,8 @@ using System.Threading; using System.Threading.Tasks; using RabbitMQ.Client; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Events; +using RabbitMQ.Client.Framing; using Xunit; using Xunit.Abstractions; using QueueDeclareOk = RabbitMQ.Client.QueueDeclareOk; diff --git a/projects/Test/SequentialIntegration/TestHeartbeats.cs b/projects/Test/SequentialIntegration/TestHeartbeats.cs index 7699e56601..4304f6ce8a 100644 --- a/projects/Test/SequentialIntegration/TestHeartbeats.cs +++ b/projects/Test/SequentialIntegration/TestHeartbeats.cs @@ -33,6 +33,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using RabbitMQ.Client; +using RabbitMQ.Client.Events; using Xunit; using Xunit.Abstractions; diff --git a/projects/Test/Unit/TestFrameFormatting.cs b/projects/Test/Unit/TestFrameFormatting.cs index 82266852e2..d4ebcc993a 100644 --- a/projects/Test/Unit/TestFrameFormatting.cs +++ b/projects/Test/Unit/TestFrameFormatting.cs @@ -32,7 +32,7 @@ using System; using System.Buffers; using RabbitMQ.Client; -using RabbitMQ.Client.Framing.Impl; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Impl; using Xunit; diff --git a/projects/Test/Unit/TestIntAllocator.cs b/projects/Test/Unit/TestIntAllocator.cs index 23ad202393..a190d864ce 100644 --- a/projects/Test/Unit/TestIntAllocator.cs +++ b/projects/Test/Unit/TestIntAllocator.cs @@ -31,7 +31,7 @@ using System; using System.Collections.Generic; -using RabbitMQ.Util; +using RabbitMQ.Client.Util; using Xunit; namespace Test.Unit diff --git a/projects/Test/Unit/TestMethodArgumentCodec.cs b/projects/Test/Unit/TestMethodArgumentCodec.cs index 21e773998b..4e91a23448 100644 --- a/projects/Test/Unit/TestMethodArgumentCodec.cs +++ b/projects/Test/Unit/TestMethodArgumentCodec.cs @@ -32,7 +32,7 @@ using System; using System.Collections; using System.Text; -using RabbitMQ; +using RabbitMQ.Client; using RabbitMQ.Client.Impl; using Xunit; diff --git a/projects/Test/Unit/TestNetworkByteOrderSerialization.cs b/projects/Test/Unit/TestNetworkByteOrderSerialization.cs index a428ff7ceb..97d38e7baa 100644 --- a/projects/Test/Unit/TestNetworkByteOrderSerialization.cs +++ b/projects/Test/Unit/TestNetworkByteOrderSerialization.cs @@ -30,8 +30,8 @@ //--------------------------------------------------------------------------- using System; -using RabbitMQ; -using RabbitMQ.Util; +using RabbitMQ.Client; +using RabbitMQ.Client.Util; using Xunit; namespace Test.Unit diff --git a/projects/Test/Unit/TestRpcContinuationQueue.cs b/projects/Test/Unit/TestRpcContinuationQueue.cs index d02342197f..c84409f4b5 100644 --- a/projects/Test/Unit/TestRpcContinuationQueue.cs +++ b/projects/Test/Unit/TestRpcContinuationQueue.cs @@ -31,7 +31,7 @@ using System; using System.Threading; -using RabbitMQ.Client.client.framing; +using RabbitMQ.Client.Framing; using RabbitMQ.Client.Impl; using Xunit;