Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Jul 31, 2019
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8696082
Bump to the right version. Switch test account to team account.
sima-zhu Jul 30, 2019
e847724
Fixed version stuff
sima-zhu Jul 30, 2019
2d1e3eb
Fixed typo
sima-zhu Jul 30, 2019
a9dc37e
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
sima-zhu Jul 30, 2019
ed6ce97
version tests
sima-zhu Jul 30, 2019
78b648c
Bump the verstion
sima-zhu Jul 30, 2019
2de5f0e
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
sima-zhu Jul 30, 2019
037a807
Uncommon blob from codesnippet
sima-zhu Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.client.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@
-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-->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be uncommented?

Copy link
Contributor Author

@sima-zhu sima-zhu Jul 30, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alzimmermsft can we add back this line?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't worry about uncommenting this line in this PR, blobs doesn't have any snippets yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will uncommon this.

-snippetpath ${project.basedir}/storage/client/file/src/samples/java
-snippetpath ${project.basedir}/storage/client/queue/src/samples/java
</additionalOptions>
</configuration>
Expand Down
4 changes: 0 additions & 4 deletions ...-keys/src/samples/java/com/azure/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
package com.azure.security.keyvault.keys;

import com.azure.core.credentials.TokenCredential;
import com.azure.core.http.HttpClient;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.VoidResponse;
import com.azure.core.util.Context;
Expand Down
0 storage/client/tests.yml → storage/client/blob/tests.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion storage/client/file/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion storage/client/file/src/main/java/com/azure/storage/file/FileConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
4 changes: 1 addition & 3 deletions ...ent/file/src/main/java/com/azure/storage/file/implementation/AzureFileStorageBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ public AzureFileStorageImpl build() {
this.pipeline = RestProxy.createDefaultPipeline();
}
AzureFileStorageImpl client = new AzureFileStorageImpl(pipeline);
if (this.version != null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the version always get set from a static conig class ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is auto-gen class. I have the temp fix to pass the spotbugs. Loop in @jianghaolu for further discussion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's track this, so it doesn't cause issues later.

client.setVersion(this.version);
}
client.setVersion(this.version);
if (this.url != null) {
client.setUrl(this.url);
}
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/DirectoryAsyncClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/DirectoryClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/FileAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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())
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/FileClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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())
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientAsyncTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/FileServiceClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/ShareAsyncClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions storage/client/file/src/test/java/com/azure/storage/file/ShareClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion storage/client/file/src/test/resources/session-records/abortCopy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"networkCallRecords" : [ ],
"variables" : [ "file10519411" ]
"variables" : [ "file59336dc2" ]
}
26 changes: 13 additions & 13 deletions storage/client/file/src/test/resources/session-records/clearMetadataFromDirClient.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" ]
}
44 changes: 22 additions & 22 deletions .../file/src/test/resources/session-records/createDirectoryAlreadyExistsFromShareClient.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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" ]
}
Loading