Bump to the right version. Switch test account to team account. (#4710)

* Bump to the right version. Switch test account to team account.
Azure · Jul 31, 2019 · 20a085f · 20a085f
1 parent 8f9e52f
commit 20a085f
Show file tree

Hide file tree

Showing 181 changed files with 2,901 additions and 3,023 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -32,7 +32,8 @@
     <azure-keyvault.version>4.0.0-preview.1</azure-keyvault.version>
     <azure-messaging-eventhubs.version>5.0.0-preview.2</azure-messaging-eventhubs.version>
     <azure-storage-blob.version>12.0.0-preview.1</azure-storage-blob.version>
-    <azure-storage-queue.version>12.0.0-preview.1</azure-storage-queue.version>
+    <azure-storage-file.version>12.0.0-preview.2</azure-storage-file.version>
+    <azure-storage-queue.version>12.0.0-preview.2</azure-storage-queue.version>
   </properties>
 
   <distributionManagement>
@@ -94,6 +95,11 @@
 <!--      <artifactId>azure-storage-blob</artifactId>-->
 <!--      <version>${azure-storage-blob.version}</version>-->
 <!--    </dependency>-->
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-storage-file</artifactId>
+      <version>${azure-storage-file.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-queue</artifactId>

diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
@@ -30,8 +30,8 @@
     <azure-keyvault.version>4.0.0-preview.1</azure-keyvault.version>
     <azure-messaging-eventhubs.version>5.0.0-preview.2</azure-messaging-eventhubs.version>
     <azure-storage.version>12.0.0-preview.1</azure-storage.version>
-    <azure-storage-file.version>12.0.0-preview.1</azure-storage-file.version>
-    <azure-storage-queue.version>12.0.0-preview.1</azure-storage-queue.version>
+    <azure-storage-file.version>12.0.0-preview.2</azure-storage-file.version>
+    <azure-storage-queue.version>12.0.0-preview.2</azure-storage-queue.version>
   </properties>
   <distributionManagement>
     <site>

diff --git a/pom.client.xml b/pom.client.xml
@@ -545,7 +545,8 @@
                 -snippetpath ${project.basedir}/sdk/eventhubs/azure-eventhubs/src/samples/java
                 -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-keys/src/samples/java
                 -snippetpath ${project.basedir}/sdk/keyvault/azure-keyvault-secrets/src/samples/java
-                <!-- -snippetpath ${project.basedir}/storage/client/blob/src/samples/java-->
+                -snippetpath ${project.basedir}/storage/client/blob/src/samples/java
+                -snippetpath ${project.basedir}/storage/client/file/src/samples/java
                 -snippetpath ${project.basedir}/storage/client/queue/src/samples/java
               </additionalOptions>
             </configuration>

diff --git a/storage/client/blob/README.md b/storage/client/blob/README.md
@@ -23,7 +23,7 @@ definition, such as text or binary data.
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob</artifactId>
-  <version>12.0.0-preview.1</version>
+  <version>12.0.0-preview.2</version>
 </dependency>
 ```
 

diff --git a/storage/client/tests.yml → storage/client/blob/tests.yml b/storage/client/tests.yml → storage/client/blob/tests.yml
diff --git a/storage/client/file/README.md b/storage/client/file/README.md
@@ -22,7 +22,7 @@ Shares provide a way to organize sets of files and also can be mounted as an SMB
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file</artifactId>
-  <version>12.0.0-preview.1</version>
+  <version>12.0.0-preview.2</version>
 </dependency>
 ```
 

diff --git a/storage/client/file/pom.xml b/storage/client/file/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-file</artifactId>
-  <version>12.0.0-preview.1</version>
+  <version>12.0.0-preview.2</version>
 
   <name>azure-storage-file</name>
   <url>https://github.com/Azure/azure-sdk-for-java</url>

diff --git a/storage/client/file/src/main/java/com/azure/storage/file/FileConfiguration.java b/storage/client/file/src/main/java/com/azure/storage/file/FileConfiguration.java
@@ -9,5 +9,5 @@
 class FileConfiguration {
     //TODO: Eventually remove these hardcoded strings with https://github.com/Azure/azure-sdk-for-java/issues/3141
     static final String NAME = "azure-storage-file";
-    static final String VERSION = "12.0.0-preview.1";
+    static final String VERSION = "12.0.0-preview.2";
 }
diff --git a/...ent/file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java b/...ent/file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
@@ -74,9 +74,7 @@ public AzureFileStorageImpl build() {
             this.pipeline = RestProxy.createDefaultPipeline();
         }
         AzureFileStorageImpl client = new AzureFileStorageImpl(pipeline);
-        if (this.version != null) {
-            client.setVersion(this.version);
-        }
+        client.setVersion(this.version);
         if (this.url != null) {
             client.setUrl(this.url);
         }

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/DirectoryAsyncClientTests.java b/storage/client/file/src/test/java/com/azure/storage/file/DirectoryAsyncClientTests.java
@@ -35,7 +35,6 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             client = setupClient((connectionString, endpoint) -> new DirectoryClientBuilder()
                              .connectionString(connectionString)
-                             .endpoint(endpoint)
                              .shareName(shareName)
                              .directoryPath(dirName)
                              .httpClient(interceptorManager.getPlaybackClient())
@@ -44,7 +43,6 @@ public void beforeTest() {
         } else {
             client = setupClient((connectionString, endpoint) -> new DirectoryClientBuilder()
                              .connectionString(connectionString)
-                             .endpoint(endpoint)
                              .shareName(shareName)
                              .directoryPath(dirName)
                              .httpClient(HttpClient.createDefault().wiretap(true))

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/DirectoryClientTests.java b/storage/client/file/src/test/java/com/azure/storage/file/DirectoryClientTests.java
@@ -31,7 +31,6 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             directoryClient = setupClient((connectionString, endpoint) -> new DirectoryClientBuilder()
                              .connectionString(connectionString)
-                             .endpoint(endpoint)
                              .shareName(shareName)
                              .directoryPath(dirName)
                              .httpClient(interceptorManager.getPlaybackClient())
@@ -40,7 +39,6 @@ public void beforeTest() {
         } else {
             directoryClient = setupClient((connectionString, endpoint) -> new DirectoryClientBuilder()
                              .connectionString(connectionString)
-                             .endpoint(endpoint)
                              .shareName(shareName)
                              .directoryPath(dirName)
                              .httpClient(HttpClient.createDefault().wiretap(true))

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/FileAsyncClientTest.java b/storage/client/file/src/test/java/com/azure/storage/file/FileAsyncClientTest.java
@@ -39,7 +39,6 @@ public void beforeTest() {
                                                                      .connectionString(connectionString)
                                                                      .shareName(shareName)
                                                                      .filePath(filePath)
-                                                                     .endpoint(endpoint)
                                                                      .httpClient(interceptorManager.getPlaybackClient())
                                                                      .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                                                                      .buildAsyncClient(), true, fileAsyncLogger);
@@ -48,7 +47,6 @@ public void beforeTest() {
                                                                      .connectionString(connectionString)
                                                                      .shareName(shareName)
                                                                      .filePath(filePath)
-                                                                     .endpoint(endpoint)
                                                                      .httpClient(HttpClient.createDefault().wiretap(true))
                                                                      .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                                                                      .addPolicy(interceptorManager.getRecordPolicy())

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/FileClientTest.java b/storage/client/file/src/test/java/com/azure/storage/file/FileClientTest.java
@@ -42,7 +42,6 @@ public void beforeTest() {
                              .connectionString(connectionString)
                              .shareName(shareName)
                              .filePath(filePath)
-                             .endpoint(endpoint)
                              .httpClient(interceptorManager.getPlaybackClient())
                              .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                              .buildClient(), true, fileLogger);
@@ -51,7 +50,6 @@ public void beforeTest() {
                              .connectionString(connectionString)
                              .shareName(shareName)
                              .filePath(filePath)
-                             .endpoint(endpoint)
                              .httpClient(HttpClient.createDefault().wiretap(true))
                              .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                              .addPolicy(interceptorManager.getRecordPolicy())

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientAsyncTests.java b/storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientAsyncTests.java
@@ -37,14 +37,12 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             fileServiceAsyncClient = setupClient((connectionString, endpoint) -> new FileServiceClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .httpClient(interceptorManager.getPlaybackClient())
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .buildAsyncClient(), true, fileServiceAsyncLogger);
         } else {
             fileServiceAsyncClient = setupClient((connectionString, endpoint) -> new FileServiceClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .httpClient(HttpClient.createDefault().wiretap(true))
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .addPolicy(interceptorManager.getRecordPolicy())

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientTests.java b/storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientTests.java
@@ -41,14 +41,12 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             fileServiceClient = setupClient((connectionString, endpoint) -> new FileServiceClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .httpClient(interceptorManager.getPlaybackClient())
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .buildClient(), true, fileServiceLogger);
         } else {
             fileServiceClient = setupClient((connectionString, endpoint) -> new FileServiceClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .httpClient(HttpClient.createDefault().wiretap(true))
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .addPolicy(interceptorManager.getRecordPolicy())

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/ShareAsyncClientTests.java b/storage/client/file/src/test/java/com/azure/storage/file/ShareAsyncClientTests.java
@@ -39,15 +39,13 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             shareAsyncClient = setupClient((connectionString, endpoint) -> new ShareClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .shareName(shareName)
                 .httpClient(interceptorManager.getPlaybackClient())
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .buildAsyncClient(), true, shareAsyncLogger);
         } else {
             shareAsyncClient = setupClient((connectionString, endpoint) -> new ShareClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .shareName(shareName)
                 .httpClient(HttpClient.createDefault().wiretap(true))
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)

diff --git a/storage/client/file/src/test/java/com/azure/storage/file/ShareClientTests.java b/storage/client/file/src/test/java/com/azure/storage/file/ShareClientTests.java
@@ -42,15 +42,13 @@ public void beforeTest() {
         if (interceptorManager.isPlaybackMode()) {
             shareClient = setupClient((connectionString, endpoint) -> new ShareClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .shareName(shareName)
                 .httpClient(interceptorManager.getPlaybackClient())
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
                 .buildClient(), true, shareLogger);
         } else {
             shareClient = setupClient((connectionString, endpoint) -> new ShareClientBuilder()
                 .connectionString(connectionString)
-                .endpoint(endpoint)
                 .shareName(shareName)
                 .httpClient(HttpClient.createDefault().wiretap(true))
                 .httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)

diff --git a/storage/client/file/src/test/resources/session-records/abortCopy.json b/storage/client/file/src/test/resources/session-records/abortCopy.json
@@ -1,4 +1,4 @@
 {
   "networkCallRecords" : [ ],
-  "variables" : [ "file10519411" ]
+  "variables" : [ "file59336dc2" ]
 }
diff --git a/storage/client/file/src/test/resources/session-records/clearMetadataFromDirClient.json b/storage/client/file/src/test/resources/session-records/clearMetadataFromDirClient.json
@@ -1,42 +1,42 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://sima.file.core.windows.net/dirsharename/directory863334?restype=directory",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/dirsharename/directory909922?restype=directory",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D70F8CB67B1F98\"",
-      "Last-Modified" : "Tue, 23 Jul 2019 16:42:12 GMT",
+      "ETag" : "\"0x8D71521CAC84923\"",
+      "Last-Modified" : "Tue, 30 Jul 2019 19:11:57 GMT",
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "a4781ee1-001a-006b-3775-4192c4000000",
+      "x-ms-request-id" : "260a2c3b-901a-0077-060a-47b537000000",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 23 Jul 2019 16:42:11 GMT"
+      "Date" : "Tue, 30 Jul 2019 19:11:57 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://sima.file.core.windows.net/dirsharename/directory863334?restype=directory&comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/dirsharename/directory909922?restype=directory&comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D70F8CB6831042\"",
-      "Last-Modified" : "Tue, 23 Jul 2019 16:42:12 GMT",
+      "ETag" : "\"0x8D71521CACDEFC8\"",
+      "Last-Modified" : "Tue, 30 Jul 2019 19:11:57 GMT",
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "200",
-      "x-ms-request-id" : "a4781ee2-001a-006b-3875-4192c4000000",
+      "x-ms-request-id" : "260a2c3c-901a-0077-070a-47b537000000",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 23 Jul 2019 16:42:11 GMT"
+      "Date" : "Tue, 30 Jul 2019 19:11:57 GMT"
     }
   } ],
-  "variables" : [ "directory863334" ]
+  "variables" : [ "directory909922" ]
 }
diff --git a/.../file/src/test/resources/session-records/createDirectoryAlreadyExistsFromShareClient.json b/.../file/src/test/resources/session-records/createDirectoryAlreadyExistsFromShareClient.json
@@ -1,47 +1,47 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://sima.file.core.windows.net/share22756b14?restype=share",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/share592387fe?restype=share",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D70F8C78DAADCB\"",
-      "Last-Modified" : "Tue, 23 Jul 2019 16:40:29 GMT",
+      "ETag" : "\"0x8D715218A138CAF\"",
+      "Last-Modified" : "Tue, 30 Jul 2019 19:10:09 GMT",
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "a4781d48-001a-006b-4875-4192c4000000",
-      "Date" : "Tue, 23 Jul 2019 16:40:28 GMT"
+      "x-ms-request-id" : "7f75e089-301a-00db-150a-4794a0000000",
+      "Date" : "Tue, 30 Jul 2019 19:10:09 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://sima.file.core.windows.net/share22756b14/testshare?restype=directory",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/share592387fe/testshare?restype=directory",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D70F8C78E3B87F\"",
-      "Last-Modified" : "Tue, 23 Jul 2019 16:40:29 GMT",
+      "ETag" : "\"0x8D715218A1A6700\"",
+      "Last-Modified" : "Tue, 30 Jul 2019 19:10:09 GMT",
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "a4781d4a-001a-006b-4975-4192c4000000",
+      "x-ms-request-id" : "7f75e08b-301a-00db-160a-4794a0000000",
       "x-ms-request-server-encrypted" : "true",
-      "Date" : "Tue, 23 Jul 2019 16:40:28 GMT"
+      "Date" : "Tue, 30 Jul 2019 19:10:09 GMT"
     }
   }, {
     "Method" : "PUT",
-    "Uri" : "https://sima.file.core.windows.net/share22756b14/testshare?restype=directory",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/share592387fe/testshare?restype=directory",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
@@ -50,27 +50,27 @@
       "retry-after" : "0",
       "Content-Length" : "228",
       "StatusCode" : "409",
-      "x-ms-request-id" : "a4781d4b-001a-006b-4a75-4192c4000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ResourceAlreadyExists</Code><Message>The specified resource already exists.\nRequestId:a4781d4b-001a-006b-4a75-4192c4000000\nTime:2019-07-23T16:40:29.4840714Z</Message></Error>",
-      "Date" : "Tue, 23 Jul 2019 16:40:28 GMT",
+      "x-ms-request-id" : "7f75e08c-301a-00db-170a-4794a0000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ResourceAlreadyExists</Code><Message>The specified resource already exists.\nRequestId:7f75e08c-301a-00db-170a-4794a0000000\nTime:2019-07-30T19:10:09.1716444Z</Message></Error>",
+      "Date" : "Tue, 30 Jul 2019 19:10:09 GMT",
       "Content-Type" : "application/xml"
     }
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://sima.file.core.windows.net/share22756b14?restype=share",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/share592387fe?restype=share",
     "Headers" : {
       "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.1 1.8.0_201; Windows 10 10.0"
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.2 1.8.0_201; Windows 10 10.0"
     },
     "Response" : {
       "x-ms-version" : "2018-11-09",
       "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "202",
-      "x-ms-request-id" : "a4781d4c-001a-006b-4b75-4192c4000000",
-      "Date" : "Tue, 23 Jul 2019 16:40:28 GMT"
+      "x-ms-request-id" : "7f75e08d-301a-00db-180a-4794a0000000",
+      "Date" : "Tue, 30 Jul 2019 19:10:09 GMT"
     }
   } ],
-  "variables" : [ "share22756b14" ]
+  "variables" : [ "share592387fe" ]
 }