Define a standardized header ordering for Azure SDK for C++ (#4632)

* Standardized header ordering for C++ repo

* Reordered categories to move private headers above public headers; added space between categories to enable future flexibility

.clang-format

@@ -33,10 +33,26 @@ CompactNamespaces: true
 Cpp11BracedListStyle: true
 FixNamespaceComments: true
 IndentWidth: 2
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IndentCaseLabels: true
 NamespaceIndentation: Inner
 PointerAlignment: Left
 PenaltyReturnTypeOnItsOwnLine: 300
 TabWidth: 2
 UseTab: Never
+IncludeCategories:
+ - Regex: '^<windows.h>$'
+   Priority: 80
+# Note: get_env.hpp must be included before any other Azure SDK headers.
+ - Regex: '^["<]get_env.hpp'
+   Priority: 10
+ - Regex: '<[[:alnum:]_.]+>'
+   Priority: 90
+ - Regex: '<Azure/.*>'
+   Priority: 50
+ - Regex: '^<azure_uamqp_c.*/(amqp_definitions_sequence_no|amqp_definitions_milliseconds|amqp_definitions_terminus_expiry_policy|amqp_definitions_terminus_durability).h>$'
+   Priority: 60
+ - Regex: '<azure_.*>'
+   Priority: 70
+ - Regex: '^".+'
+   Priority: 20

samples/integration/vcpkg-all-smoke/src/main.cpp

@@ -7,6 +7,7 @@
  */
 
 #include "get_env.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core.hpp>
 #include <azure/core/internal/json/json.hpp>
@@ -18,6 +19,7 @@
 #include <azure/storage/files/datalake.hpp>
 #include <azure/storage/files/shares.hpp>
 #include <azure/storage/queues.hpp>
+
 #include <iostream>
 
 using namespace Azure::Security::KeyVault::Keys;

sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp

@@ -5,9 +5,11 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/internal/tracing/service_tracing.hpp>
 #include <azure/core/url.hpp>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Http { namespace _internal {

sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp

@@ -5,9 +5,11 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/internal/tracing/service_tracing.hpp>
 #include <azure/core/url.hpp>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Http { namespace _internal {

sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp

@@ -10,12 +10,14 @@
 #pragma once
 
 #include "azure/attestation/dll_import_export.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/extendable_enumeration.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/paged_response.hpp>
 #include <azure/core/response.hpp>
+
 #include <iostream>
 #include <memory>
 #include <string>

sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp

@@ -11,6 +11,7 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "dll_import_export.hpp"
+
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/internal/extendable_enumeration.hpp>
 

sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp

@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp

@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp

@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp

@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp

@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/attestation/attestation_collateral.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_collateral.hpp"
+
 #include <azure/core/base64.hpp>
 
 // cspell:disable

sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp

@@ -21,6 +21,7 @@
 
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <memory>

sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp

@@ -16,6 +16,7 @@
 #include <get_env.hpp>
 
 #include <azure/attestation.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>

sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp

@@ -26,6 +26,7 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
 

sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp

@@ -7,16 +7,17 @@
 #include <algorithm>
 #include <cstring>
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
+
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 /**
  * @brief The Cryptography class provides a set of basic cryptographic primatives required
  * by the attestation samples.

sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp

@@ -21,6 +21,7 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
 

sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp

@@ -20,11 +20,13 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iomanip>
 #include <iostream>

sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp

@@ -23,6 +23,7 @@
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iomanip>
 #include <iostream>

sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp

@@ -20,11 +20,13 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <cassert>
 #include <chrono>
 #include <iomanip>

sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp

@@ -2,18 +2,20 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/attestation/attestation_administration_client.hpp"
+
 #include "azure/attestation/attestation_client.hpp"
 #include "private/attestation_client_models_private.hpp"
 #include "private/attestation_client_private.hpp"
 #include "private/attestation_common_request.hpp"
 #include "private/attestation_deserializers_private.hpp"
 #include "private/package_version.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <shared_mutex>
 
+#include <shared_mutex>
 #include <string>
 
 // cspell: words jwks

sdk/attestation/azure-security-attestation/src/attestation_client.cpp

@@ -2,19 +2,21 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/attestation/attestation_client.hpp"
+
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "private/attestation_client_models_private.hpp"
 #include "private/attestation_client_private.hpp"
 #include "private/attestation_common_request.hpp"
 #include "private/attestation_deserializers_private.hpp"
 #include "private/package_version.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <shared_mutex>
 
+#include <shared_mutex>
 #include <string>
 
 using namespace Azure::Security::Attestation;

sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp

@@ -12,7 +12,9 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/nullable.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>

sdk/attestation/azure-security-attestation/src/private/attestation_client_private.cpp

@@ -9,7 +9,9 @@
  */
 #include "attestation_client_models_private.hpp"
 #include "crypto/inc/crypto.hpp"
+
 #include <azure/core/internal/json/json.hpp>
+
 #include <chrono>
 #include <memory>
 #include <sstream>

sdk/attestation/azure-security-attestation/src/private/attestation_client_private.hpp

@@ -16,10 +16,12 @@
 #include "azure/attestation/attestation_client_options.hpp"
 #include "crypto/inc/crypto.hpp"
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
+
 #include <chrono>
 #include <memory>
 #include <sstream>

sdk/attestation/azure-security-attestation/src/private/attestation_common_request.cpp

@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_common_request.hpp"
+
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
+
 #include <memory>
 
 using namespace Azure::Security::Attestation;

sdk/attestation/azure-security-attestation/src/private/attestation_common_request.hpp

@@ -11,6 +11,7 @@
 
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>

sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.cpp

@@ -12,10 +12,12 @@
  */
 
 #include "attestation_deserializers_private.hpp"
+
 #include "attestation_client_models_private.hpp"
 #include "attestation_client_private.hpp"
 #include "azure/attestation/attestation_client_models.hpp"
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
@@ -25,6 +27,7 @@
 #include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/response.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>

sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.hpp

@@ -16,7 +16,9 @@
 #include "attestation_client_models_private.hpp"
 #include "azure/attestation/attestation_client.hpp"
 #include "azure/attestation/attestation_client_models.hpp"
+
 #include <azure/core/internal/json/json.hpp>
+
 #include <memory>
 #include <string>
 

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp

@@ -3,12 +3,13 @@
 #pragma once
 
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
   // Helpers to provide RAII wrappers for OpenSSL types.

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp

@@ -9,13 +9,21 @@
  */
 
 #include "opensslcert.hpp"
+
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
 #include "opensslkeys.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <cstring>
 #include <ctime>
 #include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
@@ -24,10 +32,6 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509v3.h>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
 
 // cspell::words OpenSSL X509 OpenSSLX509
 

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp

@@ -13,18 +13,20 @@
 #include "../../jsonhelpers_private.hpp"
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
 #include <sstream>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+
 // cspell::words OpenSSL X509 OpenSSLX509
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcrypto.cpp

@@ -11,7 +11,9 @@
 #include "../inc/crypto.hpp"
 #include "opensslcert.hpp"
 #include "opensslkeys.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <memory>
 #include <string>
 #include <type_traits>

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp

@@ -9,22 +9,26 @@
  */
 
 #include "opensslkeys.hpp"
+
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <azure/core/azure_assert.hpp>
+
 #include <cassert>
 #include <cstring>
 #include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 

sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp

@@ -12,16 +12,18 @@
 
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
   /** Represents an Asymmetric Key.

sdk/attestation/azure-security-attestation/src/private/jsonhelpers.cpp

@@ -12,6 +12,7 @@
  */
 
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>

sdk/attestation/azure-security-attestation/src/private/jsonhelpers_private.hpp

@@ -14,9 +14,11 @@
 #pragma once
 
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>

sdk/attestation/azure-security-attestation/test/ut/attestation_collateral.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_collateral.hpp"
+
 #include <azure/core/base64.hpp>
 
 namespace Azure { namespace Security { namespace Attestation { namespace Test {

sdk/attestation/azure-security-attestation/test/ut/attestation_metadata.cpp

@@ -3,12 +3,15 @@
 
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;

sdk/attestation/azure-security-attestation/test/ut/attestation_test.cpp

@@ -4,12 +4,15 @@
 #include "../src/private/crypto/inc/crypto.hpp"
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;

sdk/attestation/azure-security-attestation/test/ut/crypto_test.cpp

@@ -3,10 +3,13 @@
 
 #include "../../src/private/crypto/inc/crypto.hpp"
 #include "crypto_test_collateral.hpp"
+
 #include <azure/core/test/test_base.hpp>
-#include <gtest/gtest.h>
+
 #include <random>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace Test {
   using namespace Azure::Security::Attestation::_detail;
   using namespace Azure::Core::Diagnostics::_internal;

sdk/attestation/azure-security-attestation/test/ut/policycertmgmt_test.cpp

@@ -5,14 +5,17 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/identity/client_secret_credential.hpp"
+
 #include <azure/attestation/attestation_client_models.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <string>
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Security::Attestation::_detail;

sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp

@@ -5,14 +5,17 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/identity/client_secret_credential.hpp"
+
 #include <azure/attestation/attestation_client_models.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <string>
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Security::Attestation::_detail;

sdk/attestation/azure-security-attestation/test/ut/token_test.cpp

@@ -6,10 +6,12 @@
 #include "../../src/private/attestation_deserializers_private.hpp"
 #include "../../src/private/crypto/inc/crypto.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <gtest/gtest.h>
 
 // cspell:words jwk jwks

sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp

@@ -4,12 +4,15 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;

sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "azure/core/amqp/session.hpp"
+
 #include <azure/core/context.hpp>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {

sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <azure/core/context.hpp>
+
 #include <condition_variable>
 #include <list>
 #include <mutex>

sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp

@@ -8,7 +8,9 @@
 #include "connection_string_credential.hpp"
 #include "models/amqp_value.hpp"
 #include "session.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <chrono>
 #include <limits>
 #include <memory>

sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp

@@ -4,7 +4,9 @@
 #pragma once
 
 #include "network/sasl_transport.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <chrono>
 #include <memory>
 #include <stdexcept>

sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp

@@ -5,7 +5,9 @@
 
 #include "models/amqp_message.hpp"
 #include "session.hpp"
+
 #include <azure/core/context.hpp>
+
 #include <string>
 #include <tuple>
 #include <vector>

sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp

@@ -10,8 +10,10 @@
 #include "models/amqp_message.hpp"
 #include "models/amqp_value.hpp"
 #include "session.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <vector>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {

sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp

@@ -10,7 +10,9 @@
 #include "link.hpp"
 #include "models/amqp_message.hpp"
 #include "models/amqp_value.hpp"
+
 #include <azure/core/nullable.hpp>
+
 #include <tuple>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp

@@ -5,6 +5,7 @@
 
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <chrono>
 #include <cstddef>
 #include <cstdint>

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp

@@ -6,8 +6,10 @@
 #include "amqp_header.hpp"
 #include "amqp_properties.hpp"
 #include "amqp_value.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <map>
 #include <vector>
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp

@@ -4,8 +4,10 @@
 #pragma once
 
 #include "amqp_value.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <chrono>
 #include <vector>
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <cstdint>
 
 struct AMQPVALUE_DECODER_HANDLE_DATA_TAG;

sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_value.hpp

@@ -5,9 +5,10 @@
 
 #include "amqp_header.hpp"
 
-#include <array>
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/uuid.hpp>
+
+#include <array>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <exception>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <atomic>
 #include <functional>
 #include <memory>

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp

@@ -4,7 +4,9 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <exception>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {

sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp

@@ -6,6 +6,7 @@
 
 #pragma once
 #include <azure/core/context.hpp>
+
 #include <exception>
 #include <functional>
 #include <memory>

sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp

@@ -6,6 +6,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp

@@ -9,6 +9,7 @@
 #include <azure/core/amqp/management.hpp>
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/identity/client_secret_credential.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp

@@ -3,6 +3,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp

@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
 #include <azure/core/amqp/network/sasl_transport.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp

@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/connection_string_credential.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp

@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
 #include <azure/core/amqp/network/sasl_transport.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp

@@ -9,6 +9,7 @@
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/identity/client_secret_credential.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/eventhub_writer_sample/eventhub_writer_sample.cpp

@@ -4,6 +4,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/connection_string_credential.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp

@@ -4,6 +4,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/core/amqp/models/messaging_values.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp

@@ -3,6 +3,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>

sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp

@@ -9,6 +9,7 @@
 #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 <iostream>
 #include <string>
 

sdk/core/azure-core-amqp/src/amqp/cancellable.cpp

@@ -2,9 +2,10 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/cancellable.hpp"
-#include <memory>
 
 #include <azure_uamqp_c/async_operation.h>
+
+#include <memory>
 #if 0
 namespace Azure { namespace Core { namespace Amqp { namespace _internal {
   Cancellable::~Cancellable()

sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp

@@ -6,8 +6,10 @@
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
 #include "private/session_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <iostream>
 #include <sstream>
 

sdk/core/azure-core-amqp/src/amqp/connection.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/connection.hpp"
+
 #include "../network/private/transport_impl.hpp"
 #include "azure/core/amqp/common/global_state.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
@@ -9,11 +10,14 @@
 #include "azure/core/amqp/network/tls_transport.hpp"
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/url.hpp>
 #include <azure/core/uuid.hpp>
+
 #include <azure_uamqp_c/connection.h>
+
 #include <memory>
 
 void Azure::Core::_internal::UniqueHandleHelper<CONNECTION_INSTANCE_TAG>::FreeAmqpConnection(

sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp

@@ -2,17 +2,21 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/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 <algorithm>
+
 #include <azure/core/base64.hpp>
 #include <azure/core/url.hpp>
+
 #include <azure_c_shared_utility/azure_base64.h>
 #include <azure_c_shared_utility/buffer_.h>
 #include <azure_c_shared_utility/sastoken.h>
 #include <azure_c_shared_utility/strings.h>
 #include <azure_c_shared_utility/urlencode.h>
+
+#include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <unordered_map>

sdk/core/azure-core-amqp/src/amqp/link.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/link.hpp"
+
 #include "azure/core/amqp/message_receiver.hpp"
 #include "azure/core/amqp/message_sender.hpp"
 #include "azure/core/amqp/models/message_source.hpp"

sdk/core/azure-core-amqp/src/amqp/management.cpp

@@ -2,15 +2,19 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/management.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
 #include "azure/core/amqp/session.hpp"
 #include "private/connection_impl.hpp"
 #include "private/management_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <azure_uamqp_c/amqp_management.h>
+
 #include <iostream>
 #include <memory>
 #include <string>

sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/message_receiver.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/connection_string_credential.hpp"
 #include "azure/core/amqp/link.hpp"
@@ -9,10 +10,13 @@
 #include "azure/core/amqp/models/messaging_values.hpp"
 #include "azure/core/amqp/session.hpp"
 #include "private/message_receiver_impl.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_uamqp_c/message_receiver.h>
+
 #include <iostream>
 #include <memory>
 #include <sstream>

sdk/core/azure-core-amqp/src/amqp/message_sender.cpp

@@ -9,11 +9,13 @@
 #include "private/connection_impl.hpp"
 #include "private/message_sender_impl.hpp"
 #include "private/session_impl.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 
 #include <azure_uamqp_c/message_sender.h>
+
 #include <memory>
 
 using namespace Azure::Core::Diagnostics;

sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp

@@ -3,6 +3,7 @@
 
 #pragma once
 #include "azure/core/amqp/claims_based_security.hpp"
+
 #include <azure_uamqp_c/cbs.h>
 
 struct CBS_INSTANCE_TAG;

sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp

@@ -5,8 +5,11 @@
 
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/network/transport.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/connection.h>
+
 #include <chrono>
 #include <memory>
 #include <string>

sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp

@@ -6,7 +6,9 @@
 #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_uamqp_c/link.h>
+
 #include <chrono>
 #include <memory>
 #include <string>

sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp

@@ -11,7 +11,9 @@
 #include "session_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/amqp_management.h>
+
 #include <memory>
 #include <vector>
 

sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp

@@ -11,9 +11,11 @@
 #include "session_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/amqpvalue.h>
 #include <azure_uamqp_c/message.h>
 #include <azure_uamqp_c/message_receiver.h>
+
 #include <memory>
 #include <vector>
 

sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp

@@ -6,7 +6,9 @@
 #include "azure/core/amqp/message_sender.hpp"
 #include "claims_based_security_impl.hpp"
 #include "link_impl.hpp"
+
 #include <azure_uamqp_c/message_sender.h>
+
 #include <tuple>
 
 template <> struct Azure::Core::_internal::UniqueHandleHelper<MESSAGE_SENDER_INSTANCE_TAG>

sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp

@@ -4,13 +4,14 @@
 #pragma once
 
 #include "azure/core/amqp/session.hpp"
+
+#include <azure_uamqp_c/session.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <azure_uamqp_c/session.h>
-
 template <> struct Azure::Core::_internal::UniqueHandleHelper<SESSION_INSTANCE_TAG>
 {
   static void FreeAmqpSession(SESSION_HANDLE obj);

sdk/core/azure-core-amqp/src/amqp/session.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/session.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/link.hpp"
 #include "private/claims_based_security_impl.hpp"
@@ -10,6 +11,7 @@
 
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_uamqp_c/session.h>
 
 using namespace Azure::Core::Diagnostics::_internal;

sdk/core/azure-core-amqp/src/common/global_state.cpp

@@ -4,10 +4,13 @@
 // cspell: words xlogging
 
 #include "azure/core/amqp/common/global_state.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/xlogging.h>
+
 #include <cassert>
 #include <iomanip>
 #include <mutex>

sdk/core/azure-core-amqp/src/models/amqp_header.cpp

@@ -2,11 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_header.hpp"
+
 #include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_milliseconds.h>
 
 #include <azure_uamqp_c/amqp_definitions_header.h>
+
 #include <chrono>
 #include <iostream>
 

sdk/core/azure-core-amqp/src/models/amqp_message.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_message.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"
@@ -10,6 +11,7 @@
 #include <azure_uamqp_c/amqp_definitions_application_properties.h>
 #include <azure_uamqp_c/amqp_definitions_footer.h>
 #include <azure_uamqp_c/message.h>
+
 #include <iostream>
 #include <set>
 

sdk/core/azure-core-amqp/src/models/amqp_properties.cpp

@@ -2,11 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_properties.hpp"
+
 #include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_sequence_no.h>
 
 #include <azure_uamqp_c/amqp_definitions_properties.h>
+
 #include <iomanip>
 #include <iostream>
 #include <sstream>

sdk/core/azure-core-amqp/src/models/amqp_value.cpp

@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_value.hpp"
+
 #include "azure/core/amqp/models/amqp_properties.hpp"
 #include "azure/core/amqp/models/amqp_protocol.hpp"
 
@@ -14,6 +15,7 @@
 #include <azure_uamqp_c/amqp_definitions_properties.h>
 #include <azure_uamqp_c/amqpvalue.h>
 #include <azure_uamqp_c/amqpvalue_to_string.h>
+
 #include <iomanip>
 #include <iostream>
 #include <sstream>

sdk/core/azure-core-amqp/src/models/message_source.cpp

@@ -3,16 +3,17 @@
 
 #include "azure/core/amqp/models/message_source.hpp"
 
+#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
+#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_filter_set.h>
 #include <azure_uamqp_c/amqp_definitions_node_properties.h>
 #include <azure_uamqp_c/amqp_definitions_seconds.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
-#include <azure_uamqp_c/amqpvalue.h>
-#include <iostream>
-
 #include <azure_uamqp_c/amqp_definitions_source.h>
+#include <azure_uamqp_c/amqpvalue.h>
+
+#include <iostream>
 
 void Azure::Core::_internal::UniqueHandleHelper<SOURCE_INSTANCE_TAG>::FreeMessageSource(
     SOURCE_HANDLE value)

sdk/core/azure-core-amqp/src/models/message_target.cpp

@@ -3,16 +3,17 @@
 
 #include "azure/core/amqp/models/message_target.hpp"
 
+#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
+#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_filter_set.h>
 #include <azure_uamqp_c/amqp_definitions_node_properties.h>
 #include <azure_uamqp_c/amqp_definitions_seconds.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
-#include <azure_uamqp_c/amqpvalue.h>
-#include <iostream>
-
 #include <azure_uamqp_c/amqp_definitions_target.h>
+#include <azure_uamqp_c/amqpvalue.h>
+
+#include <iostream>
 
 void Azure::Core::_internal::UniqueHandleHelper<TARGET_INSTANCE_TAG>::FreeMessageTarget(
     TARGET_HANDLE value)

sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp

@@ -8,6 +8,7 @@
 #include <azure_c_shared_utility/socketio.h>
 #include <azure_uamqp_c/header_detect_io.h>
 #include <azure_uamqp_c/socket_listener.h>
+
 #include <exception>
 #include <memory>
 #include <stdexcept>

sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp

@@ -3,8 +3,11 @@
 
 #pragma once
 #include "azure/core/amqp/common/async_operation_queue.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <azure_c_shared_utility/xio.h>
+
 #include <exception>
 #include <functional>
 #include <stdexcept>

sdk/core/azure-core-amqp/src/network/sasl_transport.cpp

@@ -3,8 +3,10 @@
 
 // LCOV_EXCL_START
 #include "azure/core/amqp/network/sasl_transport.hpp"
+
 #include "azure/core/amqp/network/tls_transport.hpp"
 #include "private/transport_impl.hpp"
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/socketio.h>
 #include <azure_c_shared_utility/tlsio.h>