Added service prefix to file names. (#399)

sdk/storage/CMakeLists.txt

@@ -120,19 +120,19 @@ set (AZURE_STORAGE_DATALAKE_HEADER
     inc/datalake/datalake_responses.hpp
     inc/datalake/datalake_options.hpp
     inc/datalake/datalake_utilities.hpp
-    inc/datalake/service_client.hpp
-    inc/datalake/file_system_client.hpp
-    inc/datalake/path_client.hpp
-    inc/datalake/file_client.hpp
-    inc/datalake/directory_client.hpp
+    inc/datalake/datalake_service_client.hpp
+    inc/datalake/datalake_file_system_client.hpp
+    inc/datalake/datalake_path_client.hpp
+    inc/datalake/datalake_file_client.hpp
+    inc/datalake/datalake_directory_client.hpp
 )
 
 set (AZURE_STORAGE_DATALAKE_SOURCE
-    src/datalake/service_client.cpp
-    src/datalake/file_system_client.cpp
-    src/datalake/path_client.cpp
-    src/datalake/file_client.cpp
-    src/datalake/directory_client.cpp
+    src/datalake/datalake_service_client.cpp
+    src/datalake/datalake_file_system_client.cpp
+    src/datalake/datalake_path_client.cpp
+    src/datalake/datalake_file_client.cpp
+    src/datalake/datalake_directory_client.cpp
     src/datalake/datalake_utilities.cpp
     src/datalake/datalake_responses.cpp
 )
@@ -145,12 +145,12 @@ set (AZURE_STORAGE_SHARES_HEADER
     inc/shares/protocol/share_rest_client.hpp
     inc/shares/share_options.hpp
     inc/shares/share_responses.hpp
-    inc/shares/service_client.hpp
+    inc/shares/share_service_client.hpp
     inc/shares/share_client.hpp
 )
 
 set (AZURE_STORAGE_SHARES_SOURCE
-    src/shares/service_client.cpp
+    src/shares/share_service_client.cpp
     src/shares/share_client.cpp
 )
 

sdk/storage/inc/datalake/datalake.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "datalake/directory_client.hpp"
-#include "datalake/file_client.hpp"
-#include "datalake/file_system_client.hpp"
-#include "datalake/path_client.hpp"
-#include "datalake/service_client.hpp"
+#include "datalake/datalake_directory_client.hpp"
+#include "datalake/datalake_file_client.hpp"
+#include "datalake/datalake_file_system_client.hpp"
+#include "datalake/datalake_path_client.hpp"
+#include "datalake/datalake_service_client.hpp"

sdk/storage/inc/datalake/datalake_directory_client.hpp

@@ -6,7 +6,7 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
 #include "credentials/credentials.hpp"
-#include "datalake/path_client.hpp"
+#include "datalake/datalake_path_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
 #include "http/pipeline.hpp"

sdk/storage/inc/datalake/datalake_file_client.hpp

@@ -7,7 +7,7 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
 #include "credentials/credentials.hpp"
-#include "datalake/path_client.hpp"
+#include "datalake/datalake_path_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
 #include "http/pipeline.hpp"

sdk/storage/inc/datalake/datalake_file_system_client.hpp

@@ -7,7 +7,7 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
 #include "credentials/credentials.hpp"
-#include "datalake/service_client.hpp"
+#include "datalake/datalake_service_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
 #include "http/pipeline.hpp"
@@ -117,10 +117,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     /**
      * @brief Deletes the file system.
      * @param options Optional parameters to delete this file system.
-     * @return Azure::Core::Response<FileSystemDeleteResponse>
+     * @return Azure::Core::Response<FileSystemDeleteInfo>
      * @remark This request is sent to blob endpoint.
      */
-    Azure::Core::Response<FileSystemDeleteResponse> Delete(
+    Azure::Core::Response<FileSystemDeleteInfo> Delete(
         const FileSystemDeleteOptions& options = FileSystemDeleteOptions()) const;
 
     /**
@@ -150,10 +150,10 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
      *                  filesystem are listed. If "directory" is specified, the list will only
      *                  include paths that share the same root.
      * @param options Optional parameters to list the paths in file system.
-     * @return Azure::Core::Response<FileSystemListPathsResponse>
+     * @return Azure::Core::Response<ListPathsResult>
      * @remark This request is sent to dfs endpoint.
      */
-    Azure::Core::Response<FileSystemListPathsResponse> ListPaths(
+    Azure::Core::Response<ListPathsResult> ListPaths(
         bool recursive,
         const ListPathsOptions& options = ListPathsOptions()) const;
 

sdk/storage/inc/datalake/datalake_path_client.hpp

@@ -7,7 +7,7 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
 #include "credentials/credentials.hpp"
-#include "datalake/file_system_client.hpp"
+#include "datalake/datalake_file_system_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
 #include "http/pipeline.hpp"

sdk/storage/inc/datalake/datalake_responses.hpp

@@ -15,6 +15,9 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   // FileSystemClient models:
 
+  using FileSystemDeleteInfo = FileSystemDeleteResponse;
+  using ListPathsResult = FileSystemListPathsResponse;
+
   struct FileSystemProperties
   {
     std::string ETag;

sdk/storage/inc/shares/share_client.hpp

@@ -11,7 +11,7 @@
 #include "response.hpp"
 #include "share_options.hpp"
 #include "share_responses.hpp"
-#include "shares/service_client.hpp"
+#include "shares/share_service_client.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/shares/shares.hpp

@@ -3,5 +3,5 @@
 
 #pragma once
 
-#include "service_client.hpp"
 #include "share_client.hpp"
+#include "share_service_client.hpp"

sdk/storage/src/datalake/datalake_directory_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "datalake/directory_client.hpp"
+#include "datalake/datalake_directory_client.hpp"
 
 #include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"
@@ -10,8 +10,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
+#include "datalake/datalake_file_client.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "datalake/file_client.hpp"
 #include "http/curl/curl.hpp"
 
 #include <limits>

sdk/storage/src/datalake/datalake_file_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "datalake/file_client.hpp"
+#include "datalake/datalake_file_client.hpp"
 
 #include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"

sdk/storage/src/datalake/datalake_file_system_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "datalake/file_system_client.hpp"
+#include "datalake/datalake_file_system_client.hpp"
 
 #include "blobs/protocol/blob_rest_client.hpp"
 #include "common/common_headers_request_policy.hpp"
@@ -11,10 +11,10 @@
 #include "common/storage_common.hpp"
 #include "common/storage_version.hpp"
 #include "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 "datalake/directory_client.hpp"
-#include "datalake/file_client.hpp"
-#include "datalake/path_client.hpp"
 #include "http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {

sdk/storage/src/datalake/datalake_path_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "datalake/path_client.hpp"
+#include "datalake/datalake_path_client.hpp"
 
 #include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"

sdk/storage/src/datalake/datalake_service_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "datalake/service_client.hpp"
+#include "datalake/datalake_service_client.hpp"
 
 #include "blobs/protocol/blob_rest_client.hpp"
 #include "common/common_headers_request_policy.hpp"
@@ -11,8 +11,8 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_version.hpp"
 #include "credentials/policy/policies.hpp"
+#include "datalake/datalake_file_system_client.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "datalake/file_system_client.hpp"
 #include "http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {

sdk/storage/src/shares/share_service_client.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "shares/service_client.hpp"
+#include "shares/share_service_client.hpp"
 
 #include "common/common_headers_request_policy.hpp"
 #include "common/constants.hpp"

sdk/storage/test/CMakeLists.txt

@@ -19,19 +19,19 @@ add_executable (
      blobs/blob_sas_test.cpp
      blobs/performance_benchmark.cpp
      blobs/large_scale_test.cpp
-     datalake/service_client_test.hpp
-     datalake/service_client_test.cpp
-     datalake/file_system_client_test.hpp
-     datalake/file_system_client_test.cpp
-     datalake/path_client_test.hpp
-     datalake/path_client_test.cpp
-     datalake/file_client_test.hpp
-     datalake/file_client_test.cpp
-     datalake/directory_client_test.hpp
-     datalake/directory_client_test.cpp
+     datalake/datalake_service_client_test.hpp
+     datalake/datalake_service_client_test.cpp
+     datalake/datalake_file_system_client_test.hpp
+     datalake/datalake_file_system_client_test.cpp
+     datalake/datalake_path_client_test.hpp
+     datalake/datalake_path_client_test.cpp
+     datalake/datalake_file_client_test.hpp
+     datalake/datalake_file_client_test.cpp
+     datalake/datalake_directory_client_test.hpp
+     datalake/datalake_directory_client_test.cpp
      common/bearer_token_test.cpp
-     shares/service_client_test.hpp
-     shares/service_client_test.cpp
+     shares/share_service_client_test.hpp
+     shares/share_service_client_test.cpp
      shares/share_client_test.cpp
      shares/share_client_test.hpp
       )

sdk/storage/test/datalake/datalake_directory_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "directory_client_test.hpp"
+#include "datalake_directory_client_test.hpp"
 
 #include <algorithm>
 

sdk/storage/test/datalake/datalake_directory_client_test.hpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "datalake/datalake.hpp"
-#include "path_client_test.hpp"
+#include "datalake_path_client_test.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {

sdk/storage/test/datalake/datalake_file_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "file_client_test.hpp"
+#include "datalake_file_client_test.hpp"
 
 #include <algorithm>
 

sdk/storage/test/datalake/datalake_file_client_test.hpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "datalake/datalake.hpp"
-#include "file_system_client_test.hpp"
+#include "datalake_file_system_client_test.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {

sdk/storage/test/datalake/datalake_file_system_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "file_system_client_test.hpp"
+#include "datalake_file_system_client_test.hpp"
 
 #include <algorithm>
 

sdk/storage/test/datalake/datalake_path_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "path_client_test.hpp"
+#include "datalake_path_client_test.hpp"
 
 #include <algorithm>
 

sdk/storage/test/datalake/datalake_path_client_test.hpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "datalake/datalake.hpp"
-#include "file_system_client_test.hpp"
+#include "datalake_file_system_client_test.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {

sdk/storage/test/datalake/datalake_service_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "service_client_test.hpp"
+#include "datalake_service_client_test.hpp"
 
 #include <algorithm>
 

sdk/storage/test/shares/share_service_client_test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "service_client_test.hpp"
+#include "share_service_client_test.hpp"
 
 #include <algorithm>
 #include <thread>