From 9d14632f1c307e8f00dd4a2e4d15bc7855e31137 Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Mon, 30 Oct 2023 11:04:24 -0700 Subject: [PATCH] Isolate headers for AMQP internal types into an internal-only header directory. Fixes #5069 (#5079) * Moved internal AMQP types to internal header directory * Updated consumers of AMQP headers to match moved headers * Updated changelog to reflect breaking change in AMQP * Made includes explicit in event_data.hpp * Reference non-package headers with angle braces not quotes --- sdk/core/azure-core-amqp/CHANGELOG.md | 3 +- sdk/core/azure-core-amqp/CMakeLists.txt | 52 +++++++++---------- .../azure-core-amqp/inc/azure/core/amqp.hpp | 21 -------- .../core/amqp/{ => internal}/cancellable.hpp | 0 .../{ => internal}/claims_based_security.hpp | 2 +- .../common/async_operation_queue.hpp | 0 .../common/completion_operation.hpp | 0 .../{ => internal}/common/global_state.hpp | 0 .../core/amqp/{ => internal}/connection.hpp | 4 +- .../connection_string_credential.hpp | 0 .../amqp/{ => internal}/doxygen_pragma.hpp | 0 .../core/amqp/{ => internal}/endpoint.hpp | 2 +- .../azure/core/amqp/{ => internal}/link.hpp | 6 +-- .../core/amqp/{ => internal}/management.hpp | 4 +- .../amqp/{ => internal}/message_receiver.hpp | 6 +-- .../amqp/{ => internal}/message_sender.hpp | 4 +- .../amqp/{ => internal}/models/amqp_error.hpp | 6 +-- .../{ => internal}/models/amqp_protocol.hpp | 0 .../{ => internal}/models/message_source.hpp | 6 +-- .../{ => internal}/models/message_target.hpp | 6 +-- .../models/messaging_values.hpp | 3 +- .../network/amqp_header_detect_transport.hpp | 0 .../{ => internal}/network/sasl_transport.hpp | 0 .../network/socket_listener.hpp | 0 .../network/socket_transport.hpp | 0 .../{ => internal}/network/tls_transport.hpp | 0 .../amqp/{ => internal}/network/transport.hpp | 0 .../core/amqp/{ => internal}/session.hpp | 2 +- ...venthub_get_eventhub_properties_sample.cpp | 8 +-- .../eventhub_sas_reader_sample.cpp | 6 +-- .../eventhub_sas_writer_sample.cpp | 6 +-- .../eventhub_token_reader_sample.cpp | 6 +-- .../eventhub_token_writer_sample.cpp | 6 +-- .../local_client_async_sample.cpp | 6 +-- .../local_client_sample.cpp | 4 +- .../local_server_sample.cpp | 16 +++--- .../azure-core-amqp/src/amqp/cancellable.cpp | 2 +- .../azure-core-amqp/src/amqp/connection.cpp | 8 +-- .../src/amqp/connection_string_credential.cpp | 8 +-- sdk/core/azure-core-amqp/src/amqp/link.cpp | 12 ++--- .../azure-core-amqp/src/amqp/management.cpp | 8 +-- .../src/amqp/message_receiver.cpp | 12 ++--- .../src/amqp/message_sender.cpp | 8 +-- .../private/claims_based_security_impl.hpp | 4 +- .../src/amqp/private/connection_impl.hpp | 8 +-- .../src/amqp/private/link_impl.hpp | 6 +-- .../src/amqp/private/management_impl.hpp | 6 +-- .../amqp/private/message_receiver_impl.hpp | 2 +- .../src/amqp/private/message_sender_impl.hpp | 2 +- .../src/amqp/private/session_impl.hpp | 5 +- sdk/core/azure-core-amqp/src/amqp/session.cpp | 6 +-- .../src/common/global_state.cpp | 2 +- .../azure-core-amqp/src/models/amqp_error.cpp | 2 +- .../src/models/amqp_message.cpp | 2 +- .../azure-core-amqp/src/models/amqp_value.cpp | 4 +- .../src/models/message_source.cpp | 2 +- .../src/models/message_target.cpp | 2 +- .../src/models/messaging_values.cpp | 2 +- .../src/network/amqp_header_transport.cpp | 2 +- .../src/network/private/transport_impl.hpp | 2 +- .../src/network/sasl_transport.cpp | 4 +- .../src/network/socket_listener.cpp | 4 +- .../src/network/socket_transport.cpp | 2 +- .../src/network/tls_transport.cpp | 2 +- .../azure-core-amqp/src/network/transport.cpp | 6 +-- .../test/ut/amqp_value_tests.cpp | 5 +- .../test/ut/async_operation_queue_tests.cpp | 2 +- .../test/ut/claim_based_security_tests.cpp | 15 ++---- .../test/ut/connection_string_tests.cpp | 2 +- .../test/ut/connection_tests.cpp | 18 +++---- .../azure-core-amqp/test/ut/link_tests.cpp | 18 +++---- .../test/ut/management_tests.cpp | 8 +-- .../test/ut/message_sender_receiver.cpp | 20 +++---- .../test/ut/message_source_target.cpp | 6 +-- .../test/ut/mock_amqp_server.hpp | 27 +++++----- .../azure-core-amqp/test/ut/session_tests.cpp | 18 +++---- .../test/ut/transport_tests.cpp | 10 ++-- .../test/ut_uamqp/amqp_error_tests.cpp | 2 +- .../test/ut_uamqp/amqp_insertion_tests.cpp | 2 +- .../messaging/eventhubs/consumer_client.hpp | 1 + .../eventhubs/eventhubs_exception.hpp | 2 +- .../messaging/eventhubs/models/event_data.hpp | 12 ++++- .../messaging/eventhubs/partition_client.hpp | 1 + .../azure/messaging/eventhubs/processor.hpp | 2 + .../messaging/eventhubs/producer_client.hpp | 3 +- .../src/consumer_client.cpp | 2 +- .../src/eventhubs_utilities.cpp | 2 +- .../src/partition_client.cpp | 1 + .../src/private/eventhubs_utilities.hpp | 4 +- .../src/producer_client.cpp | 1 + .../src/retry_operation.cpp | 3 +- .../test/ut/processor_test.cpp | 2 +- 92 files changed, 253 insertions(+), 256 deletions(-) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/cancellable.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/claims_based_security.hpp (97%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/common/async_operation_queue.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/common/completion_operation.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/common/global_state.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/connection.hpp (99%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/connection_string_credential.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/doxygen_pragma.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/endpoint.hpp (98%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/link.hpp (94%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/management.hpp (98%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/message_receiver.hpp (97%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/message_sender.hpp (98%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/models/amqp_error.hpp (98%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/models/amqp_protocol.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/models/message_source.hpp (97%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/models/message_target.hpp (97%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/models/messaging_values.hpp (94%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/amqp_header_detect_transport.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/sasl_transport.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/socket_listener.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/socket_transport.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/tls_transport.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/network/transport.hpp (100%) rename sdk/core/azure-core-amqp/inc/azure/core/amqp/{ => internal}/session.hpp (99%) diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md index b178e2c2f..b975aba10 100644 --- a/sdk/core/azure-core-amqp/CHANGELOG.md +++ b/sdk/core/azure-core-amqp/CHANGELOG.md @@ -6,11 +6,12 @@ ### Breaking Changes +- Refactored AMQP headers to isolate internal-only types to "internal" subdirectory in headers. + ### Bugs Fixed ### Other Changes -- Added several `ostream` insertion operators for AMQP types. - Removed public dependency on azure-uamqp-c to enable local bug fixes. ## 1.0.0-beta.4 (2023-10-05) diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt index b10108d7d..f127d5db9 100644 --- a/sdk/core/azure-core-amqp/CMakeLists.txt +++ b/sdk/core/azure-core-amqp/CMakeLists.txt @@ -57,37 +57,37 @@ find_package(azure_c_shared_utility CONFIG REQUIRED) set (AZURE_CORE_AMQP_HEADER inc/azure/core/amqp.hpp - inc/azure/core/amqp/cancellable.hpp - inc/azure/core/amqp/claims_based_security.hpp - inc/azure/core/amqp/connection_string_credential.hpp - inc/azure/core/amqp/connection.hpp inc/azure/core/amqp/dll_import_export.hpp - inc/azure/core/amqp/doxygen_pragma.hpp - inc/azure/core/amqp/endpoint.hpp - inc/azure/core/amqp/link.hpp - inc/azure/core/amqp/management.hpp - inc/azure/core/amqp/message_receiver.hpp - inc/azure/core/amqp/message_sender.hpp - inc/azure/core/amqp/rtti.hpp - inc/azure/core/amqp/session.hpp - inc/azure/core/amqp/common/async_operation_queue.hpp - inc/azure/core/amqp/common/completion_operation.hpp - inc/azure/core/amqp/common/global_state.hpp - inc/azure/core/amqp/models/amqp_error.hpp + inc/azure/core/amqp/internal/cancellable.hpp + inc/azure/core/amqp/internal/claims_based_security.hpp + inc/azure/core/amqp/internal/common/async_operation_queue.hpp + inc/azure/core/amqp/internal/common/completion_operation.hpp + inc/azure/core/amqp/internal/common/global_state.hpp + inc/azure/core/amqp/internal/connection.hpp + inc/azure/core/amqp/internal/connection_string_credential.hpp + inc/azure/core/amqp/internal/doxygen_pragma.hpp + inc/azure/core/amqp/internal/endpoint.hpp + inc/azure/core/amqp/internal/link.hpp + inc/azure/core/amqp/internal/management.hpp + inc/azure/core/amqp/internal/message_receiver.hpp + inc/azure/core/amqp/internal/message_sender.hpp + inc/azure/core/amqp/internal/models/amqp_error.hpp + inc/azure/core/amqp/internal/models/amqp_protocol.hpp + inc/azure/core/amqp/internal/models/message_source.hpp + inc/azure/core/amqp/internal/models/message_target.hpp + inc/azure/core/amqp/internal/models/messaging_values.hpp + inc/azure/core/amqp/internal/network/amqp_header_detect_transport.hpp + inc/azure/core/amqp/internal/network/sasl_transport.hpp + inc/azure/core/amqp/internal/network/socket_listener.hpp + inc/azure/core/amqp/internal/network/socket_transport.hpp + inc/azure/core/amqp/internal/network/tls_transport.hpp + inc/azure/core/amqp/internal/network/transport.hpp + inc/azure/core/amqp/internal/session.hpp inc/azure/core/amqp/models/amqp_header.hpp inc/azure/core/amqp/models/amqp_message.hpp inc/azure/core/amqp/models/amqp_properties.hpp - inc/azure/core/amqp/models/amqp_protocol.hpp inc/azure/core/amqp/models/amqp_value.hpp - inc/azure/core/amqp/models/message_source.hpp - inc/azure/core/amqp/models/message_target.hpp - inc/azure/core/amqp/models/messaging_values.hpp - inc/azure/core/amqp/network/amqp_header_detect_transport.hpp - inc/azure/core/amqp/network/sasl_transport.hpp - inc/azure/core/amqp/network/socket_listener.hpp - inc/azure/core/amqp/network/socket_transport.hpp - inc/azure/core/amqp/network/tls_transport.hpp - inc/azure/core/amqp/network/transport.hpp + inc/azure/core/amqp/rtti.hpp ) set(AZURE_CORE_AMQP_SOURCE diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp.hpp index 9c4822617..4bb9e2bfa 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp.hpp @@ -2,30 +2,9 @@ // Licensed under the MIT License. #pragma once -#include "azure/core/amqp/cancellable.hpp" -#include "azure/core/amqp/claims_based_security.hpp" -#include "azure/core/amqp/common/async_operation_queue.hpp" -#include "azure/core/amqp/common/completion_operation.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/connection_string_credential.hpp" #include "azure/core/amqp/dll_import_export.hpp" -#include "azure/core/amqp/link.hpp" -#include "azure/core/amqp/management.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/message_sender.hpp" #include "azure/core/amqp/models/amqp_header.hpp" #include "azure/core/amqp/models/amqp_message.hpp" #include "azure/core/amqp/models/amqp_properties.hpp" -#include "azure/core/amqp/models/amqp_protocol.hpp" #include "azure/core/amqp/models/amqp_value.hpp" -#include "azure/core/amqp/models/message_source.hpp" -#include "azure/core/amqp/models/message_target.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" -#include "azure/core/amqp/network/sasl_transport.hpp" -#include "azure/core/amqp/network/socket_listener.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" -#include "azure/core/amqp/network/tls_transport.hpp" -#include "azure/core/amqp/network/transport.hpp" #include "azure/core/amqp/rtti.hpp" -#include "azure/core/amqp/session.hpp" diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/cancellable.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/cancellable.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/cancellable.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/cancellable.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp similarity index 97% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp index 52ea5d9c9..3a1ccac21 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp @@ -3,7 +3,7 @@ #pragma once -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/session.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/async_operation_queue.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/async_operation_queue.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/completion_operation.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/completion_operation.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/common/completion_operation.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/completion_operation.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/global_state.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/global_state.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/common/global_state.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/common/global_state.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp similarity index 99% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp index 0db98698a..e170d543c 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp @@ -3,10 +3,10 @@ #pragma once -#include "azure/core/amqp/models/amqp_protocol.hpp" +#include "azure/core/amqp/internal/models/amqp_protocol.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" #include "common/async_operation_queue.hpp" #include "connection_string_credential.hpp" -#include "models/amqp_value.hpp" #include "session.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection_string_credential.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection_string_credential.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/doxygen_pragma.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/doxygen_pragma.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/doxygen_pragma.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/doxygen_pragma.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/endpoint.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/endpoint.hpp similarity index 98% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/endpoint.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/endpoint.hpp index 150f5a516..610467636 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/endpoint.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/endpoint.hpp @@ -3,9 +3,9 @@ #pragma once +#include "azure/core/amqp/models/amqp_value.hpp" #include "common/async_operation_queue.hpp" #include "connection_string_credential.hpp" -#include "models/amqp_value.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/link.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp similarity index 94% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/link.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp index 3c55a17c6..37ce16d3e 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/link.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp @@ -3,9 +3,9 @@ #pragma once -#include "models/amqp_value.hpp" -#include "models/message_source.hpp" -#include "models/message_target.hpp" +#include "azure/core/amqp/internal/models/message_source.hpp" +#include "azure/core/amqp/internal/models/message_target.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/management.hpp similarity index 98% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/management.hpp index d1e5a43b4..3cd932f67 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/management.hpp @@ -3,8 +3,8 @@ #pragma once -#include "models/amqp_error.hpp" -#include "models/amqp_message.hpp" +#include "azure/core/amqp/internal/models/amqp_error.hpp" +#include "azure/core/amqp/models/amqp_message.hpp" #include "session.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_receiver.hpp similarity index 97% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_receiver.hpp index b51fd3ea5..d1b2bffce 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_receiver.hpp @@ -3,13 +3,13 @@ #pragma once +#include "azure/core/amqp/internal/models/amqp_error.hpp" +#include "azure/core/amqp/models/amqp_message.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" #include "claims_based_security.hpp" #include "common/async_operation_queue.hpp" #include "connection_string_credential.hpp" #include "link.hpp" -#include "models/amqp_error.hpp" -#include "models/amqp_message.hpp" -#include "models/amqp_value.hpp" #include "session.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp similarity index 98% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp index b0e4a021c..a4dc9761a 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp @@ -3,14 +3,14 @@ #pragma once +#include "azure/core/amqp/models/amqp_message.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" #include "cancellable.hpp" #include "claims_based_security.hpp" #include "common/async_operation_queue.hpp" #include "connection.hpp" #include "link.hpp" #include "models/amqp_error.hpp" -#include "models/amqp_message.hpp" -#include "models/amqp_value.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_error.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_error.hpp similarity index 98% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_error.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_error.hpp index cf7b36911..083c4f612 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_error.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_error.hpp @@ -3,10 +3,10 @@ #pragma once -#include "amqp_header.hpp" -#include "amqp_properties.hpp" -#include "amqp_value.hpp" #include "azure/core/amqp/dll_import_export.hpp" +#include "azure/core/amqp/models/amqp_header.hpp" +#include "azure/core/amqp/models/amqp_properties.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" #include diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_protocol.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_protocol.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_source.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_source.hpp similarity index 97% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_source.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_source.hpp index 42bef1ead..3abf21e72 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_source.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_source.hpp @@ -3,9 +3,9 @@ #pragma once -#include "amqp_header.hpp" -#include "amqp_properties.hpp" -#include "amqp_value.hpp" +#include "azure/core/amqp/models/amqp_header.hpp" +#include "azure/core/amqp/models/amqp_properties.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" struct SOURCE_INSTANCE_TAG; diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_target.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_target.hpp similarity index 97% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_target.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_target.hpp index cadf1156b..6f4efd223 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/message_target.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_target.hpp @@ -3,9 +3,9 @@ #pragma once -#include "amqp_header.hpp" -#include "amqp_properties.hpp" -#include "amqp_value.hpp" +#include "azure/core/amqp/models/amqp_header.hpp" +#include "azure/core/amqp/models/amqp_properties.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" struct TARGET_INSTANCE_TAG; diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/messaging_values.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/messaging_values.hpp similarity index 94% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/models/messaging_values.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/messaging_values.hpp index 19a21f215..f9796ca8d 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/messaging_values.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/messaging_values.hpp @@ -3,7 +3,8 @@ #pragma once -#include "amqp_value.hpp" +#include "azure/core/amqp/models/amqp_value.hpp" + namespace Azure { namespace Core { namespace Amqp { namespace Models { namespace _internal { class Messaging final { public: diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/amqp_header_detect_transport.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/amqp_header_detect_transport.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/sasl_transport.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/sasl_transport.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/socket_listener.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/socket_listener.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/socket_transport.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/socket_transport.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/tls_transport.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/tls_transport.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/transport.hpp similarity index 100% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/network/transport.hpp diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/session.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp similarity index 99% rename from sdk/core/azure-core-amqp/inc/azure/core/amqp/session.hpp rename to sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp index 3d9883104..ee4832ae3 100644 --- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/session.hpp +++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp @@ -3,10 +3,10 @@ #pragma once +#include "azure/core/amqp/models/amqp_value.hpp" #include "common/async_operation_queue.hpp" #include "connection_string_credential.hpp" #include "endpoint.hpp" -#include "models/amqp_value.hpp" #include "models/message_source.hpp" #include "models/message_target.hpp" diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp index 350e2c55c..fbc3d1b89 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp index b07c92341..a0cced541 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp index bf9d2657a..0c828215b 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp index d65a7beb9..7cb8e3354 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp index 49ed42959..1c2ec4d91 100644 --- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp index dd788c04d..2ec0f454f 100644 --- a/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp index 4e97de5f3..3e3c46b1e 100644 --- a/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp index 3a09cf816..2156be0ba 100644 --- a/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp +++ b/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp b/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp index 0eb11eaff..f433eafec 100644 --- a/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/cancellable.hpp" +#include "azure/core/amqp/internal/cancellable.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/amqp/connection.cpp b/sdk/core/azure-core-amqp/src/amqp/connection.cpp index e2f34ec7e..6415089cf 100644 --- a/sdk/core/azure-core-amqp/src/amqp/connection.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/connection.cpp @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/connection.hpp" +#include "azure/core/amqp/internal/connection.hpp" #include "../network/private/transport_impl.hpp" -#include "azure/core/amqp/common/global_state.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" +#include "azure/core/amqp/internal/network/tls_transport.hpp" #include "azure/core/amqp/models/amqp_value.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" -#include "azure/core/amqp/network/tls_transport.hpp" #include "private/claims_based_security_impl.hpp" #include "private/connection_impl.hpp" #include "private/session_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp index 8da553969..c86bfe587 100644 --- a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/connection_string_credential.hpp" +#include "azure/core/amqp/internal/connection_string_credential.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/models/amqp_protocol.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/models/amqp_protocol.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/src/amqp/link.cpp b/sdk/core/azure-core-amqp/src/amqp/link.cpp index ffde148b2..eea425061 100644 --- a/sdk/core/azure-core-amqp/src/amqp/link.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/link.cpp @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/link.hpp" +#include "azure/core/amqp/internal/link.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/message_sender.hpp" -#include "azure/core/amqp/models/message_source.hpp" -#include "azure/core/amqp/models/message_target.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" +#include "azure/core/amqp/internal/message_sender.hpp" +#include "azure/core/amqp/internal/models/message_source.hpp" +#include "azure/core/amqp/internal/models/message_target.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" #include "private/link_impl.hpp" #include "private/session_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/management.cpp b/sdk/core/azure-core-amqp/src/amqp/management.cpp index 027435c3e..f6ba1affd 100644 --- a/sdk/core/azure-core-amqp/src/amqp/management.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/management.cpp @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/management.hpp" +#include "azure/core/amqp/internal/management.hpp" -#include "azure/core/amqp/connection.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "azure/core/amqp/models/amqp_message.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/session.hpp" #include "private/connection_impl.hpp" #include "private/management_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp b/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp index 3899d33ff..d6038d2ac 100644 --- a/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp @@ -4,14 +4,14 @@ // Enable declaration of strerror_s. #define __STDC_WANT_LIB_EXT1__ 1 -#include "azure/core/amqp/message_receiver.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/connection_string_credential.hpp" -#include "azure/core/amqp/link.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/connection_string_credential.hpp" +#include "azure/core/amqp/internal/link.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "azure/core/amqp/models/amqp_message.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/session.hpp" #include "private/message_receiver_impl.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp b/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp index 21d9035d8..f303ee30f 100644 --- a/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp @@ -4,11 +4,11 @@ // Enable declaration of strerror_s. #define __STDC_WANT_LIB_EXT1__ 1 -#include "azure/core/amqp/claims_based_security.hpp" -#include "azure/core/amqp/common/completion_operation.hpp" +#include "azure/core/amqp/internal/claims_based_security.hpp" +#include "azure/core/amqp/internal/common/completion_operation.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "azure/core/amqp/models/amqp_message.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/session.hpp" #include "private/connection_impl.hpp" #include "private/message_sender_impl.hpp" #include "private/session_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp index 571e15362..803a620fd 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp @@ -2,8 +2,8 @@ // Licensed under the MIT License. #pragma once -#include "azure/core/amqp/claims_based_security.hpp" -#include "azure/core/amqp/management.hpp" +#include "azure/core/amqp/internal/claims_based_security.hpp" +#include "azure/core/amqp/internal/management.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp index 0a63f5d90..8e3d7c83f 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp @@ -3,12 +3,12 @@ #pragma once -#include "azure/core/amqp/common/global_state.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/network/transport.hpp" -#include "azure/core/platform.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/network/transport.hpp" #include +#include #include diff --git a/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp index 03c5e173e..b2466b7c2 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp @@ -3,10 +3,10 @@ #pragma once -#include "azure/core/amqp/models/amqp_error.hpp" +#include "azure/core/amqp/internal/models/amqp_error.hpp" +#include "azure/core/amqp/internal/models/message_source.hpp" +#include "azure/core/amqp/internal/models/message_target.hpp" #include "azure/core/amqp/models/amqp_value.hpp" -#include "azure/core/amqp/models/message_source.hpp" -#include "azure/core/amqp/models/message_target.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp index 98b23438b..c17242577 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp @@ -3,9 +3,9 @@ #pragma once -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/management.hpp" -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/management.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "connection_impl.hpp" #include "message_receiver_impl.hpp" #include "message_sender_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp index 3c08a1cf8..4102e68a7 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp @@ -3,7 +3,7 @@ #pragma once -#include "azure/core/amqp/message_receiver.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" #include "claims_based_security_impl.hpp" #include "connection_impl.hpp" #include "link_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp index ebcb8d798..f886caeb1 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp @@ -3,7 +3,7 @@ #pragma once -#include "azure/core/amqp/message_sender.hpp" +#include "azure/core/amqp/internal/message_sender.hpp" #include "claims_based_security_impl.hpp" #include "link_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp index d2a0cd6fd..bfb1ae39a 100644 --- a/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp +++ b/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp @@ -3,7 +3,8 @@ #pragma once -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/session.hpp" +#include "connection_impl.hpp" #include @@ -58,7 +59,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail { SessionImpl& operator=(SessionImpl&&) noexcept = delete; operator SESSION_HANDLE() const { return m_session.get(); } - std::shared_ptr GetConnection() const { return m_connectionToPoll; } + std::shared_ptr<_detail::ConnectionImpl> GetConnection() const { return m_connectionToPoll; } uint32_t GetIncomingWindow(); uint32_t GetOutgoingWindow(); diff --git a/sdk/core/azure-core-amqp/src/amqp/session.cpp b/sdk/core/azure-core-amqp/src/amqp/session.cpp index f6d9cbe87..b4ac22e9a 100644 --- a/sdk/core/azure-core-amqp/src/amqp/session.cpp +++ b/sdk/core/azure-core-amqp/src/amqp/session.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/session.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/link.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/link.hpp" #include "private/claims_based_security_impl.hpp" #include "private/connection_impl.hpp" #include "private/management_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/common/global_state.cpp b/sdk/core/azure-core-amqp/src/common/global_state.cpp index ac20d865e..780d2ad98 100644 --- a/sdk/core/azure-core-amqp/src/common/global_state.cpp +++ b/sdk/core/azure-core-amqp/src/common/global_state.cpp @@ -3,7 +3,7 @@ // cspell: words xlogging -#include "azure/core/amqp/common/global_state.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/src/models/amqp_error.cpp b/sdk/core/azure-core-amqp/src/models/amqp_error.cpp index 73f31d355..6f5f6b8fe 100644 --- a/sdk/core/azure-core-amqp/src/models/amqp_error.cpp +++ b/sdk/core/azure-core-amqp/src/models/amqp_error.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/models/amqp_error.hpp" +#include "azure/core/amqp/internal/models/amqp_error.hpp" #include "azure/core/amqp/models/amqp_value.hpp" diff --git a/sdk/core/azure-core-amqp/src/models/amqp_message.cpp b/sdk/core/azure-core-amqp/src/models/amqp_message.cpp index 3952a174a..f903efb5b 100644 --- a/sdk/core/azure-core-amqp/src/models/amqp_message.cpp +++ b/sdk/core/azure-core-amqp/src/models/amqp_message.cpp @@ -3,8 +3,8 @@ #include "azure/core/amqp/models/amqp_message.hpp" +#include "azure/core/amqp/internal/models/amqp_protocol.hpp" #include "azure/core/amqp/models/amqp_header.hpp" -#include "azure/core/amqp/models/amqp_protocol.hpp" #include "azure/core/amqp/models/amqp_value.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/models/amqp_value.cpp b/sdk/core/azure-core-amqp/src/models/amqp_value.cpp index 6c3bedc9c..920258ed2 100644 --- a/sdk/core/azure-core-amqp/src/models/amqp_value.cpp +++ b/sdk/core/azure-core-amqp/src/models/amqp_value.cpp @@ -3,9 +3,9 @@ #include "azure/core/amqp/models/amqp_value.hpp" -#include "azure/core/amqp/doxygen_pragma.hpp" +#include "azure/core/amqp/internal/doxygen_pragma.hpp" +#include "azure/core/amqp/internal/models/amqp_protocol.hpp" #include "azure/core/amqp/models/amqp_properties.hpp" -#include "azure/core/amqp/models/amqp_protocol.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/models/message_source.cpp b/sdk/core/azure-core-amqp/src/models/message_source.cpp index 639ff574e..b56de8c95 100644 --- a/sdk/core/azure-core-amqp/src/models/message_source.cpp +++ b/sdk/core/azure-core-amqp/src/models/message_source.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/models/message_source.hpp" +#include "azure/core/amqp/internal/models/message_source.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/src/models/message_target.cpp b/sdk/core/azure-core-amqp/src/models/message_target.cpp index 8c2a765a2..8314836e0 100644 --- a/sdk/core/azure-core-amqp/src/models/message_target.cpp +++ b/sdk/core/azure-core-amqp/src/models/message_target.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/models/message_target.hpp" +#include "azure/core/amqp/internal/models/message_target.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/src/models/messaging_values.cpp b/sdk/core/azure-core-amqp/src/models/messaging_values.cpp index 84155059c..d0aef8581 100644 --- a/sdk/core/azure-core-amqp/src/models/messaging_values.cpp +++ b/sdk/core/azure-core-amqp/src/models/messaging_values.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/models/messaging_values.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp b/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp index abcfbe004..decdfa172 100644 --- a/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp +++ b/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" +#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp" #include "private/transport_impl.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp b/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp index 82b85baef..66e0b5e14 100644 --- a/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp +++ b/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include "azure/core/amqp/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp b/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp index 169d60fd6..872b0263c 100644 --- a/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp +++ b/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/sasl_transport.hpp" +#include "azure/core/amqp/internal/network/sasl_transport.hpp" -#include "azure/core/amqp/network/tls_transport.hpp" +#include "azure/core/amqp/internal/network/tls_transport.hpp" #include "private/transport_impl.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/network/socket_listener.cpp b/sdk/core/azure-core-amqp/src/network/socket_listener.cpp index fe58fb13c..7aa499c19 100644 --- a/sdk/core/azure-core-amqp/src/network/socket_listener.cpp +++ b/sdk/core/azure-core-amqp/src/network/socket_listener.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/socket_listener.hpp" +#include "azure/core/amqp/internal/network/socket_listener.hpp" -#include "azure/core/amqp/common/global_state.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" #include "private/transport_impl.hpp" #include diff --git a/sdk/core/azure-core-amqp/src/network/socket_transport.cpp b/sdk/core/azure-core-amqp/src/network/socket_transport.cpp index 2e3593a28..886df1104 100644 --- a/sdk/core/azure-core-amqp/src/network/socket_transport.cpp +++ b/sdk/core/azure-core-amqp/src/network/socket_transport.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/socket_transport.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" #include "private/transport_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/network/tls_transport.cpp b/sdk/core/azure-core-amqp/src/network/tls_transport.cpp index fd5f1a1bc..d6e251269 100644 --- a/sdk/core/azure-core-amqp/src/network/tls_transport.cpp +++ b/sdk/core/azure-core-amqp/src/network/tls_transport.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/tls_transport.hpp" +#include "azure/core/amqp/internal/network/tls_transport.hpp" #include "private/transport_impl.hpp" diff --git a/sdk/core/azure-core-amqp/src/network/transport.cpp b/sdk/core/azure-core-amqp/src/network/transport.cpp index a27ccfa93..67d20c047 100644 --- a/sdk/core/azure-core-amqp/src/network/transport.cpp +++ b/sdk/core/azure-core-amqp/src/network/transport.cpp @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/network/transport.hpp" +#include "azure/core/amqp/internal/network/transport.hpp" -#include "azure/core/amqp/common/completion_operation.hpp" -#include "azure/core/amqp/common/global_state.hpp" +#include "azure/core/amqp/internal/common/completion_operation.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" #include "private/transport_impl.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp b/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp index dcd6989d5..b8af57c32 100644 --- a/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/global_state.hpp" -#include "azure/core/amqp/models/amqp_error.hpp" +#include "azure/core/amqp/internal/models/amqp_error.hpp" #include "azure/core/amqp/models/amqp_value.hpp" +#include + #include #include diff --git a/sdk/core/azure-core-amqp/test/ut/async_operation_queue_tests.cpp b/sdk/core/azure-core-amqp/test/ut/async_operation_queue_tests.cpp index dabf3d852..66cf77324 100644 --- a/sdk/core/azure-core-amqp/test/ut/async_operation_queue_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/async_operation_queue_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp b/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp index ffa95a5cc..c6bd855be 100644 --- a/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp @@ -3,16 +3,11 @@ #include "mock_amqp_server.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp b/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp index d176c7135..e9e69a80a 100644 --- a/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/connection_string_credential.hpp" +#include "azure/core/amqp/internal/connection_string_credential.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp b/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp index c68071d0b..b0a324393 100644 --- a/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/async_operation_queue.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/models/amqp_protocol.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" -#include "azure/core/amqp/network/socket_listener.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" +#include "azure/core/amqp/internal/models/amqp_protocol.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp" +#include "azure/core/amqp/internal/network/socket_listener.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "mock_amqp_server.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/link_tests.cpp b/sdk/core/azure-core-amqp/test/ut/link_tests.cpp index db7231a7c..1ba2dce57 100644 --- a/sdk/core/azure-core-amqp/test/ut/link_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/link_tests.cpp @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/async_operation_queue.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/message_sender.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" -#include "azure/core/amqp/network/socket_listener.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" +#include "azure/core/amqp/internal/message_sender.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp" +#include "azure/core/amqp/internal/network/socket_listener.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" +#include "azure/core/amqp/internal/session.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/management_tests.cpp b/sdk/core/azure-core-amqp/test/ut/management_tests.cpp index 01e749c70..e1696ae20 100644 --- a/sdk/core/azure-core-amqp/test/ut/management_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/management_tests.cpp @@ -3,10 +3,10 @@ #include "mock_amqp_server.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp b/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp index 2a483111d..ac7fa7161 100644 --- a/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp +++ b/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/async_operation_queue.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/message_sender.hpp" -#include "azure/core/amqp/models/message_source.hpp" -#include "azure/core/amqp/models/message_target.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" -#include "azure/core/amqp/network/socket_listener.hpp" -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" +#include "azure/core/amqp/internal/message_sender.hpp" +#include "azure/core/amqp/internal/models/message_source.hpp" +#include "azure/core/amqp/internal/models/message_target.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp" +#include "azure/core/amqp/internal/network/socket_listener.hpp" +#include "azure/core/amqp/internal/session.hpp" #include "mock_amqp_server.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp b/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp index ac70b0150..d7e3c2e05 100644 --- a/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp +++ b/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include -#include -#include +#include +#include +#include #include diff --git a/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp b/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp index b16213266..02b774e21 100644 --- a/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp +++ b/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp @@ -2,19 +2,20 @@ // Licensed under the MIT License. #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "azure/core/amqp/internal/models/amqp_error.hpp" +#include "azure/core/amqp/models/amqp_message.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sdk/core/azure-core-amqp/test/ut/session_tests.cpp b/sdk/core/azure-core-amqp/test/ut/session_tests.cpp index 9abb6e12a..5c5d69dc5 100644 --- a/sdk/core/azure-core-amqp/test/ut/session_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/session_tests.cpp @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/common/async_operation_queue.hpp" -#include "azure/core/amqp/common/global_state.hpp" -#include "azure/core/amqp/connection.hpp" -#include "azure/core/amqp/message_receiver.hpp" -#include "azure/core/amqp/models/messaging_values.hpp" -#include "azure/core/amqp/network/amqp_header_detect_transport.hpp" -#include "azure/core/amqp/network/socket_listener.hpp" -#include "azure/core/amqp/network/socket_transport.hpp" -#include "azure/core/amqp/session.hpp" +#include "azure/core/amqp/internal/common/async_operation_queue.hpp" +#include "azure/core/amqp/internal/common/global_state.hpp" +#include "azure/core/amqp/internal/connection.hpp" +#include "azure/core/amqp/internal/message_receiver.hpp" +#include "azure/core/amqp/internal/models/messaging_values.hpp" +#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp" +#include "azure/core/amqp/internal/network/socket_listener.hpp" +#include "azure/core/amqp/internal/network/socket_transport.hpp" +#include "azure/core/amqp/internal/session.hpp" #include #include diff --git a/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp b/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp index fa117c45d..414d5cfaa 100644 --- a/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/connection.hpp" +#include "azure/core/amqp/internal/connection.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_error_tests.cpp b/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_error_tests.cpp index aa465c118..391a7a30d 100644 --- a/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_error_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_error_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include "azure/core/amqp/models/amqp_error.hpp" +#include "azure/core/amqp/internal/models/amqp_error.hpp" #include diff --git a/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_insertion_tests.cpp b/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_insertion_tests.cpp index 9fed7d7bc..49069940a 100644 --- a/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_insertion_tests.cpp +++ b/sdk/core/azure-core-amqp/test/ut_uamqp/amqp_insertion_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -#include +#include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp index 00afe5cba..1b39a7db0 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp @@ -9,6 +9,7 @@ #include "partition_client.hpp" #include +#include #include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp index e4ce140af..cfec8c8a1 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp index 56b526e20..21e7ca13f 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp @@ -1,7 +1,17 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. #pragma once -#include + +#include +#include +#include +#include + +#include +#include +#include +#include + namespace Azure { namespace Messaging { namespace EventHubs { namespace Models { /** @brief Represents an event sent to the Azure Event Hubs service. diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp index 1727c1809..ff49d6a17 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp @@ -6,6 +6,7 @@ #include "models/partition_client_models.hpp" #include +#include #include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp index 509b274d7..ce46cf21d 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp @@ -1,12 +1,14 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. #pragma once + #include "checkpoint_store.hpp" #include "consumer_client.hpp" #include "models/processor_load_balancer_models.hpp" #include "models/processor_models.hpp" #include "processor_partition_client.hpp" +#include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp index 6ee7463ab..0eb7897b0 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp @@ -8,7 +8,8 @@ #include "models/management_models.hpp" #include -#include +#include +#include #include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp index ab2ecb147..5fffa24ec 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp @@ -5,7 +5,7 @@ #include "private/eventhubs_utilities.hpp" #include "private/package_version.hpp" -#include +#include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp index 63944ca79..98ff4b702 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp @@ -3,7 +3,7 @@ #include "private/eventhubs_utilities.hpp" -#include +#include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp index a3d29ec8d..1b1629ae5 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp @@ -9,6 +9,7 @@ #include "private/retry_operation.hpp" #include +#include using namespace Azure::Core::Diagnostics::_internal; using namespace Azure::Core::Diagnostics; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp b/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp index 59563f75d..5e5339a39 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp @@ -10,8 +10,8 @@ #include "azure/messaging/eventhubs/partition_client.hpp" #include "package_version.hpp" -#include -#include +#include +#include #include #include #include diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp index f4ef542e4..544371c21 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp @@ -10,6 +10,7 @@ #include "private/retry_operation.hpp" #include +#include namespace { const std::string DefaultAuthScope = "https://eventhubs.azure.net/.default"; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp index 82e7b6955..c93497e4b 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp @@ -2,9 +2,10 @@ // Licensed under the MIT License. #include "private/retry_operation.hpp" -#include "azure/core/internal/diagnostics/log.hpp" #include "azure/messaging/eventhubs/eventhubs_exception.hpp" +#include + #include namespace { diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp b/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp index b4853797a..0647a7974 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp @@ -4,7 +4,7 @@ #include "./test_checkpoint_store.hpp" #include "eventhubs_test_base.hpp" -#include +#include #include #include #include