From c5438d623bd95d9bae3256aa1a4c11ceed6c097d Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Tue, 25 Aug 2020 20:08:34 -0700 Subject: [PATCH] Restructure the azure inc folder (#514) * Restructure the azure inc folder --- sdk/core/azure-core/inc/{ => azure/core}/azure.hpp | 2 +- sdk/core/azure-core/inc/{ => azure/core}/context.hpp | 0 .../inc/{ => azure/core}/credentials/credentials.hpp | 2 +- .../{ => azure/core}/credentials/policy/policies.hpp | 4 ++-- .../inc/{ => azure/core}/http/body_stream.hpp | 3 ++- .../inc/{ => azure/core}/http/curl/curl.hpp | 4 ++-- .../azure-core/inc/{ => azure/core}/http/http.hpp | 4 ++-- .../inc/{ => azure/core}/http/pipeline.hpp | 8 ++++---- .../azure-core/inc/{ => azure/core}/http/policy.hpp | 12 ++++++------ .../inc/{ => azure/core}/http/transport.hpp | 4 ++-- .../core}/http/winhttp/win_http_client.hpp | 4 ++-- .../inc/{ => azure/core}/internal/contract.hpp | 0 .../azure-core/inc/{ => azure/core}/internal/log.hpp | 2 +- .../inc/{ => azure/core}/logging/logging.hpp | 2 +- .../azure-core/inc/{ => azure/core}/nullable.hpp | 0 .../azure-core/inc/{ => azure/core}/response.hpp | 2 +- sdk/core/azure-core/inc/{ => azure/core}/uuid.hpp | 0 sdk/core/azure-core/src/context.cpp | 2 +- sdk/core/azure-core/src/credentials/credentials.cpp | 10 +++++----- .../azure-core/src/credentials/policy/policies.cpp | 2 +- sdk/core/azure-core/src/http/body_stream.cpp | 5 +++-- sdk/core/azure-core/src/http/curl/curl.cpp | 9 +++++---- sdk/core/azure-core/src/http/logging_policy.cpp | 5 ++--- sdk/core/azure-core/src/http/policy.cpp | 4 ++-- sdk/core/azure-core/src/http/raw_response.cpp | 5 ++--- sdk/core/azure-core/src/http/request.cpp | 4 ++-- sdk/core/azure-core/src/http/retry_policy.cpp | 4 ++-- sdk/core/azure-core/src/http/telemetry_policy.cpp | 2 +- sdk/core/azure-core/src/http/transport_policy.cpp | 2 +- sdk/core/azure-core/src/http/url.cpp | 2 +- .../src/http/winhttp/win_http_transport.cpp | 6 +++--- sdk/core/azure-core/src/logging/logging.cpp | 4 ++-- sdk/core/azure-core/src/strings.cpp | 2 +- .../azure_core_storage_list_containers_sample.cpp | 6 +++--- .../test/e2e/azure_core_storage_test_sample.cpp | 6 +++--- .../test/e2e/azure_core_with_curl_bodyBuffer.cpp | 7 ++++--- .../test/e2e/azure_core_with_curl_bodyStream.cpp | 6 +++--- sdk/core/azure-core/test/ut/context.cpp | 2 +- sdk/core/azure-core/test/ut/file_upload.cpp | 5 +++-- sdk/core/azure-core/test/ut/http.cpp | 2 +- sdk/core/azure-core/test/ut/logging.cpp | 6 +++--- sdk/core/azure-core/test/ut/nullable.cpp | 2 +- sdk/core/azure-core/test/ut/string.cpp | 2 +- sdk/core/azure-core/test/ut/telemetry_policy.cpp | 4 ++-- sdk/core/azure-core/test/ut/transport_adapter.cpp | 4 ++-- sdk/core/azure-core/test/ut/transport_adapter.hpp | 8 ++++---- sdk/core/azure-core/test/ut/uuid.cpp | 2 +- sdk/storage/inc/blobs/append_blob_client.hpp | 2 +- sdk/storage/inc/blobs/blob_client.hpp | 2 +- sdk/storage/inc/blobs/blob_container_client.hpp | 2 +- sdk/storage/inc/blobs/blob_sas_builder.hpp | 2 +- sdk/storage/inc/blobs/blob_service_client.hpp | 2 +- sdk/storage/inc/blobs/block_blob_client.hpp | 2 +- sdk/storage/inc/blobs/page_blob_client.hpp | 2 +- sdk/storage/inc/blobs/protocol/blob_rest_client.hpp | 10 +++++----- sdk/storage/inc/common/access_conditions.hpp | 2 +- sdk/storage/inc/common/account_sas_builder.hpp | 2 +- sdk/storage/inc/common/reliable_stream.hpp | 4 ++-- sdk/storage/inc/common/shared_key_policy.hpp | 2 +- sdk/storage/inc/common/storage_error.hpp | 2 +- sdk/storage/inc/common/storage_per_retry_policy.hpp | 2 +- .../inc/datalake/datalake_directory_client.hpp | 6 +++--- sdk/storage/inc/datalake/datalake_file_client.hpp | 6 +++--- .../inc/datalake/datalake_file_system_client.hpp | 6 +++--- sdk/storage/inc/datalake/datalake_options.hpp | 2 +- sdk/storage/inc/datalake/datalake_path_client.hpp | 6 +++--- sdk/storage/inc/datalake/datalake_service_client.hpp | 6 +++--- .../inc/datalake/protocol/datalake_rest_client.hpp | 8 ++++---- .../inc/shares/protocol/share_rest_client.hpp | 8 ++++---- sdk/storage/inc/shares/share_client.hpp | 6 +++--- sdk/storage/inc/shares/share_directory_client.hpp | 6 +++--- sdk/storage/inc/shares/share_file_client.hpp | 6 +++--- sdk/storage/inc/shares/share_options.hpp | 2 +- sdk/storage/inc/shares/share_service_client.hpp | 6 +++--- sdk/storage/src/blobs/blob_client.cpp | 4 ++-- sdk/storage/src/blobs/blob_container_client.cpp | 4 ++-- sdk/storage/src/blobs/blob_service_client.cpp | 4 ++-- sdk/storage/src/common/reliable_stream.cpp | 2 +- sdk/storage/src/common/storage_common.cpp | 2 +- sdk/storage/src/common/storage_error.cpp | 2 +- .../src/datalake/datalake_directory_client.cpp | 4 ++-- sdk/storage/src/datalake/datalake_file_client.cpp | 4 ++-- .../src/datalake/datalake_file_system_client.cpp | 4 ++-- sdk/storage/src/datalake/datalake_path_client.cpp | 4 ++-- sdk/storage/src/datalake/datalake_service_client.cpp | 4 ++-- sdk/storage/src/shares/share_client.cpp | 4 ++-- sdk/storage/src/shares/share_directory_client.cpp | 4 ++-- sdk/storage/src/shares/share_file_client.cpp | 4 ++-- sdk/storage/src/shares/share_service_client.cpp | 4 ++-- sdk/storage/test/common/bearer_token_test.cpp | 2 +- sdk/storage/test/test_base.hpp | 2 +- 91 files changed, 178 insertions(+), 175 deletions(-) rename sdk/core/azure-core/inc/{ => azure/core}/azure.hpp (90%) rename sdk/core/azure-core/inc/{ => azure/core}/context.hpp (100%) rename sdk/core/azure-core/inc/{ => azure/core}/credentials/credentials.hpp (98%) rename sdk/core/azure-core/inc/{ => azure/core}/credentials/policy/policies.hpp (95%) rename sdk/core/azure-core/inc/{ => azure/core}/http/body_stream.hpp (99%) rename sdk/core/azure-core/inc/{ => azure/core}/http/curl/curl.hpp (99%) rename sdk/core/azure-core/inc/{ => azure/core}/http/http.hpp (99%) rename sdk/core/azure-core/inc/{ => azure/core}/http/pipeline.hpp (89%) rename sdk/core/azure-core/inc/{ => azure/core}/http/policy.hpp (95%) rename sdk/core/azure-core/inc/{ => azure/core}/http/transport.hpp (92%) rename sdk/core/azure-core/inc/{ => azure/core}/http/winhttp/win_http_client.hpp (86%) rename sdk/core/azure-core/inc/{ => azure/core}/internal/contract.hpp (100%) rename sdk/core/azure-core/inc/{ => azure/core}/internal/log.hpp (89%) rename sdk/core/azure-core/inc/{ => azure/core}/logging/logging.hpp (98%) rename sdk/core/azure-core/inc/{ => azure/core}/nullable.hpp (100%) rename sdk/core/azure-core/inc/{ => azure/core}/response.hpp (96%) rename sdk/core/azure-core/inc/{ => azure/core}/uuid.hpp (100%) diff --git a/sdk/core/azure-core/inc/azure.hpp b/sdk/core/azure-core/inc/azure/core/azure.hpp similarity index 90% rename from sdk/core/azure-core/inc/azure.hpp rename to sdk/core/azure-core/inc/azure/core/azure.hpp index 18779bfd5..13614b824 100644 --- a/sdk/core/azure-core/inc/azure.hpp +++ b/sdk/core/azure-core/inc/azure/core/azure.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #define AZURE_UNREFERENCED_PARAMETER(x) ((void)(x)); diff --git a/sdk/core/azure-core/inc/context.hpp b/sdk/core/azure-core/inc/azure/core/context.hpp similarity index 100% rename from sdk/core/azure-core/inc/context.hpp rename to sdk/core/azure-core/inc/azure/core/context.hpp diff --git a/sdk/core/azure-core/inc/credentials/credentials.hpp b/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp similarity index 98% rename from sdk/core/azure-core/inc/credentials/credentials.hpp rename to sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp index 7d47db66e..7db28ad15 100644 --- a/sdk/core/azure-core/inc/credentials/credentials.hpp +++ b/sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include "azure/core/context.hpp" #include #include diff --git a/sdk/core/azure-core/inc/credentials/policy/policies.hpp b/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp similarity index 95% rename from sdk/core/azure-core/inc/credentials/policy/policies.hpp rename to sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp index 34715a1b8..14ee4db9a 100644 --- a/sdk/core/azure-core/inc/credentials/policy/policies.hpp +++ b/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/sdk/core/azure-core/inc/http/body_stream.hpp b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp similarity index 99% rename from sdk/core/azure-core/inc/http/body_stream.hpp rename to sdk/core/azure-core/inc/azure/core/http/body_stream.hpp index b24bad690..9b1a79f76 100644 --- a/sdk/core/azure-core/inc/http/body_stream.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp @@ -15,8 +15,9 @@ #include #endif // Windows +#include + #include -#include #include #include #include diff --git a/sdk/core/azure-core/inc/http/curl/curl.hpp b/sdk/core/azure-core/inc/azure/core/http/curl/curl.hpp similarity index 99% rename from sdk/core/azure-core/inc/http/curl/curl.hpp rename to sdk/core/azure-core/inc/azure/core/http/curl/curl.hpp index ceb3f7eb3..0f54205ae 100644 --- a/sdk/core/azure-core/inc/http/curl/curl.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/curl/curl.hpp @@ -5,8 +5,8 @@ #pragma once -#include "http/http.hpp" -#include "http/policy.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/policy.hpp" #include #include diff --git a/sdk/core/azure-core/inc/http/http.hpp b/sdk/core/azure-core/inc/azure/core/http/http.hpp similarity index 99% rename from sdk/core/azure-core/inc/http/http.hpp rename to sdk/core/azure-core/inc/azure/core/http/http.hpp index a14389d08..13ebefd36 100644 --- a/sdk/core/azure-core/inc/http/http.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/http.hpp @@ -3,10 +3,10 @@ #pragma once -#include "body_stream.hpp" +#include "azure/core/http/body_stream.hpp" +#include "azure/core/internal/contract.hpp" #include -#include #include #include #include diff --git a/sdk/core/azure-core/inc/http/pipeline.hpp b/sdk/core/azure-core/inc/azure/core/http/pipeline.hpp similarity index 89% rename from sdk/core/azure-core/inc/http/pipeline.hpp rename to sdk/core/azure-core/inc/azure/core/http/pipeline.hpp index c0bd9b039..6f0da8c87 100644 --- a/sdk/core/azure-core/inc/http/pipeline.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/pipeline.hpp @@ -3,10 +3,10 @@ #pragma once -#include "context.hpp" -#include "http.hpp" -#include "policy.hpp" -#include "transport.hpp" +#include "azure/core/context.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/policy.hpp" +#include "azure/core/http/transport.hpp" #include diff --git a/sdk/core/azure-core/inc/http/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policy.hpp similarity index 95% rename from sdk/core/azure-core/inc/http/policy.hpp rename to sdk/core/azure-core/inc/azure/core/http/policy.hpp index c6d1f95aa..8e68ae3b5 100644 --- a/sdk/core/azure-core/inc/http/policy.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/policy.hpp @@ -3,12 +3,12 @@ #pragma once -#include "azure.hpp" -#include "context.hpp" -#include "http.hpp" -#include "logging/logging.hpp" -#include "transport.hpp" -#include "uuid.hpp" +#include "azure/core/azure.hpp" +#include "azure/core/context.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/transport.hpp" +#include "azure/core/logging/logging.hpp" +#include "azure/core/uuid.hpp" #include #include diff --git a/sdk/core/azure-core/inc/http/transport.hpp b/sdk/core/azure-core/inc/azure/core/http/transport.hpp similarity index 92% rename from sdk/core/azure-core/inc/http/transport.hpp rename to sdk/core/azure-core/inc/azure/core/http/transport.hpp index 3dde66310..a36bfc3af 100644 --- a/sdk/core/azure-core/inc/http/transport.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/transport.hpp @@ -3,8 +3,8 @@ #pragma once -#include "context.hpp" -#include "http.hpp" +#include "azure/core/context.hpp" +#include "azure/core/http/http.hpp" namespace Azure { namespace Core { namespace Http { diff --git a/sdk/core/azure-core/inc/http/winhttp/win_http_client.hpp b/sdk/core/azure-core/inc/azure/core/http/winhttp/win_http_client.hpp similarity index 86% rename from sdk/core/azure-core/inc/http/winhttp/win_http_client.hpp rename to sdk/core/azure-core/inc/azure/core/http/winhttp/win_http_client.hpp index 8770b2131..0fd8779e8 100644 --- a/sdk/core/azure-core/inc/http/winhttp/win_http_client.hpp +++ b/sdk/core/azure-core/inc/azure/core/http/winhttp/win_http_client.hpp @@ -5,8 +5,8 @@ #pragma once -#include "http/http.hpp" -#include "http/policy.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/policy.hpp" #include #include diff --git a/sdk/core/azure-core/inc/internal/contract.hpp b/sdk/core/azure-core/inc/azure/core/internal/contract.hpp similarity index 100% rename from sdk/core/azure-core/inc/internal/contract.hpp rename to sdk/core/azure-core/inc/azure/core/internal/contract.hpp diff --git a/sdk/core/azure-core/inc/internal/log.hpp b/sdk/core/azure-core/inc/azure/core/internal/log.hpp similarity index 89% rename from sdk/core/azure-core/inc/internal/log.hpp rename to sdk/core/azure-core/inc/azure/core/internal/log.hpp index c020870c7..28a99bf16 100644 --- a/sdk/core/azure-core/inc/internal/log.hpp +++ b/sdk/core/azure-core/inc/azure/core/internal/log.hpp @@ -3,7 +3,7 @@ #pragma once -#include "logging/logging.hpp" +#include "azure/core/logging/logging.hpp" namespace Azure { namespace Core { namespace Logging { namespace Details { bool ShouldWrite(LogClassification const& classification); diff --git a/sdk/core/azure-core/inc/logging/logging.hpp b/sdk/core/azure-core/inc/azure/core/logging/logging.hpp similarity index 98% rename from sdk/core/azure-core/inc/logging/logging.hpp rename to sdk/core/azure-core/inc/azure/core/logging/logging.hpp index d2d13902d..5b48f3c94 100644 --- a/sdk/core/azure-core/inc/logging/logging.hpp +++ b/sdk/core/azure-core/inc/azure/core/logging/logging.hpp @@ -3,7 +3,7 @@ #pragma once -#include "azure.hpp" +#include "azure/core/azure.hpp" #include #include diff --git a/sdk/core/azure-core/inc/nullable.hpp b/sdk/core/azure-core/inc/azure/core/nullable.hpp similarity index 100% rename from sdk/core/azure-core/inc/nullable.hpp rename to sdk/core/azure-core/inc/azure/core/nullable.hpp diff --git a/sdk/core/azure-core/inc/response.hpp b/sdk/core/azure-core/inc/azure/core/response.hpp similarity index 96% rename from sdk/core/azure-core/inc/response.hpp rename to sdk/core/azure-core/inc/azure/core/response.hpp index 3a36b8bb3..619c77356 100644 --- a/sdk/core/azure-core/inc/response.hpp +++ b/sdk/core/azure-core/inc/azure/core/response.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace Azure { namespace Core { diff --git a/sdk/core/azure-core/inc/uuid.hpp b/sdk/core/azure-core/inc/azure/core/uuid.hpp similarity index 100% rename from sdk/core/azure-core/inc/uuid.hpp rename to sdk/core/azure-core/inc/azure/core/uuid.hpp diff --git a/sdk/core/azure-core/src/context.cpp b/sdk/core/azure-core/src/context.cpp index 9b5ebd01d..2f59b1d0c 100644 --- a/sdk/core/azure-core/src/context.cpp +++ b/sdk/core/azure-core/src/context.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include using namespace Azure::Core; using time_point = std::chrono::system_clock::time_point; diff --git a/sdk/core/azure-core/src/credentials/credentials.cpp b/sdk/core/azure-core/src/credentials/credentials.cpp index 5bc3a5afe..2573f600e 100644 --- a/sdk/core/azure-core/src/credentials/credentials.cpp +++ b/sdk/core/azure-core/src/credentials/credentials.cpp @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core/src/credentials/policy/policies.cpp b/sdk/core/azure-core/src/credentials/policy/policies.cpp index 6bdc584d4..f06d5c06d 100644 --- a/sdk/core/azure-core/src/credentials/policy/policies.cpp +++ b/sdk/core/azure-core/src/credentials/policy/policies.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include using namespace Azure::Core::Credentials::Policy; diff --git a/sdk/core/azure-core/src/http/body_stream.cpp b/sdk/core/azure-core/src/http/body_stream.cpp index 6148d28a0..2a797fe0a 100644 --- a/sdk/core/azure-core/src/http/body_stream.cpp +++ b/sdk/core/azure-core/src/http/body_stream.cpp @@ -12,12 +12,13 @@ #include #endif // Windows +#include +#include + #include -#include #include #include #include -#include #include #include #include diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp index 8aa9daa7e..e4f5a25b0 100644 --- a/sdk/core/azure-core/src/http/curl/curl.cpp +++ b/sdk/core/azure-core/src/http/curl/curl.cpp @@ -1,8 +1,9 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// SPDX-License-Identifier: MIT -#include "http/curl/curl.hpp" - -#include "azure.hpp" -#include "http/http.hpp" +#include "azure/core/azure.hpp" +#include "azure/core/http/curl/curl.hpp" +#include "azure/core/http/http.hpp" #include diff --git a/sdk/core/azure-core/src/http/logging_policy.cpp b/sdk/core/azure-core/src/http/logging_policy.cpp index 4ef5e2503..fcf80cd77 100644 --- a/sdk/core/azure-core/src/http/logging_policy.cpp +++ b/sdk/core/azure-core/src/http/logging_policy.cpp @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include - -#include +#include +#include #include #include diff --git a/sdk/core/azure-core/src/http/policy.cpp b/sdk/core/azure-core/src/http/policy.cpp index 9dddc4f69..30b2d746c 100644 --- a/sdk/core/azure-core/src/http/policy.cpp +++ b/sdk/core/azure-core/src/http/policy.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include -#include +#include +#include using namespace Azure::Core::Http; diff --git a/sdk/core/azure-core/src/http/raw_response.cpp b/sdk/core/azure-core/src/http/raw_response.cpp index d42c0edad..b23fce31c 100644 --- a/sdk/core/azure-core/src/http/raw_response.cpp +++ b/sdk/core/azure-core/src/http/raw_response.cpp @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include -#include -#include +#include +#include #include #include diff --git a/sdk/core/azure-core/src/http/request.cpp b/sdk/core/azure-core/src/http/request.cpp index 3d82a15f5..6688aa82f 100644 --- a/sdk/core/azure-core/src/http/request.cpp +++ b/sdk/core/azure-core/src/http/request.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include -#include +#include +#include #include #include #include diff --git a/sdk/core/azure-core/src/http/retry_policy.cpp b/sdk/core/azure-core/src/http/retry_policy.cpp index 3414390c1..0792829d0 100644 --- a/sdk/core/azure-core/src/http/retry_policy.cpp +++ b/sdk/core/azure-core/src/http/retry_policy.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include -#include +#include #include #include diff --git a/sdk/core/azure-core/src/http/telemetry_policy.cpp b/sdk/core/azure-core/src/http/telemetry_policy.cpp index 4e174c119..96b07028a 100644 --- a/sdk/core/azure-core/src/http/telemetry_policy.cpp +++ b/sdk/core/azure-core/src/http/telemetry_policy.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include #include diff --git a/sdk/core/azure-core/src/http/transport_policy.cpp b/sdk/core/azure-core/src/http/transport_policy.cpp index 6b793818f..6419d4ed3 100644 --- a/sdk/core/azure-core/src/http/transport_policy.cpp +++ b/sdk/core/azure-core/src/http/transport_policy.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include using namespace Azure::Core::Http; diff --git a/sdk/core/azure-core/src/http/url.cpp b/sdk/core/azure-core/src/http/url.cpp index 9205ef19e..479d167fc 100644 --- a/sdk/core/azure-core/src/http/url.cpp +++ b/sdk/core/azure-core/src/http/url.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include +#include using namespace Azure::Core::Http; diff --git a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp index 00cd2e015..297828529 100644 --- a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp +++ b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "azure.hpp" -#include "http/http.hpp" -#include "http/winhttp/win_http_client.hpp" +#include "azure/core/azure.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/winhttp/win_http_client.hpp" #include diff --git a/sdk/core/azure-core/src/logging/logging.cpp b/sdk/core/azure-core/src/logging/logging.cpp index a61400f9c..e63785464 100644 --- a/sdk/core/azure-core/src/logging/logging.cpp +++ b/sdk/core/azure-core/src/logging/logging.cpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "logging/logging.hpp" -#include "internal/log.hpp" +#include "azure/core/logging/logging.hpp" +#include "azure/core/internal/log.hpp" #include diff --git a/sdk/core/azure-core/src/strings.cpp b/sdk/core/azure-core/src/strings.cpp index 8aae4a745..64a1b6967 100644 --- a/sdk/core/azure-core/src/strings.cpp +++ b/sdk/core/azure-core/src/strings.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include -#include +#include namespace { // The locale invariant case table is generated with the following program diff --git a/sdk/core/azure-core/test/e2e/azure_core_storage_list_containers_sample.cpp b/sdk/core/azure-core/test/e2e/azure_core_storage_list_containers_sample.cpp index 6f08672f3..164685998 100644 --- a/sdk/core/azure-core/test/e2e/azure_core_storage_list_containers_sample.cpp +++ b/sdk/core/azure-core/test/e2e/azure_core_storage_list_containers_sample.cpp @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "http/pipeline.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/pipeline.hpp" +#include "azure/core/http/curl/curl.hpp" #include -#include -#include #include #include #include diff --git a/sdk/core/azure-core/test/e2e/azure_core_storage_test_sample.cpp b/sdk/core/azure-core/test/e2e/azure_core_storage_test_sample.cpp index f9782ec62..bd4529e1b 100644 --- a/sdk/core/azure-core/test/e2e/azure_core_storage_test_sample.cpp +++ b/sdk/core/azure-core/test/e2e/azure_core_storage_test_sample.cpp @@ -5,11 +5,11 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "http/pipeline.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/pipeline.hpp" +#include "azure/core/http/curl/curl.hpp" #include -#include -#include #include #include #include diff --git a/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyBuffer.cpp b/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyBuffer.cpp index 8cb3cb8b8..9e490e0f1 100644 --- a/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyBuffer.cpp +++ b/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyBuffer.cpp @@ -6,7 +6,7 @@ * */ -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #ifdef POSIX #include @@ -18,8 +18,9 @@ #include #endif // Windows -#include -#include +#include +#include + #include #include diff --git a/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyStream.cpp b/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyStream.cpp index 664da2988..f9769fb67 100644 --- a/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyStream.cpp +++ b/sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyStream.cpp @@ -7,11 +7,11 @@ * */ -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" +#include +#include #include -#include -#include #include #include #include diff --git a/sdk/core/azure-core/test/ut/context.cpp b/sdk/core/azure-core/test/ut/context.cpp index ca76ad5e7..f6a8e08d9 100644 --- a/sdk/core/azure-core/test/ut/context.cpp +++ b/sdk/core/azure-core/test/ut/context.cpp @@ -3,7 +3,7 @@ #include "gtest/gtest.h" -#include "context.hpp" +#include "azure/core/context.hpp" #include #include diff --git a/sdk/core/azure-core/test/ut/file_upload.cpp b/sdk/core/azure-core/test/ut/file_upload.cpp index eb44dc797..6b83af6ab 100644 --- a/sdk/core/azure-core/test/ut/file_upload.cpp +++ b/sdk/core/azure-core/test/ut/file_upload.cpp @@ -11,9 +11,10 @@ #include #endif // Windows +#include "azure/core/http/http.hpp" + #include "transport_adapter.hpp" -//#include -#include + #include namespace Azure { namespace Core { namespace Test { diff --git a/sdk/core/azure-core/test/ut/http.cpp b/sdk/core/azure-core/test/ut/http.cpp index 2a340eedb..0ceb353ba 100644 --- a/sdk/core/azure-core/test/ut/http.cpp +++ b/sdk/core/azure-core/test/ut/http.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/logging.cpp b/sdk/core/azure-core/test/ut/logging.cpp index 162b3cb97..a2dc16f2b 100644 --- a/sdk/core/azure-core/test/ut/logging.cpp +++ b/sdk/core/azure-core/test/ut/logging.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/nullable.cpp b/sdk/core/azure-core/test/ut/nullable.cpp index 272869bfc..8db42bae5 100644 --- a/sdk/core/azure-core/test/ut/nullable.cpp +++ b/sdk/core/azure-core/test/ut/nullable.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/string.cpp b/sdk/core/azure-core/test/ut/string.cpp index 25ec75598..7476e8fca 100644 --- a/sdk/core/azure-core/test/ut/string.cpp +++ b/sdk/core/azure-core/test/ut/string.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include +#include #include TEST(String, invariantCompare) diff --git a/sdk/core/azure-core/test/ut/telemetry_policy.cpp b/sdk/core/azure-core/test/ut/telemetry_policy.cpp index 27d7e2099..4936208a4 100644 --- a/sdk/core/azure-core/test/ut/telemetry_policy.cpp +++ b/sdk/core/azure-core/test/ut/telemetry_policy.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include -#include +#include +#include using namespace Azure::Core; using namespace Azure::Core::Http; diff --git a/sdk/core/azure-core/test/ut/transport_adapter.cpp b/sdk/core/azure-core/test/ut/transport_adapter.cpp index bdaa90949..5609646e5 100644 --- a/sdk/core/azure-core/test/ut/transport_adapter.cpp +++ b/sdk/core/azure-core/test/ut/transport_adapter.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: MIT #include "transport_adapter.hpp" -#include -#include +#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/transport_adapter.hpp b/sdk/core/azure-core/test/ut/transport_adapter.hpp index 4915d7724..d5622915f 100644 --- a/sdk/core/azure-core/test/ut/transport_adapter.hpp +++ b/sdk/core/azure-core/test/ut/transport_adapter.hpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sdk/core/azure-core/test/ut/uuid.cpp b/sdk/core/azure-core/test/ut/uuid.cpp index c32599020..566ef21d0 100644 --- a/sdk/core/azure-core/test/ut/uuid.cpp +++ b/sdk/core/azure-core/test/ut/uuid.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "gtest/gtest.h" -#include +#include #include #include diff --git a/sdk/storage/inc/blobs/append_blob_client.hpp b/sdk/storage/inc/blobs/append_blob_client.hpp index 9f716863e..ae65fb483 100644 --- a/sdk/storage/inc/blobs/append_blob_client.hpp +++ b/sdk/storage/inc/blobs/append_blob_client.hpp @@ -6,7 +6,7 @@ #include "blob_options.hpp" #include "blobs/blob_client.hpp" #include "common/storage_credential.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/blob_client.hpp b/sdk/storage/inc/blobs/blob_client.hpp index 074268b9d..66751b3c8 100644 --- a/sdk/storage/inc/blobs/blob_client.hpp +++ b/sdk/storage/inc/blobs/blob_client.hpp @@ -7,7 +7,7 @@ #include "blob_responses.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/blob_container_client.hpp b/sdk/storage/inc/blobs/blob_container_client.hpp index bbac1651e..6357475fc 100644 --- a/sdk/storage/inc/blobs/blob_container_client.hpp +++ b/sdk/storage/inc/blobs/blob_container_client.hpp @@ -7,7 +7,7 @@ #include "blobs/blob_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/blob_sas_builder.hpp b/sdk/storage/inc/blobs/blob_sas_builder.hpp index 8a3596e7e..69d368672 100644 --- a/sdk/storage/inc/blobs/blob_sas_builder.hpp +++ b/sdk/storage/inc/blobs/blob_sas_builder.hpp @@ -8,7 +8,7 @@ #include "blobs/blob_responses.hpp" #include "blobs/protocol/blob_rest_client.hpp" #include "common/account_sas_builder.hpp" -#include "nullable.hpp" +#include "azure/core/nullable.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/inc/blobs/blob_service_client.hpp b/sdk/storage/inc/blobs/blob_service_client.hpp index 88ddec281..4743714a9 100644 --- a/sdk/storage/inc/blobs/blob_service_client.hpp +++ b/sdk/storage/inc/blobs/blob_service_client.hpp @@ -7,7 +7,7 @@ #include "blobs/blob_container_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/block_blob_client.hpp b/sdk/storage/inc/blobs/block_blob_client.hpp index 35d71c7ad..71e02eed7 100644 --- a/sdk/storage/inc/blobs/block_blob_client.hpp +++ b/sdk/storage/inc/blobs/block_blob_client.hpp @@ -6,7 +6,7 @@ #include "blob_options.hpp" #include "blobs/blob_client.hpp" #include "common/storage_credential.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/page_blob_client.hpp b/sdk/storage/inc/blobs/page_blob_client.hpp index 32dbcdc44..8eee8c0b1 100644 --- a/sdk/storage/inc/blobs/page_blob_client.hpp +++ b/sdk/storage/inc/blobs/page_blob_client.hpp @@ -7,7 +7,7 @@ #include "blob_responses.hpp" #include "blobs/blob_client.hpp" #include "common/storage_credential.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "protocol/blob_rest_client.hpp" #include diff --git a/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp b/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp index 2cbc64977..52ee5fe91 100644 --- a/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp +++ b/sdk/storage/inc/blobs/protocol/blob_rest_client.hpp @@ -6,11 +6,11 @@ #include "common/storage_common.hpp" #include "common/storage_error.hpp" #include "common/xml_wrapper.hpp" -#include "context.hpp" -#include "http/http.hpp" -#include "http/pipeline.hpp" -#include "nullable.hpp" -#include "response.hpp" +#include "azure/core/context.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/pipeline.hpp" +#include "azure/core/nullable.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/common/access_conditions.hpp b/sdk/storage/inc/common/access_conditions.hpp index 77663125b..33dbeec05 100644 --- a/sdk/storage/inc/common/access_conditions.hpp +++ b/sdk/storage/inc/common/access_conditions.hpp @@ -3,7 +3,7 @@ #pragma once -#include "nullable.hpp" +#include "azure/core/nullable.hpp" #include diff --git a/sdk/storage/inc/common/account_sas_builder.hpp b/sdk/storage/inc/common/account_sas_builder.hpp index 7dea6e5fb..e72c38f9d 100644 --- a/sdk/storage/inc/common/account_sas_builder.hpp +++ b/sdk/storage/inc/common/account_sas_builder.hpp @@ -7,7 +7,7 @@ #include "common/constants.hpp" #include "common/storage_credential.hpp" -#include "nullable.hpp" +#include "azure/core/nullable.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/inc/common/reliable_stream.hpp b/sdk/storage/inc/common/reliable_stream.hpp index dd14421d9..8afc1054d 100644 --- a/sdk/storage/inc/common/reliable_stream.hpp +++ b/sdk/storage/inc/common/reliable_stream.hpp @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // SPDX-License-Identifier: MIT -#include "context.hpp" -#include "http/body_stream.hpp" +#include "azure/core/context.hpp" +#include "azure/core/http/body_stream.hpp" #include #include diff --git a/sdk/storage/inc/common/shared_key_policy.hpp b/sdk/storage/inc/common/shared_key_policy.hpp index b24a390fa..c4f3421f6 100644 --- a/sdk/storage/inc/common/shared_key_policy.hpp +++ b/sdk/storage/inc/common/shared_key_policy.hpp @@ -4,7 +4,7 @@ #pragma once #include "common/storage_credential.hpp" -#include "http/policy.hpp" +#include "azure/core/http/policy.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/inc/common/storage_error.hpp b/sdk/storage/inc/common/storage_error.hpp index e1587c58b..f7ea192a2 100644 --- a/sdk/storage/inc/common/storage_error.hpp +++ b/sdk/storage/inc/common/storage_error.hpp @@ -3,7 +3,7 @@ #pragma once -#include "http/http.hpp" +#include "azure/core/http/http.hpp" #include #include diff --git a/sdk/storage/inc/common/storage_per_retry_policy.hpp b/sdk/storage/inc/common/storage_per_retry_policy.hpp index 758e191c4..daa20187e 100644 --- a/sdk/storage/inc/common/storage_per_retry_policy.hpp +++ b/sdk/storage/inc/common/storage_per_retry_policy.hpp @@ -3,7 +3,7 @@ #pragma once -#include "http/policy.hpp" +#include "azure/core/http/policy.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/inc/datalake/datalake_directory_client.hpp b/sdk/storage/inc/datalake/datalake_directory_client.hpp index 8611a0603..e860dcae4 100644 --- a/sdk/storage/inc/datalake/datalake_directory_client.hpp +++ b/sdk/storage/inc/datalake/datalake_directory_client.hpp @@ -5,13 +5,13 @@ #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "datalake/datalake_path_client.hpp" #include "datalake_options.hpp" #include "datalake_responses.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/datalake_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_file_client.hpp b/sdk/storage/inc/datalake/datalake_file_client.hpp index 179f0fcc3..e45099e90 100644 --- a/sdk/storage/inc/datalake/datalake_file_client.hpp +++ b/sdk/storage/inc/datalake/datalake_file_client.hpp @@ -6,13 +6,13 @@ #include "blobs/block_blob_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "datalake/datalake_path_client.hpp" #include "datalake_options.hpp" #include "datalake_responses.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/datalake_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_file_system_client.hpp b/sdk/storage/inc/datalake/datalake_file_system_client.hpp index f3d1b6a0d..742528657 100644 --- a/sdk/storage/inc/datalake/datalake_file_system_client.hpp +++ b/sdk/storage/inc/datalake/datalake_file_system_client.hpp @@ -6,13 +6,13 @@ #include "blobs/blob_container_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "datalake/datalake_service_client.hpp" #include "datalake_options.hpp" #include "datalake_responses.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/datalake_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_options.hpp b/sdk/storage/inc/datalake/datalake_options.hpp index 5207642b1..950dc6a7f 100644 --- a/sdk/storage/inc/datalake/datalake_options.hpp +++ b/sdk/storage/inc/datalake/datalake_options.hpp @@ -5,7 +5,7 @@ #include "blobs/blob_options.hpp" #include "common/access_conditions.hpp" -#include "nullable.hpp" +#include "azure/core/nullable.hpp" #include "protocol/datalake_rest_client.hpp" #include diff --git a/sdk/storage/inc/datalake/datalake_path_client.hpp b/sdk/storage/inc/datalake/datalake_path_client.hpp index 7d48d6afd..072f9a8f6 100644 --- a/sdk/storage/inc/datalake/datalake_path_client.hpp +++ b/sdk/storage/inc/datalake/datalake_path_client.hpp @@ -6,13 +6,13 @@ #include "blobs/blob_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "datalake/datalake_file_system_client.hpp" #include "datalake_options.hpp" #include "datalake_responses.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/datalake_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/datalake/datalake_service_client.hpp b/sdk/storage/inc/datalake/datalake_service_client.hpp index 6a02fe1e5..4405accf9 100644 --- a/sdk/storage/inc/datalake/datalake_service_client.hpp +++ b/sdk/storage/inc/datalake/datalake_service_client.hpp @@ -6,12 +6,12 @@ #include "blobs/blob_service_client.hpp" #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "datalake_options.hpp" #include "datalake_responses.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/datalake_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp index 5781eb156..b6d8a3831 100644 --- a/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp +++ b/sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp @@ -6,11 +6,11 @@ #include "common/storage_common.hpp" #include "common/storage_error.hpp" -#include "http/http.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/pipeline.hpp" #include "json.hpp" -#include "nullable.hpp" -#include "response.hpp" +#include "azure/core/nullable.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/shares/protocol/share_rest_client.hpp b/sdk/storage/inc/shares/protocol/share_rest_client.hpp index f35029492..a7f36941c 100644 --- a/sdk/storage/inc/shares/protocol/share_rest_client.hpp +++ b/sdk/storage/inc/shares/protocol/share_rest_client.hpp @@ -7,11 +7,11 @@ #include "common/storage_common.hpp" #include "common/storage_error.hpp" #include "common/xml_wrapper.hpp" -#include "http/http.hpp" -#include "http/pipeline.hpp" +#include "azure/core/http/http.hpp" +#include "azure/core/http/pipeline.hpp" #include "json.hpp" -#include "nullable.hpp" -#include "response.hpp" +#include "azure/core/nullable.hpp" +#include "azure/core/response.hpp" #include #include diff --git a/sdk/storage/inc/shares/share_client.hpp b/sdk/storage/inc/shares/share_client.hpp index 04f10a061..30e3f62d9 100644 --- a/sdk/storage/inc/shares/share_client.hpp +++ b/sdk/storage/inc/shares/share_client.hpp @@ -5,10 +5,10 @@ #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" -#include "http/pipeline.hpp" +#include "azure/core/credentials/credentials.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/share_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include "share_options.hpp" #include "share_responses.hpp" #include "shares/share_service_client.hpp" diff --git a/sdk/storage/inc/shares/share_directory_client.hpp b/sdk/storage/inc/shares/share_directory_client.hpp index 2ba156464..6525f7a72 100644 --- a/sdk/storage/inc/shares/share_directory_client.hpp +++ b/sdk/storage/inc/shares/share_directory_client.hpp @@ -5,10 +5,10 @@ #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" -#include "http/pipeline.hpp" +#include "azure/core/credentials/credentials.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/share_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include "share_client.hpp" #include "share_options.hpp" #include "share_responses.hpp" diff --git a/sdk/storage/inc/shares/share_file_client.hpp b/sdk/storage/inc/shares/share_file_client.hpp index f95aeb8b6..d6f042292 100644 --- a/sdk/storage/inc/shares/share_file_client.hpp +++ b/sdk/storage/inc/shares/share_file_client.hpp @@ -5,10 +5,10 @@ #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" -#include "http/pipeline.hpp" +#include "azure/core/credentials/credentials.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/share_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include "share_client.hpp" #include "share_directory_client.hpp" #include "share_options.hpp" diff --git a/sdk/storage/inc/shares/share_options.hpp b/sdk/storage/inc/shares/share_options.hpp index ac766faaf..de52c97a8 100644 --- a/sdk/storage/inc/shares/share_options.hpp +++ b/sdk/storage/inc/shares/share_options.hpp @@ -4,7 +4,7 @@ #pragma once #include "common/access_conditions.hpp" -#include "nullable.hpp" +#include "azure/core/nullable.hpp" #include "protocol/share_rest_client.hpp" #include "share_responses.hpp" diff --git a/sdk/storage/inc/shares/share_service_client.hpp b/sdk/storage/inc/shares/share_service_client.hpp index 7a48d3826..5c7c811fa 100644 --- a/sdk/storage/inc/shares/share_service_client.hpp +++ b/sdk/storage/inc/shares/share_service_client.hpp @@ -5,10 +5,10 @@ #include "common/storage_credential.hpp" #include "common/storage_uri_builder.hpp" -#include "credentials/credentials.hpp" -#include "http/pipeline.hpp" +#include "azure/core/credentials/credentials.hpp" +#include "azure/core/http/pipeline.hpp" #include "protocol/share_rest_client.hpp" -#include "response.hpp" +#include "azure/core/response.hpp" #include "share_options.hpp" #include "share_responses.hpp" diff --git a/sdk/storage/src/blobs/blob_client.cpp b/sdk/storage/src/blobs/blob_client.cpp index a5004366c..1195d4366 100644 --- a/sdk/storage/src/blobs/blob_client.cpp +++ b/sdk/storage/src/blobs/blob_client.cpp @@ -14,8 +14,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_container_client.cpp b/sdk/storage/src/blobs/blob_container_client.cpp index c6acc3b22..3f44c8246 100644 --- a/sdk/storage/src/blobs/blob_container_client.cpp +++ b/sdk/storage/src/blobs/blob_container_client.cpp @@ -11,8 +11,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/blobs/blob_service_client.cpp b/sdk/storage/src/blobs/blob_service_client.cpp index 952bea1a1..33aba94a9 100644 --- a/sdk/storage/src/blobs/blob_service_client.cpp +++ b/sdk/storage/src/blobs/blob_service_client.cpp @@ -8,8 +8,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" namespace Azure { namespace Storage { namespace Blobs { diff --git a/sdk/storage/src/common/reliable_stream.cpp b/sdk/storage/src/common/reliable_stream.cpp index 6200ee875..1f30c892a 100644 --- a/sdk/storage/src/common/reliable_stream.cpp +++ b/sdk/storage/src/common/reliable_stream.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "common/reliable_stream.hpp" -#include "http/http.hpp" +#include "azure/core/http/http.hpp" using Azure::Core::Context; using Azure::Core::Http::BodyStream; diff --git a/sdk/storage/src/common/storage_common.cpp b/sdk/storage/src/common/storage_common.cpp index 30390517a..a86111a42 100644 --- a/sdk/storage/src/common/storage_common.cpp +++ b/sdk/storage/src/common/storage_common.cpp @@ -3,7 +3,7 @@ #include "common/storage_common.hpp" -#include "uuid.hpp" +#include "azure/core/uuid.hpp" namespace Azure { namespace Storage { diff --git a/sdk/storage/src/common/storage_error.cpp b/sdk/storage/src/common/storage_error.cpp index ed6a51d75..ff38359f1 100644 --- a/sdk/storage/src/common/storage_error.cpp +++ b/sdk/storage/src/common/storage_error.cpp @@ -6,7 +6,7 @@ #include "common/constants.hpp" #include "common/storage_common.hpp" #include "common/xml_wrapper.hpp" -#include "http/policy.hpp" +#include "azure/core/http/policy.hpp" #include "json.hpp" #include diff --git a/sdk/storage/src/datalake/datalake_directory_client.cpp b/sdk/storage/src/datalake/datalake_directory_client.cpp index c98ecab1f..e4e10c019 100644 --- a/sdk/storage/src/datalake/datalake_directory_client.cpp +++ b/sdk/storage/src/datalake/datalake_directory_client.cpp @@ -9,10 +9,10 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" +#include "azure/core/credentials/policy/policies.hpp" #include "datalake/datalake_file_client.hpp" #include "datalake/datalake_utilities.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/http/curl/curl.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_file_client.cpp b/sdk/storage/src/datalake/datalake_file_client.cpp index 3a20a5962..4f5e9d5d9 100644 --- a/sdk/storage/src/datalake/datalake_file_client.cpp +++ b/sdk/storage/src/datalake/datalake_file_client.cpp @@ -9,9 +9,9 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" +#include "azure/core/credentials/policy/policies.hpp" #include "datalake/datalake_utilities.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/http/curl/curl.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_file_system_client.cpp b/sdk/storage/src/datalake/datalake_file_system_client.cpp index 8b2cb61a2..08c69cdd6 100644 --- a/sdk/storage/src/datalake/datalake_file_system_client.cpp +++ b/sdk/storage/src/datalake/datalake_file_system_client.cpp @@ -10,12 +10,12 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" +#include "azure/core/credentials/policy/policies.hpp" #include "datalake/datalake_directory_client.hpp" #include "datalake/datalake_file_client.hpp" #include "datalake/datalake_path_client.hpp" #include "datalake/datalake_utilities.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/http/curl/curl.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace { diff --git a/sdk/storage/src/datalake/datalake_path_client.cpp b/sdk/storage/src/datalake/datalake_path_client.cpp index 4fc0b5acf..10529cf60 100644 --- a/sdk/storage/src/datalake/datalake_path_client.cpp +++ b/sdk/storage/src/datalake/datalake_path_client.cpp @@ -9,9 +9,9 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" +#include "azure/core/credentials/policy/policies.hpp" #include "datalake/datalake_utilities.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/http/curl/curl.hpp" #include #include //std::pair diff --git a/sdk/storage/src/datalake/datalake_service_client.cpp b/sdk/storage/src/datalake/datalake_service_client.cpp index f053ce51f..01e39af93 100644 --- a/sdk/storage/src/datalake/datalake_service_client.cpp +++ b/sdk/storage/src/datalake/datalake_service_client.cpp @@ -10,10 +10,10 @@ #include "common/storage_credential.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" +#include "azure/core/credentials/policy/policies.hpp" #include "datalake/datalake_file_system_client.hpp" #include "datalake/datalake_utilities.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/http/curl/curl.hpp" namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace { diff --git a/sdk/storage/src/shares/share_client.cpp b/sdk/storage/src/shares/share_client.cpp index 79e9c2964..038b2541c 100644 --- a/sdk/storage/src/shares/share_client.cpp +++ b/sdk/storage/src/shares/share_client.cpp @@ -9,8 +9,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" #include "shares/share_directory_client.hpp" #include "shares/share_file_client.hpp" diff --git a/sdk/storage/src/shares/share_directory_client.cpp b/sdk/storage/src/shares/share_directory_client.cpp index 7142c6c3a..7e581e73e 100644 --- a/sdk/storage/src/shares/share_directory_client.cpp +++ b/sdk/storage/src/shares/share_directory_client.cpp @@ -9,8 +9,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" #include "shares/share_file_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/src/shares/share_file_client.cpp b/sdk/storage/src/shares/share_file_client.cpp index e4307089e..b91d2ac7d 100644 --- a/sdk/storage/src/shares/share_file_client.cpp +++ b/sdk/storage/src/shares/share_file_client.cpp @@ -12,8 +12,8 @@ #include "common/storage_common.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" #include "shares/share_constants.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/src/shares/share_service_client.cpp b/sdk/storage/src/shares/share_service_client.cpp index 414b3bef1..2afbf3367 100644 --- a/sdk/storage/src/shares/share_service_client.cpp +++ b/sdk/storage/src/shares/share_service_client.cpp @@ -9,8 +9,8 @@ #include "common/storage_credential.hpp" #include "common/storage_per_retry_policy.hpp" #include "common/storage_version.hpp" -#include "credentials/policy/policies.hpp" -#include "http/curl/curl.hpp" +#include "azure/core/credentials/policy/policies.hpp" +#include "azure/core/http/curl/curl.hpp" #include "shares/share_client.hpp" namespace Azure { namespace Storage { namespace Files { namespace Shares { diff --git a/sdk/storage/test/common/bearer_token_test.cpp b/sdk/storage/test/common/bearer_token_test.cpp index 11bdc3101..927f4445f 100644 --- a/sdk/storage/test/common/bearer_token_test.cpp +++ b/sdk/storage/test/common/bearer_token_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT #include "blobs/blob.hpp" -#include "credentials/credentials.hpp" +#include "azure/core/credentials/credentials.hpp" #include "test_base.hpp" namespace Azure { namespace Storage { namespace Test { diff --git a/sdk/storage/test/test_base.hpp b/sdk/storage/test/test_base.hpp index 4609ef2c4..961af7ee6 100644 --- a/sdk/storage/test/test_base.hpp +++ b/sdk/storage/test/test_base.hpp @@ -3,7 +3,7 @@ #pragma once -#include "http/body_stream.hpp" +#include "azure/core/http/body_stream.hpp" #include "common/constants.hpp"