From d867d7e8ad65bbafb55cc4b3ca8212b6b146858c Mon Sep 17 00:00:00 2001
From: Rick Winter <rick.winter@microsoft.com>
Date: Fri, 25 Sep 2020 10:56:06 -0700
Subject: [PATCH] Standardize header includes (#685)

* Standardize header includes

Update sources to match guidelines

- `#include ""` when file is relative to the project
- `#include <>` when file is external to the project

Updated tests to mirror how a customer will include the header

- `#include <>`
---
 sdk/core/azure-core/inc/azure/core/azure.hpp           |  3 ++-
 .../inc/azure/core/credentials/policy/policies.hpp     |  4 ++--
 .../azure-core/inc/azure/core/http/body_stream.hpp     |  2 +-
 sdk/core/azure-core/inc/azure/core/response.hpp        |  2 +-
 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           |  4 ++--
 sdk/core/azure-core/src/http/logging_policy.cpp        |  4 ++--
 sdk/core/azure-core/src/http/policy.cpp                |  4 ++--
 sdk/core/azure-core/src/http/raw_response.cpp          |  4 ++--
 sdk/core/azure-core/src/http/request.cpp               |  5 +++--
 sdk/core/azure-core/src/http/retry_policy.cpp          |  5 ++---
 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/strings.cpp                    |  3 ++-
 .../e2e/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       |  2 +-
 .../test/e2e/azure_core_with_curl_bodyStream.cpp       |  2 +-
 sdk/core/azure-core/test/ut/context.cpp                |  2 +-
 sdk/core/azure-core/test/ut/http.cpp                   |  2 +-
 sdk/core/azure-core/test/ut/http.hpp                   |  2 +-
 .../test/ut/transport_adapter_file_upload.cpp          |  2 +-
 sdk/template/azure-template/src/template_client.cpp    |  4 ++--
 25 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/sdk/core/azure-core/inc/azure/core/azure.hpp b/sdk/core/azure-core/inc/azure/core/azure.hpp
index 04b12a1e4..c6de367e2 100644
--- a/sdk/core/azure-core/inc/azure/core/azure.hpp
+++ b/sdk/core/azure-core/inc/azure/core/azure.hpp
@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include <azure/core/internal/contract.hpp>
+#include "azure/core/internal/contract.hpp"
+
 #include <string>
 
 /**
diff --git a/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp b/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp
index 81e948960..f3fd1a951 100644
--- a/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp
+++ b/sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <azure/core/credentials/credentials.hpp>
-#include <azure/core/http/policy.hpp>
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/policy.hpp"
 #include <memory>
 #include <mutex>
 #include <string>
diff --git a/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
index 38c0e0759..6f75b8df9 100644
--- a/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
+++ b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
@@ -20,7 +20,7 @@
 #include <Windows.h>
 #endif // Windows
 
-#include <azure/core/context.hpp>
+#include "azure/core/context.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/sdk/core/azure-core/inc/azure/core/response.hpp b/sdk/core/azure-core/inc/azure/core/response.hpp
index c8770f5ac..0db6d6ff4 100644
--- a/sdk/core/azure-core/inc/azure/core/response.hpp
+++ b/sdk/core/azure-core/inc/azure/core/response.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <azure/core/http/http.hpp>
+#include "azure/core/http/http.hpp"
 
 namespace Azure { namespace Core {
   /**
diff --git a/sdk/core/azure-core/src/context.cpp b/sdk/core/azure-core/src/context.cpp
index 2f59b1d0c..20d456716 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 <azure/core/context.hpp>
+#include "azure/core/context.hpp"
 
 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 25dd0fd65..6fa8f4730 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 <azure/core/credentials/credentials.hpp>
-#include <azure/core/http/body_stream.hpp>
-#include <azure/core/http/curl/curl.hpp>
-#include <azure/core/http/http.hpp>
-#include <azure/core/http/pipeline.hpp>
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/body_stream.hpp"
+#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
 
 #include <cstdlib>
 #include <iomanip>
diff --git a/sdk/core/azure-core/src/credentials/policy/policies.cpp b/sdk/core/azure-core/src/credentials/policy/policies.cpp
index f06d5c06d..4f924fa0a 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 <azure/core/credentials/policy/policies.hpp>
+#include "azure/core/credentials/policy/policies.hpp"
 
 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 2a797fe0a..220f8e21a 100644
--- a/sdk/core/azure-core/src/http/body_stream.cpp
+++ b/sdk/core/azure-core/src/http/body_stream.cpp
@@ -12,8 +12,8 @@
 #include <Windows.h>
 #endif // Windows
 
-#include <azure/core/context.hpp>
-#include <azure/core/http/body_stream.hpp>
+#include "azure/core/context.hpp"
+#include "azure/core/http/body_stream.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/sdk/core/azure-core/src/http/logging_policy.cpp b/sdk/core/azure-core/src/http/logging_policy.cpp
index d6512f9bd..d5181611d 100644
--- a/sdk/core/azure-core/src/http/logging_policy.cpp
+++ b/sdk/core/azure-core/src/http/logging_policy.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
-#include <azure/core/internal/log.hpp>
+#include "azure/core/http/policy.hpp"
+#include "azure/core/internal/log.hpp"
 
 #include <chrono>
 #include <sstream>
diff --git a/sdk/core/azure-core/src/http/policy.cpp b/sdk/core/azure-core/src/http/policy.cpp
index 30b2d746c..87be7db64 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 <azure/core/http/http.hpp>
-#include <azure/core/http/policy.hpp>
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/policy.hpp"
 
 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 b23fce31c..885632da6 100644
--- a/sdk/core/azure-core/src/http/raw_response.cpp
+++ b/sdk/core/azure-core/src/http/raw_response.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/azure.hpp>
-#include <azure/core/http/http.hpp>
+#include "azure/core/azure.hpp"
+#include "azure/core/http/http.hpp"
 
 #include <cctype>
 #include <map>
diff --git a/sdk/core/azure-core/src/http/request.cpp b/sdk/core/azure-core/src/http/request.cpp
index b2182b334..c5f973842 100644
--- a/sdk/core/azure-core/src/http/request.cpp
+++ b/sdk/core/azure-core/src/http/request.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/azure.hpp>
-#include <azure/core/http/http.hpp>
+#include "azure/core/azure.hpp"
+#include "azure/core/http/http.hpp"
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/sdk/core/azure-core/src/http/retry_policy.cpp b/sdk/core/azure-core/src/http/retry_policy.cpp
index 7d558cc90..d1c609413 100644
--- a/sdk/core/azure-core/src/http/retry_policy.cpp
+++ b/sdk/core/azure-core/src/http/retry_policy.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
-
-#include <azure/core/internal/log.hpp>
+#include "azure/core/http/policy.hpp"
+#include "azure/core/internal/log.hpp"
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/sdk/core/azure-core/src/http/telemetry_policy.cpp b/sdk/core/azure-core/src/http/telemetry_policy.cpp
index 96b07028a..5dc87df7e 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 <azure/core/http/policy.hpp>
+#include "azure/core/http/policy.hpp"
 
 #include <sstream>
 
diff --git a/sdk/core/azure-core/src/http/transport_policy.cpp b/sdk/core/azure-core/src/http/transport_policy.cpp
index 6419d4ed3..d3b53180e 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 <azure/core/http/policy.hpp>
+#include "azure/core/http/policy.hpp"
 
 using namespace Azure::Core::Http;
 
diff --git a/sdk/core/azure-core/src/strings.cpp b/sdk/core/azure-core/src/strings.cpp
index a42ccbe63..250905c72 100644
--- a/sdk/core/azure-core/src/strings.cpp
+++ b/sdk/core/azure-core/src/strings.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "azure/core/azure.hpp"
+
 #include <algorithm>
-#include <azure/core/azure.hpp>
 
 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 5af710759..ec7c9c618 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,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/curl/curl.hpp"
-#include "azure/core/http/http.hpp"
-#include "azure/core/http/pipeline.hpp"
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/pipeline.hpp>
 
 #include <array>
 #include <iostream>
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 a06f76b51..e7a6fdd1f 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,9 +5,9 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "azure/core/http/curl/curl.hpp"
-#include "azure/core/http/http.hpp"
-#include "azure/core/http/pipeline.hpp"
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/pipeline.hpp>
 
 #include <array>
 #include <iostream>
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 9b7c2425d..bcf628deb 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 "azure/core/http/pipeline.hpp"
+#include <azure/core/http/pipeline.hpp>
 
 #ifdef POSIX
 #include <fcntl.h>
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 831a948fa..b609dfbe2 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,7 +7,7 @@
  *
  */
 
-#include "azure/core/http/pipeline.hpp"
+#include <azure/core/http/pipeline.hpp>
 #include <azure/core/http/curl/curl.hpp>
 #include <azure/core/http/http.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/context.cpp b/sdk/core/azure-core/test/ut/context.cpp
index f6a8e08d9..c6d30fc7b 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 "azure/core/context.hpp"
+#include <azure/core/context.hpp>
 
 #include <chrono>
 #include <memory>
diff --git a/sdk/core/azure-core/test/ut/http.cpp b/sdk/core/azure-core/test/ut/http.cpp
index b25dc3cf9..88a214c90 100644
--- a/sdk/core/azure-core/test/ut/http.cpp
+++ b/sdk/core/azure-core/test/ut/http.cpp
@@ -3,7 +3,7 @@
 
 #include "gtest/gtest.h"
 
-#include "azure/core/http/http.hpp"
+#include <azure/core/http/http.hpp>
 #include "http.hpp"
 
 #include <string>
diff --git a/sdk/core/azure-core/test/ut/http.hpp b/sdk/core/azure-core/test/ut/http.hpp
index 88e385bac..4dfc200e9 100644
--- a/sdk/core/azure-core/test/ut/http.hpp
+++ b/sdk/core/azure-core/test/ut/http.hpp
@@ -3,7 +3,7 @@
 
 #include "gtest/gtest.h"
 
-#include "azure/core/http/http.hpp"
+#include <azure/core/http/http.hpp>
 
 namespace Azure { namespace Core { namespace Test {
 
diff --git a/sdk/core/azure-core/test/ut/transport_adapter_file_upload.cpp b/sdk/core/azure-core/test/ut/transport_adapter_file_upload.cpp
index 9d7977e56..4302efdc1 100644
--- a/sdk/core/azure-core/test/ut/transport_adapter_file_upload.cpp
+++ b/sdk/core/azure-core/test/ut/transport_adapter_file_upload.cpp
@@ -11,7 +11,7 @@
 #include <Windows.h>
 #endif // Windows
 
-#include "azure/core/http/http.hpp"
+#include <azure/core/http/http.hpp>
 
 #include "transport_adapter.hpp"
 
diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp
index 9a7992bfd..f7036672a 100644
--- a/sdk/template/azure-template/src/template_client.cpp
+++ b/sdk/template/azure-template/src/template_client.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/template/template_client.hpp>
-#include <azure/template/version.hpp>
+#include "azure/template/template_client.hpp"
+#include "azure/template/version.hpp"
 
 #include <string>