From e61d0ab6b8f3473c521ee0dce5f6f0514e5c06e1 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Wed, 28 Oct 2020 13:02:03 -0600 Subject: [PATCH 01/36] Enable revapi plugin --- sdk/keyvault/azure-security-keyvault-jca/pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index ec8978c88a2ab..4e663f84aae5c 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -130,14 +130,6 @@ true - - org.revapi - revapi-maven-plugin - 0.11.2 - - true - - From cc52f555e8bf2d28260b0156c5e2e17270c22d92 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Wed, 28 Oct 2020 13:09:06 -0600 Subject: [PATCH 02/36] Enable revapi plugin --- .../azure-spring-boot-starter-keyvault-certificates/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml index 30646cc9307e0..6ed5c8c04eb76 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml @@ -172,9 +172,6 @@ org.revapi revapi-maven-plugin 0.11.2 - - true - From adb4dafa6c7d14a43b0d3d21d2ac49c68dadb188 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Thu, 29 Oct 2020 11:51:55 -0600 Subject: [PATCH 03/36] Adding initial plumbing for user-assigned managed identity --- .../azure-security-keyvault-jca/pom.xml | 8 ++++ .../security/keyvault/jca/AuthClient.java | 15 ++++--- .../security/keyvault/jca/KeyVaultClient.java | 40 ++++++++++++++---- .../keyvault/jca/KeyVaultKeyStore.java | 31 ++++++++++---- .../jca/KeyVaultLoadStoreParameter.java | 42 +++++++++++++++++++ .../{rest => model}/CertificateBundle.java | 2 +- .../jca/{rest => model}/CertificateItem.java | 2 +- .../CertificateListResult.java | 2 +- .../{rest => model}/CertificatePolicy.java | 2 +- .../jca/{rest => model}/KeyProperties.java | 2 +- .../jca/{rest => model}/OAuthToken.java | 2 +- .../jca/{rest => model}/SecretBundle.java | 2 +- .../jca/{rest => model}/package-info.java | 2 +- .../security/keyvault/jca/AuthClientTest.java | 8 ++-- .../jca/JacksonJsonConverterTest.java | 2 +- .../pom.xml | 3 ++ 16 files changed, 131 insertions(+), 34 deletions(-) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/CertificateBundle.java (97%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/CertificateItem.java (91%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/CertificateListResult.java (93%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/CertificatePolicy.java (94%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/KeyProperties.java (93%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/OAuthToken.java (93%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/SecretBundle.java (92%) rename sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/{rest => model}/package-info.java (76%) diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 4e663f84aae5c..ec8978c88a2ab 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -130,6 +130,14 @@ true + + org.revapi + revapi-maven-plugin + 0.11.2 + + true + + diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java index e3684ed39b69b..d7eff0e841462 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java @@ -3,7 +3,7 @@ package com.azure.security.keyvault.jca; -import com.azure.security.keyvault.jca.rest.OAuthToken; +import com.azure.security.keyvault.jca.model.OAuthToken; import java.util.HashMap; import java.util.logging.Logger; @@ -71,16 +71,17 @@ class AuthClient extends DelegateRestClient { * Get an access token for a managed identity. * * @param resource the resource. + * @param identity the user-assigned identity (null if system-assigned) * @return the authorization token. */ - public String getAccessToken(String resource) { + public String getAccessToken(String resource, String identity) { String result; if (System.getenv("WEBSITE_SITE_NAME") != null && !System.getenv("WEBSITE_SITE_NAME").isEmpty()) { - result = getAccessTokenOnAppService(resource); + result = getAccessTokenOnAppService(resource, identity); } else { - result = getAccessTokenOnOthers(resource); + result = getAccessTokenOnOthers(resource, identity); } return result; } @@ -126,9 +127,10 @@ public String getAccessToken(String resource, String tenantId, * Get the access token on Azure App Service. * * @param resource the resource. + * @param identity the user-assigned identity (null if system-assigned). * @return the authorization token. */ - private String getAccessTokenOnAppService(String resource) { + private String getAccessTokenOnAppService(String resource, String identity) { LOGGER.entering("AuthClient", "getAccessTokenOnAppService", resource); LOGGER.info("Getting access token using managed identity based on MSI_SECRET"); String result = null; @@ -156,9 +158,10 @@ private String getAccessTokenOnAppService(String resource) { * Get the authorization token on everything else but Azure App Service. * * @param resource the resource. + * @param identity the user-assigned identity (null if system-assigned). * @return the authorization token. */ - private String getAccessTokenOnOthers(String resource) { + private String getAccessTokenOnOthers(String resource, String identity) { LOGGER.entering("AuthClient", "getAccessTokenOnOthers", resource); LOGGER.info("Getting access token using managed identity"); String result = null; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java index a92ec85eec317..c94c2a0845055 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java @@ -2,12 +2,12 @@ // Licensed under the MIT License. package com.azure.security.keyvault.jca; -import com.azure.security.keyvault.jca.rest.CertificateBundle; -import com.azure.security.keyvault.jca.rest.CertificateItem; -import com.azure.security.keyvault.jca.rest.CertificateListResult; -import com.azure.security.keyvault.jca.rest.CertificatePolicy; -import com.azure.security.keyvault.jca.rest.KeyProperties; -import com.azure.security.keyvault.jca.rest.SecretBundle; +import com.azure.security.keyvault.jca.model.CertificateBundle; +import com.azure.security.keyvault.jca.model.CertificateItem; +import com.azure.security.keyvault.jca.model.CertificateListResult; +import com.azure.security.keyvault.jca.model.CertificatePolicy; +import com.azure.security.keyvault.jca.model.KeyProperties; +import com.azure.security.keyvault.jca.model.SecretBundle; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -66,6 +66,11 @@ class KeyVaultClient extends DelegateRestClient { * Stores the client secret. */ private String clientSecret; + + /** + * Stores the identity (either user-assigned identity or null if system-assigned) + */ + private String identity; /** * Constructor. @@ -80,6 +85,22 @@ class KeyVaultClient extends DelegateRestClient { } this.keyVaultUrl = keyVaultUri; } + + + /** + * Constructor. + * + * @param keyVaultUri the Azure Key Vault URI. + * @param userAssignedIdentity the user assigned identity. + */ + KeyVaultClient(String keyVaultUri, String userAssignedIdentity) { + super(RestClientFactory.createClient()); + LOGGER.log(INFO, "Using Azure Key Vault: {0}", keyVaultUri); + if (!keyVaultUri.endsWith("/")) { + keyVaultUri = keyVaultUri + "/"; + } + this.keyVaultUrl = keyVaultUri; + } /** * Constructor. @@ -109,8 +130,11 @@ private String getAccessToken() { String resource = URLEncoder.encode("https://vault.azure.net", "UTF-8"); if (tenantId != null && clientId != null && clientSecret != null) { accessToken = authClient.getAccessToken(resource, tenantId, clientId, clientSecret); - } else { - accessToken = authClient.getAccessToken(resource); + } else if (identity != null) { + accessToken = authClient.getAccessToken(resource, identity); + } + else { + accessToken = authClient.getAccessToken(resource, identity); } } catch (UnsupportedEncodingException uee) { LOGGER.log(WARNING, "Unsupported encoding", uee); diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java index 634a6e1924fe5..3aa1c56634a64 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java @@ -72,8 +72,9 @@ public class KeyVaultKeyStore extends KeyStoreSpi { * The constructor uses System.getProperty for * azure.keyvault.uri, azure.keyvault.tenantId, * azure.keyvault.clientId, - * azure.keyvault.clientSecret to initialize the keyvault - * client. + * azure.keyvault.clientSecret and + * azure.keyvault.userAssignedIdentity to initialize the + * keyvault client. *

*/ public KeyVaultKeyStore() { @@ -82,7 +83,12 @@ public KeyVaultKeyStore() { String tenantId = System.getProperty("azure.keyvault.tenantId"); String clientId = System.getProperty("azure.keyvault.clientId"); String clientSecret = System.getProperty("azure.keyvault.clientSecret"); - keyVaultClient = new KeyVaultClient(keyVaultUri, tenantId, clientId, clientSecret); + String userAssignedIdentity = System.getProperty("azure.keyvault.userAssignedIdentity"); + if (userAssignedIdentity != null) { + keyVaultClient = new KeyVaultClient(keyVaultUri, userAssignedIdentity); + } else { + keyVaultClient = new KeyVaultClient(keyVaultUri, tenantId, clientId, clientSecret); + } } @Override @@ -197,11 +203,20 @@ public boolean engineIsKeyEntry(String alias) { public void engineLoad(KeyStore.LoadStoreParameter param) { if (param instanceof KeyVaultLoadStoreParameter) { KeyVaultLoadStoreParameter parameter = (KeyVaultLoadStoreParameter) param; - keyVaultClient = new KeyVaultClient( - parameter.getUri(), - parameter.getTenantId(), - parameter.getClientId(), - parameter.getClientSecret()); + if (parameter.getClientId() != null) { + keyVaultClient = new KeyVaultClient( + parameter.getUri(), + parameter.getTenantId(), + parameter.getClientId(), + parameter.getClientSecret()); + } else if (parameter.getUserAssignedIdentity() != null) { + keyVaultClient = new KeyVaultClient( + parameter.getUri(), + parameter.getUserAssignedIdentity() + ); + } else { + keyVaultClient = new KeyVaultClient(parameter.getUri()); + } } sideLoad(); } diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java index b7900e044c620..2fd11c3b7a50c 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java @@ -29,6 +29,11 @@ public class KeyVaultLoadStoreParameter implements KeyStore.LoadStoreParameter { * Stores the client secret. */ private final String clientSecret; + + /** + * Stores the user-assigned identity. + */ + private final String userAssignedIdentity; /** * Constructor. @@ -43,8 +48,36 @@ public KeyVaultLoadStoreParameter(String uri, String tenantId, String clientId, this.tenantId = tenantId; this.clientId = clientId; this.clientSecret = clientSecret; + this.userAssignedIdentity = null; } + /** + * Constructor. + * + * @param uri the Azure Key Vault URI. + * @param userAssignedIdentity the user-assigned identity. + */ + public KeyVaultLoadStoreParameter(String uri, String userAssignedIdentity) { + this.uri = uri; + this.tenantId = null; + this.clientId = null; + this.clientSecret = null; + this.userAssignedIdentity = userAssignedIdentity; + } + + /** + * Constructor. + * + * @param uri the Azure Key Vault URI. + */ + public KeyVaultLoadStoreParameter(String uri) { + this.uri = uri; + this.tenantId = null; + this.clientId = null; + this.clientSecret = null; + this.userAssignedIdentity = null; + } + /** * Get the protection parameter. * @@ -90,4 +123,13 @@ public String getTenantId() { public String getUri() { return uri; } + + /** + * Get the user-assigned identity. + * + * @return the user-assign identity. + */ + public String getUserAssignedIdentity() { + return userAssignedIdentity; + } } diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java similarity index 97% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java index c874a5483b3c3..f106f2d0fe8ed 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java similarity index 91% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java index 66dbcf277c66d..aff9778a16639 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java similarity index 93% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java index 59dd984e3db49..814b40dd666eb 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import java.io.Serializable; import java.util.List; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java similarity index 94% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java index 871d73500038f..a1eeff89c1d8b 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java similarity index 93% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java index 52ee90d4826a3..ccf41316f47b4 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java similarity index 93% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java index 55206bc4070ae..ae5624c373ea0 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java similarity index 92% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java index a15f8ba47745e..250546a233b1e 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; import java.io.Serializable; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/package-info.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/package-info.java similarity index 76% rename from sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/package-info.java rename to sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/package-info.java index 2d60b49c1a128..8420c4a6bf5e4 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/package-info.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/package-info.java @@ -4,4 +4,4 @@ /** * The Azure Key Vault JCA Provider models package. */ -package com.azure.security.keyvault.jca.rest; +package com.azure.security.keyvault.jca.model; diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/AuthClientTest.java b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/AuthClientTest.java index 8c37367078c6c..16cead66f7a38 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/AuthClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/AuthClientTest.java @@ -16,12 +16,14 @@ public class AuthClientTest { /** * Test getAuthorizationToken method. + * + * @throws Exception when a serious error occurs. */ @Test public void testGetAuthorizationToken() throws Exception { - String tenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47"; - String clientId = "2b8f123b-b18a-4077-bce0-42e10ce8bbab"; - String clientSecret = "72-~tZ9~cG~rimDI0EkQSMQ1D9DYmGmI_I"; + String tenantId = System.getProperty("azure.tenant.id"); + String clientId = System.getProperty("azure.client.id"); + String clientSecret = System.getProperty("azure.client.secret"); AuthClient authClient = new AuthClient(); String result = authClient.getAccessToken( "https://management.azure.com/", diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/JacksonJsonConverterTest.java b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/JacksonJsonConverterTest.java index 2a4ea9e397088..46f04c7fb4be0 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/JacksonJsonConverterTest.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/JacksonJsonConverterTest.java @@ -3,7 +3,7 @@ package com.azure.security.keyvault.jca; -import com.azure.security.keyvault.jca.rest.CertificateBundle; +import com.azure.security.keyvault.jca.model.CertificateBundle; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml index 6ed5c8c04eb76..30646cc9307e0 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml @@ -172,6 +172,9 @@ org.revapi revapi-maven-plugin 0.11.2 + + true + From b86e7fafae5294e4386e122470b0d81e3b15cff3 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Fri, 30 Oct 2020 11:28:06 -0600 Subject: [PATCH 04/36] Added support for user-assigned managed identity --- .../security/keyvault/jca/AuthClient.java | 16 ++++++++++ .../security/keyvault/jca/KeyVaultClient.java | 30 ++++++++++--------- .../keyvault/jca/KeyVaultKeyStore.java | 8 ++--- .../src/main/resources/application.properties | 4 +++ ...tCertificatesEnvironmentPostProcessor.java | 5 ++++ 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java index d7eff0e841462..10bf6a841c51c 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/AuthClient.java @@ -9,6 +9,7 @@ import java.util.logging.Logger; import static java.util.logging.Level.FINER; +import static java.util.logging.Level.INFO; /** * The REST client specific to getting an access token for Azure REST APIs. @@ -133,12 +134,19 @@ public String getAccessToken(String resource, String tenantId, private String getAccessTokenOnAppService(String resource, String identity) { LOGGER.entering("AuthClient", "getAccessTokenOnAppService", resource); LOGGER.info("Getting access token using managed identity based on MSI_SECRET"); + if (identity != null) { + LOGGER.log(INFO, "Using managed identity with object ID: {0}", identity); + } String result = null; StringBuilder url = new StringBuilder(); url.append(System.getenv("MSI_ENDPOINT")) .append("?api-version=2017-09-01") .append(RESOURCE_FRAGMENT).append(resource); + + if (identity != null) { + url.append("&objectid=").append(identity); + } HashMap headers = new HashMap<>(); headers.put("Metadata", "true"); @@ -164,11 +172,19 @@ private String getAccessTokenOnAppService(String resource, String identity) { private String getAccessTokenOnOthers(String resource, String identity) { LOGGER.entering("AuthClient", "getAccessTokenOnOthers", resource); LOGGER.info("Getting access token using managed identity"); + if (identity != null) { + LOGGER.log(INFO, "Using managed identity with object ID: {0}", identity); + } + String result = null; StringBuilder url = new StringBuilder(); url.append(OAUTH2_MANAGED_IDENTITY_TOKEN_URL) .append(RESOURCE_FRAGMENT).append(resource); + + if (identity != null) { + url.append("&object_id=").append(identity); + } HashMap headers = new HashMap<>(); headers.put("Metadata", "true"); diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java index c94c2a0845055..4c24037edb8a1 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java @@ -66,11 +66,12 @@ class KeyVaultClient extends DelegateRestClient { * Stores the client secret. */ private String clientSecret; - + /** - * Stores the identity (either user-assigned identity or null if system-assigned) + * Stores the managed identity (either the user-assigned managed identity + * object ID or null if system-assigned) */ - private String identity; + private String managedIdentity; /** * Constructor. @@ -85,21 +86,21 @@ class KeyVaultClient extends DelegateRestClient { } this.keyVaultUrl = keyVaultUri; } - - + /** * Constructor. * * @param keyVaultUri the Azure Key Vault URI. - * @param userAssignedIdentity the user assigned identity. + * @param managedIdentity the managed identity object ID. */ - KeyVaultClient(String keyVaultUri, String userAssignedIdentity) { + KeyVaultClient(String keyVaultUri, String managedIdentity) { super(RestClientFactory.createClient()); LOGGER.log(INFO, "Using Azure Key Vault: {0}", keyVaultUri); if (!keyVaultUri.endsWith("/")) { keyVaultUri = keyVaultUri + "/"; } this.keyVaultUrl = keyVaultUri; + this.managedIdentity = managedIdentity; } /** @@ -127,14 +128,16 @@ private String getAccessToken() { String accessToken = null; try { AuthClient authClient = new AuthClient(); + String resource = URLEncoder.encode("https://vault.azure.net", "UTF-8"); + if (managedIdentity != null) { + managedIdentity = URLEncoder.encode(managedIdentity, "UTF-8"); + } + if (tenantId != null && clientId != null && clientSecret != null) { accessToken = authClient.getAccessToken(resource, tenantId, clientId, clientSecret); - } else if (identity != null) { - accessToken = authClient.getAccessToken(resource, identity); - } - else { - accessToken = authClient.getAccessToken(resource, identity); + } else { + accessToken = authClient.getAccessToken(resource, managedIdentity); } } catch (UnsupportedEncodingException uee) { LOGGER.log(WARNING, "Unsupported encoding", uee); @@ -259,13 +262,12 @@ Key getKey(String alias, char[] password) { } } } - + // // If the private key is not available the certificate cannot be // used for server side certificates or mTLS. Then we do not know // the intent of the usage at this stage we skip this key. // - LOGGER.exiting("KeyVaultClient", "getKey", key); return key; } diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java index 3aa1c56634a64..2f473d5013d91 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java @@ -83,11 +83,11 @@ public KeyVaultKeyStore() { String tenantId = System.getProperty("azure.keyvault.tenantId"); String clientId = System.getProperty("azure.keyvault.clientId"); String clientSecret = System.getProperty("azure.keyvault.clientSecret"); - String userAssignedIdentity = System.getProperty("azure.keyvault.userAssignedIdentity"); - if (userAssignedIdentity != null) { - keyVaultClient = new KeyVaultClient(keyVaultUri, userAssignedIdentity); - } else { + String managedIdentity = System.getProperty("azure.keyvault.managedIdentity"); + if (clientId != null) { keyVaultClient = new KeyVaultClient(keyVaultUri, tenantId, clientId, clientSecret); + } else { + keyVaultClient = new KeyVaultClient(keyVaultUri, managedIdentity); } } diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/src/main/resources/application.properties b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/src/main/resources/application.properties index 5f83c4b43b258..351a50dadebac 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/src/main/resources/application.properties +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/src/main/resources/application.properties @@ -18,6 +18,10 @@ azure.keyvault.clientId=${AZURE_KEYVAULT_CLIENT_ID} # if you are not using managed identity). azure.keyvault.clientSecret=${AZURE_KEYVAULT_CLIENT_SECRET} # The server port. + +# The user-assigned managed identity object-id to use. +#azure.keyvault.managedIdentity= + server.port=8443 # Just for debugging purposes. management.endpoints.web.exposure.include=* diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/src/main/java/com/azure/spring/security/keyvault/certificates/starter/KeyVaultCertificatesEnvironmentPostProcessor.java b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/src/main/java/com/azure/spring/security/keyvault/certificates/starter/KeyVaultCertificatesEnvironmentPostProcessor.java index dadd2ce425dfa..6418222858da6 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/src/main/java/com/azure/spring/security/keyvault/certificates/starter/KeyVaultCertificatesEnvironmentPostProcessor.java +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/src/main/java/com/azure/spring/security/keyvault/certificates/starter/KeyVaultCertificatesEnvironmentPostProcessor.java @@ -49,6 +49,11 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, systemProperties.put("azure.keyvault.clientSecret", clientSecret); } + String managedIdentity = environment.getProperty("azure.keyvault.managedIdentity"); + if (managedIdentity != null) { + systemProperties.put("azure.keyvault.managedIdentity", managedIdentity); + } + String keyStoreType = environment.getProperty("server.ssl.key-store-type"); if (keyStoreType != null && keyStoreType.equals("AzureKeyVault")) { From 46b637cea40c09b7c41603f5f63d56b1ebc46692 Mon Sep 17 00:00:00 2001 From: Jorge Beauregard <69869951+jbeauregardb@users.noreply.github.com> Date: Wed, 28 Oct 2020 13:04:31 -0600 Subject: [PATCH 05/36] Communication - Purchase Search Follow-up PR (#16887) * Fixed response types * Fixed EVERYTHING * Reverted to void * Added default poll interval constant * Purchase methods are now private --- .../README.md | 15 +- .../PhoneNumberAsyncClient.java | 34 +- .../administration/PhoneNumberClient.java | 22 - .../administration/ReadmeSamples.java | 9 - ...PhoneNumberAsyncClientIntegrationTest.java | 35 +- .../PhoneNumberClientIntegrationTest.java | 14 - .../session-records/beginPurchaseSearch.json | 606 +++++++++++++++++- .../session-records/purchaseSearch.json | 20 - .../purchaseSearchWithResponse.json | 20 - 9 files changed, 613 insertions(+), 162 deletions(-) delete mode 100644 sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearch.json delete mode 100644 sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearchWithResponse.json diff --git a/sdk/communication/azure-communication-administration/README.md b/sdk/communication/azure-communication-administration/README.md index cac282cc42381..2ab5821262f28 100644 --- a/sdk/communication/azure-communication-administration/README.md +++ b/sdk/communication/azure-communication-administration/README.md @@ -240,19 +240,10 @@ for (String areaCode } ``` -### Purchase Search - - -```java -PhoneNumberClient phoneNumberClient = createPhoneNumberClient(); -phoneNumberClient.purchaseSearch(phoneNumberSearchId); -``` - ### Configure Phone Number - + ```java -PhoneNumberClient phoneNumberClient = createPhoneNumberClient(); phoneNumberClient.configureNumber(phoneNumber, pstnConfiguration); ``` @@ -262,7 +253,7 @@ The Phone Number Client supports a variety of long running operations that allow ### Create Search - + ```java String phonePlanId = "PHONE_PLAN_ID"; @@ -292,7 +283,7 @@ for (String phoneNumber: result.getPhoneNumbers()) { ``` ### Purchase Search - + ```java Duration duration = Duration.ofSeconds(1); String phoneNumberSearchId = "SEARCH_ID_TO_PURCHASE"; diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java index 5cd243fa77d1d..b85af46a83f68 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java @@ -62,6 +62,7 @@ public final class PhoneNumberAsyncClient { private final ClientLogger logger = new ClientLogger(PhoneNumberAsyncClient.class); private final PhoneNumberAdministrationsImpl phoneNumberAdministrations; + private final Duration defaultPollInterval = Duration.ofSeconds(1); PhoneNumberAsyncClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) { this.phoneNumberAdministrations = phoneNumberAdminClient.getPhoneNumberAdministrations(); @@ -735,8 +736,7 @@ Mono> cancelSearchWithResponse(String searchId, Context context) * @param searchId ID of the search * @return A {@link Mono} for the asynchronous return */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono purchaseSearch(String searchId) { + private Mono purchaseSearch(String searchId) { return purchaseSearchWithResponse(searchId).flatMap(FluxUtil::toMono); } @@ -746,12 +746,11 @@ public Mono purchaseSearch(String searchId) { * @param searchId ID of the search * @return A {@link Mono} containing a {@link Response} for the operation */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> purchaseSearchWithResponse(String searchId) { + private Mono> purchaseSearchWithResponse(String searchId) { return purchaseSearchWithResponse(searchId, null); } - Mono> purchaseSearchWithResponse(String searchId, Context context) { + private Mono> purchaseSearchWithResponse(String searchId, Context context) { Objects.requireNonNull(searchId, "'searchId' cannot be null."); try { @@ -779,7 +778,11 @@ Mono> purchaseSearchWithResponse(String searchId, Context context public PollerFlux beginCreateSearch( CreateSearchOptions options, Duration pollInterval) { Objects.requireNonNull(options, "'options' cannot be null."); - Objects.requireNonNull(pollInterval, "'pollInterval' cannot be null."); + + if (pollInterval == null) { + pollInterval = defaultPollInterval; + } + return new PollerFlux(pollInterval, createSearchActivationOperation(options), createSearchPollOperation(), @@ -849,7 +852,10 @@ Mono> createSearchFetchResultOperation() { @ServiceMethod(returns = ReturnType.COLLECTION) public PollerFlux beginPurchaseSearch(String searchId, Duration pollInterval) { Objects.requireNonNull(searchId, "'searchId' can not be null."); - Objects.requireNonNull(pollInterval, "'pollInterval' can not be null."); + + if (pollInterval == null) { + pollInterval = defaultPollInterval; + } return new PollerFlux(pollInterval, purchaseSearchActivationOperation(searchId), @@ -858,11 +864,10 @@ public PollerFlux beginPurchaseSearch(String searchId, Duration poll purchaseSearchFetchResultOperation()); } - private Function, Mono> purchaseSearchActivationOperation(String searchId) { - + private Function, + Mono> purchaseSearchActivationOperation(String searchId) { return (pollingContext) -> { - Mono response = purchaseSearch(searchId); - return response; + return purchaseSearch(searchId); }; } @@ -871,13 +876,12 @@ private Function, Mono> purchaseSearchActivationOpera return (pollingContext) -> getSearchById(searchId) .flatMap(getSearchResponse -> { SearchStatus statusResponse = getSearchResponse.getStatus(); - if (statusResponse.equals(SearchStatus.RESERVED) - || statusResponse.equals(SearchStatus.EXPIRED) - || statusResponse.equals(SearchStatus.SUCCESS)) { + if (statusResponse.equals(SearchStatus.SUCCESS)) { return Mono.just(new PollResponse<>( LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, null)); } - if (statusResponse.equals(SearchStatus.ERROR)) { + if (statusResponse.equals(SearchStatus.ERROR) + || statusResponse.equals(SearchStatus.EXPIRED)) { return Mono.just(new PollResponse<>( LongRunningOperationStatus.FAILED, null)); } diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java index a68a74937bdcf..2ddb1cc50d931 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java @@ -503,28 +503,6 @@ public Response cancelSearchWithResponse(String searchId, Context context) return phoneNumberAsyncClient.cancelSearchWithResponse(searchId, context).block(); } - /** - * Purchases the phone number search. - * - * @param searchId ID of the search - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public void purchaseSearch(String searchId) { - phoneNumberAsyncClient.purchaseSearch(searchId).block(); - } - - /** - * Purchases the phone number search. - * - * @param searchId ID of the search - * @param context A {@link Context} representing the request context. - * @return A {@link Response} for the operation - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response purchaseSearchWithResponse(String searchId, Context context) { - return phoneNumberAsyncClient.purchaseSearchWithResponse(searchId, context).block(); - } - /** * Initiates a search and returns a {@link PhoneNumberSearch} usable by other functions * This function returns a Long Running Operation poller. diff --git a/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java b/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java index 977c196baca91..1769ea5486683 100644 --- a/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java +++ b/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java @@ -326,15 +326,6 @@ public PhoneNumberSearch createPhoneNumberSearch() { return phoneNumberSearch; } - /** - * Sample code to purchase a phone number search - */ - public void purchasePhoneNumberSearch() { - String phoneNumberSearchId = "SEARCH_ID_TO_PURCHASE"; - PhoneNumberClient phoneNumberClient = createPhoneNumberClient(); - phoneNumberClient.purchaseSearch(phoneNumberSearchId); - } - /** * Sample code to configure a phone number */ diff --git a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java index abff9de75f87c..72ff8cf370127 100644 --- a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java @@ -346,26 +346,6 @@ public void getSearchByIdWithResponse(HttpClient httpClient) { .verifyComplete(); } - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void purchaseSearch(HttpClient httpClient) { - Mono mono = this.getClient(httpClient).purchaseSearch(SEARCH_ID_TO_PURCHASE); - - StepVerifier.create(mono).verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void purchaseSearchWithResponse(HttpClient httpClient) { - Mono> mono = this.getClient(httpClient).purchaseSearchWithResponse(SEARCH_ID_TO_PURCHASE, Context.NONE); - - StepVerifier.create(mono) - .assertNext(item -> { - assertEquals(202, item.getStatusCode()); - }) - .verifyComplete(); - } - @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void cancelSearch(HttpClient httpClient) { @@ -531,15 +511,18 @@ public void beginCreateSearch(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginPurchaseSearch(HttpClient httpClient) { - Duration pollInterval = Duration.ofSeconds(5); + Duration pollInterval = Duration.ofSeconds(1); + PhoneNumberAsyncClient client = this.getClient(httpClient); PollerFlux poller = - this.getClient(httpClient).beginPurchaseSearch(SEARCH_ID, pollInterval); - poller.takeUntil(apr -> apr.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED); - Mono mono = this.getClient(httpClient).getSearchById(SEARCH_ID); - StepVerifier.create(mono) + client.beginPurchaseSearch(SEARCH_ID, pollInterval); + poller.takeUntil(apr -> apr.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED) + .blockLast(); + Mono testResult = client.getSearchById(SEARCH_ID); + StepVerifier.create(testResult) .assertNext(item -> { assertEquals(SearchStatus.SUCCESS, item.getStatus()); - }); + }) + .verifyComplete(); } private PhoneNumberAsyncClient getClient(HttpClient httpClient) { diff --git a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java index 431596e253cca..cf240700853ce 100644 --- a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java +++ b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java @@ -254,20 +254,6 @@ public void getSearchByIdWithResponse(HttpClient httpClient) { assertEquals(SEARCH_ID, response.getValue().getSearchId()); } - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void purchaseSearch(HttpClient httpClient) { - this.getClient(httpClient).purchaseSearch(SEARCH_ID_TO_PURCHASE); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void purchaseSearchWithResponse(HttpClient httpClient) { - Response response = this.getClient(httpClient).purchaseSearchWithResponse(SEARCH_ID_TO_PURCHASE, Context.NONE); - - assertEquals(202, response.getStatusCode()); - } - @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void cancelSearch(HttpClient httpClient) { diff --git a/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginPurchaseSearch.json b/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginPurchaseSearch.json index 3c9d93de76b04..67f66e73e9f4e 100644 --- a/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginPurchaseSearch.json +++ b/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginPurchaseSearch.json @@ -1,74 +1,632 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/b78f406a-38c1-4cf1-af93-983d4d6bd166/purchase?api-version=2020-07-20-preview1", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1/purchase?api-version=2020-07-20-preview1", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" }, "Response" : { - "X-Processing-Time" : "979ms", - "MS-CV" : "tD5R80A6i0OfVkWF18F0JQ.0", + "X-Processing-Time" : "1454ms", + "MS-CV" : "Mv4PBSLGnkOjMDD2/7UnfQ.0", "retry-after" : "0", - "X-Azure-Ref" : "0JkSTXwAAAAB8Q1m7u3OCRq1/RROLlhWUREVOMDJFREdFMDMxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "016OYXwAAAAD+h+uEJ+K6QI1JRVRcsKrxREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "Content-Length" : "0", "StatusCode" : "202", - "Date" : "Fri, 23 Oct 2020 20:59:19 GMT" + "Date" : "Tue, 27 Oct 2020 22:48:57 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/b78f406a-38c1-4cf1-af93-983d4d6bd166?api-version=2020-07-20-preview1", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" }, "Response" : { "Transfer-Encoding" : "chunked", - "X-Processing-Time" : "265ms", - "MS-CV" : "emj4hxqTM0+d66L3++hheg.0", + "X-Processing-Time" : "358ms", + "MS-CV" : "mQ4/m0i5I0aERWi+F6kbPA.0", "retry-after" : "0", - "X-Azure-Ref" : "0LUSTXwAAAAD7XD/WlF8gRrJbSLhlKhCBREVOMDJFREdFMDMxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "02qOYXwAAAACj4Om3krHfQaMHILLESNEfREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "200", - "Body" : "{\"searchId\":\"b78f406a-38c1-4cf1-af93-983d4d6bd166\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-23T20:57:02.0409712+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134389285\",\"+12134389405\"],\"reservationExpiryDate\":\"2020-10-23T21:13:29.7369346+00:00\"}", - "Date" : "Fri, 23 Oct 2020 20:59:24 GMT", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:48:58 GMT", "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/b78f406a-38c1-4cf1-af93-983d4d6bd166?api-version=2020-07-20-preview1", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" }, "Response" : { "Transfer-Encoding" : "chunked", - "X-Processing-Time" : "2890ms", - "MS-CV" : "wTgcfgHMa0G4LwWZSVy8zQ.0", + "X-Processing-Time" : "276ms", + "MS-CV" : "fglR9kKwskihil18D0RbXw.0", "retry-after" : "0", - "X-Azure-Ref" : "0d0STXwAAAAA07DyMAbGbTpNahiG84FKcREVOMDJFREdFMDMxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "03KOYXwAAAAClBcLkVYRgRKK5u1u9hROSREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "200", - "Body" : "{\"searchId\":\"b78f406a-38c1-4cf1-af93-983d4d6bd166\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-23T20:57:02.0409712+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134389285\",\"+12134389405\"],\"reservationExpiryDate\":\"2020-10-23T21:13:29.7369346+00:00\"}", - "Date" : "Fri, 23 Oct 2020 21:00:41 GMT", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:00 GMT", "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/b78f406a-38c1-4cf1-af93-983d4d6bd166?api-version=2020-07-20-preview1", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" }, "Response" : { "Transfer-Encoding" : "chunked", - "X-Processing-Time" : "263ms", - "MS-CV" : "Ru1s65E59kO2sqi005DbGA.0", + "X-Processing-Time" : "453ms", + "MS-CV" : "RMMWm4Bp4U6OQ+b1duSeRA.0", "retry-after" : "0", - "X-Azure-Ref" : "0mkSTXwAAAAAA/WDv5/iQTLnd3QTnAcN/REVOMDJFREdFMDMxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "03aOYXwAAAAAx+QjqIxgUTo7ViLgxaZpoREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "200", - "Body" : "{\"searchId\":\"b78f406a-38c1-4cf1-af93-983d4d6bd166\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-23T20:57:02.0409712+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Success\",\"phoneNumbers\":[\"+12134389285\",\"+12134389405\"],\"reservationExpiryDate\":\"2020-10-23T21:13:29.7369346+00:00\"}", - "Date" : "Fri, 23 Oct 2020 21:01:14 GMT", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:01 GMT", "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null - }], + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "289ms", + "MS-CV" : "fcDWL3hAHEKRiPHZcu0zog.0", + "retry-after" : "0", + "X-Azure-Ref" : "036OYXwAAAAAGI5ktzTzTQ7KxE5pc3htmREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:03 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "284ms", + "MS-CV" : "vHX2ABcmWUuupb4J6aEFyA.0", + "retry-after" : "0", + "X-Azure-Ref" : "04KOYXwAAAAB4aWpAmiz3RbbH4Xd5aOkGREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:04 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "272ms", + "MS-CV" : "cIA0/YZCYEGFOugymyOn6g.0", + "retry-after" : "0", + "X-Azure-Ref" : "04aOYXwAAAACjoIzQO5l6SpNW1u9aJ7LSREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:06 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "477ms", + "MS-CV" : "oE4FXkMHwESr2kRSqv++3A.0", + "retry-after" : "0", + "X-Azure-Ref" : "046OYXwAAAACp/p2mwMhqSLHFgJj4+od1REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:07 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "280ms", + "MS-CV" : "AtLP4YeKEEK/iiHUTZaTNA.0", + "retry-after" : "0", + "X-Azure-Ref" : "05aOYXwAAAABQQ3MyYOpjT6064KD0IM3RREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:09 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "374ms", + "MS-CV" : "lNfyVZ2Npk60JlQC27cxBA.0", + "retry-after" : "0", + "X-Azure-Ref" : "05qOYXwAAAAD7sRA7/+96R5hgGhHx/l6WREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:10 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "296ms", + "MS-CV" : "pP/QPoO/y0GEAiAvlykrDA.0", + "retry-after" : "0", + "X-Azure-Ref" : "056OYXwAAAADRBlWI2CR9SbSedKBTGTtbREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Completing\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:11 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "301ms", + "MS-CV" : "N1ZuWxChFUKHyRLzsbBV/A.0", + "retry-after" : "0", + "X-Azure-Ref" : "06aOYXwAAAABAoDBoJiDQQquGSjvGhYo5REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:13 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "284ms", + "MS-CV" : "K+Ltgh1E1kiyqiWWRe0S3Q.0", + "retry-after" : "0", + "X-Azure-Ref" : "06qOYXwAAAACy6bWKoeI3Ta5oOWTMJIjkREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:14 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "331ms", + "MS-CV" : "rycjNJPLzEWM2RBV3fFv3w.0", + "retry-after" : "0", + "X-Azure-Ref" : "07KOYXwAAAAAx31k3PK4kQarpRlY7e8cAREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:16 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "385ms", + "MS-CV" : "ZuXr4HIFtE6UWGR/3411Vw.0", + "retry-after" : "0", + "X-Azure-Ref" : "07aOYXwAAAAA9An47am1kRY45e5a6mHZUREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:17 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "355ms", + "MS-CV" : "Dluba6xMUkql/+F6Ci8xmw.0", + "retry-after" : "0", + "X-Azure-Ref" : "076OYXwAAAAAUXgawLg4uRKMl8KGahmcjREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:19 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "288ms", + "MS-CV" : "JWrM5b6I+EWNV1wGbFPjvA.0", + "retry-after" : "0", + "X-Azure-Ref" : "08KOYXwAAAAC6aOlT+nenQYIWbED2zexLREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:20 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "387ms", + "MS-CV" : "bxceYgePg0exXvxbSc2FUg.0", + "retry-after" : "0", + "X-Azure-Ref" : "08aOYXwAAAAC8RcpEINaaTowSfXzODF3fREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:22 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "567ms", + "MS-CV" : "ZJeAPruvuUOB2ewat2CZbA.0", + "retry-after" : "0", + "X-Azure-Ref" : "086OYXwAAAAD1tXRlXcfmRqZ+Fgn6oR/2REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:23 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "297ms", + "MS-CV" : "mfKe2XJxREiHXjbIgFN1CA.0", + "retry-after" : "0", + "X-Azure-Ref" : "09aOYXwAAAAD0a4oVUJfbQriz6b4c1Pc9REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:25 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "287ms", + "MS-CV" : "fdFrbWdSp0SM0ZYY6oZ59g.0", + "retry-after" : "0", + "X-Azure-Ref" : "09qOYXwAAAACePbt4kWOySbER6FR6xITGREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:26 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "289ms", + "MS-CV" : "ROt6Ep5gBEuFdvRWPe7a6g.0", + "retry-after" : "0", + "X-Azure-Ref" : "0+KOYXwAAAACMIxeOpfIlTr2/GbwHtXBTREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:28 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "311ms", + "MS-CV" : "N6wduNYeRkOJ+iYnIuGQmQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0+aOYXwAAAABHUS6vAcF3QauWD0FRHjtMREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:29 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "581ms", + "MS-CV" : "CawDI5+pD0CjKTxwNFXP9w.0", + "retry-after" : "0", + "X-Azure-Ref" : "0+qOYXwAAAAAGSqPib7moTpFDw8vkDNlyREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:31 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "303ms", + "MS-CV" : "jDx5jMcGFk+/GrLytXUdFA.0", + "retry-after" : "0", + "X-Azure-Ref" : "0/KOYXwAAAACLxS3FMwB6TriEqzEZdnKVREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:32 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "417ms", + "MS-CV" : "1AmO4tp/Y06/ljh8ffWq7g.0", + "retry-after" : "0", + "X-Azure-Ref" : "0/qOYXwAAAAB2jL/qmAqER7fBCsd6QLPDREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:34 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "297ms", + "MS-CV" : "58gUG3WMh0ev5xg8tkRTwg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0/6OYXwAAAADyzH/fP2soTouU8oIO67tzREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:35 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "304ms", + "MS-CV" : "GMQgSDgc7UK6786GFOl4yw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0AaSYXwAAAABofq1JUB9UTYb44w0Bq0ErREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:37 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "292ms", + "MS-CV" : "xxfrNAJdgEGQodsdghnsyg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0AqSYXwAAAABnsqScZkobQIvuotT1yITmREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:38 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "289ms", + "MS-CV" : "t9L5z/sEnky7d8xUwUCKbw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0A6SYXwAAAACPWkAHP7biQpxSTraN714rREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:39 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "287ms", + "MS-CV" : "0ZhUpZqO/0avEk3k6jyLig.0", + "retry-after" : "0", + "X-Azure-Ref" : "0BaSYXwAAAAC4b7vdlr2fT6B3V/LbkX0mREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:41 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "299ms", + "MS-CV" : "VGJSA8i69EyCrmWCt94nPQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0BqSYXwAAAABl6+cFTONoTIduG7Qvs1oxREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:42 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "485ms", + "MS-CV" : "lGBXxkaT9UqcWoZGNF9Ppg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0CKSYXwAAAAD+KGRZOXTyQpKzCBumEA3QREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"PurchasePending\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:44 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "283ms", + "MS-CV" : "YpMfVudN70KVIVGWJL7R/A.0", + "retry-after" : "0", + "X-Azure-Ref" : "0CaSYXwAAAACV4jyJ0GWtR4xjVTRJ7I0IREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Success\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:45 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "297ms", + "MS-CV" : "cLWeHx7HY0arBKOchFl0cQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0CqSYXwAAAADOI7TnDoXMRbSGoZR4qkr8REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"searchId\":\"search-id-1\",\"displayName\":\"testsearch20200014\",\"createdAt\":\"2020-10-27T22:46:25.5026489+00:00\",\"description\":\"testsearch20200014\",\"phonePlanIds\":[\"01432411-5169-4665-b13e-3fa56c10e1d1\"],\"areaCode\":\"213\",\"quantity\":2,\"locationOptions\":[],\"status\":\"Success\",\"phoneNumbers\":[\"+12134592995\",\"+12134592997\"],\"reservationExpiryDate\":\"2020-10-27T23:02:41.3187451+00:00\"}", + "Date" : "Tue, 27 Oct 2020 22:49:46 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + } ], "variables" : [ ] } \ No newline at end of file diff --git a/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearch.json b/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearch.json deleted file mode 100644 index fa9bd4d65a978..0000000000000 --- a/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "networkCallRecords" : [ { - "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1/purchase?api-version=2020-07-20-preview1", - "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.1 (11.0.8; Mac OS X 10.15.6)" - }, - "Response" : { - "X-Processing-Time" : "974ms", - "MS-CV" : "rT3oEz+mOEilM2AB8V1xBQ.0", - "retry-after" : "0", - "X-Azure-Ref" : "0VnxpXwAAAACIK2T71wNCR5nYacbgOG2/WVZSMzBFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", - "Content-Length" : "0", - "StatusCode" : "202", - "Date" : "Tue, 22 Sep 2020 04:23:51 GMT" - }, - "Exception" : null - } ], - "variables" : [ ] -} \ No newline at end of file diff --git a/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearchWithResponse.json b/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearchWithResponse.json deleted file mode 100644 index 87d720af4e26f..0000000000000 --- a/sdk/communication/azure-communication-administration/src/test/resources/session-records/purchaseSearchWithResponse.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "networkCallRecords" : [ { - "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/searches/search-id-1/purchase?api-version=2020-07-20-preview1", - "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.1 (11.0.8; Mac OS X 10.15.6)" - }, - "Response" : { - "X-Processing-Time" : "974ms", - "MS-CV" : "rT3oEz+mOEilM2AB8V1xBQ.0", - "retry-after" : "0", - "X-Azure-Ref" : "0VnxpXwAAAACIK2T71wNCR5nYacbgOG2/WVZSMzBFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", - "Content-Length" : "0", - "StatusCode" : "202", - "Date" : "Tue, 22 Sep 2020 04:23:51 GMT" - }, - "Exception" : null - } ], - "variables" : [ ] -} From 82cc38f650e2d41123584c6b4264ccbf718bc266 Mon Sep 17 00:00:00 2001 From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:13:48 -0700 Subject: [PATCH 06/36] [Service Bus] Prepare tracing methods for message processor and scheduleMessage (#16524) --- .../servicebus/ServiceBusMessageBatch.java | 50 +--------- .../implementation/MessageUtils.java | 97 +++++++++++++++++++ .../servicebus/implementation/Messages.java | 2 + .../azure-messaging-servicebus.properties | 3 + 4 files changed, 107 insertions(+), 45 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageBatch.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageBatch.java index 3ed6b4cc8f075..1849bd3defba2 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageBatch.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageBatch.java @@ -8,31 +8,21 @@ import com.azure.core.amqp.implementation.ErrorContextProvider; import com.azure.core.amqp.implementation.MessageSerializer; import com.azure.core.amqp.implementation.TracerProvider; -import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; -import com.azure.core.util.tracing.ProcessKind; -import reactor.core.publisher.Signal; import java.nio.BufferOverflowException; import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Objects; -import java.util.Optional; -import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY; -import static com.azure.core.util.tracing.Tracer.DIAGNOSTIC_ID_KEY; -import static com.azure.core.util.tracing.Tracer.ENTITY_PATH_KEY; -import static com.azure.core.util.tracing.Tracer.HOST_NAME_KEY; -import static com.azure.core.util.tracing.Tracer.SPAN_CONTEXT_KEY; -import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.AZ_TRACING_SERVICE_NAME; +import static com.azure.messaging.servicebus.implementation.MessageUtils.traceMessageSpan; /** * A class for aggregating {@link ServiceBusMessage messages} into a single, size-limited, batch. It is treated as a * single AMQP message when sent to the Azure Service Bus service. */ public final class ServiceBusMessageBatch { - private static final String AZ_TRACING_NAMESPACE_VALUE = "Microsoft.ServiceBus"; private final ClientLogger logger = new ClientLogger(ServiceBusMessageBatch.class); private final Object lock = new Object(); private final int maxMessageSize; @@ -102,7 +92,10 @@ public boolean tryAddMessage(final ServiceBusMessage serviceBusMessage) { throw logger.logExceptionAsWarning(new NullPointerException("'serviceBusMessage' cannot be null")); } ServiceBusMessage serviceBusMessageUpdated = - tracerProvider.isEnabled() ? traceMessageSpan(serviceBusMessage) : serviceBusMessage; + tracerProvider.isEnabled() + ? traceMessageSpan(serviceBusMessage, serviceBusMessage.getContext(), hostname, entityPath, + tracerProvider) + : serviceBusMessage; final int size; try { @@ -135,39 +128,6 @@ List getMessages() { return serviceBusMessageList; } - /** - * Method to start and end a "Azure.EventHubs.message" span and add the "DiagnosticId" as a property of the - * message. - * - * @param serviceBusMessage The Message to add tracing span for. - * - * @return the updated Message data object. - */ - private ServiceBusMessage traceMessageSpan(ServiceBusMessage serviceBusMessage) { - Optional eventContextData = serviceBusMessage.getContext().getData(SPAN_CONTEXT_KEY); - if (eventContextData.isPresent()) { - // if message has context (in case of retries), don't start a message span or add a new context - return serviceBusMessage; - } else { - // Starting the span makes the sampling decision (nothing is logged at this time) - Context messageContext = serviceBusMessage.getContext() - .addData(AZ_TRACING_NAMESPACE_KEY, AZ_TRACING_NAMESPACE_VALUE) - .addData(ENTITY_PATH_KEY, entityPath) - .addData(HOST_NAME_KEY, hostname); - Context eventSpanContext = tracerProvider.startSpan(AZ_TRACING_SERVICE_NAME, messageContext, - ProcessKind.MESSAGE); - Optional eventDiagnosticIdOptional = eventSpanContext.getData(DIAGNOSTIC_ID_KEY); - if (eventDiagnosticIdOptional.isPresent()) { - serviceBusMessage.getApplicationProperties().put(DIAGNOSTIC_ID_KEY, eventDiagnosticIdOptional.get() - .toString()); - tracerProvider.endSpan(eventSpanContext, Signal.complete()); - serviceBusMessage.addContext(SPAN_CONTEXT_KEY, eventSpanContext); - } - } - - return serviceBusMessage; - } - private int getSize(final ServiceBusMessage serviceBusMessage, final boolean isFirst) { Objects.requireNonNull(serviceBusMessage, "'serviceBusMessage' cannot be null."); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/MessageUtils.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/MessageUtils.java index 622e3b89e9c4a..f628e07d7d9c2 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/MessageUtils.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/MessageUtils.java @@ -4,7 +4,13 @@ package com.azure.messaging.servicebus.implementation; import com.azure.core.amqp.implementation.AmqpConstants; +import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.util.Context; import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.tracing.ProcessKind; +import com.azure.messaging.servicebus.ServiceBusMessage; +import com.azure.messaging.servicebus.ServiceBusReceivedMessage; import com.azure.messaging.servicebus.ServiceBusTransactionContext; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.Symbol; @@ -15,16 +21,32 @@ import org.apache.qpid.proton.amqp.transaction.TransactionalState; import org.apache.qpid.proton.amqp.transport.DeliveryState; import org.apache.qpid.proton.amqp.transport.ErrorCondition; +import reactor.core.publisher.Signal; +import java.io.Closeable; +import java.io.IOException; import java.nio.ByteBuffer; import java.time.Duration; import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.HashMap; +import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.UUID; +import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY; +import static com.azure.core.util.tracing.Tracer.DIAGNOSTIC_ID_KEY; +import static com.azure.core.util.tracing.Tracer.ENTITY_PATH_KEY; +import static com.azure.core.util.tracing.Tracer.HOST_NAME_KEY; +import static com.azure.core.util.tracing.Tracer.MESSAGE_ENQUEUED_TIME; +import static com.azure.core.util.tracing.Tracer.SCOPE_KEY; +import static com.azure.core.util.tracing.Tracer.SPAN_CONTEXT_KEY; +import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.AZ_TRACING_SERVICE_NAME; +import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.AZ_TRACING_NAMESPACE_VALUE; + + /** * Contains helper methods for message conversions, reading status codes, and getting delivery state. */ @@ -253,4 +275,79 @@ private static TransactionalState getTransactionState(ByteBuffer transactionId, transactionalState.setOutcome(outcome); return transactionalState; } + + /** + * Used in ServiceBusMessageBatch.tryAddMessage() to start tracing for to-be-sent out messages. + */ + public static ServiceBusMessage traceMessageSpan(ServiceBusMessage serviceBusMessage, + Context messageContext, String hostname, String entityPath, TracerProvider tracerProvider) { + Optional eventContextData = messageContext.getData(SPAN_CONTEXT_KEY); + if (eventContextData.isPresent()) { + // if message has context (in case of retries), don't start a message span or add a new context + return serviceBusMessage; + } else { + // Starting the span makes the sampling decision (nothing is logged at this time) + Context newMessageContext = messageContext + .addData(AZ_TRACING_NAMESPACE_KEY, AZ_TRACING_NAMESPACE_VALUE) + .addData(ENTITY_PATH_KEY, entityPath) + .addData(HOST_NAME_KEY, hostname); + Context eventSpanContext = tracerProvider.startSpan(AZ_TRACING_SERVICE_NAME, newMessageContext, + ProcessKind.MESSAGE); + Optional eventDiagnosticIdOptional = eventSpanContext.getData(DIAGNOSTIC_ID_KEY); + if (eventDiagnosticIdOptional.isPresent()) { + serviceBusMessage.getApplicationProperties().put(DIAGNOSTIC_ID_KEY, eventDiagnosticIdOptional.get() + .toString()); + tracerProvider.endSpan(eventSpanContext, Signal.complete()); + serviceBusMessage.addContext(SPAN_CONTEXT_KEY, eventSpanContext); + } + } + return serviceBusMessage; + } + + /* + * Starts a new process tracing span and attaches the returned context to the ServiceBusReceivedMessage object for + * users. + */ + public static Context startProcessTracingSpan(ServiceBusReceivedMessage receivedMessage, + String hostname, String entityPath, TracerProvider tracerProvider, ProcessKind processKind) { + Object diagnosticId = receivedMessage.getApplicationProperties().get(DIAGNOSTIC_ID_KEY); + if (diagnosticId == null || !tracerProvider.isEnabled()) { + return Context.NONE; + } + + Context spanContext = tracerProvider.extractContext(diagnosticId.toString(), Context.NONE) + .addData(ENTITY_PATH_KEY, entityPath) + .addData(HOST_NAME_KEY, hostname) + .addData(AZ_TRACING_NAMESPACE_KEY, AZ_TRACING_NAMESPACE_VALUE); + spanContext = receivedMessage.getEnqueuedTime() == null + ? spanContext + : spanContext.addData(MESSAGE_ENQUEUED_TIME, receivedMessage.getEnqueuedTime().toEpochSecond()); + return tracerProvider.startSpan(AZ_TRACING_SERVICE_NAME, spanContext, processKind); + } + + /* + * Ends the process tracing span and the scope of that span. + */ + public static void endProcessTracingSpan(Context processSpanContext, Signal signal, + TracerProvider tracerProvider, ClientLogger logger) { + if (processSpanContext != null) { + Optional spanScope = processSpanContext.getData(SCOPE_KEY); + // Disposes of the scope when the trace span closes. + if (tracerProvider.isEnabled() && spanScope.isPresent()) { + if (spanScope.get() instanceof Closeable) { + Closeable close = (Closeable) spanScope.get(); + try { + close.close(); + tracerProvider.endSpan(processSpanContext, signal); + } catch (IOException ioException) { + logger.error(Messages.MESSAGE_PROCESSOR_RUN_END, ioException); + } + + } else { + logger.warning(String.format(Locale.US, + Messages.PROCESS_SPAN_SCOPE_TYPE_ERROR, spanScope.getClass())); + } + } + } + } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java index 49671a2fdb022..c6b70756564f4 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java @@ -23,6 +23,8 @@ public class Messages { public static final String INVALID_LOCK_TOKEN_STRING = getMessage("INVALID_LOCK_TOKEN_STRING"); public static final String MESSAGE_NOT_OF_TYPE = getMessage("MESSAGE_NOT_OF_TYPE"); public static final String REQUEST_VALUE_NOT_VALID = getMessage("REQUEST_VALUE_NOT_VALID"); + public static final String PROCESS_SPAN_SCOPE_TYPE_ERROR = getMessage("PROCESS_SPAN_SCOPE_TYPE_ERROR"); + public static final String MESSAGE_PROCESSOR_RUN_END = getMessage("MESSAGE_PROCESSOR_RUN_END"); private static synchronized Properties getProperties() { if (properties != null) { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/resources/azure-messaging-servicebus.properties b/sdk/servicebus/azure-messaging-servicebus/src/main/resources/azure-messaging-servicebus.properties index 0600b337ca0e8..3876503c3bc5d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/resources/azure-messaging-servicebus.properties +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/resources/azure-messaging-servicebus.properties @@ -5,3 +5,6 @@ MESSAGE_NOT_OF_TYPE=Message body type is not of type Data, but type: %s. Not set REQUEST_VALUE_NOT_VALID=Back pressure request value not valid. It must be between {} and {}. INVALID_OPERATION_DISPOSED_RECEIVER=Cannot perform operation '%s' on a disposed receiver. INVALID_LOCK_TOKEN_STRING=Invalid lock token '%s'. +PROCESS_SPAN_SCOPE_TYPE_ERROR=Process span scope type is not of type Closeable, but type: %s. Not closing the scope\ + and span +MESSAGE_PROCESSOR_RUN_END=MessageProcessor.run() endTracingSpan().close() failed with an error %s From 3307b606f6a0736ba9be20c44654bca73d952923 Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:26:36 -0700 Subject: [PATCH 07/36] Prepare Azure Core for November 2020 Release (#16924) * Prepare Azure Core for November 2020 Release * Fix linting issue * Revert updates to release azure-core-test and other Core libraries with dependencies on it --- .../src/main/resources/revapi/revapi.json | 5 +++++ eng/jacoco-test-coverage/pom.xml | 8 ++++---- eng/versioning/version_client.txt | 10 +++++----- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-experimental/CHANGELOG.md | 11 +++++++++++ sdk/core/azure-core-experimental/README.md | 2 +- sdk/core/azure-core-experimental/pom.xml | 4 ++-- sdk/core/azure-core-http-jdk-httpclient/pom.xml | 4 ++-- sdk/core/azure-core-http-netty/CHANGELOG.md | 3 +++ sdk/core/azure-core-http-netty/pom.xml | 4 ++-- sdk/core/azure-core-http-okhttp/CHANGELOG.md | 3 +++ sdk/core/azure-core-http-okhttp/pom.xml | 4 ++-- .../azure-core-serializer-avro-apache/CHANGELOG.md | 5 ++++- sdk/core/azure-core-serializer-avro-apache/README.md | 2 +- sdk/core/azure-core-serializer-avro-apache/pom.xml | 4 ++-- sdk/core/azure-core-serializer-avro-jackson/pom.xml | 4 ++-- .../azure-core-serializer-json-gson/CHANGELOG.md | 5 ++++- sdk/core/azure-core-serializer-json-gson/README.md | 2 +- sdk/core/azure-core-serializer-json-gson/pom.xml | 4 ++-- .../azure-core-serializer-json-jackson/CHANGELOG.md | 5 ++++- .../azure-core-serializer-json-jackson/README.md | 2 +- sdk/core/azure-core-serializer-json-jackson/pom.xml | 4 ++-- sdk/core/azure-core-test/CHANGELOG.md | 3 +++ sdk/core/azure-core-test/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/core/azure-core/CHANGELOG.md | 12 +++++++++++- sdk/core/azure-core/README.md | 2 +- sdk/core/azure-core/pom.xml | 2 +- sdk/e2e/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- 30 files changed, 84 insertions(+), 40 deletions(-) diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index c5ead03aa9776..c9a824db4bb55 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/eng/code-quality-reports/src/main/resources/revapi/revapi.json @@ -3,6 +3,11 @@ "extension": "revapi.java", "configuration": { "filter": { + "classes": { + "exclude": [ + "com.azure.core.util.Configuration" + ] + }, "packages": { "regex": true, "exclude": [ diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index ae17b2c167939..5774c19ebc26a 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -79,7 +79,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure @@ -94,7 +94,7 @@ com.azure azure-core-experimental - 1.0.0-beta.7 + 1.0.0-beta.8 com.azure @@ -124,12 +124,12 @@ com.azure azure-core-serializer-json-gson - 1.1.0-beta.1 + 1.0.3 com.azure azure-core-serializer-json-jackson - 1.1.0-beta.1 + 1.1.0 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 124c954b0d11c..cc9795dfcf351 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -12,18 +12,18 @@ com.azure:azure-communication-chat;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-common;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-administration;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-sms;1.0.0-beta.2;1.0.0-beta.3 -com.azure:azure-core;1.9.0;1.10.0-beta.1 +com.azure:azure-core;1.9.0;1.10.0 com.azure:azure-core-amqp;1.6.0;1.7.0-beta.1 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-experimental;1.0.0-beta.6;1.0.0-beta.7 +com.azure:azure-core-experimental;1.0.0-beta.7;1.0.0-beta.8 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-http-netty;1.6.2;1.7.0-beta.1 com.azure:azure-core-http-okhttp;1.3.2;1.4.0-beta.1 com.azure:azure-core-management;1.0.0;1.1.0-beta.1 com.azure:azure-core-serializer-avro-apache;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2 -com.azure:azure-core-serializer-json-gson;1.0.2;1.1.0-beta.1 -com.azure:azure-core-serializer-json-jackson;1.0.2;1.1.0-beta.1 +com.azure:azure-core-serializer-json-gson;1.0.2;1.0.3 +com.azure:azure-core-serializer-json-jackson;1.0.2;1.1.0 com.azure:azure-core-test;1.5.0;1.6.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.6;1.0.0-beta.7 com.azure:azure-cosmos;4.8.0;4.9.0-beta.1 @@ -143,7 +143,7 @@ com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.1;2.0.0-beta.1 # unreleased_:;dependency-version # note: The unreleased dependencies will not be manipulated with the automatic PR creation code. unreleased_com.azure:azure-core-amqp;1.7.0-beta.1 -unreleased_com.azure:azure-core;1.10.0-beta.1 +unreleased_com.azure:azure-core;1.10.0 unreleased_com.azure:azure-identity;1.2.0-beta.2 unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7 unreleased_com.azure:azure-messaging-eventhubs;5.3.0 diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index ac5a09ac9848f..1236049c26c5e 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.microsoft.azure diff --git a/sdk/core/azure-core-experimental/CHANGELOG.md b/sdk/core/azure-core-experimental/CHANGELOG.md index 9ed249c7810ff..9f130d48082f1 100644 --- a/sdk/core/azure-core-experimental/CHANGELOG.md +++ b/sdk/core/azure-core-experimental/CHANGELOG.md @@ -1,5 +1,16 @@ # Release History +## 1.0.0-beta.8 (2020-10-28) + +### New Features + +- Added `Object` based APIs to `BinaryData` that use a default `JsonSerializer`. + +### Breaking Changes + +- Moved `JsonPatchDocument` into `azure-core`. +- Removed `BinaryData.fromString(String, Charset)`. + ## 1.0.0-beta.7 (2020-10-08) - Added API `fromObject()` in `BinaryData` which uses `JsonSerializer` present in the classpath. diff --git a/sdk/core/azure-core-experimental/README.md b/sdk/core/azure-core-experimental/README.md index cef08ab741f97..7bdd8338359f6 100644 --- a/sdk/core/azure-core-experimental/README.md +++ b/sdk/core/azure-core-experimental/README.md @@ -17,7 +17,7 @@ Azure Core Experimental contains types that are being evaluated and might eventu com.azure azure-core-experimental - 1.0.0-beta.7 + 1.0.0-beta.8 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 1c41eda86499b..8e0f557cf0f26 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-experimental jar - 1.0.0-beta.7 + 1.0.0-beta.8 Microsoft Azure Java Core Experimental Library This package contains experimental core types for Azure Java clients. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index 347fcd39c1b7d..e2ed83074d8b0 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -62,14 +62,14 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure azure-core - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-http-netty/CHANGELOG.md b/sdk/core/azure-core-http-netty/CHANGELOG.md index a94fd086494bb..7591ee2d83590 100644 --- a/sdk/core/azure-core-http-netty/CHANGELOG.md +++ b/sdk/core/azure-core-http-netty/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.7.0-beta.1 (Unreleased) +### Dependency updates + +- Updated `azure-core` to `1.10.0`. ## 1.6.2 (2020-10-01) diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 9f592b8b81711..6a5592cc81066 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 @@ -117,7 +117,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/CHANGELOG.md b/sdk/core/azure-core-http-okhttp/CHANGELOG.md index 0e0dfee2ce2ce..5ece50fd59e6a 100644 --- a/sdk/core/azure-core-http-okhttp/CHANGELOG.md +++ b/sdk/core/azure-core-http-okhttp/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.4.0-beta.1 (Unreleased) +### Dependency updates + +- Updated `azure-core` to `1.10.0`. ## 1.3.2 (2020-10-01) diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index a31df22772976..d027d5ab8afff 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 @@ -73,7 +73,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md index f703eb0adc9e8..b77b1449cc510 100644 --- a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md @@ -1,7 +1,10 @@ # Release History -## 1.0.0-beta.5 (Unreleased) +## 1.0.0-beta.5 (2020-10-28) +### Dependency updates + +- Updated `azure-core` to `1.10.0`. ## 1.0.0-beta.4 (2020-10-01) diff --git a/sdk/core/azure-core-serializer-avro-apache/README.md b/sdk/core/azure-core-serializer-avro-apache/README.md index 433b71a0d6396..2c87682ff451d 100644 --- a/sdk/core/azure-core-serializer-avro-apache/README.md +++ b/sdk/core/azure-core-serializer-avro-apache/README.md @@ -15,7 +15,7 @@ Azure Core Apache Avro Serializer is a plugin for the `azure-core` `AvroSerializ com.azure azure-core-serializer-avro-apache - 1.0.0-beta.4 + 1.0.0-beta.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 88cd0640be8eb..4c0d990d50f1c 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -58,12 +58,12 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure azure-core-experimental - 1.0.0-beta.7 + 1.0.0-beta.8 diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index 38dd0cbb40687..acae5c278d4c9 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -58,12 +58,12 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure azure-core-experimental - 1.0.0-beta.7 + 1.0.0-beta.8 diff --git a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md index bf2a22b7c75cd..0fe322ac2ffc0 100644 --- a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md @@ -1,7 +1,10 @@ # Release History -## 1.1.0-beta.1 (Unreleased) +## 1.0.3 (2020-10-28) +### Dependency updates + +- Updated `azure-core` to `1.10.0`. ## 1.0.2 (2020-10-01) diff --git a/sdk/core/azure-core-serializer-json-gson/README.md b/sdk/core/azure-core-serializer-json-gson/README.md index b96ce10bfecbe..4d4a8c35c600e 100644 --- a/sdk/core/azure-core-serializer-json-gson/README.md +++ b/sdk/core/azure-core-serializer-json-gson/README.md @@ -15,7 +15,7 @@ Azure Core Gson JSON Serializer is a plugin for the `azure-core` `JsonSerializer com.azure azure-core-serializer-json-gson - 1.0.2 + 1.0.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index db36f2937520a..5e6bc1c08f25c 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-gson jar - 1.1.0-beta.1 + 1.0.3 Microsoft Azure Gson JSON Serializer Library This package contains the Gson JSON serializer client plugin for azure-core. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 diff --git a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md index 31ab0d01d805d..87a8766b929ab 100644 --- a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md @@ -1,7 +1,10 @@ # Release History -## 1.1.0-beta.1 (Unreleased) +## 1.1.0 (2020-10-28) +### Breaking Changes + +- Changed default `ObjectMapper` configuration used by `JacksonJsonSerializerBuilder`. ## 1.0.2 (2020-10-01) diff --git a/sdk/core/azure-core-serializer-json-jackson/README.md b/sdk/core/azure-core-serializer-json-jackson/README.md index b713dc79aa655..6ed54ca1022ab 100644 --- a/sdk/core/azure-core-serializer-json-jackson/README.md +++ b/sdk/core/azure-core-serializer-json-jackson/README.md @@ -15,7 +15,7 @@ Azure Core Jackson JSON Serializer is a plugin for the `azure-core` `JsonSeriali com.azure azure-core-serializer-json-jackson - 1.0.2 + 1.1.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 7a312cee73d06..64a1169ca24cb 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-jackson jar - 1.1.0-beta.1 + 1.1.0 Microsoft Azure Jackson JSON Serializer Library This package contains the Jackson JSON serializer client plugin for azure-core. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index 0e39a6e2c8de6..759860839376d 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.6.0-beta.1 (Unreleased) +### Dependency updates + +- Updated `azure-core` to `1.10.0`. ## 1.5.0 (2020-10-01) diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 6b55952203be8..7b1f4f0c7fa04 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index b3673708110af..8d2e08835229b 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 io.grpc diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index ea52485c20967..6b9c6b26fcb91 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,7 +1,17 @@ # Release History -## 1.10.0-beta.1 (Unreleased) +## 1.10.0 (2020-10-28) +### New Features + +- Added `Option` to represent the states of instantiated, null, and non-null for the wrapped value. +- Added `JsonPatchDocument` to support `json-patch` functionality. +- Added new Identity `Configuration` properties. + +### Bug Fixes + +- Modified `ContinuablePagedFlux` implementation to prevent `OutOfMemoryError` when retrieving many pages. [#12453](https://github.com/Azure/azure-sdk-for-java/issues/12453) +- Fixed a bug where request retrying didn't consume the network response potentially leading to resource leaking. ## 1.9.0 (2020-10-01) diff --git a/sdk/core/azure-core/README.md b/sdk/core/azure-core/README.md index 0ce91686d7de5..4060ffc32de71 100644 --- a/sdk/core/azure-core/README.md +++ b/sdk/core/azure-core/README.md @@ -27,7 +27,7 @@ tool when you depend on client libraries using it. com.azure azure-core - 1.9.0 + 1.10.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index aa4f2114f44bc..e9b374603857c 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core jar - 1.10.0-beta.1 + 1.10.0 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 990cda6871368..7f50a5f91f4a0 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -23,7 +23,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index c6a560a312d68..6c332a487dd5e 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -27,7 +27,7 @@ com.azure azure-core - 1.10.0-beta.1 + 1.10.0 com.azure From f6a2000bee070854b3b09018718b13fa631a511f Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Wed, 28 Oct 2020 17:02:16 -0700 Subject: [PATCH 08/36] Sb track2 schedule multiple message validate batch size (#16767) added validation in schedule. --- .../ServiceBusSenderAsyncClient.java | 31 +++++++++++++------ .../ServiceBusSenderAsyncClientTest.java | 27 ++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java index 77d5de40514c8..3332ced69344d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java @@ -338,7 +338,7 @@ public Mono scheduleMessage(ServiceBusMessage message, OffsetDateTime sche * Sends a scheduled messages to the Azure Service Bus entity this sender is connected to. A scheduled message is * enqueued and made available to receivers only at the scheduled enqueue time. * - * @param messages Message to be sent to the Service Bus Queue. + * @param messages Messages to be sent to the Service Bus Queue. * @param scheduledEnqueueTime OffsetDateTime at which the message should appear in the Service Bus queue or topic. * * @return The sequence number of the scheduled message which can be used to cancel the scheduling of the message. @@ -353,7 +353,7 @@ public Flux scheduleMessages(Iterable messages, OffsetD * Sends a scheduled messages to the Azure Service Bus entity this sender is connected to. A scheduled message is * enqueued and made available to receivers only at the scheduled enqueue time. * - * @param messages Message to be sent to the Service Bus Queue. + * @param messages Messages to be sent to the Service Bus Queue. * @param scheduledEnqueueTime Instant at which the message should appear in the Service Bus queue or topic. * @param transactionContext to be set on batch message before scheduling them on Service Bus. * @@ -371,13 +371,26 @@ public Flux scheduleMessages(Iterable messages, OffsetD return fluxError(logger, new NullPointerException("'scheduledEnqueueTime' cannot be null.")); } - return createMessageBatch().flatMapMany(messageBatch -> { - messages.forEach(message -> messageBatch.tryAddMessage(message)); - return getSendLink().flatMapMany(link -> connectionProcessor - .flatMap(connection -> connection.getManagementNode(entityName, entityType)) - .flatMapMany(managementNode -> managementNode.schedule(messageBatch.getMessages(), scheduledEnqueueTime, - messageBatch.getMaxSizeInBytes(), link.getLinkName(), transactionContext))); - }); + return getSendLink().flatMapMany(link -> createMessageBatch() + .flatMapMany(messageBatch -> { + int index = 0; + for (ServiceBusMessage message : messages) { + if (!messageBatch.tryAddMessage(message)) { + final String error = String.format(Locale.US, + "Messages exceed max allowed size for all the messages together. " + + "Failed to add message at index '%s'.", index); + throw logger.logExceptionAsError(new AmqpException(false, + AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED, error, link.getErrorContext())); + } + ++index; + } + + return connectionProcessor + .flatMap(connection -> connection.getManagementNode(entityName, entityType)) + .flatMapMany(managementNode -> managementNode.schedule(messageBatch.getMessages(), + scheduledEnqueueTime, messageBatch.getMaxSizeInBytes(), link.getLinkName(), + transactionContext)); + })); } /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java index 203b5f8a77ca0..1f832c0702116 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java @@ -70,6 +70,8 @@ import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.AZ_TRACING_SERVICE_NAME; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; @@ -288,6 +290,31 @@ void createsMessageBatchWithSize() { .verifyComplete(); } + @Test + void scheduleMessageSizeTooBig() { + // Arrange + int maxLinkSize = 1024; + int batchSize = maxLinkSize + 10; + + OffsetDateTime instant = mock(OffsetDateTime.class); + final List messages = TestUtils.getServiceBusMessages(batchSize, UUID.randomUUID().toString()); + + final AmqpSendLink link = mock(AmqpSendLink.class); + when(link.getLinkSize()).thenReturn(Mono.just(maxLinkSize)); + + when(connection.createSendLink(eq(ENTITY_NAME), eq(ENTITY_NAME), any(AmqpRetryOptions.class), isNull())) + .thenReturn(Mono.just(link)); + when(link.getLinkSize()).thenReturn(Mono.just(maxLinkSize)); + + // Act & Assert + StepVerifier.create(sender.scheduleMessages(messages, instant)) + .verifyErrorMatches(throwable -> { + assertTrue(throwable instanceof AmqpException); + assertSame(((AmqpException) throwable).getErrorCondition(), AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED); + return true; + }); + } + /** * Verifies that sending multiple message will result in calling sender.send(MessageBatch, transaction). */ From 1ff1621ecbf0c6734a3a62d2f06cc89176982c67 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Thu, 29 Oct 2020 11:14:25 +0800 Subject: [PATCH 09/36] Mgmt: generate avs 2020 03 (#16954) * generate avs 2020 03 * update version to 1.0.0 --- sdk/avs/mgmt-v2020_03_20/pom.xml | 2 +- .../management/avs/v2020_03_20/Cluster.java | 14 +- .../avs/v2020_03_20/ErrorResponse.java | 5 +- .../avs/v2020_03_20/LogSpecification.java | 95 +++++ .../avs/v2020_03_20/ManagementCluster.java | 27 ++ .../avs/v2020_03_20/MetricDimension.java | 69 ++++ .../avs/v2020_03_20/MetricSpecification.java | 359 ++++++++++++++++++ .../management/avs/v2020_03_20/Operation.java | 15 + .../avs/v2020_03_20/OperationProperties.java | 43 +++ .../avs/v2020_03_20/ServiceSpecification.java | 70 ++++ .../implementation/ClusterImpl.java | 8 +- .../implementation/ClusterInner.java | 45 ++- .../implementation/OperationImpl.java | 16 + .../implementation/OperationInner.java | 80 ++++ 14 files changed, 827 insertions(+), 21 deletions(-) create mode 100644 sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/LogSpecification.java create mode 100644 sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricDimension.java create mode 100644 sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricSpecification.java create mode 100644 sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/OperationProperties.java create mode 100644 sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ServiceSpecification.java diff --git a/sdk/avs/mgmt-v2020_03_20/pom.xml b/sdk/avs/mgmt-v2020_03_20/pom.xml index 2ee6866b239b8..92eb36167cb05 100644 --- a/sdk/avs/mgmt-v2020_03_20/pom.xml +++ b/sdk/avs/mgmt-v2020_03_20/pom.xml @@ -15,7 +15,7 @@ ../../parents/azure-arm-parent/pom.xml azure-mgmt-avs - 1.0.0-beta + 1.0.0 jar Microsoft Azure SDK for AVS Management This package contains Microsoft AVS Management SDK. diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Cluster.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Cluster.java index 720b1ff366836..f1c14b9368ab9 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Cluster.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Cluster.java @@ -116,12 +116,24 @@ interface WithClusterSize { WithCreate withClusterSize(Integer clusterSize); } + /** + * The stage of the cluster definition allowing to specify ProvisioningState. + */ + interface WithProvisioningState { + /** + * Specifies provisioningState. + * @param provisioningState The state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating' + * @return the next definition stage + */ + WithCreate withProvisioningState(ClusterProvisioningState provisioningState); + } + /** * The stage of the definition which contains all the minimum required inputs for * the resource to be created (via {@link WithCreate#create()}), but also allows * for any other optional settings to be specified. */ - interface WithCreate extends Creatable, DefinitionStages.WithClusterSize { + interface WithCreate extends Creatable, DefinitionStages.WithClusterSize, DefinitionStages.WithProvisioningState { } } /** diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ErrorResponse.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ErrorResponse.java index 6dea1bcae7aee..8e4e1da1eb3cc 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ErrorResponse.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ErrorResponse.java @@ -12,7 +12,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * The resource management error response. + * Error Response. + * Common error response for all Azure Resource Manager APIs to return error + * details for failed operations. (This also follows the OData error response + * format.). */ public class ErrorResponse { /** diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/LogSpecification.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/LogSpecification.java new file mode 100644 index 0000000000000..7b66c2042edc3 --- /dev/null +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/LogSpecification.java @@ -0,0 +1,95 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.avs.v2020_03_20; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifications of the Log for Azure Monitoring. + */ +public class LogSpecification { + /** + * Name of the log. + */ + @JsonProperty(value = "name") + private String name; + + /** + * Localized friendly display name of the log. + */ + @JsonProperty(value = "displayName") + private String displayName; + + /** + * Blob duration of the log. + */ + @JsonProperty(value = "blobDuration") + private String blobDuration; + + /** + * Get name of the log. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set name of the log. + * + * @param name the name value to set + * @return the LogSpecification object itself. + */ + public LogSpecification withName(String name) { + this.name = name; + return this; + } + + /** + * Get localized friendly display name of the log. + * + * @return the displayName value + */ + public String displayName() { + return this.displayName; + } + + /** + * Set localized friendly display name of the log. + * + * @param displayName the displayName value to set + * @return the LogSpecification object itself. + */ + public LogSpecification withDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get blob duration of the log. + * + * @return the blobDuration value + */ + public String blobDuration() { + return this.blobDuration; + } + + /** + * Set blob duration of the log. + * + * @param blobDuration the blobDuration value to set + * @return the LogSpecification object itself. + */ + public LogSpecification withBlobDuration(String blobDuration) { + this.blobDuration = blobDuration; + return this; + } + +} diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ManagementCluster.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ManagementCluster.java index a82bce4b275d8..2067f4e8c3ea5 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ManagementCluster.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/ManagementCluster.java @@ -15,6 +15,13 @@ * The properties of a default cluster. */ public class ManagementCluster extends ClusterUpdateProperties { + /** + * The state of the cluster provisioning. Possible values include: + * 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + */ + @JsonProperty(value = "provisioningState") + private ClusterProvisioningState provisioningState; + /** * The identity. */ @@ -27,6 +34,26 @@ public class ManagementCluster extends ClusterUpdateProperties { @JsonProperty(value = "hosts", access = JsonProperty.Access.WRITE_ONLY) private List hosts; + /** + * Get the state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + * + * @return the provisioningState value + */ + public ClusterProvisioningState provisioningState() { + return this.provisioningState; + } + + /** + * Set the state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + * + * @param provisioningState the provisioningState value to set + * @return the ManagementCluster object itself. + */ + public ManagementCluster withProvisioningState(ClusterProvisioningState provisioningState) { + this.provisioningState = provisioningState; + return this; + } + /** * Get the identity. * diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricDimension.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricDimension.java new file mode 100644 index 0000000000000..280ad5fc6b2e9 --- /dev/null +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricDimension.java @@ -0,0 +1,69 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.avs.v2020_03_20; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifications of the Dimension of metrics. + */ +public class MetricDimension { + /** + * Name of the dimension. + */ + @JsonProperty(value = "name") + private String name; + + /** + * Localized friendly display name of the dimension. + */ + @JsonProperty(value = "displayName") + private String displayName; + + /** + * Get name of the dimension. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set name of the dimension. + * + * @param name the name value to set + * @return the MetricDimension object itself. + */ + public MetricDimension withName(String name) { + this.name = name; + return this; + } + + /** + * Get localized friendly display name of the dimension. + * + * @return the displayName value + */ + public String displayName() { + return this.displayName; + } + + /** + * Set localized friendly display name of the dimension. + * + * @param displayName the displayName value to set + * @return the MetricDimension object itself. + */ + public MetricDimension withDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + +} diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricSpecification.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricSpecification.java new file mode 100644 index 0000000000000..8d70d8c8422d1 --- /dev/null +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/MetricSpecification.java @@ -0,0 +1,359 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.avs.v2020_03_20; + +import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Specifications of the Metrics for Azure Monitoring. + */ +public class MetricSpecification { + /** + * Name of the metric. + */ + @JsonProperty(value = "name") + private String name; + + /** + * Localized friendly display name of the metric. + */ + @JsonProperty(value = "displayName") + private String displayName; + + /** + * Localized friendly description of the metric. + */ + @JsonProperty(value = "displayDescription") + private String displayDescription; + + /** + * Unit that makes sense for the metric. + */ + @JsonProperty(value = "unit") + private String unit; + + /** + * Name of the metric category that the metric belongs to. A metric can + * only belong to a single category. + */ + @JsonProperty(value = "category") + private String category; + + /** + * Only provide one value for this field. Valid values: Average, Minimum, + * Maximum, Total, Count. + */ + @JsonProperty(value = "aggregationType") + private String aggregationType; + + /** + * Supported aggregation types. + */ + @JsonProperty(value = "supportedAggregationTypes") + private List supportedAggregationTypes; + + /** + * Supported time grain types. + */ + @JsonProperty(value = "supportedTimeGrainTypes") + private List supportedTimeGrainTypes; + + /** + * Optional. If set to true, then zero will be returned for time duration + * where no metric is emitted/published. + */ + @JsonProperty(value = "fillGapWithZero") + private Boolean fillGapWithZero; + + /** + * Dimensions of the metric. + */ + @JsonProperty(value = "dimensions") + private List dimensions; + + /** + * Whether or not the service is using regional MDM accounts. + */ + @JsonProperty(value = "enableRegionalMdmAccount") + private String enableRegionalMdmAccount; + + /** + * The name of the MDM account. + */ + @JsonProperty(value = "sourceMdmAccount") + private String sourceMdmAccount; + + /** + * The name of the MDM namespace. + */ + @JsonProperty(value = "sourceMdmNamespace") + private String sourceMdmNamespace; + + /** + * Get name of the metric. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set name of the metric. + * + * @param name the name value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withName(String name) { + this.name = name; + return this; + } + + /** + * Get localized friendly display name of the metric. + * + * @return the displayName value + */ + public String displayName() { + return this.displayName; + } + + /** + * Set localized friendly display name of the metric. + * + * @param displayName the displayName value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get localized friendly description of the metric. + * + * @return the displayDescription value + */ + public String displayDescription() { + return this.displayDescription; + } + + /** + * Set localized friendly description of the metric. + * + * @param displayDescription the displayDescription value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withDisplayDescription(String displayDescription) { + this.displayDescription = displayDescription; + return this; + } + + /** + * Get unit that makes sense for the metric. + * + * @return the unit value + */ + public String unit() { + return this.unit; + } + + /** + * Set unit that makes sense for the metric. + * + * @param unit the unit value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withUnit(String unit) { + this.unit = unit; + return this; + } + + /** + * Get name of the metric category that the metric belongs to. A metric can only belong to a single category. + * + * @return the category value + */ + public String category() { + return this.category; + } + + /** + * Set name of the metric category that the metric belongs to. A metric can only belong to a single category. + * + * @param category the category value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withCategory(String category) { + this.category = category; + return this; + } + + /** + * Get only provide one value for this field. Valid values: Average, Minimum, Maximum, Total, Count. + * + * @return the aggregationType value + */ + public String aggregationType() { + return this.aggregationType; + } + + /** + * Set only provide one value for this field. Valid values: Average, Minimum, Maximum, Total, Count. + * + * @param aggregationType the aggregationType value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withAggregationType(String aggregationType) { + this.aggregationType = aggregationType; + return this; + } + + /** + * Get supported aggregation types. + * + * @return the supportedAggregationTypes value + */ + public List supportedAggregationTypes() { + return this.supportedAggregationTypes; + } + + /** + * Set supported aggregation types. + * + * @param supportedAggregationTypes the supportedAggregationTypes value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withSupportedAggregationTypes(List supportedAggregationTypes) { + this.supportedAggregationTypes = supportedAggregationTypes; + return this; + } + + /** + * Get supported time grain types. + * + * @return the supportedTimeGrainTypes value + */ + public List supportedTimeGrainTypes() { + return this.supportedTimeGrainTypes; + } + + /** + * Set supported time grain types. + * + * @param supportedTimeGrainTypes the supportedTimeGrainTypes value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withSupportedTimeGrainTypes(List supportedTimeGrainTypes) { + this.supportedTimeGrainTypes = supportedTimeGrainTypes; + return this; + } + + /** + * Get optional. If set to true, then zero will be returned for time duration where no metric is emitted/published. + * + * @return the fillGapWithZero value + */ + public Boolean fillGapWithZero() { + return this.fillGapWithZero; + } + + /** + * Set optional. If set to true, then zero will be returned for time duration where no metric is emitted/published. + * + * @param fillGapWithZero the fillGapWithZero value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withFillGapWithZero(Boolean fillGapWithZero) { + this.fillGapWithZero = fillGapWithZero; + return this; + } + + /** + * Get dimensions of the metric. + * + * @return the dimensions value + */ + public List dimensions() { + return this.dimensions; + } + + /** + * Set dimensions of the metric. + * + * @param dimensions the dimensions value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withDimensions(List dimensions) { + this.dimensions = dimensions; + return this; + } + + /** + * Get whether or not the service is using regional MDM accounts. + * + * @return the enableRegionalMdmAccount value + */ + public String enableRegionalMdmAccount() { + return this.enableRegionalMdmAccount; + } + + /** + * Set whether or not the service is using regional MDM accounts. + * + * @param enableRegionalMdmAccount the enableRegionalMdmAccount value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withEnableRegionalMdmAccount(String enableRegionalMdmAccount) { + this.enableRegionalMdmAccount = enableRegionalMdmAccount; + return this; + } + + /** + * Get the name of the MDM account. + * + * @return the sourceMdmAccount value + */ + public String sourceMdmAccount() { + return this.sourceMdmAccount; + } + + /** + * Set the name of the MDM account. + * + * @param sourceMdmAccount the sourceMdmAccount value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withSourceMdmAccount(String sourceMdmAccount) { + this.sourceMdmAccount = sourceMdmAccount; + return this; + } + + /** + * Get the name of the MDM namespace. + * + * @return the sourceMdmNamespace value + */ + public String sourceMdmNamespace() { + return this.sourceMdmNamespace; + } + + /** + * Set the name of the MDM namespace. + * + * @param sourceMdmNamespace the sourceMdmNamespace value to set + * @return the MetricSpecification object itself. + */ + public MetricSpecification withSourceMdmNamespace(String sourceMdmNamespace) { + this.sourceMdmNamespace = sourceMdmNamespace; + return this; + } + +} diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Operation.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Operation.java index 6185e1b6c9466..02525d3927b53 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Operation.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/Operation.java @@ -22,9 +22,24 @@ public interface Operation extends HasInner, HasManager logSpecifications; + + /** + * Specifications of the Metrics for Azure Monitoring. + */ + @JsonProperty(value = "metricSpecifications") + private List metricSpecifications; + + /** + * Get specifications of the Log for Azure Monitoring. + * + * @return the logSpecifications value + */ + public List logSpecifications() { + return this.logSpecifications; + } + + /** + * Set specifications of the Log for Azure Monitoring. + * + * @param logSpecifications the logSpecifications value to set + * @return the ServiceSpecification object itself. + */ + public ServiceSpecification withLogSpecifications(List logSpecifications) { + this.logSpecifications = logSpecifications; + return this; + } + + /** + * Get specifications of the Metrics for Azure Monitoring. + * + * @return the metricSpecifications value + */ + public List metricSpecifications() { + return this.metricSpecifications; + } + + /** + * Set specifications of the Metrics for Azure Monitoring. + * + * @param metricSpecifications the metricSpecifications value to set + * @return the ServiceSpecification object itself. + */ + public ServiceSpecification withMetricSpecifications(List metricSpecifications) { + this.metricSpecifications = metricSpecifications; + return this; + } + +} diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterImpl.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterImpl.java index ceac591254d2e..ac263aceb74ce 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterImpl.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterImpl.java @@ -13,8 +13,8 @@ import rx.Observable; import com.microsoft.azure.management.avs.v2020_03_20.ClusterUpdate; import com.microsoft.azure.management.avs.v2020_03_20.Sku; -import java.util.List; import com.microsoft.azure.management.avs.v2020_03_20.ClusterProvisioningState; +import java.util.List; import rx.functions.Func1; class ClusterImpl extends CreatableUpdatableImpl implements Cluster, Cluster.Definition, Cluster.Update { @@ -147,6 +147,12 @@ public ClusterImpl withSku(Sku sku) { return this; } + @Override + public ClusterImpl withProvisioningState(ClusterProvisioningState provisioningState) { + this.inner().withProvisioningState(provisioningState); + return this; + } + @Override public ClusterImpl withClusterSize(Integer clusterSize) { if (isInCreateMode()) { diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterInner.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterInner.java index 4d6025e5965d5..52c51c7fbeca8 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterInner.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/ClusterInner.java @@ -9,8 +9,8 @@ package com.microsoft.azure.management.avs.v2020_03_20.implementation; import com.microsoft.azure.management.avs.v2020_03_20.Sku; -import java.util.List; import com.microsoft.azure.management.avs.v2020_03_20.ClusterProvisioningState; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.ProxyResource; @@ -32,6 +32,13 @@ public class ClusterInner extends ProxyResource { @JsonProperty(value = "properties.clusterSize") private Integer clusterSize; + /** + * The state of the cluster provisioning. Possible values include: + * 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + */ + @JsonProperty(value = "properties.provisioningState") + private ClusterProvisioningState provisioningState; + /** * The identity. */ @@ -44,13 +51,6 @@ public class ClusterInner extends ProxyResource { @JsonProperty(value = "properties.hosts", access = JsonProperty.Access.WRITE_ONLY) private List hosts; - /** - * The state of the cluster provisioning. Possible values include: - * 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. - */ - @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) - private ClusterProvisioningState provisioningState; - /** * Get the cluster SKU. * @@ -91,6 +91,26 @@ public ClusterInner withClusterSize(Integer clusterSize) { return this; } + /** + * Get the state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + * + * @return the provisioningState value + */ + public ClusterProvisioningState provisioningState() { + return this.provisioningState; + } + + /** + * Set the state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. + * + * @param provisioningState the provisioningState value to set + * @return the ClusterInner object itself. + */ + public ClusterInner withProvisioningState(ClusterProvisioningState provisioningState) { + this.provisioningState = provisioningState; + return this; + } + /** * Get the identity. * @@ -109,13 +129,4 @@ public List hosts() { return this.hosts; } - /** - * Get the state of the cluster provisioning. Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Deleting', 'Updating'. - * - * @return the provisioningState value - */ - public ClusterProvisioningState provisioningState() { - return this.provisioningState; - } - } diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationImpl.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationImpl.java index 15d5475e05e37..44373a8afdbe3 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationImpl.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationImpl.java @@ -11,6 +11,7 @@ import com.microsoft.azure.management.avs.v2020_03_20.Operation; import com.microsoft.azure.arm.model.implementation.WrapperImpl; import com.microsoft.azure.management.avs.v2020_03_20.OperationDisplay; +import com.microsoft.azure.management.avs.v2020_03_20.OperationProperties; class OperationImpl extends WrapperImpl implements Operation { private final AVSManager manager; @@ -29,9 +30,24 @@ public OperationDisplay display() { return this.inner().display(); } + @Override + public Boolean isDataAction() { + return this.inner().isDataAction(); + } + @Override public String name() { return this.inner().name(); } + @Override + public String origin() { + return this.inner().origin(); + } + + @Override + public OperationProperties properties() { + return this.inner().properties(); + } + } diff --git a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationInner.java b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationInner.java index 20515eee54d28..a1384f31ac4fe 100644 --- a/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationInner.java +++ b/sdk/avs/mgmt-v2020_03_20/src/main/java/com/microsoft/azure/management/avs/v2020_03_20/implementation/OperationInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.avs.v2020_03_20.implementation; import com.microsoft.azure.management.avs.v2020_03_20.OperationDisplay; +import com.microsoft.azure.management.avs.v2020_03_20.OperationProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -27,6 +28,25 @@ public class OperationInner { @JsonProperty(value = "display", access = JsonProperty.Access.WRITE_ONLY) private OperationDisplay display; + /** + * Gets or sets a value indicating whether the operation is a data action + * or not. + */ + @JsonProperty(value = "isDataAction") + private Boolean isDataAction; + + /** + * Origin of the operation. + */ + @JsonProperty(value = "origin") + private String origin; + + /** + * Properties of the operation. + */ + @JsonProperty(value = "properties") + private OperationProperties properties; + /** * Get name of the operation being performed on this object. * @@ -45,4 +65,64 @@ public OperationDisplay display() { return this.display; } + /** + * Get gets or sets a value indicating whether the operation is a data action or not. + * + * @return the isDataAction value + */ + public Boolean isDataAction() { + return this.isDataAction; + } + + /** + * Set gets or sets a value indicating whether the operation is a data action or not. + * + * @param isDataAction the isDataAction value to set + * @return the OperationInner object itself. + */ + public OperationInner withIsDataAction(Boolean isDataAction) { + this.isDataAction = isDataAction; + return this; + } + + /** + * Get origin of the operation. + * + * @return the origin value + */ + public String origin() { + return this.origin; + } + + /** + * Set origin of the operation. + * + * @param origin the origin value to set + * @return the OperationInner object itself. + */ + public OperationInner withOrigin(String origin) { + this.origin = origin; + return this; + } + + /** + * Get properties of the operation. + * + * @return the properties value + */ + public OperationProperties properties() { + return this.properties; + } + + /** + * Set properties of the operation. + * + * @param properties the properties value to set + * @return the OperationInner object itself. + */ + public OperationInner withProperties(OperationProperties properties) { + this.properties = properties; + return this; + } + } From c7a06791e9c03d2452f0b56d54064dd6663bd009 Mon Sep 17 00:00:00 2001 From: Chuang <54572251+xccc-msft@users.noreply.github.com> Date: Thu, 29 Oct 2020 11:29:51 +0800 Subject: [PATCH 10/36] mgmt rename session records by azure-core-test changes (#16921) * mgmt rename session records by azure-core-test changes * rename privatedns records --- .../{canCRUDApp.json => SpringCloudTest.canCRUDApp.json} | 0 .../{canCRUDServie.json => SpringCloudTest.canCRUDServie.json} | 0 ...ePlan.json => AppServicePlansTests.canCRUDAppServicePlan.json} | 0 ...nd.json => AppServicePlansTests.failOnAppServiceNotFound.json} | 0 ...r.json => CertificateOrdersTests.canCRUDCertificateOrder.json} | 0 ...DCertificate.json => CertificatesTests.canCRDCertificate.json} | 0 ...Certificate.json => CertificatesTests.canListCertificate.json} | 0 ...DSwapSlots.json => DeploymentSlotsTests.canCRUDSwapSlots.json} | 0 ...n => DiagnosticLogsTests.canCRUDWebAppWithDiagnosticLogs.json} | 0 .../{canCRUDDomain.json => DomainsTests.canCRUDDomain.json} | 0 ...FunctionApp.json => FunctionAppsTests.canCRUDFunctionApp.json} | 0 ...ionApp.json => FunctionAppsTests.canCRUDLinuxFunctionApp.json} | 0 ....json => FunctionAppsTests.canCRUDLinuxFunctionAppJava11.json} | 0 ...json => FunctionAppsTests.canCRUDLinuxFunctionAppPremium.json} | 0 ...=> FunctionDeploymentSlotsTests.canCRUDFunctionSwapSlots.json} | 0 ...ameAndSsl.json => HostnameSslTests.canBindHostnameAndSsl.json} | 0 ...ebApp.json => LinuxWebAppsTests.canCRUDLinuxJava11WebApp.json} | 0 ...LinuxWebApp.json => LinuxWebAppsTests.canCRUDLinuxWebApp.json} | 0 ...ontrol.json => SourceControlTests.canDeploySourceControl.json} | 0 ...ultipleWars.json => WarDeployTests.canDeployMultipleWars.json} | 0 .../{canDeployWar.json => WarDeployTests.canDeployWar.json} | 0 ...bAppConfig.json => WebAppConfigTests.canCRUDWebAppConfig.json} | 0 ...va11.json => WebAppConfigTests.canCRUDWebAppConfigJava11.json} | 0 ...bAppWithMsi.json => WebAppsMsiTests.canCRUDWebAppWithMsi.json} | 0 ...json => WebAppsMsiTests.canCRUDWebAppWithUserAssignedMsi.json} | 0 .../{canCRUDWebApp.json => WebAppsTests.canCRUDWebApp.json} | 0 .../{canListWebApp.json => WebAppsTests.canListWebApp.json} | 0 ...oyWarFile.json => WebAppsWebDeployTests.canDeployWarFile.json} | 0 ...ployFunction.json => ZipDeployTests.canZipDeployFunction.json} | 0 ...Application.json => ApplicationsTests.canCRUDApplication.json} | 0 .../{canCRUDGroup.json => GroupsTests.canCRUDGroup.json} | 0 ...gnment.json => RoleAssignmentTests.canCRUDRoleAssignment.json} | 0 ...oleName.json => RoleDefinitionTests.canGetRoleByRoleName.json} | 0 ...l.json => ServicePrincipalsTests.canCRUDServicePrincipal.json} | 0 .../{canCreateUser.json => UsersTests.canCreateUser.json} | 0 .../{canUpdateUser.json => UsersTests.canUpdateUser.json} | 0 ...le.json => CdnProfileOperationsTests.canCreateCdnProfile.json} | 0 ... => CdnProfileOperationsTests.canCreateUpdateCdnEndpoint.json} | 0 ...n => CdnProfileOperationsTests.canCreateUpdateCdnProfile.json} | 0 ...ests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json} | 0 .../{canListSkus.json => ComputeSkuTests.canListSkus.json} | 0 ...SkusByRegion.json => ComputeSkuTests.canListSkusByRegion.json} | 0 ...on => ComputeSkuTests.canListSkusByRegionAndResourceType.json} | 0 ...ceType.json => ComputeSkuTests.canListSkusByResourceType.json} | 0 .../session-records/{foo.json => ComputeSkuTests.foo.json} | 0 ...json => ComputeUsageOperationsTests.canListComputeUsages.json} | 0 ... ManagedDiskOperationsTests.canOperateOnEmptyManagedDisk.json} | 0 ...nagedDiskOperationsTests.canOperateOnManagedDiskFromDisk.json} | 0 ...dDiskOperationsTests.canOperateOnManagedDiskFromSnapshot.json} | 0 ...gedDiskOperationsTests.canOperateOnManagedDiskFromUpload.json} | 0 ...edGalleryImageTests.canCreateUpdateGetDeleteGalleryImage.json} | 0 ...ryImageTests.canCreateUpdateGetDeleteGalleryImageVersion.json} | 0 ...redGalleryImageTests.canCreateUpdateListGetDeleteGallery.json} | 0 ...teZonedVirtualMachineWithExplicitZoneForRelatedResources.json} | 0 ...teZonedVirtualMachineWithImplicitZoneForRelatedResources.json} | 0 ...ts.canCreateZonedVirtualMachineWithZoneResilientPublicIP.json} | 0 ...ts.bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json} | 0 ....bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json} | 0 ...ualMachineBootDiagnosticsTests.canDisableBootDiagnostics.json} | 0 ...leBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json} | 0 ...BootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json} | 0 ...bleBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json} | 0 ...bleBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json} | 0 ...eBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json} | 0 ...ineCustomImageOperationsTest.canCreateImageByCapturingVM.json} | 0 ...eCustomImageOperationsTest.canCreateImageFromManagedDisk.json} | 0 ...ineCustomImageOperationsTest.canCreateImageFromNativeVhd.json} | 0 ...MSIOperationsTests.canCreateUpdateVirtualMachineWithEMSI.json} | 0 ...SIOperationsTests.canCreateVirtualMachineWithLMSIAndEMSI.json} | 0 ...SIOperationsTests.canUpdateVirtualMachineWithEMSIAndLMSI.json} | 0 ...nImageOperationsTests.canGetExtensionTypeVersionAndImage.json} | 0 ...hineExtensionImageOperationsTests.canListExtensionImages.json} | 0 ...neExtensionOperationsTests.canEnableDiagnosticsExtension.json} | 0 ...hineExtensionOperationsTests.canHandleExtensionReference.json} | 0 ...ensionOperationsTests.canInstallUninstallCustomExtension.json} | 0 ...onOperationsTests.canResetPasswordUsingVMAccessExtension.json} | 0 ...lMachineImageOperationsTests.canListVirtualMachineImages.json} | 0 ...s.canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json} | 0 ...onsTests.canCreateVirtualMachineByAttachingManagedOsDisk.json} | 0 ...s.canCreateVirtualMachineFromCustomImageWithManagedDisks.json} | 0 ...sts.canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json} | 0 ...ateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json} | 0 ...s.canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json} | 0 ...OperationsTests.canSetMSIOnExistingVMWithRoleAssignments.json} | 0 ...onsTests.canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json} | 0 ...rationsTests.canSetMSIOnNewVMWithMultipleRoleAssignments.json} | 0 ...s.canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json} | 0 ...alMachineOperationsTests.canCreateUpdatePriorityAndPrice.json} | 0 ...=> VirtualMachineOperationsTests.canCreateVirtualMachine.json} | 0 ...alMachineOperationsTests.canCreateVirtualMachineSyncPoll.json} | 0 ...ineOperationsTests.canCreateVirtualMachineWithNetworking.json} | 0 ...lMachinesAndAvailabilitySetInSameProximityPlacementGroup.json} | 0 ...ts.canCreateVirtualMachinesAndRelatedResourcesInParallel.json} | 0 ...ionsTests.canPerformSimulateEvictionOnSpotVirtualMachine.json} | 0 ...M.json => VirtualMachineOperationsTests.canRunScriptOnVM.json} | 0 ...hineOperationsTests.canSetStorageAccountForUnmanagedDisk.json} | 0 ...nStreamParallelCreatedVirtualMachinesAndRelatedResources.json} | 0 ....json => VirtualMachineOperationsTests.canUpdateTagsOnVM.json} | 0 ...sts.cannotUpdateProximityPlacementGroupForVirtualMachine.json} | 0 ...rtualMachinePopularImageTests.canCreateAllPopularImageVM.json} | 0 ...s.canDeleteRelatedResourcesFromFailedParallelVMCreations.json} | 0 ...ootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json} | 0 ...tDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json} | 0 ...aleSetBootDiagnosticsTests.canDisableVMSSBootDiagnostics.json} | 0 ...BootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json} | 0 ...otDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json} | 0 ...eBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json} | 0 ...eBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json} | 0 ...tionsTests.canCreateUpdateVirtualMachineScaleSetWithEMSI.json} | 0 ...ionsTests.canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json} | 0 ...ionsTests.canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json} | 0 ...CreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json} | 0 ...eateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json} | 0 ...ScaleSetOperationsTests.canCreateLowPriorityVMSSInstance.json} | 0 ...eEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json} | 0 ...canCreateVirtualMachineScaleSetWithCustomScriptExtension.json} | 0 ...nCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json} | 0 ...perationsTests.canCreateVirtualMachineScaleSetWithSecret.json} | 0 ...ndantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json} | 0 ...bleMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json} | 0 ...anEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json} | 0 ...lMachineScaleSetOperationsTests.canGetSingleVMSSInstance.json} | 0 ...ationsTests.canPerformSimulateEvictionOnSpotVMSSInstance.json} | 0 ...dateVirtualMachineScaleSetWithExtensionProtectedSettings.json} | 0 ...aleSetOperationsTests.testVirtualMachineScaleSetSkuTypes.json} | 0 ... ContainerGroupTest.testContainerGroupWithVirtualNetwork.json} | 0 ...on => RegistryTaskTests.dockerTaskRunRequestFromRegistry.json} | 0 ...s.json => RegistryTaskTests.dockerTaskRunRequestFromRuns.json} | 0 ...n => RegistryTaskTests.encodedTaskRunRequestFromRegistry.json} | 0 ....json => RegistryTaskTests.encodedTaskRunRequestFromRuns.json} | 0 ...json => RegistryTaskTests.fileTaskRunRequestFromRegistry.json} | 0 ...uns.json => RegistryTaskTests.fileTaskRunRequestFromRuns.json} | 0 ...skTests.getBuildSourceUploadUrlFromRegistryAndRegistries.json} | 0 .../{getLogSasUrl.json => RegistryTaskTests.getLogSasUrl.json} | 0 ...json => KubernetesClustersTests.canCRUDKubernetesCluster.json} | 0 ...json => CosmosDBTests.canCreateCosmosDbAzureTableAccount.json} | 0 ....json => CosmosDBTests.canCreateCosmosDbCassandraAccount.json} | 0 ...nt.json => CosmosDBTests.canCreateCosmosDbMongoDBAccount.json} | 0 ...ccount.json => CosmosDBTests.canCreateCosmosDbSqlAccount.json} | 0 ...dpoint.json => CosmosDBTests.canCreateSqlPrivateEndpoint.json} | 0 ...son => CosmosDBTests.canUpdateCosmosDbCassandraConnector.json} | 0 ...oneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json} | 0 ...> DnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json} | 0 ...oneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json} | 0 ... DnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json} | 0 ...oneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json} | 0 ... DnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json} | 0 ....json => EventHubTests.canConfigureEventHubDataCapturing.json} | 0 ...on => EventHubTests.canEnableEventHubDataCaptureOnUpdate.json} | 0 ...son => EventHubTests.canManageEventHubAuthorizationRules.json} | 0 ...ps.json => EventHubTests.canManageEventHubConsumerGroups.json} | 0 ...entHubTests.canManageEventHubNamespaceAuthorizationRules.json} | 0 ...=> EventHubTests.canManageEventHubNamespaceBasicSettings.json} | 0 ...son => EventHubTests.canManageEventHubNamespaceEventHubs.json} | 0 ...son => EventHubTests.canManageGeoDisasterRecoveryPairing.json} | 0 .../{canCRUDVault.json => VaultTests.canCRUDVault.json} | 0 .../{canCRUDVaultAsync.json => VaultTests.canCRUDVaultAsync.json} | 0 ...eAndPurge.json => VaultTests.canEnableSoftDeleteAndPurge.json} | 0 ...tionGroups.json => ActionGroupsTests.canCRUDActionGroups.json} | 0 ...tyLogAlerts.json => AlertsTests.canCRUDActivityLogAlerts.json} | 0 ...CRUDMetricAlerts.json => AlertsTests.canCRUDMetricAlerts.json} | 0 ....json => AlertsTests.canCRUDMultipleResourceMetricAlerts.json} | 0 ...canCRUDAutoscale.json => AutoscaleTests.canCRUDAutoscale.json} | 0 ...son => DiagnosticSettingsTests.canCRUDDiagnosticSettings.json} | 0 ...> MonitorActivityAndMetricsTests.canListEventsAndMetrics.json} | 0 ...tTests.canAssignCurrentResourceGroupAccessRoleToIdentity.json} | 0 ...n => MSIIdentityManagementTests.canAssignRolesToIdentity.json} | 0 ...SIIdentityManagementTests.canCreateGetListDeleteIdentity.json} | 0 ...ApplicationGatewayTests.canCRUDApplicationGatewayWithWAF.json} | 0 ...cationGatewayTests.canCreateApplicationGatewayWithSecret.json} | 0 ...cationSecurityGroupTests.canCRUDApplicationSecurityGroup.json} | 0 ...son => DdosProtectionPlanTests.canCRUDDdosProtectionPlan.json} | 0 .../{canCRUDProbe.json => LoadBalancerTests.canCRUDProbe.json} | 0 ...terfaceOperationsTests.canCreateBatchOfNetworkInterfaces.json} | 0 ...rfaceOperationsTests.canDeleteNetworkWithServiceCallBack.json} | 0 ... NetworkInterfaceOperationsTests.canUseMultipleIPConfigs.json} | 0 ...json => NetworkUsageOperationsTests.canListNetworkUsages.json} | 0 ...orkWatcherTests.canListProvidersAndGetReachabilityReport.json} | 0 ...DRouteFilter.json => RouteFilterTests.canCRUDRouteFilter.json} | 0 ...erRule.json => RouteFilterTests.canCreateRouteFilterRule.json} | 0 ...oneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json} | 0 ...teDnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json} | 0 ...oneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json} | 0 ...eDnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json} | 0 ...oneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json} | 0 ...eDnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json} | 0 ...LinkETagTests.canCreateVirtualNetworkLinkWithDefaultETag.json} | 0 ...inkETagTests.canDeleteVirtualNetworkLinkWithExplicitETag.json} | 0 ...inkETagTests.canUpdateVirtualNetworkLinkWithExplicitETag.json} | 0 ...s.json => RedisCacheOperationsTests.canCRUDLinkedServers.json} | 0 ...ache.json => RedisCacheOperationsTests.canCRUDRedisCache.json} | 0 ...Network.json => DeploymentsTests.canDeployVirtualNetwork.json} | 0 ...json => DeploymentsTests.canDeployVirtualNetworkSyncPoll.json} | 0 ...loymentsTests.canDeployVirtualNetworkSyncPollWithFailure.json} | 0 ... DeploymentsTests.canPostDeploymentWhatIfOnResourceGroup.json} | 0 ...> DeploymentsTests.canPostDeploymentWhatIfOnSubscription.json} | 0 ...on => DeploymentsTests.canUpdateVirtualNetworkDeployment.json} | 0 ...=> GenericResourcesTests.canCreateDeleteResourceSyncPoll.json} | 0 ...son => GenericResourcesTests.canCreateUpdateMoveResource.json} | 0 ...cyAssignment.json => PolicyTests.canCRUDPolicyAssignment.json} | 0 ...cyDefinition.json => PolicyTests.canCRUDPolicyDefinition.json} | 0 ....json => ProvidersTests.canUnregisterAndRegisterProvider.json} | 0 ...Group.json => ResourceGroupsTests.canCreateResourceGroup.json} | 0 ...istLocations.json => SubscriptionsTests.canListLocations.json} | 0 ...riptions.json => SubscriptionsTests.canListSubscriptions.json} | 0 .../{canListTenants.json => TenantsTests.canListTenants.json} | 0 ... AppServiceSampleLiveOnlyTests.testManageFunctionAppLogs.json} | 0 ...ceSampleLiveOnlyTests.testManageFunctionAppSourceControl.json} | 0 ...pleLiveOnlyTests.testManageFunctionAppWithAuthentication.json} | 0 ...ceSampleLiveOnlyTests.testManageLinuxWebAppCosmosDbByMsi.json} | 0 ...ceSampleLiveOnlyTests.testManageLinuxWebAppSourceControl.json} | 0 ...eOnlyTests.testManageLinuxWebAppStorageAccountConnection.json} | 0 ...LiveOnlyTests.testManageLinuxWebAppWithContainerRegistry.json} | 0 ...pleLiveOnlyTests.testManageLinuxWebAppWithTrafficManager.json} | 0 ...ServiceSampleLiveOnlyTests.testManageWebAppCosmosDbByMsi.json} | 0 ...pleLiveOnlyTests.testManageWebAppCosmosDbThroughKeyVault.json} | 0 ...on => AppServiceSampleLiveOnlyTests.testManageWebAppLogs.json} | 0 ...ServiceSampleLiveOnlyTests.testManageWebAppSourceControl.json} | 0 ...leLiveOnlyTests.testManageWebAppStorageAccountConnection.json} | 0 ...ceSampleLiveOnlyTests.testManageWebAppWithTrafficManager.json} | 0 ...json => AppServiceSampleTests.testManageFunctionAppBasic.json} | 0 ...json => AppServiceSampleTests.testManageLinuxWebAppBasic.json} | 0 ...AppServiceSampleTests.testManageLinuxWebAppSqlConnection.json} | 0 ...asic.json => AppServiceSampleTests.testManageWebAppBasic.json} | 0 ...lots.json => AppServiceSampleTests.testManageWebAppSlots.json} | 0 ...n => AppServiceSampleTests.testManageWebAppSqlConnection.json} | 0 ...n => CdnSampleTests.testManageCdnProfileWithCustomDomain.json} | 0 ...mputeSampleTests.testConvertVirtualMachineToManagedDisks.json} | 0 ...pleTests.testCreateVirtualMachineUsingCustomImageFromVHD.json} | 0 ...mpleTests.testCreateVirtualMachineUsingCustomImageFromVM.json} | 0 ...testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json} | 0 ...ests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json} | 0 ...> ComputeSampleTests.testCreateVirtualMachinesInParallel.json} | 0 ...estCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json} | 0 ...eSkus.json => ComputeSampleTests.testListListComputeSkus.json} | 0 ...ComputeSampleTests.testListVirtualMachineExtensionImages.json} | 0 ....json => ComputeSampleTests.testListVirtualMachineImages.json} | 0 ...Set.json => ComputeSampleTests.testManageAvailabilitySet.json} | 0 ...dDisks.json => ComputeSampleTests.testManageManagedDisks.json} | 0 ...ageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json} | 0 ...ampleTests.testManageStorageFromMSIEnabledVirtualMachine.json} | 0 ...mpleTests.testManageUserAssignedMSIEnabledVirtualMachine.json} | 0 ...hine.json => ComputeSampleTests.testManageVirtualMachine.json} | 0 ...json => ComputeSampleTests.testManageVirtualMachineAsync.json} | 0 ... => ComputeSampleTests.testManageVirtualMachineExtension.json} | 0 ...n => ComputeSampleTests.testManageVirtualMachineScaleSet.json} | 0 ...ComputeSampleTests.testManageVirtualMachineScaleSetAsync.json} | 0 ...Tests.testManageVirtualMachineScaleSetWithUnmanagedDisks.json} | 0 ...n => ComputeSampleTests.testManageVirtualMachineWithDisk.json} | 0 ...teSampleTests.testManageVirtualMachineWithUnmanagedDisks.json} | 0 ...> ComputeSampleTests.testManageVirtualMachinesInParallel.json} | 0 ...json => ComputeSampleTests.testManageZonalVirtualMachine.json} | 0 ...ComputeSampleTests.testManageZonalVirtualMachineScaleSet.json} | 0 ...Tests.testManageContainerInstanceWithAzureFileShareMount.json} | 0 ...geContainerInstanceWithManualAzureFileShareMountCreation.json} | 0 ...s.testManageContainerInstanceWithMultipleContainerImages.json} | 0 ...ceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json} | 0 ...on => ContainerRegistryTests.testManageContainerRegistry.json} | 0 ...nerRegistryTests.testManageContainerRegistryWithWebhooks.json} | 0 ...mosDBTests.testCreateCosmosDBTableWithVirtualNetworkRule.json} | 0 ... CosmosDBTests.testCreateCosmosDBWithEventualConsistency.json} | 0 ...ange.json => CosmosDBTests.testCreateCosmosDBWithIPRange.json} | 0 ....json => CosmosDBTests.testCreateCosmosDBWithKindMongoDB.json} | 0 ...ageHACosmosDB.json => CosmosDBTests.testManageHACosmosDB.json} | 0 .../{testManageDns.json => DnsSampleTests.testManageDns.json} | 0 ...EventHub.json => EventHubsSampleTests.testManageEventHub.json} | 0 ...ts.json => EventHubsSampleTests.testManageEventHubEvents.json} | 0 ...entHubsSampleTests.testManageEventHubGeoDisasterRecovery.json} | 0 ...ncipal.json => GraphRbacTests.testManageServicePrincipal.json} | 0 ... => GraphRbacTests.testManageServicePrincipalCredentials.json} | 0 ...les.json => GraphRbacTests.testManageUsersGroupsAndRoles.json} | 0 ...eKeyVault.json => KeyVaultSampleTests.testManageKeyVault.json} | 0 ...erTests.testDeployImageFromContainerRegistryToKubernetes.json} | 0 ...on => KubernetesClusterTests.testManageKubernetesCluster.json} | 0 ...rTests.testAutoscaleSettingsBasedOnPerformanceOrSchedule.json} | 0 ...ogs.json => MonitorTests.testQueryMetricsAndActivityLogs.json} | 0 ...> MonitorTests.testSecurityBreachOrRiskActivityLogAlerts.json} | 0 ...on => MonitorTests.testWebAppPerformanceMonitoringAlerts.json} | 0 ...rkSampleTests.testCreateSimpleInternetFacingLoadBalancer.json} | 0 ....json => NetworkSampleTests.testManageApplicationGateway.json} | 0 ...IPAddress.json => NetworkSampleTests.testManageIPAddress.json} | 0 ...son => NetworkSampleTests.testManageInternalLoadBalancer.json} | 0 ... NetworkSampleTests.testManageInternetFacingLoadBalancer.json} | 0 ...ce.json => NetworkSampleTests.testManageNetworkInterface.json} | 0 ...rkSampleTests.testManageNetworkPeeringInSameSubscription.json} | 0 ...son => NetworkSampleTests.testManageNetworkSecurityGroup.json} | 0 ...=> NetworkSampleTests.testManageSimpleApplicationGateway.json} | 0 ...mpleTests.testManageVirtualMachinesInParallelWithNetwork.json} | 0 ...work.json => NetworkSampleTests.testManageVirtualNetwork.json} | 0 ...json => NetworkSampleTests.testManageVirtualNetworkAsync.json} | 0 ...tworkSampleTests.testManageVpnGatewaySite2SiteConnection.json} | 0 ...rkSampleTests.testVerifyNetworkPeeringWithNetworkWatcher.json} | 0 ...tworkWatcherSampleLiveOnlyTests.testManageNetworkWatcher.json} | 0 ...teDns.json => PrivateDnsSampleTests.testManagePrivateDns.json} | 0 ...Cache.json => RedisCacheSampleTests.testManageRedisCache.json} | 0 ...e.json => ResourceSampleTests.testDeployUsingARMTemplate.json} | 0 ...n => ResourceSampleTests.testDeployUsingARMTemplateAsync.json} | 0 ...Tests.testDeployUsingARMTemplateWithDeploymentOperations.json} | 0 ...sourceSampleTests.testDeployUsingARMTemplateWithProgress.json} | 0 ...> ResourceSampleTests.testDeployUsingARMTemplateWithTags.json} | 0 ...urceSampleTests.testDeployVirtualMachineUsingARMTemplate.json} | 0 ...eResource.json => ResourceSampleTests.testManageResource.json} | 0 ...roup.json => ResourceSampleTests.testManageResourceGroup.json} | 0 ...eOnlyTests.testServiceBusPublishSubscribeAdvanceFeatures.json} | 0 ...sSampleLiveOnlyTests.testServiceBusPublishSubscribeBasic.json} | 0 ...usSampleLiveOnlyTests.testServiceBusQueueAdvanceFeatures.json} | 0 ...> ServiceBusSampleLiveOnlyTests.testServiceBusQueueBasic.json} | 0 ...eLiveOnlyTests.testServiceBusWithClaimBasedAuthorization.json} | 0 ...trics.json => SqlSampleTests.testGettingSqlServerMetrics.json} | 0 ...SqlDatabase.json => SqlSampleTests.testManageSqlDatabase.json} | 0 ...son => SqlSampleTests.testManageSqlDatabaseInElasticPool.json} | 0 ...leTests.testManageSqlDatabasesAcrossDifferentDataCenters.json} | 0 ...roups.json => SqlSampleTests.testManageSqlFailoverGroups.json} | 0 ...lRules.json => SqlSampleTests.testManageSqlFirewallRules.json} | 0 ...json => SqlSampleTests.testManageSqlImportExportDatabase.json} | 0 ...ses.json => SqlSampleTests.testManageSqlServerDnsAliases.json} | 0 ...lSampleTests.testManageSqlServerKeysWithAzureKeyVaultKey.json} | 0 ...=> SqlSampleTests.testManageSqlServerSecurityAlertPolicy.json} | 0 ....json => SqlSampleTests.testManageSqlVirtualNetworkRules.json} | 0 ...SampleTests.testManageSqlWithRecoveredOrRestoredDatabase.json} | 0 ...ount.json => StorageSampleTests.testManageStorageAccount.json} | 0 ...json => StorageSampleTests.testManageStorageAccountAsync.json} | 0 ... StorageSampleTests.testManageStorageAccountNetworkRules.json} | 0 ...TrafficManagerSampleTests.testManageSimpleTrafficManager.json} | 0 ...on => TrafficManagerSampleTests.testManageTrafficManager.json} | 0 ...on => ServiceBusOperationsTests.canCRUDOnSimpleNamespace.json} | 0 ...viceBusOperationsTests.canCreateDeleteQueueWithNamespace.json} | 0 ...viceBusOperationsTests.canCreateDeleteTopicWithNamespace.json} | 0 ...viceBusOperationsTests.canCreateNamespaceThenCRUDOnQueue.json} | 0 ...viceBusOperationsTests.canCreateNamespaceThenCRUDOnTopic.json} | 0 ...ServiceBusOperationsTests.canOperateOnAuthorizationRules.json} | 0 ... ServiceBusOperationsTests.canPerformCRUDOnSubscriptions.json} | 0 ...> ServiceBusOperationsTests.canPerformOnNamespaceActions.json} | 0 ...base.json => SqlServerOperationsTests.canCRUDSqlDatabase.json} | 0 ...lServerOperationsTests.canCRUDSqlDatabaseWithElasticPool.json} | 0 ...l.json => SqlServerOperationsTests.canCRUDSqlElasticPool.json} | 0 ...json => SqlServerOperationsTests.canCRUDSqlFailoverGroup.json} | 0 ....json => SqlServerOperationsTests.canCRUDSqlFirewallRule.json} | 0 ...Server.json => SqlServerOperationsTests.canCRUDSqlServer.json} | 0 ...qlServerOperationsTests.canCRUDSqlServerWithFirewallRule.json} | 0 ...ServerOperationsTests.canCRUDSqlServerWithImportDatabase.json} | 0 ...oup.json => SqlServerOperationsTests.canCRUDSqlSyncGroup.json} | 0 ...er.json => SqlServerOperationsTests.canCRUDSqlSyncMember.json} | 0 ...ationsTests.canChangeSqlServerAndDatabaseAutomaticTuning.json} | 0 ...base.json => SqlServerOperationsTests.canCopySqlDatabase.json} | 0 ...qlServerOperationsTests.canCreateAndAquireServerDnsAlias.json} | 0 ... SqlServerOperationsTests.canDoOperationsOnDataWarehouse.json} | 0 ...ationsTests.canGetSqlServerCapabilitiesAndCreateIdentity.json} | 0 ...on => SqlServerOperationsTests.canManageReplicationLinks.json} | 0 ...erOperationsTests.canUseCoolShortcutsForResourceCreation.json} | 0 ...countNetworkRuleTests.canConfigureNetworkRulesWithCreate.json} | 0 ...countNetworkRuleTests.canConfigureNetworkRulesWithUpdate.json} | 0 ...n => StorageAccountOperationsTests.canCRUDStorageAccount.json} | 0 ...erationsTests.canEnableDisableEncryptionOnStorageAccount.json} | 0 ...ionsTests.canEnableDisableFileEncryptionOnStorageAccount.json} | 0 ...OperationsTests.canEnableLargeFileSharesOnStorageAccount.json} | 0 ...son => StorageBlobContainersTests.canCreateBlobContainer.json} | 0 ...son => StorageBlobContainersTests.canUpdateBlobContainer.json} | 0 ...s.json => StorageBlobServicesTests.canCreateBlobServices.json} | 0 ...s.json => StorageBlobServicesTests.canUpdateBlobServices.json} | 0 ...orageManagementPoliciesTests.canCreateManagementPolicies.json} | 0 ...StorageManagementPoliciesTests.canUpdateManagementPolicy.json} | 0 ...> StorageManagementPoliciesTests.managementPolicyGetters.json} | 0 .../{canGetUsages.json => UsageOperationsTests.canGetUsages.json} | 0 ...ficManagerTests.canCreateTrafficManagerWithSubnetRouting.json} | 0 ...anagerTests.canCreateUpdateProfileWithGeographicEndpoint.json} | 0 ...hy.json => TrafficManagerTests.canGetGeographicHierarchy.json} | 0 ...ApplicationGatewayTests.testAppGatewayBackendHealthCheck.json} | 0 ...> ApplicationGatewayTests.testAppGatewaysInternalComplex.json} | 0 ...> ApplicationGatewayTests.testAppGatewaysInternalMinimal.json} | 0 ...icationGatewayTests.testAppGatewaysInternetFacingComplex.json} | 0 ...icationGatewayTests.testAppGatewaysInternetFacingMinimal.json} | 0 ...pplicationGatewayTests.testAppGatewaysPublicUrlPathBased.json} | 0 ...json => ApplicationGatewayTests.testAppGatewaysStartStop.json} | 0 ...pplicationGatewayTests.testApplicationGatewaysInParallel.json} | 0 ...t.json => AzureResourceManagerTests.createStorageAccount.json} | 0 ...ocations.json => AzureResourceManagerTests.listLocations.json} | 0 ...ups.json => AzureResourceManagerTests.listResourceGroups.json} | 0 ...ts.json => AzureResourceManagerTests.listStorageAccounts.json} | 0 ...ions.json => AzureResourceManagerTests.listSubscriptions.json} | 0 ...s.json => AzureResourceManagerTests.testAvailabilitySets.json} | 0 ...count.json => AzureResourceManagerTests.testBatchAccount.json} | 0 ...Manager.json => AzureResourceManagerTests.testCdnManager.json} | 0 ...ceManagerTests.testContainerInstanceWithPrivateIpAddress.json} | 0 ...ontainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json} | 0 ...tContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json} | 0 ....json => AzureResourceManagerTests.testContainerRegistry.json} | 0 ...tCosmosDB.json => AzureResourceManagerTests.testCosmosDB.json} | 0 ...son => AzureResourceManagerTests.testDdosAndVmProtection.json} | 0 ...yments.json => AzureResourceManagerTests.testDeployments.json} | 0 ...tDnsZones.json => AzureResourceManagerTests.testDnsZones.json} | 0 ...num.json => AzureResourceManagerTests.testExpandableEnum.json} | 0 ...AzureResourceManagerTests.testExpressRouteCircuitPeering.json} | 0 ...on => AzureResourceManagerTests.testExpressRouteCircuits.json} | 0 ...s.json => AzureResourceManagerTests.testGenericResources.json} | 0 ....json => AzureResourceManagerTests.testKubernetesCluster.json} | 0 ...ureResourceManagerTests.testLoadBalancersInternalMinimum.json} | 0 ...ureResourceManagerTests.testLoadBalancersInternetMinimum.json} | 0 ...on => AzureResourceManagerTests.testLoadBalancersNatOnly.json} | 0 ...n => AzureResourceManagerTests.testLoadBalancersNatPools.json} | 0 ...n => AzureResourceManagerTests.testLoadBalancersNatRules.json} | 0 ...on => AzureResourceManagerTests.testLocalNetworkGateways.json} | 0 ...son => AzureResourceManagerTests.testManagedDiskVMUpdate.json} | 0 ...ks.json => AzureResourceManagerTests.testManagementLocks.json} | 0 ....json => AzureResourceManagerTests.testNetworkInterfaces.json} | 0 ...gs.json => AzureResourceManagerTests.testNetworkPeerings.json} | 0 ...n => AzureResourceManagerTests.testNetworkSecurityGroups.json} | 0 ....json => AzureResourceManagerTests.testNetworkUpdateTags.json} | 0 ...=> AzureResourceManagerTests.testNetworkWatcherFunctions.json} | 0 ...rs.json => AzureResourceManagerTests.testNetworkWatchers.json} | 0 ...rceManagerTests.testNetworkWithAccessFromServiceToSubnet.json} | 0 ...tNetworks.json => AzureResourceManagerTests.testNetworks.json} | 0 ...es.json => AzureResourceManagerTests.testPrivateDnsZones.json} | 0 ....json => AzureResourceManagerTests.testPublicIPAddresses.json} | 0 ...s.json => AzureResourceManagerTests.testPublicIPPrefixes.json} | 0 .../{testRedis.json => AzureResourceManagerTests.testRedis.json} | 0 ...estRegions.json => AzureResourceManagerTests.testRegions.json} | 0 ....json => AzureResourceManagerTests.testResourceStreaming.json} | 0 ...Tables.json => AzureResourceManagerTests.testRouteTables.json} | 0 ...son => AzureResourceManagerTests.testSearchServiceAnySku.json} | 0 ...n => AzureResourceManagerTests.testSearchServiceBasicSku.json} | 0 ...on => AzureResourceManagerTests.testSearchServiceFreeSku.json} | 0 ...> AzureResourceManagerTests.testSearchServiceStandardSku.json} | 0 ...qlServer.json => AzureResourceManagerTests.testSqlServer.json} | 0 ...ger.json => AzureResourceManagerTests.testTrafficManager.json} | 0 ...tVMImages.json => AzureResourceManagerTests.testVMImages.json} | 0 ...> AzureResourceManagerTests.testVirtualMachineCustomData.json} | 0 ... => AzureResourceManagerTests.testVirtualMachineDataDisk.json} | 0 ...ResourceManagerTests.testVirtualMachineInAvailabilitySet.json} | 0 ...json => AzureResourceManagerTests.testVirtualMachineNics.json} | 0 ....json => AzureResourceManagerTests.testVirtualMachineSSh.json} | 0 ...son => AzureResourceManagerTests.testVirtualMachineSizes.json} | 0 ...> AzureResourceManagerTests.testVirtualMachineSyncPoller.json} | 0 ...es.json => AzureResourceManagerTests.testVirtualMachines.json} | 0 ...ualNetworkGatewayTests.testNetworkWatcherTroubleshooting.json} | 0 ...NetworkGatewayTests.testVirtualNetworkGatewayPointToSite.json} | 0 ...lNetworkGatewayTests.testVirtualNetworkGatewaySiteToSite.json} | 0 ...lNetworkGatewayTests.testVirtualNetworkGatewayVNetToVNet.json} | 0 ...=> VirtualNetworkGatewayTests.testVirtualNetworkGateways.json} | 0 439 files changed, 0 insertions(+), 0 deletions(-) rename sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/{canCRUDApp.json => SpringCloudTest.canCRUDApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/{canCRUDServie.json => SpringCloudTest.canCRUDServie.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDAppServicePlan.json => AppServicePlansTests.canCRUDAppServicePlan.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{failOnAppServiceNotFound.json => AppServicePlansTests.failOnAppServiceNotFound.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDCertificateOrder.json => CertificateOrdersTests.canCRUDCertificateOrder.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRDCertificate.json => CertificatesTests.canCRDCertificate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canListCertificate.json => CertificatesTests.canListCertificate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDSwapSlots.json => DeploymentSlotsTests.canCRUDSwapSlots.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebAppWithDiagnosticLogs.json => DiagnosticLogsTests.canCRUDWebAppWithDiagnosticLogs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDDomain.json => DomainsTests.canCRUDDomain.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDFunctionApp.json => FunctionAppsTests.canCRUDFunctionApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDLinuxFunctionApp.json => FunctionAppsTests.canCRUDLinuxFunctionApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDLinuxFunctionAppJava11.json => FunctionAppsTests.canCRUDLinuxFunctionAppJava11.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDLinuxFunctionAppPremium.json => FunctionAppsTests.canCRUDLinuxFunctionAppPremium.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDFunctionSwapSlots.json => FunctionDeploymentSlotsTests.canCRUDFunctionSwapSlots.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canBindHostnameAndSsl.json => HostnameSslTests.canBindHostnameAndSsl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDLinuxJava11WebApp.json => LinuxWebAppsTests.canCRUDLinuxJava11WebApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDLinuxWebApp.json => LinuxWebAppsTests.canCRUDLinuxWebApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canDeploySourceControl.json => SourceControlTests.canDeploySourceControl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canDeployMultipleWars.json => WarDeployTests.canDeployMultipleWars.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canDeployWar.json => WarDeployTests.canDeployWar.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebAppConfig.json => WebAppConfigTests.canCRUDWebAppConfig.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebAppConfigJava11.json => WebAppConfigTests.canCRUDWebAppConfigJava11.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebAppWithMsi.json => WebAppsMsiTests.canCRUDWebAppWithMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebAppWithUserAssignedMsi.json => WebAppsMsiTests.canCRUDWebAppWithUserAssignedMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canCRUDWebApp.json => WebAppsTests.canCRUDWebApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canListWebApp.json => WebAppsTests.canListWebApp.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canDeployWarFile.json => WebAppsWebDeployTests.canDeployWarFile.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/{canZipDeployFunction.json => ZipDeployTests.canZipDeployFunction.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canCRUDApplication.json => ApplicationsTests.canCRUDApplication.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canCRUDGroup.json => GroupsTests.canCRUDGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canCRUDRoleAssignment.json => RoleAssignmentTests.canCRUDRoleAssignment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canGetRoleByRoleName.json => RoleDefinitionTests.canGetRoleByRoleName.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canCRUDServicePrincipal.json => ServicePrincipalsTests.canCRUDServicePrincipal.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canCreateUser.json => UsersTests.canCreateUser.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/{canUpdateUser.json => UsersTests.canUpdateUser.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/{canCreateCdnProfile.json => CdnProfileOperationsTests.canCreateCdnProfile.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/{canCreateUpdateCdnEndpoint.json => CdnProfileOperationsTests.canCreateUpdateCdnEndpoint.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/{canCreateUpdateCdnProfile.json => CdnProfileOperationsTests.canCreateUpdateCdnProfile.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{testCreateVirtualMachineUsingSpecializedDiskFromVhd.json => ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListSkus.json => ComputeSkuTests.canListSkus.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListSkusByRegion.json => ComputeSkuTests.canListSkusByRegion.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListSkusByRegionAndResourceType.json => ComputeSkuTests.canListSkusByRegionAndResourceType.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListSkusByResourceType.json => ComputeSkuTests.canListSkusByResourceType.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{foo.json => ComputeSkuTests.foo.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListComputeUsages.json => ComputeUsageOperationsTests.canListComputeUsages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canOperateOnEmptyManagedDisk.json => ManagedDiskOperationsTests.canOperateOnEmptyManagedDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canOperateOnManagedDiskFromDisk.json => ManagedDiskOperationsTests.canOperateOnManagedDiskFromDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canOperateOnManagedDiskFromSnapshot.json => ManagedDiskOperationsTests.canOperateOnManagedDiskFromSnapshot.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canOperateOnManagedDiskFromUpload.json => ManagedDiskOperationsTests.canOperateOnManagedDiskFromUpload.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateGetDeleteGalleryImage.json => SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateGetDeleteGalleryImageVersion.json => SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImageVersion.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateListGetDeleteGallery.json => SharedGalleryImageTests.canCreateUpdateListGetDeleteGallery.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json => VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json => VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateZonedVirtualMachineWithZoneResilientPublicIP.json => VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithZoneResilientPublicIP.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json => VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json => VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canDisableBootDiagnostics.json => VirtualMachineBootDiagnosticsTests.canDisableBootDiagnostics.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json => VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json => VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json => VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json => VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json => VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateImageByCapturingVM.json => VirtualMachineCustomImageOperationsTest.canCreateImageByCapturingVM.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateImageFromManagedDisk.json => VirtualMachineCustomImageOperationsTest.canCreateImageFromManagedDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateImageFromNativeVhd.json => VirtualMachineCustomImageOperationsTest.canCreateImageFromNativeVhd.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateVirtualMachineWithEMSI.json => VirtualMachineEMSILMSIOperationsTests.canCreateUpdateVirtualMachineWithEMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineWithLMSIAndEMSI.json => VirtualMachineEMSILMSIOperationsTests.canCreateVirtualMachineWithLMSIAndEMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canUpdateVirtualMachineWithEMSIAndLMSI.json => VirtualMachineEMSILMSIOperationsTests.canUpdateVirtualMachineWithEMSIAndLMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canGetExtensionTypeVersionAndImage.json => VirtualMachineExtensionImageOperationsTests.canGetExtensionTypeVersionAndImage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListExtensionImages.json => VirtualMachineExtensionImageOperationsTests.canListExtensionImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableDiagnosticsExtension.json => VirtualMachineExtensionOperationsTests.canEnableDiagnosticsExtension.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canHandleExtensionReference.json => VirtualMachineExtensionOperationsTests.canHandleExtensionReference.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canInstallUninstallCustomExtension.json => VirtualMachineExtensionOperationsTests.canInstallUninstallCustomExtension.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canResetPasswordUsingVMAccessExtension.json => VirtualMachineExtensionOperationsTests.canResetPasswordUsingVMAccessExtension.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canListVirtualMachineImages.json => VirtualMachineImageOperationsTests.canListVirtualMachineImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json => VirtualMachineManagedDiskOperationsTests.canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineByAttachingManagedOsDisk.json => VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineByAttachingManagedOsDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineFromCustomImageWithManagedDisks.json => VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromCustomImageWithManagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json => VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json => VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json => VirtualMachineManagedDiskOperationsTests.canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canSetMSIOnExistingVMWithRoleAssignments.json => VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnExistingVMWithRoleAssignments.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json => VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canSetMSIOnNewVMWithMultipleRoleAssignments.json => VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithMultipleRoleAssignments.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json => VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdatePriorityAndPrice.json => VirtualMachineOperationsTests.canCreateUpdatePriorityAndPrice.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachine.json => VirtualMachineOperationsTests.canCreateVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineSyncPoll.json => VirtualMachineOperationsTests.canCreateVirtualMachineSyncPoll.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineWithNetworking.json => VirtualMachineOperationsTests.canCreateVirtualMachineWithNetworking.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json => VirtualMachineOperationsTests.canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachinesAndRelatedResourcesInParallel.json => VirtualMachineOperationsTests.canCreateVirtualMachinesAndRelatedResourcesInParallel.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canPerformSimulateEvictionOnSpotVirtualMachine.json => VirtualMachineOperationsTests.canPerformSimulateEvictionOnSpotVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canRunScriptOnVM.json => VirtualMachineOperationsTests.canRunScriptOnVM.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canSetStorageAccountForUnmanagedDisk.json => VirtualMachineOperationsTests.canSetStorageAccountForUnmanagedDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canStreamParallelCreatedVirtualMachinesAndRelatedResources.json => VirtualMachineOperationsTests.canStreamParallelCreatedVirtualMachinesAndRelatedResources.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canUpdateTagsOnVM.json => VirtualMachineOperationsTests.canUpdateTagsOnVM.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{cannotUpdateProximityPlacementGroupForVirtualMachine.json => VirtualMachineOperationsTests.cannotUpdateProximityPlacementGroupForVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateAllPopularImageVM.json => VirtualMachinePopularImageTests.canCreateAllPopularImageVM.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canDeleteRelatedResourcesFromFailedParallelVMCreations.json => VirtualMachineRelatedResourcesDeletionTests.canDeleteRelatedResourcesFromFailedParallelVMCreations.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json => VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json => VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canDisableVMSSBootDiagnostics.json => VirtualMachineScaleSetBootDiagnosticsTests.canDisableVMSSBootDiagnostics.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json => VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json => VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json => VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json => VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateVirtualMachineScaleSetWithEMSI.json => VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateUpdateVirtualMachineScaleSetWithEMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json => VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json => VirtualMachineScaleSetEMSILMSIOperationsTests.canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json => VirtualMachineScaleSetManagedDiskOperationsTests.canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json => VirtualMachineScaleSetManagedDiskOperationsTests.canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateLowPriorityVMSSInstance.json => VirtualMachineScaleSetOperationsTests.canCreateLowPriorityVMSSInstance.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json => VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineScaleSetWithCustomScriptExtension.json => VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithCustomScriptExtension.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json => VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateVirtualMachineScaleSetWithSecret.json => VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithSecret.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json => VirtualMachineScaleSetOperationsTests.canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json => VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json => VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canGetSingleVMSSInstance.json => VirtualMachineScaleSetOperationsTests.canGetSingleVMSSInstance.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canPerformSimulateEvictionOnSpotVMSSInstance.json => VirtualMachineScaleSetOperationsTests.canPerformSimulateEvictionOnSpotVMSSInstance.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json => VirtualMachineScaleSetOperationsTests.canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{testVirtualMachineScaleSetSkuTypes.json => VirtualMachineScaleSetOperationsTests.testVirtualMachineScaleSetSkuTypes.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/resources/session-records/{testContainerGroupWithVirtualNetwork.json => ContainerGroupTest.testContainerGroupWithVirtualNetwork.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{dockerTaskRunRequestFromRegistry.json => RegistryTaskTests.dockerTaskRunRequestFromRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{dockerTaskRunRequestFromRuns.json => RegistryTaskTests.dockerTaskRunRequestFromRuns.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{encodedTaskRunRequestFromRegistry.json => RegistryTaskTests.encodedTaskRunRequestFromRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{encodedTaskRunRequestFromRuns.json => RegistryTaskTests.encodedTaskRunRequestFromRuns.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{fileTaskRunRequestFromRegistry.json => RegistryTaskTests.fileTaskRunRequestFromRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{fileTaskRunRequestFromRuns.json => RegistryTaskTests.fileTaskRunRequestFromRuns.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{getBuildSourceUploadUrlFromRegistryAndRegistries.json => RegistryTaskTests.getBuildSourceUploadUrlFromRegistryAndRegistries.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/{getLogSasUrl.json => RegistryTaskTests.getLogSasUrl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/resources/session-records/{canCRUDKubernetesCluster.json => KubernetesClustersTests.canCRUDKubernetesCluster.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canCreateCosmosDbAzureTableAccount.json => CosmosDBTests.canCreateCosmosDbAzureTableAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canCreateCosmosDbCassandraAccount.json => CosmosDBTests.canCreateCosmosDbCassandraAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canCreateCosmosDbMongoDBAccount.json => CosmosDBTests.canCreateCosmosDbMongoDBAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canCreateCosmosDbSqlAccount.json => CosmosDBTests.canCreateCosmosDbSqlAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canCreateSqlPrivateEndpoint.json => CosmosDBTests.canCreateSqlPrivateEndpoint.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/{canUpdateCosmosDbCassandraConnector.json => CosmosDBTests.canUpdateCosmosDbCassandraConnector.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canCreateRecordSetsWithDefaultETag.json => DnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canCreateZoneWithDefaultETag.json => DnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canDeleteRecordSetWithExplicitETag.json => DnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canDeleteZoneWithExplicitETag.json => DnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canUpdateRecordSetWithExplicitETag.json => DnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/{canUpdateZoneWithExplicitETag.json => DnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canConfigureEventHubDataCapturing.json => EventHubTests.canConfigureEventHubDataCapturing.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canEnableEventHubDataCaptureOnUpdate.json => EventHubTests.canEnableEventHubDataCaptureOnUpdate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageEventHubAuthorizationRules.json => EventHubTests.canManageEventHubAuthorizationRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageEventHubConsumerGroups.json => EventHubTests.canManageEventHubConsumerGroups.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageEventHubNamespaceAuthorizationRules.json => EventHubTests.canManageEventHubNamespaceAuthorizationRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageEventHubNamespaceBasicSettings.json => EventHubTests.canManageEventHubNamespaceBasicSettings.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageEventHubNamespaceEventHubs.json => EventHubTests.canManageEventHubNamespaceEventHubs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/{canManageGeoDisasterRecoveryPairing.json => EventHubTests.canManageGeoDisasterRecoveryPairing.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/{canCRUDVault.json => VaultTests.canCRUDVault.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/{canCRUDVaultAsync.json => VaultTests.canCRUDVaultAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/{canEnableSoftDeleteAndPurge.json => VaultTests.canEnableSoftDeleteAndPurge.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDActionGroups.json => ActionGroupsTests.canCRUDActionGroups.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDActivityLogAlerts.json => AlertsTests.canCRUDActivityLogAlerts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDMetricAlerts.json => AlertsTests.canCRUDMetricAlerts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDMultipleResourceMetricAlerts.json => AlertsTests.canCRUDMultipleResourceMetricAlerts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDAutoscale.json => AutoscaleTests.canCRUDAutoscale.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canCRUDDiagnosticSettings.json => DiagnosticSettingsTests.canCRUDDiagnosticSettings.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/{canListEventsAndMetrics.json => MonitorActivityAndMetricsTests.canListEventsAndMetrics.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/{canAssignCurrentResourceGroupAccessRoleToIdentity.json => MSIIdentityManagementTests.canAssignCurrentResourceGroupAccessRoleToIdentity.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/{canAssignRolesToIdentity.json => MSIIdentityManagementTests.canAssignRolesToIdentity.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/{canCreateGetListDeleteIdentity.json => MSIIdentityManagementTests.canCreateGetListDeleteIdentity.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCRUDApplicationGatewayWithWAF.json => ApplicationGatewayTests.canCRUDApplicationGatewayWithWAF.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCreateApplicationGatewayWithSecret.json => ApplicationGatewayTests.canCreateApplicationGatewayWithSecret.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCRUDApplicationSecurityGroup.json => ApplicationSecurityGroupTests.canCRUDApplicationSecurityGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCRUDDdosProtectionPlan.json => DdosProtectionPlanTests.canCRUDDdosProtectionPlan.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCRUDProbe.json => LoadBalancerTests.canCRUDProbe.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCreateBatchOfNetworkInterfaces.json => NetworkInterfaceOperationsTests.canCreateBatchOfNetworkInterfaces.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canDeleteNetworkWithServiceCallBack.json => NetworkInterfaceOperationsTests.canDeleteNetworkWithServiceCallBack.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canUseMultipleIPConfigs.json => NetworkInterfaceOperationsTests.canUseMultipleIPConfigs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canListNetworkUsages.json => NetworkUsageOperationsTests.canListNetworkUsages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canListProvidersAndGetReachabilityReport.json => NetworkWatcherTests.canListProvidersAndGetReachabilityReport.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCRUDRouteFilter.json => RouteFilterTests.canCRUDRouteFilter.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/{canCreateRouteFilterRule.json => RouteFilterTests.canCreateRouteFilterRule.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canCreateRecordSetsWithDefaultETag.json => PrivateDnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canCreateZoneWithDefaultETag.json => PrivateDnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canDeleteRecordSetWithExplicitETag.json => PrivateDnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canDeleteZoneWithExplicitETag.json => PrivateDnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canUpdateRecordSetWithExplicitETag.json => PrivateDnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canUpdateZoneWithExplicitETag.json => PrivateDnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canCreateVirtualNetworkLinkWithDefaultETag.json => VirtualNetworkLinkETagTests.canCreateVirtualNetworkLinkWithDefaultETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canDeleteVirtualNetworkLinkWithExplicitETag.json => VirtualNetworkLinkETagTests.canDeleteVirtualNetworkLinkWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/{canUpdateVirtualNetworkLinkWithExplicitETag.json => VirtualNetworkLinkETagTests.canUpdateVirtualNetworkLinkWithExplicitETag.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/{canCRUDLinkedServers.json => RedisCacheOperationsTests.canCRUDLinkedServers.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/{canCRUDRedisCache.json => RedisCacheOperationsTests.canCRUDRedisCache.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canDeployVirtualNetwork.json => DeploymentsTests.canDeployVirtualNetwork.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canDeployVirtualNetworkSyncPoll.json => DeploymentsTests.canDeployVirtualNetworkSyncPoll.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canDeployVirtualNetworkSyncPollWithFailure.json => DeploymentsTests.canDeployVirtualNetworkSyncPollWithFailure.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canPostDeploymentWhatIfOnResourceGroup.json => DeploymentsTests.canPostDeploymentWhatIfOnResourceGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canPostDeploymentWhatIfOnSubscription.json => DeploymentsTests.canPostDeploymentWhatIfOnSubscription.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canUpdateVirtualNetworkDeployment.json => DeploymentsTests.canUpdateVirtualNetworkDeployment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canCreateDeleteResourceSyncPoll.json => GenericResourcesTests.canCreateDeleteResourceSyncPoll.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canCreateUpdateMoveResource.json => GenericResourcesTests.canCreateUpdateMoveResource.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canCRUDPolicyAssignment.json => PolicyTests.canCRUDPolicyAssignment.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canCRUDPolicyDefinition.json => PolicyTests.canCRUDPolicyDefinition.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canUnregisterAndRegisterProvider.json => ProvidersTests.canUnregisterAndRegisterProvider.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canCreateResourceGroup.json => ResourceGroupsTests.canCreateResourceGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canListLocations.json => SubscriptionsTests.canListLocations.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canListSubscriptions.json => SubscriptionsTests.canListSubscriptions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/{canListTenants.json => TenantsTests.canListTenants.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageFunctionAppLogs.json => AppServiceSampleLiveOnlyTests.testManageFunctionAppLogs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageFunctionAppSourceControl.json => AppServiceSampleLiveOnlyTests.testManageFunctionAppSourceControl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageFunctionAppWithAuthentication.json => AppServiceSampleLiveOnlyTests.testManageFunctionAppWithAuthentication.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppCosmosDbByMsi.json => AppServiceSampleLiveOnlyTests.testManageLinuxWebAppCosmosDbByMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppSourceControl.json => AppServiceSampleLiveOnlyTests.testManageLinuxWebAppSourceControl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppStorageAccountConnection.json => AppServiceSampleLiveOnlyTests.testManageLinuxWebAppStorageAccountConnection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppWithContainerRegistry.json => AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithContainerRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppWithTrafficManager.json => AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithTrafficManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppCosmosDbByMsi.json => AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbByMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppCosmosDbThroughKeyVault.json => AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbThroughKeyVault.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppLogs.json => AppServiceSampleLiveOnlyTests.testManageWebAppLogs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppSourceControl.json => AppServiceSampleLiveOnlyTests.testManageWebAppSourceControl.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppStorageAccountConnection.json => AppServiceSampleLiveOnlyTests.testManageWebAppStorageAccountConnection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppWithTrafficManager.json => AppServiceSampleLiveOnlyTests.testManageWebAppWithTrafficManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageFunctionAppBasic.json => AppServiceSampleTests.testManageFunctionAppBasic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppBasic.json => AppServiceSampleTests.testManageLinuxWebAppBasic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageLinuxWebAppSqlConnection.json => AppServiceSampleTests.testManageLinuxWebAppSqlConnection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppBasic.json => AppServiceSampleTests.testManageWebAppBasic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppSlots.json => AppServiceSampleTests.testManageWebAppSlots.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageWebAppSqlConnection.json => AppServiceSampleTests.testManageWebAppSqlConnection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageCdnProfileWithCustomDomain.json => CdnSampleTests.testManageCdnProfileWithCustomDomain.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testConvertVirtualMachineToManagedDisks.json => ComputeSampleTests.testConvertVirtualMachineToManagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachineUsingCustomImageFromVHD.json => ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVHD.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachineUsingCustomImageFromVM.json => ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVM.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json => ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachineUsingSpecializedDiskFromVhd.json => ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachinesInParallel.json => ComputeSampleTests.testCreateVirtualMachinesInParallel.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json => ComputeSampleTests.testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testListListComputeSkus.json => ComputeSampleTests.testListListComputeSkus.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testListVirtualMachineExtensionImages.json => ComputeSampleTests.testListVirtualMachineExtensionImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testListVirtualMachineImages.json => ComputeSampleTests.testListVirtualMachineImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageAvailabilitySet.json => ComputeSampleTests.testManageAvailabilitySet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageManagedDisks.json => ComputeSampleTests.testManageManagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json => ComputeSampleTests.testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageStorageFromMSIEnabledVirtualMachine.json => ComputeSampleTests.testManageStorageFromMSIEnabledVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageUserAssignedMSIEnabledVirtualMachine.json => ComputeSampleTests.testManageUserAssignedMSIEnabledVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachine.json => ComputeSampleTests.testManageVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineAsync.json => ComputeSampleTests.testManageVirtualMachineAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineExtension.json => ComputeSampleTests.testManageVirtualMachineExtension.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineScaleSet.json => ComputeSampleTests.testManageVirtualMachineScaleSet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineScaleSetAsync.json => ComputeSampleTests.testManageVirtualMachineScaleSetAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineScaleSetWithUnmanagedDisks.json => ComputeSampleTests.testManageVirtualMachineScaleSetWithUnmanagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineWithDisk.json => ComputeSampleTests.testManageVirtualMachineWithDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachineWithUnmanagedDisks.json => ComputeSampleTests.testManageVirtualMachineWithUnmanagedDisks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachinesInParallel.json => ComputeSampleTests.testManageVirtualMachinesInParallel.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageZonalVirtualMachine.json => ComputeSampleTests.testManageZonalVirtualMachine.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageZonalVirtualMachineScaleSet.json => ComputeSampleTests.testManageZonalVirtualMachineScaleSet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerInstanceWithAzureFileShareMount.json => ContainerInstanceTests.testManageContainerInstanceWithAzureFileShareMount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerInstanceWithManualAzureFileShareMountCreation.json => ContainerInstanceTests.testManageContainerInstanceWithManualAzureFileShareMountCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerInstanceWithMultipleContainerImages.json => ContainerInstanceTests.testManageContainerInstanceWithMultipleContainerImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json => ContainerInstanceTests.testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerRegistry.json => ContainerRegistryTests.testManageContainerRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageContainerRegistryWithWebhooks.json => ContainerRegistryTests.testManageContainerRegistryWithWebhooks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateCosmosDBTableWithVirtualNetworkRule.json => CosmosDBTests.testCreateCosmosDBTableWithVirtualNetworkRule.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateCosmosDBWithEventualConsistency.json => CosmosDBTests.testCreateCosmosDBWithEventualConsistency.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateCosmosDBWithIPRange.json => CosmosDBTests.testCreateCosmosDBWithIPRange.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateCosmosDBWithKindMongoDB.json => CosmosDBTests.testCreateCosmosDBWithKindMongoDB.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageHACosmosDB.json => CosmosDBTests.testManageHACosmosDB.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageDns.json => DnsSampleTests.testManageDns.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageEventHub.json => EventHubsSampleTests.testManageEventHub.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageEventHubEvents.json => EventHubsSampleTests.testManageEventHubEvents.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageEventHubGeoDisasterRecovery.json => EventHubsSampleTests.testManageEventHubGeoDisasterRecovery.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageServicePrincipal.json => GraphRbacTests.testManageServicePrincipal.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageServicePrincipalCredentials.json => GraphRbacTests.testManageServicePrincipalCredentials.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageUsersGroupsAndRoles.json => GraphRbacTests.testManageUsersGroupsAndRoles.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageKeyVault.json => KeyVaultSampleTests.testManageKeyVault.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployImageFromContainerRegistryToKubernetes.json => KubernetesClusterTests.testDeployImageFromContainerRegistryToKubernetes.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageKubernetesCluster.json => KubernetesClusterTests.testManageKubernetesCluster.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testAutoscaleSettingsBasedOnPerformanceOrSchedule.json => MonitorTests.testAutoscaleSettingsBasedOnPerformanceOrSchedule.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testQueryMetricsAndActivityLogs.json => MonitorTests.testQueryMetricsAndActivityLogs.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testSecurityBreachOrRiskActivityLogAlerts.json => MonitorTests.testSecurityBreachOrRiskActivityLogAlerts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testWebAppPerformanceMonitoringAlerts.json => MonitorTests.testWebAppPerformanceMonitoringAlerts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testCreateSimpleInternetFacingLoadBalancer.json => NetworkSampleTests.testCreateSimpleInternetFacingLoadBalancer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageApplicationGateway.json => NetworkSampleTests.testManageApplicationGateway.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageIPAddress.json => NetworkSampleTests.testManageIPAddress.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageInternalLoadBalancer.json => NetworkSampleTests.testManageInternalLoadBalancer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageInternetFacingLoadBalancer.json => NetworkSampleTests.testManageInternetFacingLoadBalancer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageNetworkInterface.json => NetworkSampleTests.testManageNetworkInterface.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageNetworkPeeringInSameSubscription.json => NetworkSampleTests.testManageNetworkPeeringInSameSubscription.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageNetworkSecurityGroup.json => NetworkSampleTests.testManageNetworkSecurityGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSimpleApplicationGateway.json => NetworkSampleTests.testManageSimpleApplicationGateway.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualMachinesInParallelWithNetwork.json => NetworkSampleTests.testManageVirtualMachinesInParallelWithNetwork.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualNetwork.json => NetworkSampleTests.testManageVirtualNetwork.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVirtualNetworkAsync.json => NetworkSampleTests.testManageVirtualNetworkAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageVpnGatewaySite2SiteConnection.json => NetworkSampleTests.testManageVpnGatewaySite2SiteConnection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testVerifyNetworkPeeringWithNetworkWatcher.json => NetworkSampleTests.testVerifyNetworkPeeringWithNetworkWatcher.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageNetworkWatcher.json => NetworkWatcherSampleLiveOnlyTests.testManageNetworkWatcher.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManagePrivateDns.json => PrivateDnsSampleTests.testManagePrivateDns.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageRedisCache.json => RedisCacheSampleTests.testManageRedisCache.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployUsingARMTemplate.json => ResourceSampleTests.testDeployUsingARMTemplate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployUsingARMTemplateAsync.json => ResourceSampleTests.testDeployUsingARMTemplateAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployUsingARMTemplateWithDeploymentOperations.json => ResourceSampleTests.testDeployUsingARMTemplateWithDeploymentOperations.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployUsingARMTemplateWithProgress.json => ResourceSampleTests.testDeployUsingARMTemplateWithProgress.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployUsingARMTemplateWithTags.json => ResourceSampleTests.testDeployUsingARMTemplateWithTags.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testDeployVirtualMachineUsingARMTemplate.json => ResourceSampleTests.testDeployVirtualMachineUsingARMTemplate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageResource.json => ResourceSampleTests.testManageResource.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageResourceGroup.json => ResourceSampleTests.testManageResourceGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testServiceBusPublishSubscribeAdvanceFeatures.json => ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeAdvanceFeatures.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testServiceBusPublishSubscribeBasic.json => ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeBasic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testServiceBusQueueAdvanceFeatures.json => ServiceBusSampleLiveOnlyTests.testServiceBusQueueAdvanceFeatures.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testServiceBusQueueBasic.json => ServiceBusSampleLiveOnlyTests.testServiceBusQueueBasic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testServiceBusWithClaimBasedAuthorization.json => ServiceBusSampleLiveOnlyTests.testServiceBusWithClaimBasedAuthorization.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testGettingSqlServerMetrics.json => SqlSampleTests.testGettingSqlServerMetrics.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlDatabase.json => SqlSampleTests.testManageSqlDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlDatabaseInElasticPool.json => SqlSampleTests.testManageSqlDatabaseInElasticPool.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlDatabasesAcrossDifferentDataCenters.json => SqlSampleTests.testManageSqlDatabasesAcrossDifferentDataCenters.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlFailoverGroups.json => SqlSampleTests.testManageSqlFailoverGroups.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlFirewallRules.json => SqlSampleTests.testManageSqlFirewallRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlImportExportDatabase.json => SqlSampleTests.testManageSqlImportExportDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlServerDnsAliases.json => SqlSampleTests.testManageSqlServerDnsAliases.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlServerKeysWithAzureKeyVaultKey.json => SqlSampleTests.testManageSqlServerKeysWithAzureKeyVaultKey.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlServerSecurityAlertPolicy.json => SqlSampleTests.testManageSqlServerSecurityAlertPolicy.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlVirtualNetworkRules.json => SqlSampleTests.testManageSqlVirtualNetworkRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSqlWithRecoveredOrRestoredDatabase.json => SqlSampleTests.testManageSqlWithRecoveredOrRestoredDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageStorageAccount.json => StorageSampleTests.testManageStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageStorageAccountAsync.json => StorageSampleTests.testManageStorageAccountAsync.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageStorageAccountNetworkRules.json => StorageSampleTests.testManageStorageAccountNetworkRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageSimpleTrafficManager.json => TrafficManagerSampleTests.testManageSimpleTrafficManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/{testManageTrafficManager.json => TrafficManagerSampleTests.testManageTrafficManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canCRUDOnSimpleNamespace.json => ServiceBusOperationsTests.canCRUDOnSimpleNamespace.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canCreateDeleteQueueWithNamespace.json => ServiceBusOperationsTests.canCreateDeleteQueueWithNamespace.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canCreateDeleteTopicWithNamespace.json => ServiceBusOperationsTests.canCreateDeleteTopicWithNamespace.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canCreateNamespaceThenCRUDOnQueue.json => ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnQueue.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canCreateNamespaceThenCRUDOnTopic.json => ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnTopic.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canOperateOnAuthorizationRules.json => ServiceBusOperationsTests.canOperateOnAuthorizationRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canPerformCRUDOnSubscriptions.json => ServiceBusOperationsTests.canPerformCRUDOnSubscriptions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/{canPerformOnNamespaceActions.json => ServiceBusOperationsTests.canPerformOnNamespaceActions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlDatabase.json => SqlServerOperationsTests.canCRUDSqlDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlDatabaseWithElasticPool.json => SqlServerOperationsTests.canCRUDSqlDatabaseWithElasticPool.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlElasticPool.json => SqlServerOperationsTests.canCRUDSqlElasticPool.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlFailoverGroup.json => SqlServerOperationsTests.canCRUDSqlFailoverGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlFirewallRule.json => SqlServerOperationsTests.canCRUDSqlFirewallRule.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlServer.json => SqlServerOperationsTests.canCRUDSqlServer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlServerWithFirewallRule.json => SqlServerOperationsTests.canCRUDSqlServerWithFirewallRule.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlServerWithImportDatabase.json => SqlServerOperationsTests.canCRUDSqlServerWithImportDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlSyncGroup.json => SqlServerOperationsTests.canCRUDSqlSyncGroup.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCRUDSqlSyncMember.json => SqlServerOperationsTests.canCRUDSqlSyncMember.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canChangeSqlServerAndDatabaseAutomaticTuning.json => SqlServerOperationsTests.canChangeSqlServerAndDatabaseAutomaticTuning.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCopySqlDatabase.json => SqlServerOperationsTests.canCopySqlDatabase.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canCreateAndAquireServerDnsAlias.json => SqlServerOperationsTests.canCreateAndAquireServerDnsAlias.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canDoOperationsOnDataWarehouse.json => SqlServerOperationsTests.canDoOperationsOnDataWarehouse.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canGetSqlServerCapabilitiesAndCreateIdentity.json => SqlServerOperationsTests.canGetSqlServerCapabilitiesAndCreateIdentity.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canManageReplicationLinks.json => SqlServerOperationsTests.canManageReplicationLinks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/{canUseCoolShortcutsForResourceCreation.json => SqlServerOperationsTests.canUseCoolShortcutsForResourceCreation.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canConfigureNetworkRulesWithCreate.json => StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithCreate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canConfigureNetworkRulesWithUpdate.json => StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithUpdate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canCRUDStorageAccount.json => StorageAccountOperationsTests.canCRUDStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canEnableDisableEncryptionOnStorageAccount.json => StorageAccountOperationsTests.canEnableDisableEncryptionOnStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canEnableDisableFileEncryptionOnStorageAccount.json => StorageAccountOperationsTests.canEnableDisableFileEncryptionOnStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canEnableLargeFileSharesOnStorageAccount.json => StorageAccountOperationsTests.canEnableLargeFileSharesOnStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canCreateBlobContainer.json => StorageBlobContainersTests.canCreateBlobContainer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canUpdateBlobContainer.json => StorageBlobContainersTests.canUpdateBlobContainer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canCreateBlobServices.json => StorageBlobServicesTests.canCreateBlobServices.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canUpdateBlobServices.json => StorageBlobServicesTests.canUpdateBlobServices.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canCreateManagementPolicies.json => StorageManagementPoliciesTests.canCreateManagementPolicies.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canUpdateManagementPolicy.json => StorageManagementPoliciesTests.canUpdateManagementPolicy.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{managementPolicyGetters.json => StorageManagementPoliciesTests.managementPolicyGetters.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/{canGetUsages.json => UsageOperationsTests.canGetUsages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/{canCreateTrafficManagerWithSubnetRouting.json => TrafficManagerTests.canCreateTrafficManagerWithSubnetRouting.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/{canCreateUpdateProfileWithGeographicEndpoint.json => TrafficManagerTests.canCreateUpdateProfileWithGeographicEndpoint.json} (100%) rename sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/{canGetGeographicHierarchy.json => TrafficManagerTests.canGetGeographicHierarchy.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewayBackendHealthCheck.json => ApplicationGatewayTests.testAppGatewayBackendHealthCheck.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysInternalComplex.json => ApplicationGatewayTests.testAppGatewaysInternalComplex.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysInternalMinimal.json => ApplicationGatewayTests.testAppGatewaysInternalMinimal.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysInternetFacingComplex.json => ApplicationGatewayTests.testAppGatewaysInternetFacingComplex.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysInternetFacingMinimal.json => ApplicationGatewayTests.testAppGatewaysInternetFacingMinimal.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysPublicUrlPathBased.json => ApplicationGatewayTests.testAppGatewaysPublicUrlPathBased.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAppGatewaysStartStop.json => ApplicationGatewayTests.testAppGatewaysStartStop.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testApplicationGatewaysInParallel.json => ApplicationGatewayTests.testApplicationGatewaysInParallel.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{createStorageAccount.json => AzureResourceManagerTests.createStorageAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{listLocations.json => AzureResourceManagerTests.listLocations.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{listResourceGroups.json => AzureResourceManagerTests.listResourceGroups.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{listStorageAccounts.json => AzureResourceManagerTests.listStorageAccounts.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{listSubscriptions.json => AzureResourceManagerTests.listSubscriptions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testAvailabilitySets.json => AzureResourceManagerTests.testAvailabilitySets.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testBatchAccount.json => AzureResourceManagerTests.testBatchAccount.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testCdnManager.json => AzureResourceManagerTests.testCdnManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testContainerInstanceWithPrivateIpAddress.json => AzureResourceManagerTests.testContainerInstanceWithPrivateIpAddress.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json => AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json => AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testContainerRegistry.json => AzureResourceManagerTests.testContainerRegistry.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testCosmosDB.json => AzureResourceManagerTests.testCosmosDB.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testDdosAndVmProtection.json => AzureResourceManagerTests.testDdosAndVmProtection.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testDeployments.json => AzureResourceManagerTests.testDeployments.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testDnsZones.json => AzureResourceManagerTests.testDnsZones.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testExpandableEnum.json => AzureResourceManagerTests.testExpandableEnum.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testExpressRouteCircuitPeering.json => AzureResourceManagerTests.testExpressRouteCircuitPeering.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testExpressRouteCircuits.json => AzureResourceManagerTests.testExpressRouteCircuits.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testGenericResources.json => AzureResourceManagerTests.testGenericResources.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testKubernetesCluster.json => AzureResourceManagerTests.testKubernetesCluster.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLoadBalancersInternalMinimum.json => AzureResourceManagerTests.testLoadBalancersInternalMinimum.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLoadBalancersInternetMinimum.json => AzureResourceManagerTests.testLoadBalancersInternetMinimum.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLoadBalancersNatOnly.json => AzureResourceManagerTests.testLoadBalancersNatOnly.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLoadBalancersNatPools.json => AzureResourceManagerTests.testLoadBalancersNatPools.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLoadBalancersNatRules.json => AzureResourceManagerTests.testLoadBalancersNatRules.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testLocalNetworkGateways.json => AzureResourceManagerTests.testLocalNetworkGateways.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testManagedDiskVMUpdate.json => AzureResourceManagerTests.testManagedDiskVMUpdate.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testManagementLocks.json => AzureResourceManagerTests.testManagementLocks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkInterfaces.json => AzureResourceManagerTests.testNetworkInterfaces.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkPeerings.json => AzureResourceManagerTests.testNetworkPeerings.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkSecurityGroups.json => AzureResourceManagerTests.testNetworkSecurityGroups.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkUpdateTags.json => AzureResourceManagerTests.testNetworkUpdateTags.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkWatcherFunctions.json => AzureResourceManagerTests.testNetworkWatcherFunctions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkWatchers.json => AzureResourceManagerTests.testNetworkWatchers.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkWithAccessFromServiceToSubnet.json => AzureResourceManagerTests.testNetworkWithAccessFromServiceToSubnet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworks.json => AzureResourceManagerTests.testNetworks.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testPrivateDnsZones.json => AzureResourceManagerTests.testPrivateDnsZones.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testPublicIPAddresses.json => AzureResourceManagerTests.testPublicIPAddresses.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testPublicIPPrefixes.json => AzureResourceManagerTests.testPublicIPPrefixes.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testRedis.json => AzureResourceManagerTests.testRedis.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testRegions.json => AzureResourceManagerTests.testRegions.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testResourceStreaming.json => AzureResourceManagerTests.testResourceStreaming.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testRouteTables.json => AzureResourceManagerTests.testRouteTables.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testSearchServiceAnySku.json => AzureResourceManagerTests.testSearchServiceAnySku.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testSearchServiceBasicSku.json => AzureResourceManagerTests.testSearchServiceBasicSku.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testSearchServiceFreeSku.json => AzureResourceManagerTests.testSearchServiceFreeSku.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testSearchServiceStandardSku.json => AzureResourceManagerTests.testSearchServiceStandardSku.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testSqlServer.json => AzureResourceManagerTests.testSqlServer.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testTrafficManager.json => AzureResourceManagerTests.testTrafficManager.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVMImages.json => AzureResourceManagerTests.testVMImages.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineCustomData.json => AzureResourceManagerTests.testVirtualMachineCustomData.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineDataDisk.json => AzureResourceManagerTests.testVirtualMachineDataDisk.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineInAvailabilitySet.json => AzureResourceManagerTests.testVirtualMachineInAvailabilitySet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineNics.json => AzureResourceManagerTests.testVirtualMachineNics.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineSSh.json => AzureResourceManagerTests.testVirtualMachineSSh.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineSizes.json => AzureResourceManagerTests.testVirtualMachineSizes.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachineSyncPoller.json => AzureResourceManagerTests.testVirtualMachineSyncPoller.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualMachines.json => AzureResourceManagerTests.testVirtualMachines.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testNetworkWatcherTroubleshooting.json => VirtualNetworkGatewayTests.testNetworkWatcherTroubleshooting.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualNetworkGatewayPointToSite.json => VirtualNetworkGatewayTests.testVirtualNetworkGatewayPointToSite.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualNetworkGatewaySiteToSite.json => VirtualNetworkGatewayTests.testVirtualNetworkGatewaySiteToSite.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualNetworkGatewayVNetToVNet.json => VirtualNetworkGatewayTests.testVirtualNetworkGatewayVNetToVNet.json} (100%) rename sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/{testVirtualNetworkGateways.json => VirtualNetworkGatewayTests.testVirtualNetworkGateways.json} (100%) diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/canCRUDApp.json b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/canCRUDApp.json rename to sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/canCRUDServie.json b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDServie.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/canCRUDServie.json rename to sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDServie.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDAppServicePlan.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/AppServicePlansTests.canCRUDAppServicePlan.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDAppServicePlan.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/AppServicePlansTests.canCRUDAppServicePlan.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/failOnAppServiceNotFound.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/AppServicePlansTests.failOnAppServiceNotFound.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/failOnAppServiceNotFound.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/AppServicePlansTests.failOnAppServiceNotFound.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDCertificateOrder.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificateOrdersTests.canCRUDCertificateOrder.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDCertificateOrder.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificateOrdersTests.canCRUDCertificateOrder.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRDCertificate.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificatesTests.canCRDCertificate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRDCertificate.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificatesTests.canCRDCertificate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canListCertificate.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificatesTests.canListCertificate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canListCertificate.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/CertificatesTests.canListCertificate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDSwapSlots.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DeploymentSlotsTests.canCRUDSwapSlots.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDSwapSlots.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DeploymentSlotsTests.canCRUDSwapSlots.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithDiagnosticLogs.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DiagnosticLogsTests.canCRUDWebAppWithDiagnosticLogs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithDiagnosticLogs.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DiagnosticLogsTests.canCRUDWebAppWithDiagnosticLogs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDDomain.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DomainsTests.canCRUDDomain.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDDomain.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/DomainsTests.canCRUDDomain.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDFunctionApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDFunctionApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDFunctionApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDFunctionApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionAppJava11.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionAppJava11.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionAppJava11.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionAppJava11.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionAppPremium.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionAppPremium.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxFunctionAppPremium.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionAppsTests.canCRUDLinuxFunctionAppPremium.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDFunctionSwapSlots.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionDeploymentSlotsTests.canCRUDFunctionSwapSlots.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDFunctionSwapSlots.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/FunctionDeploymentSlotsTests.canCRUDFunctionSwapSlots.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canBindHostnameAndSsl.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/HostnameSslTests.canBindHostnameAndSsl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canBindHostnameAndSsl.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/HostnameSslTests.canBindHostnameAndSsl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxJava11WebApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/LinuxWebAppsTests.canCRUDLinuxJava11WebApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxJava11WebApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/LinuxWebAppsTests.canCRUDLinuxJava11WebApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxWebApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/LinuxWebAppsTests.canCRUDLinuxWebApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDLinuxWebApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/LinuxWebAppsTests.canCRUDLinuxWebApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeploySourceControl.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/SourceControlTests.canDeploySourceControl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeploySourceControl.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/SourceControlTests.canDeploySourceControl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployMultipleWars.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WarDeployTests.canDeployMultipleWars.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployMultipleWars.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WarDeployTests.canDeployMultipleWars.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployWar.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WarDeployTests.canDeployWar.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployWar.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WarDeployTests.canDeployWar.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppConfig.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppConfigTests.canCRUDWebAppConfig.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppConfig.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppConfigTests.canCRUDWebAppConfig.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppConfigJava11.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppConfigTests.canCRUDWebAppConfigJava11.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppConfigJava11.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppConfigTests.canCRUDWebAppConfigJava11.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithMsi.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsMsiTests.canCRUDWebAppWithMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithMsi.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsMsiTests.canCRUDWebAppWithMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithUserAssignedMsi.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsMsiTests.canCRUDWebAppWithUserAssignedMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebAppWithUserAssignedMsi.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsMsiTests.canCRUDWebAppWithUserAssignedMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsTests.canCRUDWebApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canCRUDWebApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsTests.canCRUDWebApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canListWebApp.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsTests.canListWebApp.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canListWebApp.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsTests.canListWebApp.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployWarFile.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsWebDeployTests.canDeployWarFile.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canDeployWarFile.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/WebAppsWebDeployTests.canDeployWarFile.json diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canZipDeployFunction.json b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/ZipDeployTests.canZipDeployFunction.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/canZipDeployFunction.json rename to sdk/resourcemanager/azure-resourcemanager-appservice/src/test/resources/session-records/ZipDeployTests.canZipDeployFunction.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDApplication.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/ApplicationsTests.canCRUDApplication.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDApplication.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/ApplicationsTests.canCRUDApplication.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDGroup.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/GroupsTests.canCRUDGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDGroup.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/GroupsTests.canCRUDGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDRoleAssignment.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/RoleAssignmentTests.canCRUDRoleAssignment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDRoleAssignment.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/RoleAssignmentTests.canCRUDRoleAssignment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canGetRoleByRoleName.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/RoleDefinitionTests.canGetRoleByRoleName.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canGetRoleByRoleName.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/RoleDefinitionTests.canGetRoleByRoleName.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDServicePrincipal.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/ServicePrincipalsTests.canCRUDServicePrincipal.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCRUDServicePrincipal.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/ServicePrincipalsTests.canCRUDServicePrincipal.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCreateUser.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/UsersTests.canCreateUser.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canCreateUser.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/UsersTests.canCreateUser.json diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canUpdateUser.json b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/UsersTests.canUpdateUser.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/canUpdateUser.json rename to sdk/resourcemanager/azure-resourcemanager-authorization/src/test/resources/session-records/UsersTests.canUpdateUser.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateCdnProfile.json b/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateCdnProfile.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateCdnProfile.json rename to sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateCdnProfile.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateUpdateCdnEndpoint.json b/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateUpdateCdnEndpoint.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateUpdateCdnEndpoint.json rename to sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateUpdateCdnEndpoint.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateUpdateCdnProfile.json b/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateUpdateCdnProfile.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/canCreateUpdateCdnProfile.json rename to sdk/resourcemanager/azure-resourcemanager-cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateUpdateCdnProfile.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromVhd.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromVhd.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkus.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkus.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkus.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkus.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByRegion.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByRegion.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByRegion.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByRegion.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByRegionAndResourceType.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByRegionAndResourceType.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByRegionAndResourceType.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByRegionAndResourceType.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByResourceType.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByResourceType.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListSkusByResourceType.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.canListSkusByResourceType.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/foo.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.foo.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/foo.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeSkuTests.foo.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListComputeUsages.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeUsageOperationsTests.canListComputeUsages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListComputeUsages.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ComputeUsageOperationsTests.canListComputeUsages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnEmptyManagedDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnEmptyManagedDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnEmptyManagedDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnEmptyManagedDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromSnapshot.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromSnapshot.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromSnapshot.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromSnapshot.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromUpload.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromUpload.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canOperateOnManagedDiskFromUpload.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/ManagedDiskOperationsTests.canOperateOnManagedDiskFromUpload.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateGetDeleteGalleryImage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateGetDeleteGalleryImage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateGetDeleteGalleryImageVersion.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImageVersion.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateGetDeleteGalleryImageVersion.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImageVersion.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateListGetDeleteGallery.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateListGetDeleteGallery.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateListGetDeleteGallery.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/SharedGalleryImageTests.canCreateUpdateListGetDeleteGallery.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithZoneResilientPublicIP.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithZoneResilientPublicIP.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZonedVirtualMachineWithZoneResilientPublicIP.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineAvailabilityZoneOperationsTests.canCreateZonedVirtualMachineWithZoneResilientPublicIP.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUseUnManagedDisksExplicitStorage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.bootDiagnosticsShouldUsesOSUnManagedDiskImplicitStorage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDisableBootDiagnostics.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canDisableBootDiagnostics.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDisableBootDiagnostics.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canDisableBootDiagnostics.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnUnManagedVMCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageByCapturingVM.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageByCapturingVM.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageByCapturingVM.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageByCapturingVM.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageFromManagedDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageFromManagedDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageFromManagedDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageFromManagedDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageFromNativeVhd.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageFromNativeVhd.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateImageFromNativeVhd.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineCustomImageOperationsTest.canCreateImageFromNativeVhd.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineWithEMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canCreateUpdateVirtualMachineWithEMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineWithEMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canCreateUpdateVirtualMachineWithEMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithLMSIAndEMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canCreateVirtualMachineWithLMSIAndEMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithLMSIAndEMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canCreateVirtualMachineWithLMSIAndEMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineWithEMSIAndLMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canUpdateVirtualMachineWithEMSIAndLMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineWithEMSIAndLMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineEMSILMSIOperationsTests.canUpdateVirtualMachineWithEMSIAndLMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canGetExtensionTypeVersionAndImage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionImageOperationsTests.canGetExtensionTypeVersionAndImage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canGetExtensionTypeVersionAndImage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionImageOperationsTests.canGetExtensionTypeVersionAndImage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListExtensionImages.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionImageOperationsTests.canListExtensionImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListExtensionImages.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionImageOperationsTests.canListExtensionImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableDiagnosticsExtension.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canEnableDiagnosticsExtension.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableDiagnosticsExtension.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canEnableDiagnosticsExtension.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canHandleExtensionReference.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canHandleExtensionReference.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canHandleExtensionReference.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canHandleExtensionReference.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canInstallUninstallCustomExtension.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canInstallUninstallCustomExtension.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canInstallUninstallCustomExtension.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canInstallUninstallCustomExtension.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canResetPasswordUsingVMAccessExtension.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canResetPasswordUsingVMAccessExtension.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canResetPasswordUsingVMAccessExtension.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineExtensionOperationsTests.canResetPasswordUsingVMAccessExtension.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListVirtualMachineImages.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineImageOperationsTests.canListVirtualMachineImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canListVirtualMachineImages.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineImageOperationsTests.canListVirtualMachineImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateUpdateVirtualMachineWithEmptyManagedDataDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineByAttachingManagedOsDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineByAttachingManagedOsDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineByAttachingManagedOsDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineByAttachingManagedOsDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineFromCustomImageWithManagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromCustomImageWithManagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineFromCustomImageWithManagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromCustomImageWithManagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineFromPIRImageWithManagedOsDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedDiskOperationsTests.canUpdateVirtualMachineByAddingAndRemovingManagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnExistingVMWithRoleAssignments.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnExistingVMWithRoleAssignments.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnExistingVMWithRoleAssignments.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnExistingVMWithRoleAssignments.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewOrExistingVMWithoutRoleAssignment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewVMWithMultipleRoleAssignments.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithMultipleRoleAssignments.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewVMWithMultipleRoleAssignments.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithMultipleRoleAssignments.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineManagedServiceIdentityOperationsTests.canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdatePriorityAndPrice.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateUpdatePriorityAndPrice.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdatePriorityAndPrice.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateUpdatePriorityAndPrice.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineSyncPoll.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachineSyncPoll.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineSyncPoll.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachineSyncPoll.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithNetworking.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachineWithNetworking.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineWithNetworking.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachineWithNetworking.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachinesAndAvailabilitySetInSameProximityPlacementGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachinesAndRelatedResourcesInParallel.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachinesAndRelatedResourcesInParallel.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachinesAndRelatedResourcesInParallel.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canCreateVirtualMachinesAndRelatedResourcesInParallel.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canPerformSimulateEvictionOnSpotVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canPerformSimulateEvictionOnSpotVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canPerformSimulateEvictionOnSpotVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canPerformSimulateEvictionOnSpotVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canRunScriptOnVM.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canRunScriptOnVM.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canRunScriptOnVM.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canRunScriptOnVM.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetStorageAccountForUnmanagedDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canSetStorageAccountForUnmanagedDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canSetStorageAccountForUnmanagedDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canSetStorageAccountForUnmanagedDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canStreamParallelCreatedVirtualMachinesAndRelatedResources.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canStreamParallelCreatedVirtualMachinesAndRelatedResources.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canStreamParallelCreatedVirtualMachinesAndRelatedResources.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canStreamParallelCreatedVirtualMachinesAndRelatedResources.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateTagsOnVM.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canUpdateTagsOnVM.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateTagsOnVM.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.canUpdateTagsOnVM.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/cannotUpdateProximityPlacementGroupForVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.cannotUpdateProximityPlacementGroupForVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/cannotUpdateProximityPlacementGroupForVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineOperationsTests.cannotUpdateProximityPlacementGroupForVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateAllPopularImageVM.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachinePopularImageTests.canCreateAllPopularImageVM.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateAllPopularImageVM.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachinePopularImageTests.canCreateAllPopularImageVM.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDeleteRelatedResourcesFromFailedParallelVMCreations.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineRelatedResourcesDeletionTests.canDeleteRelatedResourcesFromFailedParallelVMCreations.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDeleteRelatedResourcesFromFailedParallelVMCreations.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineRelatedResourcesDeletionTests.canDeleteRelatedResourcesFromFailedParallelVMCreations.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUseVMSSUnManagedDisksExplicitStorage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.bootDiagnosticsShouldUsesVMSSOSUnManagedDiskImplicitStorage.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDisableVMSSBootDiagnostics.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canDisableVMSSBootDiagnostics.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canDisableVMSSBootDiagnostics.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canDisableVMSSBootDiagnostics.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnManagedVMSSCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithCreatableStorageOnUnManagedVMSSCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithExplicitStorageOnManagedVMSSCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetBootDiagnosticsTests.canEnableBootDiagnosticsWithImplicitStorageOnManagedVMSSCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineScaleSetWithEMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateUpdateVirtualMachineScaleSetWithEMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineScaleSetWithEMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateUpdateVirtualMachineScaleSetWithEMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canCreateVirtualMachineScaleSetWithLMSIAndEMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetEMSILMSIOperationsTests.canUpdateVirtualMachineScaleSetWithEMSIAndLMSI.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetManagedDiskOperationsTests.canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetManagedDiskOperationsTests.canCreateUpdateVirtualMachineScaleSetFromPIRWithManagedDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetManagedDiskOperationsTests.canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetManagedDiskOperationsTests.canCreateVirtualMachineScaleSetFromCustomImageWithManagedDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateLowPriorityVMSSInstance.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateLowPriorityVMSSInstance.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateLowPriorityVMSSInstance.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateLowPriorityVMSSInstance.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithCustomScriptExtension.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithCustomScriptExtension.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithCustomScriptExtension.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithCustomScriptExtension.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithOptionalNetworkSettings.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithSecret.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithSecret.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateVirtualMachineScaleSetWithSecret.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateVirtualMachineScaleSetWithSecret.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateZoneRedundantVirtualMachineScaleSetWithZoneResilientLoadBalancer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithMultipleRoleAssignment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canEnableMSIOnVirtualMachineScaleSetWithoutRoleAssignment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canGetSingleVMSSInstance.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canGetSingleVMSSInstance.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canGetSingleVMSSInstance.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canGetSingleVMSSInstance.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canPerformSimulateEvictionOnSpotVMSSInstance.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canPerformSimulateEvictionOnSpotVMSSInstance.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canPerformSimulateEvictionOnSpotVMSSInstance.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canPerformSimulateEvictionOnSpotVMSSInstance.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings.json diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/testVirtualMachineScaleSetSkuTypes.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.testVirtualMachineScaleSetSkuTypes.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/testVirtualMachineScaleSetSkuTypes.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.testVirtualMachineScaleSetSkuTypes.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/resources/session-records/testContainerGroupWithVirtualNetwork.json b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/resources/session-records/ContainerGroupTest.testContainerGroupWithVirtualNetwork.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/resources/session-records/testContainerGroupWithVirtualNetwork.json rename to sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/resources/session-records/ContainerGroupTest.testContainerGroupWithVirtualNetwork.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/dockerTaskRunRequestFromRegistry.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.dockerTaskRunRequestFromRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/dockerTaskRunRequestFromRegistry.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.dockerTaskRunRequestFromRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/dockerTaskRunRequestFromRuns.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.dockerTaskRunRequestFromRuns.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/dockerTaskRunRequestFromRuns.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.dockerTaskRunRequestFromRuns.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/encodedTaskRunRequestFromRegistry.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.encodedTaskRunRequestFromRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/encodedTaskRunRequestFromRegistry.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.encodedTaskRunRequestFromRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/encodedTaskRunRequestFromRuns.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.encodedTaskRunRequestFromRuns.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/encodedTaskRunRequestFromRuns.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.encodedTaskRunRequestFromRuns.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/fileTaskRunRequestFromRegistry.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.fileTaskRunRequestFromRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/fileTaskRunRequestFromRegistry.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.fileTaskRunRequestFromRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/fileTaskRunRequestFromRuns.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.fileTaskRunRequestFromRuns.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/fileTaskRunRequestFromRuns.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.fileTaskRunRequestFromRuns.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/getBuildSourceUploadUrlFromRegistryAndRegistries.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.getBuildSourceUploadUrlFromRegistryAndRegistries.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/getBuildSourceUploadUrlFromRegistryAndRegistries.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.getBuildSourceUploadUrlFromRegistryAndRegistries.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/getLogSasUrl.json b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.getLogSasUrl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/getLogSasUrl.json rename to sdk/resourcemanager/azure-resourcemanager-containerregistry/src/test/resources/session-records/RegistryTaskTests.getLogSasUrl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/resources/session-records/canCRUDKubernetesCluster.json b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/resources/session-records/KubernetesClustersTests.canCRUDKubernetesCluster.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/resources/session-records/canCRUDKubernetesCluster.json rename to sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/resources/session-records/KubernetesClustersTests.canCRUDKubernetesCluster.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbAzureTableAccount.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbAzureTableAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbAzureTableAccount.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbAzureTableAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbCassandraAccount.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbCassandraAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbCassandraAccount.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbCassandraAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbMongoDBAccount.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbMongoDBAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbMongoDBAccount.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbMongoDBAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbSqlAccount.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbSqlAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateCosmosDbSqlAccount.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateCosmosDbSqlAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateSqlPrivateEndpoint.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateSqlPrivateEndpoint.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canCreateSqlPrivateEndpoint.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canCreateSqlPrivateEndpoint.json diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canUpdateCosmosDbCassandraConnector.json b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canUpdateCosmosDbCassandraConnector.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/canUpdateCosmosDbCassandraConnector.json rename to sdk/resourcemanager/azure-resourcemanager-cosmos/src/test/resources/session-records/CosmosDBTests.canUpdateCosmosDbCassandraConnector.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canCreateRecordSetsWithDefaultETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canCreateRecordSetsWithDefaultETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canCreateZoneWithDefaultETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canCreateZoneWithDefaultETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canDeleteRecordSetWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canDeleteRecordSetWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canDeleteZoneWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canDeleteZoneWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canUpdateRecordSetWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canUpdateRecordSetWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canUpdateZoneWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/canUpdateZoneWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-dns/src/test/resources/session-records/DnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canConfigureEventHubDataCapturing.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canConfigureEventHubDataCapturing.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canConfigureEventHubDataCapturing.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canConfigureEventHubDataCapturing.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canEnableEventHubDataCaptureOnUpdate.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canEnableEventHubDataCaptureOnUpdate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canEnableEventHubDataCaptureOnUpdate.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canEnableEventHubDataCaptureOnUpdate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubAuthorizationRules.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubAuthorizationRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubAuthorizationRules.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubAuthorizationRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubConsumerGroups.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubConsumerGroups.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubConsumerGroups.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubConsumerGroups.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceAuthorizationRules.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceAuthorizationRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceAuthorizationRules.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceAuthorizationRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceBasicSettings.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceBasicSettings.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceBasicSettings.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceBasicSettings.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceEventHubs.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceEventHubs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageEventHubNamespaceEventHubs.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageEventHubNamespaceEventHubs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageGeoDisasterRecoveryPairing.json b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageGeoDisasterRecoveryPairing.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/canManageGeoDisasterRecoveryPairing.json rename to sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/resources/session-records/EventHubTests.canManageGeoDisasterRecoveryPairing.json diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canCRUDVault.json b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canCRUDVault.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canCRUDVault.json rename to sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canCRUDVault.json diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canCRUDVaultAsync.json b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canCRUDVaultAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canCRUDVaultAsync.json rename to sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canCRUDVaultAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canEnableSoftDeleteAndPurge.json b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canEnableSoftDeleteAndPurge.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/canEnableSoftDeleteAndPurge.json rename to sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/resources/session-records/VaultTests.canEnableSoftDeleteAndPurge.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDActionGroups.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/ActionGroupsTests.canCRUDActionGroups.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDActionGroups.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/ActionGroupsTests.canCRUDActionGroups.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDActivityLogAlerts.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDActivityLogAlerts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDActivityLogAlerts.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDActivityLogAlerts.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDMetricAlerts.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDMetricAlerts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDMetricAlerts.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDMetricAlerts.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDMultipleResourceMetricAlerts.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDMultipleResourceMetricAlerts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDMultipleResourceMetricAlerts.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AlertsTests.canCRUDMultipleResourceMetricAlerts.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDAutoscale.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AutoscaleTests.canCRUDAutoscale.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDAutoscale.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/AutoscaleTests.canCRUDAutoscale.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDDiagnosticSettings.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/DiagnosticSettingsTests.canCRUDDiagnosticSettings.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canCRUDDiagnosticSettings.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/DiagnosticSettingsTests.canCRUDDiagnosticSettings.json diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canListEventsAndMetrics.json b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/MonitorActivityAndMetricsTests.canListEventsAndMetrics.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/canListEventsAndMetrics.json rename to sdk/resourcemanager/azure-resourcemanager-monitor/src/test/resources/session-records/MonitorActivityAndMetricsTests.canListEventsAndMetrics.json diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canAssignCurrentResourceGroupAccessRoleToIdentity.json b/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canAssignCurrentResourceGroupAccessRoleToIdentity.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canAssignCurrentResourceGroupAccessRoleToIdentity.json rename to sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canAssignCurrentResourceGroupAccessRoleToIdentity.json diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canAssignRolesToIdentity.json b/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canAssignRolesToIdentity.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canAssignRolesToIdentity.json rename to sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canAssignRolesToIdentity.json diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canCreateGetListDeleteIdentity.json b/sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canCreateGetListDeleteIdentity.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/canCreateGetListDeleteIdentity.json rename to sdk/resourcemanager/azure-resourcemanager-msi/src/test/resources/session-records/MSIIdentityManagementTests.canCreateGetListDeleteIdentity.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDApplicationGatewayWithWAF.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationGatewayTests.canCRUDApplicationGatewayWithWAF.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDApplicationGatewayWithWAF.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationGatewayTests.canCRUDApplicationGatewayWithWAF.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateApplicationGatewayWithSecret.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationGatewayTests.canCreateApplicationGatewayWithSecret.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateApplicationGatewayWithSecret.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationGatewayTests.canCreateApplicationGatewayWithSecret.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDApplicationSecurityGroup.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationSecurityGroupTests.canCRUDApplicationSecurityGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDApplicationSecurityGroup.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/ApplicationSecurityGroupTests.canCRUDApplicationSecurityGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDDdosProtectionPlan.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/DdosProtectionPlanTests.canCRUDDdosProtectionPlan.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDDdosProtectionPlan.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/DdosProtectionPlanTests.canCRUDDdosProtectionPlan.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDProbe.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/LoadBalancerTests.canCRUDProbe.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDProbe.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/LoadBalancerTests.canCRUDProbe.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateBatchOfNetworkInterfaces.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canCreateBatchOfNetworkInterfaces.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateBatchOfNetworkInterfaces.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canCreateBatchOfNetworkInterfaces.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canDeleteNetworkWithServiceCallBack.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canDeleteNetworkWithServiceCallBack.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canDeleteNetworkWithServiceCallBack.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canDeleteNetworkWithServiceCallBack.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canUseMultipleIPConfigs.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canUseMultipleIPConfigs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canUseMultipleIPConfigs.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkInterfaceOperationsTests.canUseMultipleIPConfigs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canListNetworkUsages.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkUsageOperationsTests.canListNetworkUsages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canListNetworkUsages.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkUsageOperationsTests.canListNetworkUsages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canListProvidersAndGetReachabilityReport.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkWatcherTests.canListProvidersAndGetReachabilityReport.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canListProvidersAndGetReachabilityReport.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/NetworkWatcherTests.canListProvidersAndGetReachabilityReport.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDRouteFilter.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/RouteFilterTests.canCRUDRouteFilter.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCRUDRouteFilter.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/RouteFilterTests.canCRUDRouteFilter.json diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateRouteFilterRule.json b/sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/RouteFilterTests.canCreateRouteFilterRule.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/canCreateRouteFilterRule.json rename to sdk/resourcemanager/azure-resourcemanager-network/src/test/resources/session-records/RouteFilterTests.canCreateRouteFilterRule.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateRecordSetsWithDefaultETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateRecordSetsWithDefaultETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canCreateRecordSetsWithDefaultETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateZoneWithDefaultETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateZoneWithDefaultETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canCreateZoneWithDefaultETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteRecordSetWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteRecordSetWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canDeleteRecordSetWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteZoneWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteZoneWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canDeleteZoneWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateRecordSetWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateRecordSetWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canUpdateRecordSetWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateZoneWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateZoneWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/PrivateDnsZoneRecordSetETagTests.canUpdateZoneWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateVirtualNetworkLinkWithDefaultETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canCreateVirtualNetworkLinkWithDefaultETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canCreateVirtualNetworkLinkWithDefaultETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canCreateVirtualNetworkLinkWithDefaultETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteVirtualNetworkLinkWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canDeleteVirtualNetworkLinkWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canDeleteVirtualNetworkLinkWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canDeleteVirtualNetworkLinkWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateVirtualNetworkLinkWithExplicitETag.json b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canUpdateVirtualNetworkLinkWithExplicitETag.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/canUpdateVirtualNetworkLinkWithExplicitETag.json rename to sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/resources/session-records/VirtualNetworkLinkETagTests.canUpdateVirtualNetworkLinkWithExplicitETag.json diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/canCRUDLinkedServers.json b/sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/RedisCacheOperationsTests.canCRUDLinkedServers.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/canCRUDLinkedServers.json rename to sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/RedisCacheOperationsTests.canCRUDLinkedServers.json diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/canCRUDRedisCache.json b/sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/RedisCacheOperationsTests.canCRUDRedisCache.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/canCRUDRedisCache.json rename to sdk/resourcemanager/azure-resourcemanager-redis/src/test/resources/session-records/RedisCacheOperationsTests.canCRUDRedisCache.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetwork.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetwork.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetwork.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetwork.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetworkSyncPoll.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetworkSyncPoll.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetworkSyncPoll.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetworkSyncPoll.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetworkSyncPollWithFailure.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetworkSyncPollWithFailure.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canDeployVirtualNetworkSyncPollWithFailure.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canDeployVirtualNetworkSyncPollWithFailure.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canPostDeploymentWhatIfOnResourceGroup.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canPostDeploymentWhatIfOnResourceGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canPostDeploymentWhatIfOnResourceGroup.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canPostDeploymentWhatIfOnResourceGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canPostDeploymentWhatIfOnSubscription.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canPostDeploymentWhatIfOnSubscription.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canPostDeploymentWhatIfOnSubscription.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canPostDeploymentWhatIfOnSubscription.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canUpdateVirtualNetworkDeployment.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canUpdateVirtualNetworkDeployment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canUpdateVirtualNetworkDeployment.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/DeploymentsTests.canUpdateVirtualNetworkDeployment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateDeleteResourceSyncPoll.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/GenericResourcesTests.canCreateDeleteResourceSyncPoll.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateDeleteResourceSyncPoll.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/GenericResourcesTests.canCreateDeleteResourceSyncPoll.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateUpdateMoveResource.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/GenericResourcesTests.canCreateUpdateMoveResource.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateUpdateMoveResource.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/GenericResourcesTests.canCreateUpdateMoveResource.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCRUDPolicyAssignment.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/PolicyTests.canCRUDPolicyAssignment.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCRUDPolicyAssignment.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/PolicyTests.canCRUDPolicyAssignment.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCRUDPolicyDefinition.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/PolicyTests.canCRUDPolicyDefinition.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCRUDPolicyDefinition.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/PolicyTests.canCRUDPolicyDefinition.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canUnregisterAndRegisterProvider.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/ProvidersTests.canUnregisterAndRegisterProvider.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canUnregisterAndRegisterProvider.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/ProvidersTests.canUnregisterAndRegisterProvider.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateResourceGroup.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/ResourceGroupsTests.canCreateResourceGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canCreateResourceGroup.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/ResourceGroupsTests.canCreateResourceGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListLocations.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/SubscriptionsTests.canListLocations.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListLocations.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/SubscriptionsTests.canListLocations.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListSubscriptions.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/SubscriptionsTests.canListSubscriptions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListSubscriptions.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/SubscriptionsTests.canListSubscriptions.json diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListTenants.json b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/TenantsTests.canListTenants.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/canListTenants.json rename to sdk/resourcemanager/azure-resourcemanager-resources/src/test/resources/session-records/TenantsTests.canListTenants.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppLogs.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppLogs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppLogs.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppLogs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppSourceControl.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppSourceControl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppSourceControl.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppSourceControl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppWithAuthentication.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppWithAuthentication.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppWithAuthentication.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageFunctionAppWithAuthentication.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppCosmosDbByMsi.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppCosmosDbByMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppCosmosDbByMsi.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppCosmosDbByMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppSourceControl.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppSourceControl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppSourceControl.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppSourceControl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppStorageAccountConnection.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppStorageAccountConnection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppStorageAccountConnection.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppStorageAccountConnection.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppWithContainerRegistry.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithContainerRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppWithContainerRegistry.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithContainerRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppWithTrafficManager.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithTrafficManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppWithTrafficManager.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageLinuxWebAppWithTrafficManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppCosmosDbByMsi.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbByMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppCosmosDbByMsi.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbByMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppCosmosDbThroughKeyVault.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbThroughKeyVault.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppCosmosDbThroughKeyVault.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppCosmosDbThroughKeyVault.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppLogs.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppLogs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppLogs.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppLogs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSourceControl.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppSourceControl.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSourceControl.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppSourceControl.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppStorageAccountConnection.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppStorageAccountConnection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppStorageAccountConnection.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppStorageAccountConnection.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppWithTrafficManager.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppWithTrafficManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppWithTrafficManager.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleLiveOnlyTests.testManageWebAppWithTrafficManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppBasic.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageFunctionAppBasic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageFunctionAppBasic.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageFunctionAppBasic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppBasic.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageLinuxWebAppBasic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppBasic.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageLinuxWebAppBasic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppSqlConnection.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageLinuxWebAppSqlConnection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageLinuxWebAppSqlConnection.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageLinuxWebAppSqlConnection.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppBasic.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppBasic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppBasic.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppBasic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSlots.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppSlots.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSlots.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppSlots.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSqlConnection.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppSqlConnection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageWebAppSqlConnection.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/AppServiceSampleTests.testManageWebAppSqlConnection.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageCdnProfileWithCustomDomain.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CdnSampleTests.testManageCdnProfileWithCustomDomain.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageCdnProfileWithCustomDomain.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CdnSampleTests.testManageCdnProfileWithCustomDomain.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testConvertVirtualMachineToManagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testConvertVirtualMachineToManagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testConvertVirtualMachineToManagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testConvertVirtualMachineToManagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingCustomImageFromVHD.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVHD.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingCustomImageFromVHD.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVHD.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingCustomImageFromVM.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVM.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingCustomImageFromVM.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingCustomImageFromVM.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromSnapshot.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromVhd.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachineUsingSpecializedDiskFromVhd.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachinesInParallel.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachinesInParallel.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachinesInParallel.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachinesInParallel.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListListComputeSkus.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListListComputeSkus.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListListComputeSkus.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListListComputeSkus.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListVirtualMachineExtensionImages.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListVirtualMachineExtensionImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListVirtualMachineExtensionImages.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListVirtualMachineExtensionImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListVirtualMachineImages.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListVirtualMachineImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testListVirtualMachineImages.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testListVirtualMachineImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageAvailabilitySet.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageAvailabilitySet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageAvailabilitySet.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageAvailabilitySet.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageManagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageManagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageManagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageManagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageFromMSIEnabledVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageStorageFromMSIEnabledVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageFromMSIEnabledVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageStorageFromMSIEnabledVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageUserAssignedMSIEnabledVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageUserAssignedMSIEnabledVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageUserAssignedMSIEnabledVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageUserAssignedMSIEnabledVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineAsync.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineAsync.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineExtension.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineExtension.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineExtension.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineExtension.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSet.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSet.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSet.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSetAsync.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSetAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSetAsync.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSetAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSetWithUnmanagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSetWithUnmanagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineScaleSetWithUnmanagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineScaleSetWithUnmanagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineWithDisk.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineWithDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineWithDisk.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineWithDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineWithUnmanagedDisks.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineWithUnmanagedDisks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachineWithUnmanagedDisks.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachineWithUnmanagedDisks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachinesInParallel.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachinesInParallel.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachinesInParallel.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageVirtualMachinesInParallel.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageZonalVirtualMachine.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageZonalVirtualMachine.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageZonalVirtualMachine.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageZonalVirtualMachine.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageZonalVirtualMachineScaleSet.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageZonalVirtualMachineScaleSet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageZonalVirtualMachineScaleSet.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ComputeSampleTests.testManageZonalVirtualMachineScaleSet.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithAzureFileShareMount.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithAzureFileShareMount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithAzureFileShareMount.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithAzureFileShareMount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithManualAzureFileShareMountCreation.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithManualAzureFileShareMountCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithManualAzureFileShareMountCreation.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithManualAzureFileShareMountCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithMultipleContainerImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceWithMultipleContainerImages.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceWithMultipleContainerImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerInstanceTests.testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerRegistry.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerRegistryTests.testManageContainerRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerRegistry.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerRegistryTests.testManageContainerRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerRegistryWithWebhooks.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerRegistryTests.testManageContainerRegistryWithWebhooks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageContainerRegistryWithWebhooks.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ContainerRegistryTests.testManageContainerRegistryWithWebhooks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBTableWithVirtualNetworkRule.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBTableWithVirtualNetworkRule.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBTableWithVirtualNetworkRule.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBTableWithVirtualNetworkRule.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithEventualConsistency.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithEventualConsistency.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithEventualConsistency.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithEventualConsistency.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithIPRange.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithIPRange.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithIPRange.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithIPRange.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithKindMongoDB.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithKindMongoDB.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateCosmosDBWithKindMongoDB.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testCreateCosmosDBWithKindMongoDB.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageHACosmosDB.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testManageHACosmosDB.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageHACosmosDB.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/CosmosDBTests.testManageHACosmosDB.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageDns.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/DnsSampleTests.testManageDns.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageDns.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/DnsSampleTests.testManageDns.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHub.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHub.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHub.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHub.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHubEvents.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHubEvents.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHubEvents.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHubEvents.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHubGeoDisasterRecovery.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHubGeoDisasterRecovery.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageEventHubGeoDisasterRecovery.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/EventHubsSampleTests.testManageEventHubGeoDisasterRecovery.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageServicePrincipal.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageServicePrincipal.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageServicePrincipal.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageServicePrincipal.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageServicePrincipalCredentials.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageServicePrincipalCredentials.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageServicePrincipalCredentials.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageServicePrincipalCredentials.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageUsersGroupsAndRoles.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageUsersGroupsAndRoles.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageUsersGroupsAndRoles.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/GraphRbacTests.testManageUsersGroupsAndRoles.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageKeyVault.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KeyVaultSampleTests.testManageKeyVault.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageKeyVault.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KeyVaultSampleTests.testManageKeyVault.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployImageFromContainerRegistryToKubernetes.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KubernetesClusterTests.testDeployImageFromContainerRegistryToKubernetes.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployImageFromContainerRegistryToKubernetes.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KubernetesClusterTests.testDeployImageFromContainerRegistryToKubernetes.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageKubernetesCluster.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KubernetesClusterTests.testManageKubernetesCluster.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageKubernetesCluster.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/KubernetesClusterTests.testManageKubernetesCluster.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testAutoscaleSettingsBasedOnPerformanceOrSchedule.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testAutoscaleSettingsBasedOnPerformanceOrSchedule.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testAutoscaleSettingsBasedOnPerformanceOrSchedule.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testAutoscaleSettingsBasedOnPerformanceOrSchedule.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testQueryMetricsAndActivityLogs.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testQueryMetricsAndActivityLogs.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testQueryMetricsAndActivityLogs.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testQueryMetricsAndActivityLogs.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testSecurityBreachOrRiskActivityLogAlerts.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testSecurityBreachOrRiskActivityLogAlerts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testSecurityBreachOrRiskActivityLogAlerts.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testSecurityBreachOrRiskActivityLogAlerts.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testWebAppPerformanceMonitoringAlerts.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testWebAppPerformanceMonitoringAlerts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testWebAppPerformanceMonitoringAlerts.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/MonitorTests.testWebAppPerformanceMonitoringAlerts.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateSimpleInternetFacingLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testCreateSimpleInternetFacingLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testCreateSimpleInternetFacingLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testCreateSimpleInternetFacingLoadBalancer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageApplicationGateway.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageApplicationGateway.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageApplicationGateway.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageApplicationGateway.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageIPAddress.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageIPAddress.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageIPAddress.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageIPAddress.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageInternalLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageInternalLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageInternalLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageInternalLoadBalancer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageInternetFacingLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageInternetFacingLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageInternetFacingLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageInternetFacingLoadBalancer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkInterface.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkInterface.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkInterface.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkInterface.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkPeeringInSameSubscription.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkPeeringInSameSubscription.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkPeeringInSameSubscription.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkPeeringInSameSubscription.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkSecurityGroup.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkSecurityGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkSecurityGroup.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageNetworkSecurityGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSimpleApplicationGateway.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageSimpleApplicationGateway.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSimpleApplicationGateway.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageSimpleApplicationGateway.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachinesInParallelWithNetwork.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualMachinesInParallelWithNetwork.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualMachinesInParallelWithNetwork.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualMachinesInParallelWithNetwork.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualNetwork.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualNetwork.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualNetwork.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualNetwork.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualNetworkAsync.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualNetworkAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVirtualNetworkAsync.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVirtualNetworkAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVpnGatewaySite2SiteConnection.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVpnGatewaySite2SiteConnection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageVpnGatewaySite2SiteConnection.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testManageVpnGatewaySite2SiteConnection.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testVerifyNetworkPeeringWithNetworkWatcher.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testVerifyNetworkPeeringWithNetworkWatcher.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testVerifyNetworkPeeringWithNetworkWatcher.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkSampleTests.testVerifyNetworkPeeringWithNetworkWatcher.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkWatcher.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkWatcherSampleLiveOnlyTests.testManageNetworkWatcher.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageNetworkWatcher.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/NetworkWatcherSampleLiveOnlyTests.testManageNetworkWatcher.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManagePrivateDns.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/PrivateDnsSampleTests.testManagePrivateDns.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManagePrivateDns.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/PrivateDnsSampleTests.testManagePrivateDns.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageRedisCache.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/RedisCacheSampleTests.testManageRedisCache.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageRedisCache.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/RedisCacheSampleTests.testManageRedisCache.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplate.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplate.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateAsync.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateAsync.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithDeploymentOperations.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithDeploymentOperations.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithDeploymentOperations.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithDeploymentOperations.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithProgress.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithProgress.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithProgress.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithProgress.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithTags.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithTags.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployUsingARMTemplateWithTags.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployUsingARMTemplateWithTags.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployVirtualMachineUsingARMTemplate.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployVirtualMachineUsingARMTemplate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testDeployVirtualMachineUsingARMTemplate.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testDeployVirtualMachineUsingARMTemplate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResource.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testManageResource.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResource.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testManageResource.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResourceGroup.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testManageResourceGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageResourceGroup.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ResourceSampleTests.testManageResourceGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusPublishSubscribeAdvanceFeatures.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeAdvanceFeatures.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusPublishSubscribeAdvanceFeatures.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeAdvanceFeatures.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusPublishSubscribeBasic.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeBasic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusPublishSubscribeBasic.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusPublishSubscribeBasic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusQueueAdvanceFeatures.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusQueueAdvanceFeatures.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusQueueAdvanceFeatures.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusQueueAdvanceFeatures.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusQueueBasic.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusQueueBasic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusQueueBasic.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusQueueBasic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusWithClaimBasedAuthorization.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusWithClaimBasedAuthorization.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testServiceBusWithClaimBasedAuthorization.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/ServiceBusSampleLiveOnlyTests.testServiceBusWithClaimBasedAuthorization.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testGettingSqlServerMetrics.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testGettingSqlServerMetrics.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testGettingSqlServerMetrics.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testGettingSqlServerMetrics.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabase.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabaseInElasticPool.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabaseInElasticPool.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabaseInElasticPool.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabaseInElasticPool.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabasesAcrossDifferentDataCenters.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabasesAcrossDifferentDataCenters.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlDatabasesAcrossDifferentDataCenters.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlDatabasesAcrossDifferentDataCenters.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlFailoverGroups.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlFailoverGroups.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlFailoverGroups.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlFailoverGroups.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlFirewallRules.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlFirewallRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlFirewallRules.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlFirewallRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlImportExportDatabase.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlImportExportDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlImportExportDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlImportExportDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerDnsAliases.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerDnsAliases.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerDnsAliases.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerDnsAliases.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerKeysWithAzureKeyVaultKey.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerKeysWithAzureKeyVaultKey.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerKeysWithAzureKeyVaultKey.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerKeysWithAzureKeyVaultKey.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerSecurityAlertPolicy.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerSecurityAlertPolicy.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlServerSecurityAlertPolicy.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlServerSecurityAlertPolicy.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlVirtualNetworkRules.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlVirtualNetworkRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlVirtualNetworkRules.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlVirtualNetworkRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlWithRecoveredOrRestoredDatabase.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlWithRecoveredOrRestoredDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSqlWithRecoveredOrRestoredDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/SqlSampleTests.testManageSqlWithRecoveredOrRestoredDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccountAsync.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccountAsync.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccountAsync.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccountAsync.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccountNetworkRules.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccountNetworkRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageStorageAccountNetworkRules.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/StorageSampleTests.testManageStorageAccountNetworkRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSimpleTrafficManager.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/TrafficManagerSampleTests.testManageSimpleTrafficManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageSimpleTrafficManager.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/TrafficManagerSampleTests.testManageSimpleTrafficManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageTrafficManager.json b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/TrafficManagerSampleTests.testManageTrafficManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/testManageTrafficManager.json rename to sdk/resourcemanager/azure-resourcemanager-samples/src/test/resources/session-records/TrafficManagerSampleTests.testManageTrafficManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCRUDOnSimpleNamespace.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCRUDOnSimpleNamespace.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCRUDOnSimpleNamespace.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCRUDOnSimpleNamespace.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateDeleteQueueWithNamespace.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateDeleteQueueWithNamespace.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateDeleteQueueWithNamespace.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateDeleteQueueWithNamespace.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateDeleteTopicWithNamespace.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateDeleteTopicWithNamespace.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateDeleteTopicWithNamespace.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateDeleteTopicWithNamespace.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateNamespaceThenCRUDOnQueue.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnQueue.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateNamespaceThenCRUDOnQueue.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnQueue.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateNamespaceThenCRUDOnTopic.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnTopic.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canCreateNamespaceThenCRUDOnTopic.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canCreateNamespaceThenCRUDOnTopic.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canOperateOnAuthorizationRules.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canOperateOnAuthorizationRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canOperateOnAuthorizationRules.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canOperateOnAuthorizationRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canPerformCRUDOnSubscriptions.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canPerformCRUDOnSubscriptions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canPerformCRUDOnSubscriptions.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canPerformCRUDOnSubscriptions.json diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canPerformOnNamespaceActions.json b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canPerformOnNamespaceActions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/canPerformOnNamespaceActions.json rename to sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/resources/session-records/ServiceBusOperationsTests.canPerformOnNamespaceActions.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlDatabase.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlDatabaseWithElasticPool.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlDatabaseWithElasticPool.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlDatabaseWithElasticPool.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlDatabaseWithElasticPool.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlElasticPool.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlElasticPool.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlElasticPool.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlElasticPool.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlFailoverGroup.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlFailoverGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlFailoverGroup.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlFailoverGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlFirewallRule.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlFirewallRule.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlFirewallRule.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlFirewallRule.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServer.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServer.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServerWithFirewallRule.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServerWithFirewallRule.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServerWithFirewallRule.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServerWithFirewallRule.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServerWithImportDatabase.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServerWithImportDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlServerWithImportDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlServerWithImportDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlSyncGroup.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlSyncGroup.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlSyncGroup.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlSyncGroup.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlSyncMember.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlSyncMember.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCRUDSqlSyncMember.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCRUDSqlSyncMember.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canChangeSqlServerAndDatabaseAutomaticTuning.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canChangeSqlServerAndDatabaseAutomaticTuning.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canChangeSqlServerAndDatabaseAutomaticTuning.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canChangeSqlServerAndDatabaseAutomaticTuning.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCopySqlDatabase.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCopySqlDatabase.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCopySqlDatabase.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCopySqlDatabase.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCreateAndAquireServerDnsAlias.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCreateAndAquireServerDnsAlias.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canCreateAndAquireServerDnsAlias.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canCreateAndAquireServerDnsAlias.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canDoOperationsOnDataWarehouse.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canDoOperationsOnDataWarehouse.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canDoOperationsOnDataWarehouse.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canDoOperationsOnDataWarehouse.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canGetSqlServerCapabilitiesAndCreateIdentity.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canGetSqlServerCapabilitiesAndCreateIdentity.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canGetSqlServerCapabilitiesAndCreateIdentity.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canGetSqlServerCapabilitiesAndCreateIdentity.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canManageReplicationLinks.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canManageReplicationLinks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canManageReplicationLinks.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canManageReplicationLinks.json diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canUseCoolShortcutsForResourceCreation.json b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canUseCoolShortcutsForResourceCreation.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/canUseCoolShortcutsForResourceCreation.json rename to sdk/resourcemanager/azure-resourcemanager-sql/src/test/resources/session-records/SqlServerOperationsTests.canUseCoolShortcutsForResourceCreation.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canConfigureNetworkRulesWithCreate.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithCreate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canConfigureNetworkRulesWithCreate.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithCreate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canConfigureNetworkRulesWithUpdate.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithUpdate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canConfigureNetworkRulesWithUpdate.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountNetworkRuleTests.canConfigureNetworkRulesWithUpdate.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCRUDStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canCRUDStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCRUDStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canCRUDStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableDisableEncryptionOnStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableDisableEncryptionOnStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableDisableEncryptionOnStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableDisableEncryptionOnStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableDisableFileEncryptionOnStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableDisableFileEncryptionOnStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableDisableFileEncryptionOnStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableDisableFileEncryptionOnStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableLargeFileSharesOnStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableLargeFileSharesOnStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canEnableLargeFileSharesOnStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageAccountOperationsTests.canEnableLargeFileSharesOnStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateBlobContainer.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobContainersTests.canCreateBlobContainer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateBlobContainer.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobContainersTests.canCreateBlobContainer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateBlobContainer.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobContainersTests.canUpdateBlobContainer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateBlobContainer.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobContainersTests.canUpdateBlobContainer.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateBlobServices.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobServicesTests.canCreateBlobServices.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateBlobServices.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobServicesTests.canCreateBlobServices.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateBlobServices.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobServicesTests.canUpdateBlobServices.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateBlobServices.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageBlobServicesTests.canUpdateBlobServices.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateManagementPolicies.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.canCreateManagementPolicies.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canCreateManagementPolicies.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.canCreateManagementPolicies.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateManagementPolicy.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.canUpdateManagementPolicy.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canUpdateManagementPolicy.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.canUpdateManagementPolicy.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/managementPolicyGetters.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.managementPolicyGetters.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/managementPolicyGetters.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/StorageManagementPoliciesTests.managementPolicyGetters.json diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canGetUsages.json b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/UsageOperationsTests.canGetUsages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/canGetUsages.json rename to sdk/resourcemanager/azure-resourcemanager-storage/src/test/resources/session-records/UsageOperationsTests.canGetUsages.json diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canCreateTrafficManagerWithSubnetRouting.json b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canCreateTrafficManagerWithSubnetRouting.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canCreateTrafficManagerWithSubnetRouting.json rename to sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canCreateTrafficManagerWithSubnetRouting.json diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canCreateUpdateProfileWithGeographicEndpoint.json b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canCreateUpdateProfileWithGeographicEndpoint.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canCreateUpdateProfileWithGeographicEndpoint.json rename to sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canCreateUpdateProfileWithGeographicEndpoint.json diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canGetGeographicHierarchy.json b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canGetGeographicHierarchy.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/canGetGeographicHierarchy.json rename to sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/test/resources/session-records/TrafficManagerTests.canGetGeographicHierarchy.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewayBackendHealthCheck.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewayBackendHealthCheck.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewayBackendHealthCheck.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewayBackendHealthCheck.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternalComplex.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternalComplex.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternalComplex.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternalComplex.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternalMinimal.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternalMinimal.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternalMinimal.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternalMinimal.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternetFacingComplex.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternetFacingComplex.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternetFacingComplex.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternetFacingComplex.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternetFacingMinimal.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternetFacingMinimal.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysInternetFacingMinimal.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysInternetFacingMinimal.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysPublicUrlPathBased.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysPublicUrlPathBased.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysPublicUrlPathBased.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysPublicUrlPathBased.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysStartStop.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysStartStop.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAppGatewaysStartStop.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testAppGatewaysStartStop.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testApplicationGatewaysInParallel.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testApplicationGatewaysInParallel.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testApplicationGatewaysInParallel.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/ApplicationGatewayTests.testApplicationGatewaysInParallel.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/createStorageAccount.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.createStorageAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/createStorageAccount.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.createStorageAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listLocations.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listLocations.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listLocations.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listLocations.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listResourceGroups.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listResourceGroups.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listResourceGroups.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listResourceGroups.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listStorageAccounts.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listStorageAccounts.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listStorageAccounts.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listStorageAccounts.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listSubscriptions.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listSubscriptions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/listSubscriptions.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.listSubscriptions.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAvailabilitySets.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testAvailabilitySets.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testAvailabilitySets.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testAvailabilitySets.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testBatchAccount.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testBatchAccount.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testBatchAccount.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testBatchAccount.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testCdnManager.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testCdnManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testCdnManager.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testCdnManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPrivateIpAddress.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPrivateIpAddress.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPrivateIpAddress.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPrivateIpAddress.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerInstanceWithPublicIpAddressWithUserAssignedMsi.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerRegistry.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerRegistry.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testContainerRegistry.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerRegistry.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testCosmosDB.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testCosmosDB.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testCosmosDB.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testCosmosDB.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDdosAndVmProtection.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDdosAndVmProtection.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDdosAndVmProtection.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDdosAndVmProtection.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDeployments.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDeployments.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDeployments.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDeployments.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDnsZones.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDnsZones.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testDnsZones.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testDnsZones.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpandableEnum.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpandableEnum.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpandableEnum.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpandableEnum.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpressRouteCircuitPeering.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpressRouteCircuitPeering.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpressRouteCircuitPeering.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpressRouteCircuitPeering.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpressRouteCircuits.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpressRouteCircuits.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testExpressRouteCircuits.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testExpressRouteCircuits.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testGenericResources.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testGenericResources.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testGenericResources.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testGenericResources.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testKubernetesCluster.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testKubernetesCluster.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testKubernetesCluster.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testKubernetesCluster.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersInternalMinimum.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersInternalMinimum.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersInternalMinimum.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersInternalMinimum.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersInternetMinimum.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersInternetMinimum.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersInternetMinimum.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersInternetMinimum.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatOnly.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatOnly.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatOnly.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatOnly.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatPools.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatPools.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatPools.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatPools.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatRules.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatRules.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLoadBalancersNatRules.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLoadBalancersNatRules.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLocalNetworkGateways.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLocalNetworkGateways.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testLocalNetworkGateways.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testLocalNetworkGateways.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testManagedDiskVMUpdate.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testManagedDiskVMUpdate.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testManagedDiskVMUpdate.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testManagedDiskVMUpdate.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testManagementLocks.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testManagementLocks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testManagementLocks.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testManagementLocks.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkInterfaces.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkInterfaces.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkInterfaces.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkInterfaces.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkPeerings.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkPeerings.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkPeerings.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkPeerings.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkSecurityGroups.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkSecurityGroups.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkSecurityGroups.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkSecurityGroups.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkUpdateTags.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkUpdateTags.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkUpdateTags.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkUpdateTags.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatcherFunctions.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWatcherFunctions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatcherFunctions.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWatcherFunctions.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatchers.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWatchers.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatchers.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWatchers.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWithAccessFromServiceToSubnet.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWithAccessFromServiceToSubnet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWithAccessFromServiceToSubnet.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworkWithAccessFromServiceToSubnet.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworks.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworks.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworks.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testNetworks.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPrivateDnsZones.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPrivateDnsZones.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPrivateDnsZones.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPrivateDnsZones.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPublicIPAddresses.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPublicIPAddresses.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPublicIPAddresses.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPublicIPAddresses.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPublicIPPrefixes.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPublicIPPrefixes.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testPublicIPPrefixes.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testPublicIPPrefixes.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRedis.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRedis.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRedis.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRedis.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRegions.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRegions.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRegions.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRegions.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testResourceStreaming.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testResourceStreaming.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testResourceStreaming.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testResourceStreaming.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRouteTables.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRouteTables.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testRouteTables.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testRouteTables.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceAnySku.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceAnySku.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceAnySku.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceAnySku.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceBasicSku.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceBasicSku.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceBasicSku.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceBasicSku.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceFreeSku.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceFreeSku.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceFreeSku.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceFreeSku.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceStandardSku.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceStandardSku.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSearchServiceStandardSku.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSearchServiceStandardSku.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSqlServer.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSqlServer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testSqlServer.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testSqlServer.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testTrafficManager.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testTrafficManager.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testTrafficManager.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testTrafficManager.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVMImages.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVMImages.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVMImages.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVMImages.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineCustomData.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineCustomData.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineCustomData.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineCustomData.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineDataDisk.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineDataDisk.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineDataDisk.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineDataDisk.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineInAvailabilitySet.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineInAvailabilitySet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineInAvailabilitySet.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineInAvailabilitySet.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineNics.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineNics.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineNics.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineNics.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSSh.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSSh.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSSh.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSSh.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSizes.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSizes.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSizes.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSizes.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSyncPoller.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSyncPoller.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachineSyncPoller.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachineSyncPoller.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachines.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachines.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualMachines.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testVirtualMachines.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatcherTroubleshooting.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testNetworkWatcherTroubleshooting.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testNetworkWatcherTroubleshooting.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testNetworkWatcherTroubleshooting.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewayPointToSite.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewayPointToSite.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewayPointToSite.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewayPointToSite.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewaySiteToSite.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewaySiteToSite.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewaySiteToSite.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewaySiteToSite.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewayVNetToVNet.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewayVNetToVNet.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGatewayVNetToVNet.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGatewayVNetToVNet.json diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGateways.json b/sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGateways.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/testVirtualNetworkGateways.json rename to sdk/resourcemanager/azure-resourcemanager/src/test/resources/session-records/VirtualNetworkGatewayTests.testVirtualNetworkGateways.json From 66d9527af07b774e551e009409734d47158d224a Mon Sep 17 00:00:00 2001 From: Connie Yau Date: Wed, 28 Oct 2020 21:10:05 -0700 Subject: [PATCH 11/36] Fixing live test failures in Event Hubs. (#16934) * Adding verify anonymous peer. * Relax assertions in EventConsumerIntegrationTest. --- ...EventHubConsumerClientIntegrationTest.java | 41 ++++++++----------- .../EventPositionIntegrationTest.java | 24 +++-------- .../messaging/eventhubs/ProxyReceiveTest.java | 16 ++++++-- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientIntegrationTest.java index be45e7dc53df0..0353c36c5d898 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientIntegrationTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientIntegrationTest.java @@ -12,14 +12,14 @@ import org.junit.jupiter.api.Test; import java.time.Duration; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.function.Function; import java.util.stream.Collectors; import static com.azure.messaging.eventhubs.EventHubClientBuilder.DEFAULT_CONSUMER_GROUP_NAME; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for synchronous {@link EventHubConsumerClient}. @@ -83,12 +83,14 @@ public void receiveEventsMultipleTimes() { final Duration waitTime = Duration.ofSeconds(10); // Act - final IterableStream actual = consumer.receiveFromPartition(PARTITION_ID, numberOfEvents, startingPosition, waitTime); + final IterableStream actual = consumer.receiveFromPartition(PARTITION_ID, numberOfEvents, + startingPosition, waitTime); final Map asList = actual.stream() .collect(Collectors.toMap(e -> e.getData().getSequenceNumber(), Function.identity())); Assertions.assertEquals(numberOfEvents, asList.size()); - final IterableStream actual2 = consumer.receiveFromPartition(PARTITION_ID, numberOfEvents, startingPosition, waitTime); + final IterableStream actual2 = consumer.receiveFromPartition(PARTITION_ID, numberOfEvents, + startingPosition, waitTime); final Map asList2 = actual2.stream() .collect(Collectors.toMap(e -> e.getData().getSequenceNumber(), Function.identity())); @@ -100,7 +102,7 @@ public void receiveEventsMultipleTimes() { Assertions.assertNotNull(removed, String.format("Expecting '%s' to be in second set. But was not.", key)); } - Assertions.assertTrue(asList2.isEmpty(), "Expected all keys to be removed from second set."); + assertTrue(asList2.isEmpty(), "Expected all keys to be removed from second set."); } /** @@ -117,7 +119,7 @@ public void receiveUntilTimeout() { // Assert final List asList = receive.stream().collect(Collectors.toList()); final int actual = asList.size(); - Assertions.assertTrue(eventSize <= actual && actual <= maximumSize, + assertTrue(eventSize <= actual && actual <= maximumSize, String.format("Should be between %s and %s. Actual: %s", eventSize, maximumSize, actual)); } @@ -139,7 +141,9 @@ public void doesNotContinueToReceiveEvents() { // Assert final List asList = receive.stream().collect(Collectors.toList()); - Assertions.assertEquals(numberOfEvents, asList.size()); + assertTrue(!asList.isEmpty() && asList.size() <= numberOfEvents, + String.format("Expected: %s. Actual: %s", numberOfEvents, asList.size())); + } finally { dispose(consumer); } @@ -150,9 +154,7 @@ public void doesNotContinueToReceiveEvents() { */ @Test public void multipleConsumers() { - final int numberOfEvents = 15; final int receiveNumber = 10; - final String messageId = UUID.randomUUID().toString(); final String partitionId = "1"; final Map testData = getTestData(); final IntegrationTestEventData integrationTestEventData = testData.get(partitionId); @@ -162,7 +164,7 @@ public void multipleConsumers() { final EventHubClientBuilder builder = createBuilder().consumerGroup(DEFAULT_CONSUMER_GROUP_NAME); final EventHubConsumerClient consumer = builder.buildConsumerClient(); final EventHubConsumerClient consumer2 = builder.buildConsumerClient(); - final Duration firstReceive = Duration.ofSeconds(5); + final Duration firstReceive = Duration.ofSeconds(30); final Duration secondReceiveDuration = firstReceive.plus(firstReceive); try { @@ -174,20 +176,13 @@ public void multipleConsumers() { startingPosition, secondReceiveDuration); // Assert - final List asList = receive.stream().map(e -> e.getData().getSequenceNumber()).collect(Collectors.toList()); - final List asList2 = receive2.stream().map(e -> e.getData().getSequenceNumber()).collect(Collectors.toList()); - - Assertions.assertEquals(receiveNumber, asList.size()); - Assertions.assertEquals(receiveNumber, asList2.size()); - - Collections.sort(asList); - Collections.sort(asList2); - - final Long[] first = asList.toArray(new Long[0]); - final Long[] second = asList2.toArray(new Long[0]); - - Assertions.assertArrayEquals(first, second); + final List asList = receive.stream().map(e -> e.getData().getSequenceNumber()) + .collect(Collectors.toList()); + final List asList2 = receive2.stream().map(e -> e.getData().getSequenceNumber()) + .collect(Collectors.toList()); + assertFalse(asList.isEmpty()); + assertFalse(asList2.isEmpty()); } finally { dispose(consumer, consumer2); } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java index 74e1433dee3b6..e45f8bfa21fa3 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import reactor.core.Disposable; import reactor.test.StepVerifier; import java.time.Duration; @@ -21,8 +20,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -171,35 +168,26 @@ void receiveLatestMessagesNoneAdded() { * Test for receiving message from latest offset */ @Test - void receiveLatestMessages() throws InterruptedException { + void receiveLatestMessages() { // Arrange final String messageId = UUID.randomUUID().toString(); final SendOptions options = new SendOptions().setPartitionId(testData.getPartitionId()); final EventHubProducerClient producer = createBuilder() .buildProducerClient(); final List events = TestUtils.getEvents(15, messageId); - final CountDownLatch countDownLatch = new CountDownLatch(numberOfEvents); - Disposable subscription = null; try { - subscription = consumer.receiveFromPartition(testData.getPartitionId(), EventPosition.latest()) + StepVerifier.create(consumer.receiveFromPartition(testData.getPartitionId(), EventPosition.latest()) .filter(event -> isMatchingEvent(event, messageId)) - .take(numberOfEvents) - .subscribe(event -> countDownLatch.countDown()); + .take(numberOfEvents)) + .then(() -> producer.send(events, options)) + .expectNextCount(numberOfEvents) + .verifyComplete(); // Act - producer.send(events, options); - countDownLatch.await(TIMEOUT.getSeconds(), TimeUnit.SECONDS); } finally { - if (subscription != null) { - subscription.dispose(); - } - dispose(producer); } - - // Assert - Assertions.assertEquals(0, countDownLatch.getCount()); } /** diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyReceiveTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyReceiveTest.java index 52a8d4cef0e29..fc7ec8e67c031 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyReceiveTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxyReceiveTest.java @@ -8,6 +8,7 @@ import com.azure.messaging.eventhubs.jproxy.ProxyServer; import com.azure.messaging.eventhubs.jproxy.SimpleProxy; import com.azure.messaging.eventhubs.models.EventPosition; +import org.apache.qpid.proton.engine.SslDomain; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; @@ -19,6 +20,7 @@ import java.net.ProxySelector; import java.net.SocketAddress; import java.net.URI; +import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -38,6 +40,8 @@ public ProxyReceiveTest() { @BeforeAll public static void setup() throws IOException { + StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + proxyServer = new SimpleProxy(PROXY_PORT); proxyServer.start(null); @@ -59,16 +63,20 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { @AfterAll() public static void cleanup() throws Exception { - if (proxyServer != null) { - proxyServer.stop(); + try { + if (proxyServer != null) { + proxyServer.stop(); + } + } finally { + ProxySelector.setDefault(defaultProxySelector); + StepVerifier.resetDefaultTimeout(); } - - ProxySelector.setDefault(defaultProxySelector); } @Test public void testReceiverStartOfStreamFilters() { final EventHubConsumerAsyncClient consumer = createBuilder() + .verifyMode(SslDomain.VerifyMode.ANONYMOUS_PEER) .transportType(AmqpTransportType.AMQP_WEB_SOCKETS) .consumerGroup(EventHubClientBuilder.DEFAULT_CONSUMER_GROUP_NAME) .buildAsyncConsumerClient(); From 2b73ce8e55bebabdf5989e0454ad3ffaa713d980 Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Wed, 28 Oct 2020 22:51:53 -0700 Subject: [PATCH 12/36] Sb t2 schedule multiple message validate batch size (#16959) added check for maxsize for schedule message api --- .../ServiceBusSenderAsyncClient.java | 21 +++++++++---------- .../ServiceBusSenderAsyncClientTest.java | 14 ++++++------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java index 3332ced69344d..b026fec9de706 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClient.java @@ -371,26 +371,25 @@ public Flux scheduleMessages(Iterable messages, OffsetD return fluxError(logger, new NullPointerException("'scheduledEnqueueTime' cannot be null.")); } - return getSendLink().flatMapMany(link -> createMessageBatch() - .flatMapMany(messageBatch -> { + return createMessageBatch() + .map(messageBatch -> { int index = 0; for (ServiceBusMessage message : messages) { if (!messageBatch.tryAddMessage(message)) { final String error = String.format(Locale.US, "Messages exceed max allowed size for all the messages together. " + "Failed to add message at index '%s'.", index); - throw logger.logExceptionAsError(new AmqpException(false, - AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED, error, link.getErrorContext())); + throw logger.logExceptionAsError(new IllegalArgumentException(error)); } ++index; } - - return connectionProcessor - .flatMap(connection -> connection.getManagementNode(entityName, entityType)) - .flatMapMany(managementNode -> managementNode.schedule(messageBatch.getMessages(), - scheduledEnqueueTime, messageBatch.getMaxSizeInBytes(), link.getLinkName(), - transactionContext)); - })); + return messageBatch; + }) + .flatMapMany(messageBatch -> connectionProcessor + .flatMap(connection -> connection.getManagementNode(entityName, entityType)) + .flatMapMany(managementNode -> managementNode.schedule(messageBatch.getMessages(), scheduledEnqueueTime, + messageBatch.getMaxSizeInBytes(), linkName.get(), transactionContext)) + ); } /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java index 1f832c0702116..07a821cd22eec 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java @@ -70,9 +70,8 @@ import static com.azure.messaging.servicebus.implementation.ServiceBusConstants.AZ_TRACING_SERVICE_NAME; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; @@ -308,13 +307,12 @@ void scheduleMessageSizeTooBig() { // Act & Assert StepVerifier.create(sender.scheduleMessages(messages, instant)) - .verifyErrorMatches(throwable -> { - assertTrue(throwable instanceof AmqpException); - assertSame(((AmqpException) throwable).getErrorCondition(), AmqpErrorCondition.LINK_PAYLOAD_SIZE_EXCEEDED); - return true; - }); + .verifyError(IllegalArgumentException.class); + + verify(managementNode, never()).schedule(any(), eq(instant), anyInt(), eq(LINK_NAME), isNull()); } - + + /** * Verifies that sending multiple message will result in calling sender.send(MessageBatch, transaction). */ From e2fd4578677e9c1e6b8f06489414800eb15a4142 Mon Sep 17 00:00:00 2001 From: M Date: Thu, 29 Oct 2020 17:03:34 +0800 Subject: [PATCH 13/36] update MSI usage doc for service bus multi-binder sample (#16736) * add MSI usage for service bus multi-binder sample --- .../README.adoc | 132 ++++++++++++++++-- 1 file changed, 120 insertions(+), 12 deletions(-) diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc index 99b4ae04a728f..62356c2a0df8d 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/README.adoc @@ -36,7 +36,112 @@ spring.cloud.stream.binders.servicebus2.type=servicebus-queue spring.cloud.stream.binders.servicebus2.defaultCandidate=false spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.servicebus.connection-string=[servicebus-namespace-2-connection-string] +# Configuration for bindings +spring.cloud.stream.bindings.input.destination=[servicebus-queue-1-name] +spring.cloud.stream.bindings.output.destination=[servicebus-queue-name-same-as-above] +spring.cloud.stream.bindings.input1.destination=[servicebus-queue-2-name] +spring.cloud.stream.bindings.output1.destination=[servicebus-queue-name-same-as-above] +spring.cloud.stream.bindings.input1.binder=servicebus2 +spring.cloud.stream.bindings.output1.binder=servicebus2 +.... + +=== MSI credential based usage + +==== Overview + +https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/[MSI] (Managed Service Identity, aka Managed Identity) for Azure resources provides Azure services with an automatically managed identity in https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis[Azure AD]. +You can use this identity to authenticate to any service that supports Azure AD authentication without having any credentials in your code. + +==== Prerequisites + +1. Create https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-quickstart-portal[Azure Service Bus]. +Please note `Basic` tier is unsupported. + +2. Create https://docs.microsoft.com/azure/storage/[Azure Storage] for checkpoint use. + +==== Setup Application + +Please note your application should run in VM (Virtual Machine) or App Services on Azure for support of MSI. Choose any of them. + +===== Method 1: Setup VM and assign identity + +1. Create VM in Azure portal. +Please refer to https://docs.microsoft.com/azure/virtual-machines/windows/quick-create-portal[Create a Windows virtual machine in the Azure portal] or https://docs.microsoft.com/azure/virtual-machines/linux/quick-create-portal[Create a Linux virtual machine in the Azure portal]. +Choose any one according to your needs. + +2. Create an user-assigned identity in Azure Portal. +Please refer to https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal#create-a-user-assigned-managed-identity[Create an user-assigned managed identity]. + +3. Assign the user-assigned identity to the VM. +Please refer to https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/qs-configure-portal-windows-vm#assign-a-user-assigned-managed-identity-to-an-existing-vm[Assign an user-assigned managed identity to an existing VM]. + +===== Method 2: Setup App Service and assign identity + +- 1. Deploy this sample's Spring Boot JAR file to App Service. + +You can follow https://docs.microsoft.com/java/azure/spring-framework/deploy-spring-boot-java-app-with-maven-plugin?toc=%2Fazure%2Fapp-service%2Fcontainers%2Ftoc.json&view=azure-java-stable[ + Deploy a Spring Boot JAR file to Azure App Service] to deploy the JAR file. + +Another way to deploy an executable JAR is via FTP/S. Follow https://docs.microsoft.com/azure/app-service/deploy-ftp[ +Deploy your app to App Service using FTP/S]. +And the JAR file's name must be `app.jar`. + +- 2. Create a managed identity for App Service. + +If you choose system-assigned identity, follow https://docs.microsoft.com/azure/app-service/overview-managed-identity#adding-a-system-assigned-identity[ + Adding a system assigned identity]. + +If you choose user-assigned identity, follow https://docs.microsoft.com/azure/app-service/overview-managed-identity#adding-a-user-assigned-identity[ + Adding a user assigned identity]. + +==== Add Role Assignment for Resource Group + +- Resource Group: assign `Reader` role for managed identity. + +See https://docs.microsoft.com/azure/role-based-access-control/role-assignments-portal[Add or remove Azure role assignments] to add the role assignment for Resource Group. + +For different built-in role's descriptions, please see https://docs.microsoft.com/azure/role-based-access-control/built-in-roles[Built-in role descriptions]. + +==== Add Role Assignment for Service Bus +- Namespace of Service Bus: assign `Contributor` role for managed identity. + +See https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-managed-service-identity[Managed identities for Azure resources with Service Bus] to add role assignment for Service Bus, Storage Account is similar. + + +==== Add MSI related properties +1. Update link:src/main/resources/application.properties[application.properties] ++ +.... +# Enable MSI +spring.cloud.azure.msi-enabled=true +spring.cloud.azure.resource-group=[resource-group] +spring.cloud.azure.subscription-id=[subscription-id] +spring.cloud.azure.servicebus=[servicebus-namespace-1] +spring.cloud.azure.managed-identity.client-id=[client id of managed identity] + +# Default binder +spring.cloud.stream.bindings.input.destination=[servicebus-queue-1-name] +spring.cloud.stream.bindings.output.destination=[servicebus-queue-1-name-same-as-above] +spring.cloud.stream.servicebus.queue.bindings.input.consumer.checkpoint-mode=MANUAL + +# Another binder for servicebus2 +spring.cloud.stream.binders.servicebus2.type=servicebus-queue +spring.cloud.stream.binders.servicebus2.defaultCandidate=false +spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.servicebus.namespace=[servicebus-namespace-2] + +spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.msi-enabled=true +spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.resource-group=[resource-group] +spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.subscription-id=[subscription-id] +spring.cloud.stream.binders.servicebus2.environment.spring.cloud.azure.managed-identity.client-id=[client id of managed identity] + +spring.cloud.stream.bindings.input1.destination=[servicebus-queue-2-name] +spring.cloud.stream.bindings.output1.destination=[servicebus-queue-2-name-same-as-above] +spring.cloud.stream.bindings.input1.binder=servicebus2 +spring.cloud.stream.bindings.output1.binder=servicebus2 + +# Use manual checkpoint mode +spring.cloud.stream.servicebus.queue.bindings.input1.consumer.checkpoint-mode=MANUAL .... [NOTE] @@ -47,23 +152,16 @@ Whether the binder configuration is a candidate for being considered a default b This allows adding binder configurations without interfering with the default processing. ==== +==== Redeploy Application + +If you update the role assignment for services, then redeploy the app again. + === How to run First, we need to ensure that this {instruction}[instruction] is completed before run. 1. Update stream binding related properties in link:src/main/resources/application.properties[application.properties] -+ -[source%nowrap,properties] -.... -spring.cloud.stream.bindings.input.destination=[servicebus-queue-1-name] -spring.cloud.stream.bindings.output.destination=[servicebus-queue-name-same-as-above] - - -spring.cloud.stream.bindings.input1.destination=[servicebus-queue-2-name] -spring.cloud.stream.bindings.output1.destination=[servicebus-queue-name-same-as-above] -.... - -2. Run the `mvn clean spring-boot:run` in the root of the code sample to get the app running. +2. For connection string usage, run the `mvn clean spring-boot:run` in the root of the code sample to get the app running; for MSI usage, deploy or redeploy web application. 3. Send a POST request to test the default binder + @@ -71,6 +169,11 @@ spring.cloud.stream.bindings.output1.destination=[servicebus-queue-name-same-as- $ curl -X POST http://localhost:8080/messages?message=hello .... + +or when the app runs on App Service or VM ++ +.... +$ curl -d -X POST https://[your-app-URL]/messages?message=hello +.... 4. Verify in your app's logs that a similar message was posted: + @@ -85,6 +188,11 @@ $ curl -X POST http://localhost:8080/messages?message=hello $ curl -X POST http://localhost:8080/messages1?message=hello .... + +or when the app runs on App Service or VM ++ +.... +$ curl -d -X POST https://[your-app-URL]/messages1?message=hello +.... 6. Verify in your app's logs that a similar message was posted: + From 23213a99b98356c9daff578003c7a3595ab22f80 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 29 Oct 2020 09:36:43 -0700 Subject: [PATCH 14/36] Fix redactor to skip redaction for empty key-value pairs values (#16943) --- sdk/core/azure-core-test/CHANGELOG.md | 3 +++ .../com/azure/core/test/models/RecordingRedactor.java | 11 ++++++++--- .../com/azure/core/test/RecordingRedactorTests.java | 8 +++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index 759860839376d..a1e252626e2b6 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -6,6 +6,9 @@ - Updated `azure-core` to `1.10.0`. +### Bug Fixes +- Fixed a bug in test recording redaction for redacting empty values for json key-value pairs. + ## 1.5.0 (2020-10-01) ### New Features diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordingRedactor.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordingRedactor.java index b6e8b69cbcac9..faeaba677e07e 100644 --- a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordingRedactor.java +++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordingRedactor.java @@ -3,6 +3,8 @@ package com.azure.core.test.models; +import com.azure.core.util.CoreUtils; + import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Base64; @@ -40,11 +42,11 @@ public class RecordingRedactor { .add("url") .add("host") .add("password") - .add("password") .add("userName"); private static final Pattern JSON_PROPERTY_VALUE_REDACTION_PATTERN - = Pattern.compile(String.format("(?:%s)(.*?)(?:\",|\"})", JSON_PROPERTIES_TO_REDACT.toString())); + = Pattern.compile(String.format("(?:%s)(.*?)(?:\",|\"})", JSON_PROPERTIES_TO_REDACT.toString()), + Pattern.CASE_INSENSITIVE); /** * Redact the sensitive information. @@ -96,7 +98,10 @@ private static String redactUserDelegationKey(String content) { private static String redactionReplacement(String content, Matcher matcher, String replacement) { while (matcher.find()) { - content = content.replace(matcher.group(1), replacement); + String captureGroup = matcher.group(1); + if (!CoreUtils.isNullOrEmpty(captureGroup)) { + content = content.replace(matcher.group(1), replacement); + } } return content; diff --git a/sdk/core/azure-core-test/src/test/java/com/azure/core/test/RecordingRedactorTests.java b/sdk/core/azure-core-test/src/test/java/com/azure/core/test/RecordingRedactorTests.java index 8e5264ddf4bea..6d3cc41186941 100644 --- a/sdk/core/azure-core-test/src/test/java/com/azure/core/test/RecordingRedactorTests.java +++ b/sdk/core/azure-core-test/src/test/java/com/azure/core/test/RecordingRedactorTests.java @@ -116,11 +116,16 @@ public class RecordingRedactorTests { + "\":\"adsample\",\"accountKey\":\"REDACTED\"}"; private static final String AUTH_HEADER_RESPONSE_BODY = "\"dataSourceParameter\":" - + "{\"authHeader\":\"authHeaderXYZ\",\"port\":\"9200\""; + + "{\"authHeader\":\"XYZ\",\"port\":\"9200\""; private static final String REDACTED_AUTH_HEADER_RESPONSE_BODY = "\"dataSourceParameter\":" + "{\"authHeader\":\"REDACTED\",\"port\":\"9200\""; + private static final String EMPTY_KEY_RESPONSE_BODY = "\"dataSourceParameter\":" + + "{\"username\":\"\",\"port\":\"9200\""; + + private static final String REDACTED_EMPTY_KEY_RESPONSE_BODY = "\"dataSourceParameter\":" + + "{\"username\":\"\",\"port\":\"9200\""; /** * Verify if the given content is redacted successfully. */ @@ -162,6 +167,7 @@ private static Stream sensitiveDataSupplier() { Arguments.of(USER_DELEGATION_KEY_FOR_VALUE_RESPONSE, EXPECTED_USER_DELEGATION_KEY_FOR_VALUE_RESPONSE_REDACTED), Arguments.of(PASSWORD_RESPONSE_BODY, REDACTED_PASSWORD_RESPONSE_BODY), Arguments.of(USERNAME_RESPONSE_BODY, REDACTED_USERNAME_RESPONSE), + Arguments.of(REDACTED_EMPTY_KEY_RESPONSE_BODY, EMPTY_KEY_RESPONSE_BODY), Arguments.of(NON_SENSITIVE_DATA_CONTENT, NON_SENSITIVE_DATA_CONTENT) ); } From ecc9d522e01eb552ca2a8c4d0a91cb7264651caf Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 10:14:45 -0700 Subject: [PATCH 15/36] Remove JsonPatchDocument.getOperations(), JsonPatchOperation, JsonPatchOperationKind, and Option from azure-core public API (#16953) --- .../checkstyle/checkstyle-suppressions.xml | 14 ++++----- sdk/core/azure-core/CHANGELOG.md | 1 - .../core/{util => implementation}/Option.java | 24 +++++++-------- .../OptionBeanPropertyWriter.java | 3 +- .../OptionModule.java | 3 +- .../OptionPropertiesModifier.java | 3 +- .../OptionSerializer.java | 29 +++++++++---------- .../OptionSerializerProvider.java | 11 ++++--- .../OptionTypeModifier.java | 3 +- .../azure/core/models/JsonPatchDocument.java | 10 +++++-- .../JsonPatchDocumentSerializer.java | 4 +-- .../azure/core/models/JsonPatchOperation.java | 14 +++++---- .../core/models/JsonPatchOperationKind.java | 2 +- .../JsonPatchOperationSerializer.java | 5 ++-- .../core/util/serializer/JacksonAdapter.java | 3 -- .../core/util/OptionJavaDocCodeSnippets.java | 2 ++ .../OptionSerializerTests.java | 28 ++++++++++++------ .../{util => implementation}/OptionTests.java | 11 ++++--- 18 files changed, 87 insertions(+), 83 deletions(-) rename sdk/core/azure-core/src/main/java/com/azure/core/{util => implementation}/Option.java (90%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionBeanPropertyWriter.java (98%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionModule.java (95%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionPropertiesModifier.java (95%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionSerializer.java (74%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionSerializerProvider.java (82%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => implementation}/OptionTypeModifier.java (96%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => models}/JsonPatchDocumentSerializer.java (91%) rename sdk/core/azure-core/src/main/java/com/azure/core/{util/serializer => models}/JsonPatchOperationSerializer.java (93%) rename sdk/core/azure-core/src/test/java/com/azure/core/{util/serializer => implementation}/OptionSerializerTests.java (71%) rename sdk/core/azure-core/src/test/java/com/azure/core/{util => implementation}/OptionTests.java (89%) diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml index b3faa05df9ad3..f9211243ee09a 100755 --- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml +++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -37,12 +37,12 @@ - - - - - - + + + + + + @@ -676,7 +676,7 @@ + files="com.azure.core.implementation.Option.java"/> ` to represent the states of instantiated, null, and non-null for the wrapped value. - Added `JsonPatchDocument` to support `json-patch` functionality. - Added new Identity `Configuration` properties. diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/Option.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Option.java similarity index 90% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/Option.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Option.java index 347e02f4bd1bb..5404ac44b6fd2 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/Option.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Option.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.core.util; +package com.azure.core.implementation; import java.util.NoSuchElementException; import java.util.Objects; /** - * The Option type to describe tri-state. Every Option instance is in one of - * the three states: a state representing a non-null-value, null-value, or no-value. + * The Option type to describe tri-state. Every Option instance is in one of the three states: a state representing a + * non-null-value, null-value, or no-value. * *

Code sample

* {@codesnippet com.azure.core.util.Option} @@ -37,6 +37,7 @@ public static Option of(T value) { *

* {@code Option.empty()} is a syntactic sugar for {@code Option.of(null)}. *

+ * * @param The value type. * @return an {@link Option} with a null-value. */ @@ -59,8 +60,8 @@ public static Option uninitialized() { } /** - * Return {@code true} if this instance is initialized with a null-value or non-null-value, - * otherwise {@code false}. + * Return {@code true} if this instance is initialized with a null-value or non-null-value, otherwise {@code + * false}. * * @return {@code true} if a value has been initialized, otherwise {@code false} */ @@ -71,8 +72,7 @@ public boolean isInitialized() { /** * Gets the value in the {@link Option}. * - * @return The {@code null} (null-value) or non-null-value that the {@link Option} - * is initialized with. + * @return The {@code null} (null-value) or non-null-value that the {@link Option} is initialized with. * @throws NoSuchElementException thrown if the {@link Option} is in no-value state. */ public T getValue() { @@ -83,8 +83,7 @@ public T getValue() { } /** - * Indicates whether some other object is "equal to" this Option. The - * other object is considered equal if: + * Indicates whether some other object is "equal to" this Option. The other object is considered equal if: *
    *
  • it is also an {@code Option} and; *
  • both instances are not initialized or; @@ -112,13 +111,12 @@ public boolean equals(Object obj) { } /** - * Returns hash code of the value this Option is initialized with or -1 if in - * uninitialized state. + * Returns hash code of the value this Option is initialized with or -1 if in uninitialized state. *

    * The value 0 will be returned when initialized with {@code null}. *

    - * @return hash code of the value this Option is initialized with or -1 if in - * uninitialized state. + * + * @return hash code of the value this Option is initialized with or -1 if in uninitialized state. */ @Override public int hashCode() { diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionBeanPropertyWriter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionBeanPropertyWriter.java similarity index 98% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionBeanPropertyWriter.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionBeanPropertyWriter.java index 2a56cc39a6435..a9c95e56764c6 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionBeanPropertyWriter.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionBeanPropertyWriter.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.io.SerializedString; import com.fasterxml.jackson.databind.PropertyName; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionModule.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionModule.java similarity index 95% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionModule.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionModule.java index a412a68876713..3e296cbf0769f 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionModule.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionModule.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionPropertiesModifier.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionPropertiesModifier.java similarity index 95% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionPropertiesModifier.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionPropertiesModifier.java index 6507c6f08218a..0b7e74dde01e3 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionPropertiesModifier.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionPropertiesModifier.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializer.java similarity index 74% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializer.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializer.java index 1a6c75ac06ae0..8b5ff9ff3d806 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializer.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializer.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; @@ -35,19 +34,19 @@ final class OptionSerializer extends ReferenceTypeSerializer> { private static final long serialVersionUID = 1L; OptionSerializer(ReferenceType fullType, - boolean staticTyping, - TypeSerializer typeSerializer, - JsonSerializer valueSerializer) { + boolean staticTyping, + TypeSerializer typeSerializer, + JsonSerializer valueSerializer) { super(fullType, staticTyping, typeSerializer, valueSerializer); } private OptionSerializer(OptionSerializer base, - BeanProperty property, - TypeSerializer typeSerializer, - JsonSerializer valueSerializer, - NameTransformer transformer, - Object suppressableValue, - boolean suppressNulls) { + BeanProperty property, + TypeSerializer typeSerializer, + JsonSerializer valueSerializer, + NameTransformer transformer, + Object suppressableValue, + boolean suppressNulls) { super(base, property, typeSerializer, valueSerializer, transformer, suppressableValue, suppressNulls); @@ -55,9 +54,9 @@ private OptionSerializer(OptionSerializer base, @Override protected ReferenceTypeSerializer> withResolved(BeanProperty property, - TypeSerializer typeSerializer, - JsonSerializer valueSerializer, - NameTransformer transformer) { + TypeSerializer typeSerializer, + JsonSerializer valueSerializer, + NameTransformer transformer) { return new OptionSerializer(this, property, typeSerializer, valueSerializer, transformer, super._suppressableValue, super._suppressNulls); @@ -65,7 +64,7 @@ protected ReferenceTypeSerializer> withResolved(BeanProperty property, @Override public ReferenceTypeSerializer> withContentInclusion(Object suppressableValue, - boolean suppressNulls) { + boolean suppressNulls) { return new OptionSerializer(this, super._property, super._valueTypeSerializer, super._valueSerializer, super._unwrapper, suppressableValue, suppressNulls); diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializerProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializerProvider.java similarity index 82% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializerProvider.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializerProvider.java index 6c2fbf1a6b970..7176a82f8d272 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionSerializerProvider.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionSerializerProvider.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.MapperFeature; @@ -37,10 +36,10 @@ final class OptionSerializerProvider extends Serializers.Base implements java.io @Override public JsonSerializer findReferenceSerializer(SerializationConfig config, - ReferenceType refType, - BeanDescription beanDesc, - TypeSerializer contentTypeSerializer, - JsonSerializer contentValueSerializer) { + ReferenceType refType, + BeanDescription beanDesc, + TypeSerializer contentTypeSerializer, + JsonSerializer contentValueSerializer) { if (Option.class.isAssignableFrom(refType.getRawClass())) { // The standard Serializers.Base implementations for reference types honor // USE_STATIC_TYPING flag (e.g. Optional in Jdk8Module), do the same for diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionTypeModifier.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionTypeModifier.java similarity index 96% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionTypeModifier.java rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionTypeModifier.java index b10ea04d2ccd7..f15ac03520040 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/OptionTypeModifier.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OptionTypeModifier.java @@ -18,9 +18,8 @@ * Portions Copyright (c) Microsoft Corporation */ -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.ReferenceType; import com.fasterxml.jackson.databind.type.TypeBindings; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocument.java b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocument.java index d5d7f460089aa..8f5fdfcfc6a91 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocument.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocument.java @@ -3,11 +3,13 @@ package com.azure.core.models; -import com.azure.core.util.Option; +import com.azure.core.implementation.Option; import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.JsonSerializer; import com.azure.core.util.serializer.JsonSerializerProviders; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonValue; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -23,9 +25,13 @@ public final class JsonPatchDocument { private static final Object SERIALIZER_INSTANTIATION_SYNCHRONIZER = new Object(); private static volatile JsonSerializer defaultSerializer; + @JsonIgnore private final ClientLogger logger = new ClientLogger(JsonPatchDocument.class); + @JsonIgnore private final JsonSerializer serializer; + + @JsonValue private final List operations; /** @@ -54,7 +60,7 @@ public JsonPatchDocument(JsonSerializer serializer) { * * @return The JSON patch operations in this JSON patch document. */ - public List getOperations() { + List getOperations() { return new ArrayList<>(operations); } diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchDocumentSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocumentSerializer.java similarity index 91% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchDocumentSerializer.java rename to sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocumentSerializer.java index 0c9960970b904..32de095b0f99b 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchDocumentSerializer.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchDocumentSerializer.java @@ -1,11 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.core.util.serializer; +package com.azure.core.models; import com.azure.core.util.CoreUtils; -import com.azure.core.models.JsonPatchDocument; -import com.azure.core.models.JsonPatchOperation; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperation.java b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperation.java index 4d370b3a69721..52764516285a6 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperation.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperation.java @@ -4,7 +4,8 @@ package com.azure.core.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.Option; +import com.azure.core.implementation.Option; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Objects; import java.util.Optional; @@ -13,7 +14,8 @@ * Represents a JSON Patch operation. */ @Immutable -public final class JsonPatchOperation { +@JsonSerialize(using = JsonPatchOperationSerializer.class) +final class JsonPatchOperation { private final JsonPatchOperationKind op; private final String from; private final String path; @@ -42,7 +44,7 @@ public final class JsonPatchOperation { * * @return The kind of operation. */ - public JsonPatchOperationKind getOp() { + JsonPatchOperationKind getOp() { return op; } @@ -51,7 +53,7 @@ public JsonPatchOperationKind getOp() { * * @return The operation from target path. */ - public String getFrom() { + String getFrom() { return from; } @@ -60,7 +62,7 @@ public String getFrom() { * * @return The operation target path. */ - public String getPath() { + String getPath() { return path; } @@ -71,7 +73,7 @@ public String getPath() { * * @return The operation value. */ - public Option getValue() { + Option getValue() { return value; } diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationKind.java b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationKind.java index 3a5d942ff1d92..2ee1885d74cb7 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationKind.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationKind.java @@ -8,7 +8,7 @@ /** * Represents the JSON Patch operation kind. */ -public enum JsonPatchOperationKind { +enum JsonPatchOperationKind { /** * Add operation. */ diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchOperationSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationSerializer.java similarity index 93% rename from sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchOperationSerializer.java rename to sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationSerializer.java index 0cd3fe3ecab0e..0427c0234d5fc 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JsonPatchOperationSerializer.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/models/JsonPatchOperationSerializer.java @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.core.util.serializer; +package com.azure.core.models; -import com.azure.core.models.JsonPatchOperation; -import com.azure.core.util.Option; +import com.azure.core.implementation.Option; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JacksonAdapter.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JacksonAdapter.java index 16d2346b814a9..9dc693db50a1b 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JacksonAdapter.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/serializer/JacksonAdapter.java @@ -288,7 +288,6 @@ private static T initializeObjectMapper(T mapper) { .configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true) .setSerializationInclusion(JsonInclude.Include.NON_NULL) .registerModule(new JavaTimeModule()) - .registerModule(new OptionModule()) .registerModule(ByteArraySerializer.getModule()) .registerModule(Base64UrlSerializer.getModule()) .registerModule(DateTimeSerializer.getModule()) @@ -296,8 +295,6 @@ private static T initializeObjectMapper(T mapper) { .registerModule(DateTimeRfc1123Serializer.getModule()) .registerModule(DurationSerializer.getModule()) .registerModule(HttpHeadersSerializer.getModule()) - .registerModule(JsonPatchDocumentSerializer.getModule()) - .registerModule(JsonPatchOperationSerializer.getModule()) .registerModule(UnixTimeSerializer.getModule()); mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker() .withFieldVisibility(JsonAutoDetect.Visibility.ANY) diff --git a/sdk/core/azure-core/src/samples/java/com/azure/core/util/OptionJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/util/OptionJavaDocCodeSnippets.java index 987a00dd97909..0c1ce58e4ebd5 100644 --- a/sdk/core/azure-core/src/samples/java/com/azure/core/util/OptionJavaDocCodeSnippets.java +++ b/sdk/core/azure-core/src/samples/java/com/azure/core/util/OptionJavaDocCodeSnippets.java @@ -3,6 +3,8 @@ package com.azure.core.util; +import com.azure.core.implementation.Option; + import java.util.NoSuchElementException; /** diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/util/serializer/OptionSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionSerializerTests.java similarity index 71% rename from sdk/core/azure-core/src/test/java/com/azure/core/util/serializer/OptionSerializerTests.java rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionSerializerTests.java index 522ea77c8d8c7..ec3bf84ee5174 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/util/serializer/OptionSerializerTests.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionSerializerTests.java @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.core.util.serializer; +package com.azure.core.implementation; -import com.azure.core.util.Option; +import com.azure.core.util.serializer.JacksonAdapter; +import com.azure.core.util.serializer.SerializerEncoding; import com.fasterxml.jackson.annotation.JsonProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,23 +15,32 @@ * Tests for {@link Option} that can represent tri-sate (non-null-value, null-value, or no-value). */ public class OptionSerializerTests { + private static final JacksonAdapter ADAPTER; + + static { + JacksonAdapter adapter = new JacksonAdapter(); + adapter.serializer().registerModule(new OptionModule()); + + ADAPTER = adapter; + } + @Test public void canSerializeExplicitNull() throws IOException { PatchModel model = new PatchModel(); model.setSku(Option.of(null)); - String serialized = new JacksonAdapter().serialize(model, SerializerEncoding.JSON); + String serialized = ADAPTER.serialize(model, SerializerEncoding.JSON); Assertions.assertEquals("{\"sku\":null}", serialized); model.setSku(Option.empty()); - serialized = new JacksonAdapter().serialize(model, SerializerEncoding.JSON); + serialized = ADAPTER.serialize(model, SerializerEncoding.JSON); Assertions.assertEquals("{\"sku\":null}", serialized); } @Test public void shouldIgnoreImplicitNull() throws IOException { PatchModel model = new PatchModel(); - String serialized = new JacksonAdapter().serialize(model, SerializerEncoding.JSON); + String serialized = ADAPTER.serialize(model, SerializerEncoding.JSON); Assertions.assertEquals("{}", serialized); } @@ -38,7 +48,7 @@ public void shouldIgnoreImplicitNull() throws IOException { public void shouldIgnoreUninitialized() throws IOException { PatchModel model = new PatchModel(); model.setSku(Option.uninitialized()); - String serialized = new JacksonAdapter().serialize(model, SerializerEncoding.JSON); + String serialized = ADAPTER.serialize(model, SerializerEncoding.JSON); Assertions.assertEquals("{}", serialized); } @@ -46,7 +56,7 @@ public void shouldIgnoreUninitialized() throws IOException { public void canSerializeNonNullValue() throws IOException { PatchModel model = new PatchModel(); model.setSku(Option.of("basic")); - String serialized = new JacksonAdapter().serialize(model, SerializerEncoding.JSON); + String serialized = ADAPTER.serialize(model, SerializerEncoding.JSON); Assertions.assertEquals("{\"sku\":\"basic\"}", serialized); } @@ -54,12 +64,12 @@ public void canSerializeNonNullValue() throws IOException { public void canSerializeRawType() throws IOException { @SuppressWarnings("rawtypes") final Option rawOption = Option.of(new RawModel().setName("test")); - String serialized = new JacksonAdapter().serialize(rawOption, SerializerEncoding.JSON); + String serialized = ADAPTER.serialize(rawOption, SerializerEncoding.JSON); Assertions.assertEquals("{\"name\":\"test\"}", serialized); @SuppressWarnings("rawtypes") final Option rawOption1 = Option.of("test"); - String serialized1 = new JacksonAdapter().serialize(rawOption1, SerializerEncoding.JSON); + String serialized1 = ADAPTER.serialize(rawOption1, SerializerEncoding.JSON); Assertions.assertEquals("\"test\"", serialized1); } diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/util/OptionTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionTests.java similarity index 89% rename from sdk/core/azure-core/src/test/java/com/azure/core/util/OptionTests.java rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionTests.java index 4a841eaaf0b59..7029d50c4f4b5 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/util/OptionTests.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/OptionTests.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.core.util; +package com.azure.core.implementation; import org.junit.jupiter.api.Test; @@ -10,6 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,14 +26,14 @@ public void testOfNonNull() { public void testOfNull() { final Option setOption = Option.of(null); assertTrue(setOption.isInitialized()); - assertEquals(null, setOption.getValue()); + assertNull(setOption.getValue()); } @Test public void testEmpty() { final Option emptyOption = Option.empty(); assertTrue(emptyOption.isInitialized()); - assertEquals(null, emptyOption.getValue()); + assertNull(emptyOption.getValue()); } @Test @@ -44,9 +45,7 @@ public void testUninitialized() { @Test public void testGetValueThrows() { final Option uninitializedOption = Option.uninitialized(); - assertThrows(NoSuchElementException.class, () -> { - uninitializedOption.getValue(); - }); + assertThrows(NoSuchElementException.class, uninitializedOption::getValue); } @Test From 8be35262019edda8684ffce73b45bfc3f1e73b8e Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 29 Oct 2020 11:29:57 -0700 Subject: [PATCH 16/36] Delete unused pipeline (#16945) --- eng/pipelines/client.yml | 233 --------------------------------------- 1 file changed, 233 deletions(-) delete mode 100644 eng/pipelines/client.yml diff --git a/eng/pipelines/client.yml b/eng/pipelines/client.yml deleted file mode 100644 index b5ed0d6fc4626..0000000000000 --- a/eng/pipelines/client.yml +++ /dev/null @@ -1,233 +0,0 @@ -# External variables Settable at queue time: -# "pomFile" : "pom.client.xml". This is the project object model file for Maven. - -trigger: - - master - -variables: - DefaultOptions: '--batch-mode --fail-at-end -Dmaven.wagon.http.pool=false --settings eng/settings.xml' - LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - -jobs: - - job: 'Build' - - pool: - vmImage: 'ubuntu-18.04' - - strategy: - matrix: - Client Libraries: - ArtifactName: 'packages' - JavaVersion: '1.11' - - steps: - - script: | - echo "##vso[build.addbuildtag]Scheduled" - displayName: 'Tag scheduled builds' - condition: and(eq(variables['Build.SourceBranchName'],'master'),eq(variables['Build.Reason'],'Schedule')) - - - task: Maven@3 - displayName: 'Build and Package' - inputs: - mavenPomFile: $(pomFile) - goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dinclude-template' # We include template-module so we ensure it always builds in CI - mavenOptions: '$(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - - - task: PublishPipelineArtifact@0 - displayName: 'Publish $(ArtifactName) artifact' - inputs: - artifactName: '$(ArtifactName)' - targetPath: $(Build.ArtifactStagingDirectory) - - - job: 'Analyze' - - pool: - vmImage: 'ubuntu-18.04' - - steps: - - task: UsePythonVersion@0 - displayName: 'Use Python 3.6' - inputs: - versionSpec: '3.6' - - - script: | - pip install setuptools wheel - pip install doc-warden - ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/eng/.docsettings.yml - displayName: 'Verify Readmes' - - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR - # builds should be sufficient. - condition: and(succeededOrFailed(), ne(variables['Build.Reason'], 'PullRequest')) - displayName: 'Component Detection' - - # We `install` the code quality reports tooling into our local m2 cache separately from building the Maven project - # reports. This means it is available as part of that, but also so that this is not documented in the project report. - - task: Maven@3 - displayName: 'Install reporting tools' - inputs: - mavenPomFile: eng/code-quality-reports/pom.xml - options: '--batch-mode' - mavenOptions: '$(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'install' - - - task: Maven@3 - displayName: 'Install Module and Run SpotBugs, Checkstyle, and Javadoc' - inputs: - mavenPomFile: $(pomFile) - options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme' - mavenOptions: '' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'install' - - # Generate the Maven site report, including SpotBugs, JavaDoc, CheckStyle, Jacoco, etc only when we are not - # running as a PR check. - - task: Maven@3 - displayName: 'Generate Maven project site, including JavaDocs, SpotBugs, and CheckStyle reports' - condition: ne(variables['Build.Reason'], 'PullRequest') - inputs: - mavenPomFile: pom.client.xml - options: '$(DefaultOptions) -DskipTests -Dgpg.skip' - mavenOptions: '$(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'site:site site:stage' - - - script: | - git clone https://github.com/JonathanGiles/DependencyChecker.git - mkdir input && cp eng/DependencyChecker/client_dependencies.json input/dependencies.json - displayName: 'Download dependency checker' - - - task: Maven@3 - displayName: 'Install azure-sdk-parent' - inputs: - mavenPomFile: parent/pom.xml - options: '$(DefaultOptions) -DskipTests -Dgpg.skip' - mavenOptions: '$(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'install' - - - task: Maven@3 - displayName: 'Analyze dependencies' - inputs: - mavenPomFile: 'DependencyChecker/core/pom.xml' - options: '-Dexec.args="-showall -dependencymanagement"' - mavenOptions: '$(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'clean package exec:java' - - # We only copy artifacts into the staging in nightly builds, we don't bother with this for PR validation builds. - - pwsh: | - copy -r target/staging $(Build.ArtifactStagingDirectory) - copy eng/code-quality-reports/src/main/resources/index.html $(Build.ArtifactStagingDirectory) - copy output/dependencies.html (Join-Path $(Build.ArtifactStagingDirectory) "staging") - displayName: 'Copy reports to artifact staging' - condition: ne(variables['Build.Reason'], 'PullRequest') - - - task: PublishPipelineArtifact@0 - condition: succeededOrFailed() - displayName: 'Publish reports artifact' - inputs: - artifactName: reports - targetPath: $(Build.ArtifactStagingDirectory) - - - job: 'Test' - - strategy: - matrix: - Linux - Java 8: - OSVmImage: 'ubuntu-18.04' - JavaVersion: '1.8' - macOS - Java 8: - OSVmImage: 'macOS-10.15' - JavaVersion: '1.8' - Windows - Java 8: - OSVmImage: 'windows-2019' - JavaVersion: '1.8' - Linux - Java 11: - OSVmImage: 'ubuntu-18.04' - JavaVersion: '1.11' - macOS - Java 11: - OSVmImage: 'macOS-10.15' - JavaVersion: '1.11' - Windows - Java 11: - OSVmImage: 'windows-2019' - JavaVersion: '1.11' - - pool: - vmImage: $(OSVmImage) - - steps: - - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - - - task: Maven@3 - displayName: 'Compile all code and run tests' - inputs: - mavenPomFile: $(pomFile) - options: '$(DefaultOptions) -Dinclude-non-shipping-modules' - mavenOptions: '-Xmx3072m $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'test' - - # Generate JaCoCo code coverage report on Java 11, Linux builds if the build reason is not PR. - - task: Maven@3 - displayName: 'Generate aggregate code coverage report' - condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), contains(variables['pomFile'], 'pom.client.xml'), ne(variables['Build.Reason'], 'PullRequest')) - inputs: - mavenPomFile: $(pomFile) - options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true' - mavenOptions: '-Xmx3072m $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - goals: 'verify' - - - task: PublishTestResults@2 - condition: succeededOrFailed() - inputs: - mergeTestResults: true - testRunTitle: '$(OSName) on Java $(JavaVersion)' - - # Azure DevOps only seems to respect the last code coverage result published, so only do this for Linux + Java LTS. - # Code coverage reporting is setup only for Track 2 modules. - - task: PublishCodeCoverageResults@1 - condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), contains(variables['pomFile'], 'pom.client.xml'), ne(variables['Build.Reason'], 'PullRequest')) - inputs: - codeCoverageTool: JaCoCo - summaryFileLocation: eng/jacoco-test-coverage/target/site/test-coverage/jacoco.xml - reportDirectory: eng/jacoco-test-coverage/target/site/test-coverage/ - failIfCoverageEmpty: true - - # Publish code coverage to an artifact so it can be uploaded to the Maven site. - # Do this for track 2 modules only. Code coverage from previous step is only published for Linux + Java LTS. - - task: PublishPipelineArtifact@0 - displayName: 'Publish coverage artifact' - condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), contains(variables['pomFile'], 'pom.client.xml'), ne(variables['Build.Reason'], 'PullRequest')) - inputs: - artifactName: coverage - targetPath: eng/jacoco-test-coverage/target/site/ From 3d6f0533431392f43c764e7f0b5d74b0659d6dff Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:07:25 -0700 Subject: [PATCH 17/36] Update CHANGELOG dates and added new CHANGELOG updates (#16967) --- eng/jacoco-test-coverage/pom.xml | 4 ++-- eng/versioning/version_client.txt | 6 +++--- sdk/core/azure-core-experimental/CHANGELOG.md | 2 +- sdk/core/azure-core-http-jdk-httpclient/pom.xml | 4 ++-- sdk/core/azure-core-http-netty/CHANGELOG.md | 2 +- sdk/core/azure-core-http-netty/README.md | 2 +- sdk/core/azure-core-http-netty/pom.xml | 6 +++--- sdk/core/azure-core-http-okhttp/CHANGELOG.md | 2 +- sdk/core/azure-core-http-okhttp/README.md | 2 +- sdk/core/azure-core-http-okhttp/pom.xml | 6 +++--- sdk/core/azure-core-test/CHANGELOG.md | 3 ++- sdk/core/azure-core-test/README.md | 2 +- sdk/core/azure-core-test/pom.xml | 2 +- sdk/core/azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/core/azure-core/CHANGELOG.md | 2 +- sdk/e2e/pom.xml | 4 ++-- 16 files changed, 26 insertions(+), 25 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 5774c19ebc26a..dd8963ecfa6a2 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -104,12 +104,12 @@ com.azure azure-core-http-netty - 1.7.0-beta.1 + 1.6.3 com.azure azure-core-http-okhttp - 1.4.0-beta.1 + 1.3.3 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index cc9795dfcf351..771188a9ae5ba 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -17,14 +17,14 @@ com.azure:azure-core-amqp;1.6.0;1.7.0-beta.1 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-experimental;1.0.0-beta.7;1.0.0-beta.8 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-http-netty;1.6.2;1.7.0-beta.1 -com.azure:azure-core-http-okhttp;1.3.2;1.4.0-beta.1 +com.azure:azure-core-http-netty;1.6.2;1.6.3 +com.azure:azure-core-http-okhttp;1.3.2;1.3.3 com.azure:azure-core-management;1.0.0;1.1.0-beta.1 com.azure:azure-core-serializer-avro-apache;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-core-serializer-json-gson;1.0.2;1.0.3 com.azure:azure-core-serializer-json-jackson;1.0.2;1.1.0 -com.azure:azure-core-test;1.5.0;1.6.0-beta.1 +com.azure:azure-core-test;1.5.0;1.5.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.6;1.0.0-beta.7 com.azure:azure-cosmos;4.8.0;4.9.0-beta.1 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 diff --git a/sdk/core/azure-core-experimental/CHANGELOG.md b/sdk/core/azure-core-experimental/CHANGELOG.md index 9f130d48082f1..749e243ea4464 100644 --- a/sdk/core/azure-core-experimental/CHANGELOG.md +++ b/sdk/core/azure-core-experimental/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0-beta.8 (2020-10-28) +## 1.0.0-beta.8 (2020-10-29) ### New Features diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index e2ed83074d8b0..de7826591b461 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -76,13 +76,13 @@ com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test-jar test diff --git a/sdk/core/azure-core-http-netty/CHANGELOG.md b/sdk/core/azure-core-http-netty/CHANGELOG.md index 7591ee2d83590..1930f64404745 100644 --- a/sdk/core/azure-core-http-netty/CHANGELOG.md +++ b/sdk/core/azure-core-http-netty/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.7.0-beta.1 (Unreleased) +## 1.6.3 (2020-10-29) ### Dependency updates diff --git a/sdk/core/azure-core-http-netty/README.md b/sdk/core/azure-core-http-netty/README.md index a7f0ab968fcf2..c66bbff3c493d 100644 --- a/sdk/core/azure-core-http-netty/README.md +++ b/sdk/core/azure-core-http-netty/README.md @@ -15,7 +15,7 @@ Azure Core Netty HTTP client is a plugin for the `azure-core` HTTP client API. com.azure azure-core-http-netty - 1.6.2 + 1.6.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 6a5592cc81066..9c0bb9de3fbbb 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-netty jar - 1.7.0-beta.1 + 1.6.3 Microsoft Azure Netty HTTP Client Library This package contains the Netty HTTP client plugin for azure-core. @@ -124,13 +124,13 @@ com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/CHANGELOG.md b/sdk/core/azure-core-http-okhttp/CHANGELOG.md index 5ece50fd59e6a..39fe13c9b75f3 100644 --- a/sdk/core/azure-core-http-okhttp/CHANGELOG.md +++ b/sdk/core/azure-core-http-okhttp/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.4.0-beta.1 (Unreleased) +## 1.3.3 (2020-10-29) ### Dependency updates diff --git a/sdk/core/azure-core-http-okhttp/README.md b/sdk/core/azure-core-http-okhttp/README.md index 3063d9ffa916b..c3669b4770293 100644 --- a/sdk/core/azure-core-http-okhttp/README.md +++ b/sdk/core/azure-core-http-okhttp/README.md @@ -15,7 +15,7 @@ Azure Core OkHttp HTTP client is a plugin for the `azure-core` HTTP client API. com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index d027d5ab8afff..9391eee3ad42f 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-okhttp jar - 1.4.0-beta.1 + 1.3.3 Microsoft Azure OkHttp HTTP Client Library This package contains the OkHttp HTTP client plugin for azure-core. @@ -80,13 +80,13 @@ com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test-jar test diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index a1e252626e2b6..d42a9311f83d2 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -1,12 +1,13 @@ # Release History -## 1.6.0-beta.1 (Unreleased) +## 1.5.1 (2020-10-29) ### Dependency updates - Updated `azure-core` to `1.10.0`. ### Bug Fixes + - Fixed a bug in test recording redaction for redacting empty values for json key-value pairs. ## 1.5.0 (2020-10-01) diff --git a/sdk/core/azure-core-test/README.md b/sdk/core/azure-core-test/README.md index cd7af00aa2d05..816dc8d81d78f 100644 --- a/sdk/core/azure-core-test/README.md +++ b/sdk/core/azure-core-test/README.md @@ -18,7 +18,7 @@ To use this package, add the following to your _pom.xml_. com.azure azure-core-test - 1.5.0 + 1.5.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 7b1f4f0c7fa04..3179f2f0de7b3 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-test jar - 1.6.0-beta.1 + 1.5.1 Microsoft Azure Java Core Test Library This package contains core test types for Azure Java clients. diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 8d2e08835229b..8a5f90c1e427d 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core-http-netty - 1.7.0-beta.1 + 1.6.3 test diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index b15db8fd900d8..c96302301162f 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.10.0 (2020-10-28) +## 1.10.0 (2020-10-29) ### New Features diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 7f50a5f91f4a0..3268feac7c56e 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -28,7 +28,7 @@ com.azure azure-core-http-netty - 1.7.0-beta.1 + 1.6.3 com.azure @@ -64,7 +64,7 @@ com.azure azure-core-test - 1.6.0-beta.1 + 1.5.1 test From 321ccb24704e9bfaf7d7ed5e6120bff32e013da1 Mon Sep 17 00:00:00 2001 From: chrwhit <35080559+chrwhit@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:18:40 -0700 Subject: [PATCH 18/36] Update CommunicationClientCredential.java (#16966) * Update CommunicationClientCredential.java Non-US locales were creating incompatible date strings. Forcing US to make sure that we get the date string we need for authentication. * Update HmacDateTimeFormatTests.java --- .../common/CommunicationClientCredential.java | 7 +++++-- .../common/HmacDateTimeFormatTests.java | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationClientCredential.java b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationClientCredential.java index c6249aa8c7a42..96eeb6ead1ab4 100644 --- a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationClientCredential.java +++ b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationClientCredential.java @@ -43,9 +43,12 @@ public final class CommunicationClientCredential { // Previously DateTimeFormatter.RFC_1123_DATE_TIME was being used. There // was an issue with the day of month part. RFC_1123_DATE_TIME does not - // append a leading '0' on days that are less than 10. + // append a leading '0' on days that are less than 10. It is important + // that the locale remain US. In other locals the values that are generated + // for the day and month strings may be different. (e.g. Canada day strings + // have a '.' at the end) static final DateTimeFormatter HMAC_DATETIMEFORMATTER_PATTERN = - DateTimeFormatter.ofPattern("E, dd MMM YYYY HH:mm:ss 'GMT'"); + DateTimeFormatter.ofPattern("E, dd MMM YYYY HH:mm:ss 'GMT'", Locale.US); private final ClientLogger logger = new ClientLogger(CommunicationClientCredential.class); private final Mac sha256HMAC; diff --git a/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/HmacDateTimeFormatTests.java b/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/HmacDateTimeFormatTests.java index 394ee8e25b768..879aeaa160f21 100644 --- a/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/HmacDateTimeFormatTests.java +++ b/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/HmacDateTimeFormatTests.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; +import java.util.Locale; import java.time.ZoneId; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,6 +27,18 @@ public void twentyFourHourClockTest() { assertEquals("Wed, 01 Jan 2020 23:01:00 GMT", getDateTimeString(2020, 1, 1, 23, 1, 0)); } + @Test + public void twentyFourHourClockTestNonUSLocale() { + Locale defaultLocale = Locale.getDefault(); + + try { + Locale.setDefault(Locale.CANADA); + assertEquals("Wed, 01 Jan 2020 23:01:00 GMT", getDateTimeString(2020, 1, 1, 23, 1, 0)); + } finally { + Locale.setDefault(defaultLocale); + } + } + private String getDateTimeString(int year, int month, int day, int hour, int minute, int second) { ZonedDateTime dateTime = ZonedDateTime.of(year, month, day, hour, minute, second, 0 /* nanoOfSecond */, ZoneId.of("UTC")); return dateTime.format(CommunicationClientCredential.HMAC_DATETIMEFORMATTER_PATTERN); From 595b139904d7b0bb33b4e97200684988bc80edfb Mon Sep 17 00:00:00 2001 From: Jorge Beauregard <69869951+jbeauregardb@users.noreply.github.com> Date: Thu, 29 Oct 2020 14:32:58 -0600 Subject: [PATCH 19/36] Communication - Added release phone number LRO (#16821) * Added release phone number LRO * Made implemented functions private * Refactor private methods and added readme * Fixed style issues * Fixed readme samples * Addressed comments --- .../README.md | 16 + .../PhoneNumberAsyncClient.java | 76 +++- .../administration/PhoneNumberClient.java | 40 +- .../administration/ReadmeSamples.java | 19 +- ...PhoneNumberAsyncClientIntegrationTest.java | 65 ++- .../PhoneNumberClientIntegrationTest.java | 25 -- .../beginReleasePhoneNumbers.json | 383 ++++++++++++++++++ 7 files changed, 529 insertions(+), 95 deletions(-) create mode 100644 sdk/communication/azure-communication-administration/src/test/resources/session-records/beginReleasePhoneNumbers.json diff --git a/sdk/communication/azure-communication-administration/README.md b/sdk/communication/azure-communication-administration/README.md index 2ab5821262f28..fd60ffff5594f 100644 --- a/sdk/communication/azure-communication-administration/README.md +++ b/sdk/communication/azure-communication-administration/README.md @@ -294,6 +294,22 @@ SyncPoller res = res.waitForCompletion(); ``` +### Release Phone Numbers + +```java +Duration duration = Duration.ofSeconds(1); +PhoneNumber phoneNumber = new PhoneNumber("PHONE_NUMBER_TO_RELEASE"); +List phoneNumbers = new ArrayList<>(); +phoneNumbers.add(phoneNumber); +PhoneNumberClient phoneNumberClient = createPhoneNumberClient(); + +SyncPoller res = + phoneNumberClient.beginReleasePhoneNumbers(phoneNumbers, duration); +res.waitForCompletion(); +PhoneNumberRelease result = res.getFinalResult(); +System.out.println("Phone number release status: " + result.getStatus()); +``` + ## Contributing This project welcomes contributions and suggestions. Most contributions require you to agree to a [Contributor License Agreement (CLA)][cla] declaring that you have the right to, and actually do, grant us the rights to use your contribution. diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java index b85af46a83f68..347523d578a24 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java @@ -22,6 +22,7 @@ import com.azure.communication.administration.models.PstnConfiguration; import com.azure.communication.administration.models.ReleaseRequest; import com.azure.communication.administration.models.ReleaseResponse; +import com.azure.communication.administration.models.ReleaseStatus; import com.azure.communication.administration.models.UpdateNumberCapabilitiesResponse; import com.azure.communication.administration.models.NumberConfiguration; import com.azure.communication.administration.models.PhoneNumberSearch; @@ -541,8 +542,7 @@ Mono> getReleaseByIdWithResponse(String releaseId, * @param phoneNumbers {@link List} of {@link PhoneNumber} objects with the phone numbers. * @return A {@link Mono} containing a {@link ReleaseResponse} representing the release. */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono releasePhoneNumbers(List phoneNumbers) { + private Mono releasePhoneNumbers(List phoneNumbers) { return releasePhoneNumbersWithResponse(phoneNumbers).flatMap(FluxUtil::toMono); } @@ -553,12 +553,12 @@ public Mono releasePhoneNumbers(List phoneNumbers) * @return A {@link Mono} containing a {@link Response} whose {@link Response#getValue()} value returns * a {@link ReleaseResponse} representing the release. */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> releasePhoneNumbersWithResponse(List phoneNumbers) { + private Mono> releasePhoneNumbersWithResponse(List phoneNumbers) { return releasePhoneNumbersWithResponse(phoneNumbers, null); } - Mono> releasePhoneNumbersWithResponse(List phoneNumbers, Context context) { + private Mono> releasePhoneNumbersWithResponse( + List phoneNumbers, Context context) { Objects.requireNonNull(phoneNumbers, "'phoneNumbers' cannot be null."); List phoneNumberStrings = phoneNumbers.stream().map(PhoneNumber::getValue).collect(Collectors.toList()); @@ -896,4 +896,70 @@ Mono> purchaseSearchFetchResultOperation() { }; } + + /** + * Releases the given phone numbers. + * This function returns a Long Running Operation poller that allows you to + * wait indefinitely until the operation is complete. + * + * @param phoneNumbers A list of {@link PhoneNumber} with the desired numbers to release + * @param pollInterval The time our long running operation will keep on polling + * until it gets a result from the server + * @return A {@link PollerFlux} object with the release entity + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PollerFlux + beginReleasePhoneNumbers(List phoneNumbers, Duration pollInterval) { + Objects.requireNonNull(phoneNumbers, "'phoneNumbers' cannot be null."); + + if (pollInterval == null) { + pollInterval = defaultPollInterval; + } + + return new PollerFlux(pollInterval, + releaseNumbersActivationOperation(phoneNumbers), + releaseNumbersPollOperation(), + (activationResponse, pollingContext) -> + monoError(logger, new RuntimeException("Cancellation is not supported")), + releaseNumbersFetchResultOperation()); + } + + private Function, Mono> + releaseNumbersActivationOperation(List phoneNumbers) { + return (pollingContext) -> { + Mono response = releasePhoneNumbers(phoneNumbers) + .flatMap(releaseNumberResponse -> { + String releaseId = releaseNumberResponse.getReleaseId(); + Mono phoneNumberRelease = getReleaseById(releaseId); + return phoneNumberRelease; + }); + return response; + }; + } + + private Function, Mono>> + releaseNumbersPollOperation() { + return pollingContext -> + getReleaseById(pollingContext.getLatestResponse().getValue().getReleaseId()) + .flatMap(getReleaseResponse -> { + ReleaseStatus status = getReleaseResponse.getStatus(); + if (status.equals(ReleaseStatus.COMPLETE) + || status.equals(ReleaseStatus.EXPIRED)) { + return Mono.just(new PollResponse<>( + LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, getReleaseResponse)); + } + if (status.equals(ReleaseStatus.FAILED)) { + return Mono.just(new PollResponse<>( + LongRunningOperationStatus.FAILED, getReleaseResponse)); + } + return Mono.just(new PollResponse<>(LongRunningOperationStatus.IN_PROGRESS, getReleaseResponse)); + }); + } + + private Function, + Mono> releaseNumbersFetchResultOperation() { + return pollingContext -> { + return Mono.just(pollingContext.getLatestResponse().getValue()); + }; + } } diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java index 2ddb1cc50d931..9f628180517d1 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java @@ -16,7 +16,6 @@ import com.azure.communication.administration.models.PhonePlan; import com.azure.communication.administration.models.PhonePlanGroup; import com.azure.communication.administration.models.PstnConfiguration; -import com.azure.communication.administration.models.ReleaseResponse; import com.azure.communication.administration.models.UpdateNumberCapabilitiesResponse; import com.azure.communication.administration.models.PhoneNumberSearch; import com.azure.communication.administration.models.UpdatePhoneNumberCapabilitiesResponse; @@ -367,30 +366,6 @@ public Response getReleaseByIdWithResponse(String releaseId, return phoneNumberAsyncClient.getReleaseByIdWithResponse(releaseId, context).block(); } - /** - * Creates a release for the given phone numbers. - * - * @param phoneNumbers {@link List} of {@link PhoneNumber} objects with the phone numbers. - * @return A {@link ReleaseResponse} representing the release. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public ReleaseResponse releasePhoneNumbers(List phoneNumbers) { - return phoneNumberAsyncClient.releasePhoneNumbers(phoneNumbers).block(); - } - - /** - * Creates a release for the given phone numbers. - * - * @param phoneNumbers {@link List} of {@link PhoneNumber} objects with the phone numbers. - * @param context A {@link Context} representing the request context. - * @return A {@link Response} whose {@link Response#getValue()} value returns - * a {@link ReleaseResponse} representing the release. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response releasePhoneNumbersWithResponse(List phoneNumbers, Context context) { - return phoneNumberAsyncClient.releasePhoneNumbersWithResponse(phoneNumbers, context).block(); - } - /** * Gets the list of all releases * @@ -532,4 +507,19 @@ public SyncPoller beginPurchaseSearch( String searchId, Duration pollInterval) { return phoneNumberAsyncClient.beginPurchaseSearch(searchId, pollInterval).getSyncPoller(); } + + /** + * Releases the given phone numbers. + * This function returns a Long Running Operation poller + * + * @param phoneNumbers A list of {@link PhoneNumber} with the desired numbers to release + * @param pollInterval The time our long running operation will keep on polling + * until it gets a result from the server + * @return A {@link SyncPoller} object with the search result + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public SyncPoller beginReleasePhoneNumbers( + List phoneNumbers, Duration pollInterval) { + return phoneNumberAsyncClient.beginReleasePhoneNumbers(phoneNumbers, pollInterval).getSyncPoller(); + } } diff --git a/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java b/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java index 1769ea5486683..7a570b0ef840e 100644 --- a/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java +++ b/sdk/communication/azure-communication-administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java @@ -15,6 +15,7 @@ import com.azure.communication.administration.models.LocationOptionsDetails; import com.azure.communication.administration.models.LocationOptionsQuery; import com.azure.communication.administration.models.PhoneNumberCountry; +import com.azure.communication.administration.models.PhoneNumberRelease; import com.azure.communication.administration.models.PhoneNumberSearch; import com.azure.communication.administration.models.PhonePlan; import com.azure.communication.administration.models.PhonePlanGroup; @@ -27,7 +28,6 @@ import com.azure.core.util.polling.SyncPoller; public class ReadmeSamples { - /** * Sample code for creating a sync Communication Identity Client. * @@ -381,4 +381,21 @@ public void beginPurchaseSearch() { phoneNumberClient.beginPurchaseSearch(phoneNumberSearchId, duration); res.waitForCompletion(); } + + /** + * Sample code to release a phone number as a long running operation + */ + public void beginReleasePhoneNumbers() { + Duration duration = Duration.ofSeconds(1); + PhoneNumber phoneNumber = new PhoneNumber("PHONE_NUMBER_TO_RELEASE"); + List phoneNumbers = new ArrayList<>(); + phoneNumbers.add(phoneNumber); + PhoneNumberClient phoneNumberClient = createPhoneNumberClient(); + + SyncPoller res = + phoneNumberClient.beginReleasePhoneNumbers(phoneNumbers, duration); + res.waitForCompletion(); + PhoneNumberRelease result = res.getFinalResult(); + System.out.println("Phone number release status: " + result.getStatus()); + } } diff --git a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java index 72ff8cf370127..daa3df16d6408 100644 --- a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java @@ -13,11 +13,12 @@ import com.azure.communication.administration.models.NumberUpdateCapabilities; import com.azure.communication.administration.models.PhoneNumberCountry; import com.azure.communication.administration.models.PhoneNumberEntity; +import com.azure.communication.administration.models.PhoneNumberRelease; import com.azure.communication.administration.models.PhoneNumberSearch; import com.azure.communication.administration.models.PhonePlan; import com.azure.communication.administration.models.PhonePlanGroup; import com.azure.communication.administration.models.PstnConfiguration; -import com.azure.communication.administration.models.ReleaseResponse; +import com.azure.communication.administration.models.ReleaseStatus; import com.azure.communication.administration.models.SearchStatus; import com.azure.communication.administration.models.UpdateNumberCapabilitiesResponse; import com.azure.communication.administration.models.UpdatePhoneNumberCapabilitiesResponse; @@ -450,38 +451,6 @@ public void unconfigureNumberWithResponse(HttpClient httpClient) { .verifyComplete(); } - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void releasePhoneNumbers(HttpClient httpClient) { - List phoneNumbers = new ArrayList<>(); - phoneNumbers.add(new PhoneNumber(PHONENUMBER_TO_RELEASE)); - - Mono mono = this.getClient(httpClient).releasePhoneNumbers(phoneNumbers); - - StepVerifier.create(mono) - .assertNext(item -> { - assertNotNull(item.getReleaseId()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void releasePhoneNumbersWithResponse(HttpClient httpClient) { - List phoneNumbers = new ArrayList<>(); - phoneNumbers.add(new PhoneNumber(PHONENUMBER_TO_RELEASE)); - - Mono> mono = - this.getClient(httpClient).releasePhoneNumbersWithResponse(phoneNumbers, Context.NONE); - - StepVerifier.create(mono) - .assertNext(item -> { - assertEquals(200, item.getStatusCode()); - assertNotNull(item.getValue().getReleaseId()); - }) - .verifyComplete(); - } - @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginCreateSearch(HttpClient httpClient) { @@ -500,12 +469,13 @@ public void beginCreateSearch(HttpClient httpClient) { PhoneNumberAsyncClient client = this.getClient(httpClient); PollerFlux poller = client.beginCreateSearch(createSearchOptions, duration); - AsyncPollResponse asyncRes = - poller.takeUntil(apr -> apr.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED) - .blockLast(); - PhoneNumberSearch testResult = asyncRes.getValue(); - assertEquals(testResult.getPhoneNumbers().size(), 2); - assertNotNull(testResult.getSearchId()); + Mono> asyncRes = poller.last(); + StepVerifier.create(asyncRes) + .assertNext(item -> { + assertEquals(item.getValue().getPhoneNumbers().size(), 2); + assertNotNull(item.getValue().getSearchId()); + }) + .verifyComplete(); } @ParameterizedTest @@ -525,6 +495,23 @@ public void beginPurchaseSearch(HttpClient httpClient) { .verifyComplete(); } + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginReleasePhoneNumbers(HttpClient httpClient) { + PhoneNumber phoneNumber = new PhoneNumber(PHONENUMBER_TO_RELEASE); + List phoneNumbers = new ArrayList<>(); + phoneNumbers.add(phoneNumber); + Duration pollInterval = Duration.ofSeconds(1); + PollerFlux poller = + this.getClient(httpClient).beginReleasePhoneNumbers(phoneNumbers, pollInterval); + Mono> asyncRes = poller.last(); + StepVerifier.create(asyncRes) + .assertNext(item -> { + assertEquals(ReleaseStatus.COMPLETE, item.getValue().getStatus()); + }) + .verifyComplete(); + } + private PhoneNumberAsyncClient getClient(HttpClient httpClient) { return super.getClientBuilder(httpClient).buildAsyncClient(); } diff --git a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java index cf240700853ce..df3da0d5c609f 100644 --- a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java +++ b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientIntegrationTest.java @@ -17,7 +17,6 @@ import com.azure.communication.administration.models.PhonePlan; import com.azure.communication.administration.models.PhonePlanGroup; import com.azure.communication.administration.models.PstnConfiguration; -import com.azure.communication.administration.models.ReleaseResponse; import com.azure.communication.administration.models.UpdateNumberCapabilitiesResponse; import com.azure.communication.administration.models.UpdatePhoneNumberCapabilitiesResponse; import com.azure.communication.common.PhoneNumber; @@ -331,30 +330,6 @@ public void unconfigureNumberWithResponse(HttpClient httpClient) { assertEquals(200, response.getStatusCode()); } - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void releasePhoneNumbers(HttpClient httpClient) { - List phoneNumbers = new ArrayList<>(); - phoneNumbers.add(new PhoneNumber(PHONENUMBER_TO_RELEASE)); - - ReleaseResponse releaseResponse = this.getClient(httpClient).releasePhoneNumbers(phoneNumbers); - - assertNotNull(releaseResponse.getReleaseId()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void releasePhoneNumbersWithResponse(HttpClient httpClient) { - List phoneNumbers = new ArrayList<>(); - phoneNumbers.add(new PhoneNumber(PHONENUMBER_TO_RELEASE)); - - Response response = - this.getClient(httpClient).releasePhoneNumbersWithResponse(phoneNumbers, Context.NONE); - - assertEquals(200, response.getStatusCode()); - assertNotNull(response.getValue().getReleaseId()); - } - private PhoneNumberClient getClient(HttpClient httpClient) { return super.getClientBuilder(httpClient).buildClient(); } diff --git a/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginReleasePhoneNumbers.json b/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginReleasePhoneNumbers.json new file mode 100644 index 0000000000000..c5c2a62d2f5a8 --- /dev/null +++ b/sdk/communication/azure-communication-administration/src/test/resources/session-records/beginReleasePhoneNumbers.json @@ -0,0 +1,383 @@ +{ + "networkCallRecords" : [ { + "Method" : "POST", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)", + "Content-Type" : "application/json" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "1021ms", + "MS-CV" : "OkktCzuvUUeGdwjjKSxWpw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0GiyXXwAAAACsY2Y2pmWDQ4uF9jhQlzhHREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\"}", + "Date" : "Mon, 26 Oct 2020 20:05:46 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "447ms", + "MS-CV" : "LA1nngj23EKnZVRmN3kZHQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0GyyXXwAAAAANStwPu4xJRJ55d7IxiXsAREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:05:48 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "218ms", + "MS-CV" : "IRGMqOvgnUiDfeXfAEq8vg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0ISyXXwAAAADHjTcg/4s6QalFu9fKUfNUREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:05:52 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "281ms", + "MS-CV" : "09VjyN0Cp0argLV2ztIZjA.0", + "retry-after" : "0", + "X-Azure-Ref" : "0JiyXXwAAAABJgGwcxuPdS65En2jWCWeyREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:05:58 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "199ms", + "MS-CV" : "tn3VvTszSU6hQedEaPpWyQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0LCyXXwAAAADfVU1F/Jb1Tqmk4Yl/skNrREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:03 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "199ms", + "MS-CV" : "2Z8V/ovtTkSSCX92PoPlHQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0MSyXXwAAAAATqVIPBtLHR7cPCK/LJUNwREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:09 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "196ms", + "MS-CV" : "bLXHxJJ1OUqw9lYcDwRLAw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0NiyXXwAAAADtmPYpu8BiT5JZcRQUBhwhREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:13 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "204ms", + "MS-CV" : "jGpqtF1M80ay+9PaRhqkTQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0OyyXXwAAAACFtjBQuLMGSpdnmh1MQYyvREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:19 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "200ms", + "MS-CV" : "X5av9HGRvEKPpPVP0Ftiqw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0QSyXXwAAAAAiI0ejZHdgQqCh3L9AlVQkREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Pending\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Pending\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:24 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "196ms", + "MS-CV" : "Lk5CPIl9rUmwaNS9LWd2/w.0", + "retry-after" : "0", + "X-Azure-Ref" : "0RiyXXwAAAAB8rQ0abyLQRr/qkTbMbOenREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:30 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "195ms", + "MS-CV" : "KtWmXnEb/06TzCj5U9PzuQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0SyyXXwAAAACMWo4raCoCRqQY7viXAhiaREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:34 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "202ms", + "MS-CV" : "wunF1VTjyU6ZBbdx3r0iJw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0UCyXXwAAAADcRX97IXr+QLxD7qykHYwcREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:40 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "195ms", + "MS-CV" : "2H3GVB7xoEir8W8xcgjudw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0ViyXXwAAAAA94b7XOhJwRLmCXJRwBJvsREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:45 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "250ms", + "MS-CV" : "j1LcvY17ikW0COkorLc4aw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0WyyXXwAAAAD/Ma3wVnIZQrTcx7dyfVcrREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:51 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "2212ms", + "MS-CV" : "vSVVtN6bDU2gMb2BTo1JRQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0YCyXXwAAAABQSluFk2kRQoNRl8+fkW0nREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:06:57 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "261ms", + "MS-CV" : "uAnk9qCfGk6z2fmS17uJ0Q.0", + "retry-after" : "0", + "X-Azure-Ref" : "0aCyXXwAAAACj4RqkTuwUS4WmkAChTzL7REVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:04 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "355ms", + "MS-CV" : "zWkQB2CIAUilQTHSZ/2oWQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0bSyXXwAAAAA6GpqN9SXpRrgz2+I1pwPZREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:09 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "197ms", + "MS-CV" : "m9uzYzLyYkmQgn/hx7l6xg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0ciyXXwAAAAA6WniR8TUEQ4SDIofSNPLDREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:14 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "309ms", + "MS-CV" : "RAqlfHjzuEqciZlb7qxbDw.0", + "retry-after" : "0", + "X-Azure-Ref" : "0eCyXXwAAAAAul0Mo31JLTqmJE6lNiriQREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:20 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "282ms", + "MS-CV" : "d1/zdj71qEKDB1F/BLpREQ.0", + "retry-after" : "0", + "X-Azure-Ref" : "0fSyXXwAAAABgGll90BArR5Ra7yZYNFEUREVOMDJFREdFMDMwOQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"InProgress\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"InProgress\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:25 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + }, { + "Method" : "GET", + "Uri" : "https://REDACTED.communication.azure.com/administration/phonenumbers/releases/1e671fd9-31e3-4c93-a688-e3c13e865e25?api-version=2020-07-20-preview1", + "Headers" : { + "User-Agent" : "azsdk-java-azure-communication-administration/1.0.0-beta.3 (11.0.8; Windows 10; 10.0)" + }, + "Response" : { + "Transfer-Encoding" : "chunked", + "X-Processing-Time" : "238ms", + "MS-CV" : "LEbXKBbttk6cClcEvddQBg.0", + "retry-after" : "0", + "X-Azure-Ref" : "0giyXXwAAAABpw1FAFjbDSbcgW8pYXZdqREVOMDJFREdFMDMxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "StatusCode" : "200", + "Body" : "{\"releaseId\":\"1e671fd9-31e3-4c93-a688-e3c13e865e25\",\"createdAt\":\"2020-10-26T20:05:46.9508456+00:00\",\"status\":\"Complete\",\"phoneNumberReleaseStatusDetails\":{\"+12134592987\":{\"status\":\"Success\"}}}", + "Date" : "Mon, 26 Oct 2020 20:07:31 GMT", + "Content-Type" : "application/json; charset=utf-8" + }, + "Exception" : null + } ], + "variables" : [ ] + } \ No newline at end of file From e2d450344e347216f8329acc0caa8993e72e383b Mon Sep 17 00:00:00 2001 From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com> Date: Thu, 29 Oct 2020 14:57:31 -0700 Subject: [PATCH 20/36] [Service Bus] Change getter of boolean values to isXyz() (#15890) --- .../models/CreateQueueOptions.java | 32 +++++------ .../models/CreateSubscriptionOptions.java | 24 ++++---- .../models/CreateTopicOptions.java | 32 +++++------ .../models/QueueProperties.java | 22 ++++---- .../administration/models/RuleProperties.java | 4 +- .../administration/models/SqlRuleAction.java | 2 +- .../administration/models/SqlRuleFilter.java | 2 +- .../models/SubscriptionProperties.java | 16 +++--- .../models/TopicProperties.java | 16 +++--- .../implementation/EntityHelper.java | 24 ++++---- ...inistrationAsyncClientIntegrationTest.java | 56 +++++++++---------- ...rviceBusAdministrationAsyncClientTest.java | 10 ++-- .../models/CreateQueueOptionsTest.java | 28 +++++----- .../models/CreateSubscriptionOptionsTest.java | 12 ++-- .../models/CreateTopicOptionsTest.java | 14 ++--- .../implementation/EntityHelperTest.java | 36 ++++++------ .../ServiceBusManagementSerializerTest.java | 40 ++++++------- 17 files changed, 185 insertions(+), 185 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java index 8ff0c24c1546f..fa795849fdd1f 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptions.java @@ -53,12 +53,12 @@ public class CreateQueueOptions { *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • *
  • {@link #setDuplicateDetectionHistoryTimeWindow(Duration)} is max duration value, but duplication * detection is disabled.
    • - *
  • {@link #setRequiresDuplicateDetection(boolean)} is false.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setDuplicateDetectionRequired(boolean)} is false.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • *
  • {@link #setMaxSizeInMegabytes(int)} is 1024MB.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -98,16 +98,16 @@ public CreateQueueOptions(QueueProperties queue) { this.duplicateDetectionHistoryTimeWindow = queue.getDuplicateDetectionHistoryTimeWindow() != null ? queue.getDuplicateDetectionHistoryTimeWindow() : DEFAULT_DUPLICATE_DETECTION_DURATION; - this.enableBatchedOperations = queue.enableBatchedOperations(); - this.enablePartitioning = queue.enablePartitioning(); + this.enableBatchedOperations = queue.isBatchedOperationsEnabled(); + this.enablePartitioning = queue.isPartitioningEnabled(); this.forwardTo = queue.getForwardTo(); this.forwardDeadLetteredMessagesTo = queue.getForwardDeadLetteredMessagesTo(); this.lockDuration = queue.getLockDuration(); this.maxDeliveryCount = queue.getMaxDeliveryCount(); this.maxSizeInMegabytes = queue.getMaxSizeInMegabytes(); - this.requiresDuplicateDetection = queue.requiresDuplicateDetection(); - this.requiresSession = queue.requiresSession(); + this.requiresDuplicateDetection = queue.isDuplicateDetectionRequired(); + this.requiresSession = queue.isSessionRequired(); this.status = queue.getStatus(); this.userMetadata = queue.getUserMetadata(); } @@ -175,7 +175,7 @@ public CreateQueueOptions setDefaultMessageTimeToLive(Duration defaultMessageTim * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -221,7 +221,7 @@ public CreateQueueOptions setDuplicateDetectionHistoryTimeWindow(Duration duplic * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -233,7 +233,7 @@ public boolean enableBatchedOperations() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateQueueOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } @@ -244,7 +244,7 @@ public CreateQueueOptions setEnableBatchedOperations(boolean enableBatchedOperat * * @return the enablePartitioning value. */ - public boolean enablePartitioning() { + public boolean isPartitioningEnabled() { return this.enablePartitioning; } @@ -256,7 +256,7 @@ public boolean enablePartitioning() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setEnablePartitioning(boolean enablePartitioning) { + public CreateQueueOptions setPartitioningEnabled(boolean enablePartitioning) { this.enablePartitioning = enablePartitioning; return this; } @@ -383,7 +383,7 @@ public CreateQueueOptions setMaxSizeInMegabytes(int maxSizeInMegabytes) { * * @return the requiresDuplicateDetection value. */ - public boolean requiresDuplicateDetection() { + public boolean isDuplicateDetectionRequired() { return this.requiresDuplicateDetection; } @@ -394,7 +394,7 @@ public boolean requiresDuplicateDetection() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setRequiresDuplicateDetection(boolean requiresDuplicateDetection) { + public CreateQueueOptions setDuplicateDetectionRequired(boolean requiresDuplicateDetection) { this.requiresDuplicateDetection = requiresDuplicateDetection; return this; } @@ -404,7 +404,7 @@ public CreateQueueOptions setRequiresDuplicateDetection(boolean requiresDuplicat * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -415,7 +415,7 @@ public boolean requiresSession() { * * @return the CreateQueueOptions object itself. */ - public CreateQueueOptions setRequiresSession(boolean requiresSession) { + public CreateQueueOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java index 367bde1913a14..0a9431066cbef 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java @@ -42,11 +42,11 @@ public class CreateSubscriptionOptions { *
  • {@link #setAutoDeleteOnIdle(Duration)} is max duration value.
    • *
  • {@link #setDeadLetteringOnMessageExpiration(boolean)} is false.
    • *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} is true.
    • *
  • {@link #setEnableDeadLetteringOnFilterEvaluationExceptions(boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -76,15 +76,15 @@ public CreateSubscriptionOptions(SubscriptionProperties subscription) { Objects.requireNonNull(subscription, "'subscription' cannot be null."); this.autoDeleteOnIdle = subscription.getAutoDeleteOnIdle(); - this.deadLetteringOnMessageExpiration = subscription.deadLetteringOnMessageExpiration(); - this.deadLetteringOnFilterEvaluationExceptions = subscription.enableDeadLetteringOnFilterEvaluationExceptions(); + this.deadLetteringOnMessageExpiration = subscription.isDeadLetteringOnMessageExpiration(); + this.deadLetteringOnFilterEvaluationExceptions = subscription.isDeadLetteringOnFilterEvaluationExceptions(); this.defaultMessageTimeToLive = subscription.getDefaultMessageTimeToLive(); - this.enableBatchedOperations = subscription.enableBatchedOperations(); + this.enableBatchedOperations = subscription.isBatchedOperationsEnabled(); this.forwardTo = subscription.getForwardTo(); this.forwardDeadLetteredMessagesTo = subscription.getForwardDeadLetteredMessagesTo(); this.lockDuration = subscription.getLockDuration(); this.maxDeliveryCount = subscription.getMaxDeliveryCount(); - this.requiresSession = subscription.requiresSession(); + this.requiresSession = subscription.isSessionRequired(); this.status = subscription.getStatus(); this.userMetadata = subscription.getUserMetadata(); } @@ -119,7 +119,7 @@ public CreateSubscriptionOptions setLockDuration(Duration lockDuration) { * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -130,7 +130,7 @@ public boolean requiresSession() { * * @return the CreateSubscriptionOptions object itself. */ - public CreateSubscriptionOptions setRequiresSession(boolean requiresSession) { + public CreateSubscriptionOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } @@ -166,7 +166,7 @@ public CreateSubscriptionOptions setDefaultMessageTimeToLive(Duration defaultMes * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -189,7 +189,7 @@ public CreateSubscriptionOptions setDeadLetteringOnMessageExpiration(boolean dea * * @return the deadLetteringOnFilterEvaluationExceptions value. */ - public boolean enableDeadLetteringOnFilterEvaluationExceptions() { + public boolean isDeadLetteringOnFilterEvaluationExceptions() { return this.deadLetteringOnFilterEvaluationExceptions; } @@ -236,7 +236,7 @@ public CreateSubscriptionOptions setMaxDeliveryCount(int maxDeliveryCount) { * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -248,7 +248,7 @@ public boolean enableBatchedOperations() { * * @return the CreateSubscriptionOptions object itself. */ - public CreateSubscriptionOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateSubscriptionOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java index bb5fbbe7cb5ed..d5e6277bf8e99 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptions.java @@ -49,12 +49,12 @@ public class CreateTopicOptions { *
  • {@link #setDefaultMessageTimeToLive(Duration)} is max duration value.
    • *
  • {@link #setDuplicateDetectionHistoryTimeWindow(Duration)} is max duration value, but duplication * detection is disabled.
    • - *
  • {@link #setRequiresDuplicateDetection(boolean)} is false.
    • - *
  • {@link #setEnableBatchedOperations(boolean)} is true.
    • + *
  • {@link #setDuplicateDetectionRequired(boolean)} is false.
    • + *
  • {@link #setBatchedOperationsEnabled(boolean)} (boolean)} is true.
    • *
  • {@link #setLockDuration(Duration)} is 1 minute.
    • *
  • {@link #setMaxDeliveryCount(int)} is 10.
    • *
  • {@link #setMaxSizeInMegabytes(long)} is 1024MB.
    • - *
  • {@link #setRequiresSession(boolean)} is false.
    • + *
  • {@link #setSessionRequired(boolean)} is false.
    • *
  • {@link #setStatus(EntityStatus)} is {@link EntityStatus#ACTIVE}.
    • * * @@ -89,11 +89,11 @@ public CreateTopicOptions(TopicProperties topic) { this.autoDeleteOnIdle = topic.getAutoDeleteOnIdle(); this.defaultMessageTimeToLive = topic.getDefaultMessageTimeToLive(); this.duplicateDetectionHistoryTimeWindow = topic.getDuplicateDetectionHistoryTimeWindow(); - this.enableBatchedOperations = topic.enableBatchedOperations(); - this.enablePartitioning = topic.enablePartitioning(); + this.enableBatchedOperations = topic.isBatchedOperationsEnabled(); + this.enablePartitioning = topic.isPartitioningEnabled(); this.maxSizeInMegabytes = topic.getMaxSizeInMegabytes(); - this.requiresDuplicateDetection = topic.requiresDuplicateDetection(); - this.supportOrdering = topic.supportOrdering(); + this.requiresDuplicateDetection = topic.isDuplicateDetectionRequired(); + this.supportOrdering = topic.isOrderingSupported(); this.status = topic.getStatus(); this.userMetadata = topic.getUserMetadata(); } @@ -184,7 +184,7 @@ public CreateTopicOptions setDuplicateDetectionHistoryTimeWindow(Duration duplic * * @return the enableBatchedOperations value. */ - public Boolean enableBatchedOperations() { + public Boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -196,7 +196,7 @@ public Boolean enableBatchedOperations() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setEnableBatchedOperations(boolean enableBatchedOperations) { + public CreateTopicOptions setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } @@ -207,7 +207,7 @@ public CreateTopicOptions setEnableBatchedOperations(boolean enableBatchedOperat * * @return the enablePartitioning value. */ - public Boolean enablePartitioning() { + public Boolean isPartitioningEnabled() { return this.enablePartitioning; } @@ -219,7 +219,7 @@ public Boolean enablePartitioning() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setEnablePartitioning(boolean enablePartitioning) { + public CreateTopicOptions setPartitioningEnabled(boolean enablePartitioning) { this.enablePartitioning = enablePartitioning; return this; } @@ -263,7 +263,7 @@ public boolean isSupportOrdering() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setSupportOrdering(boolean supportOrdering) { + public CreateTopicOptions setOrderingSupported(boolean supportOrdering) { this.supportOrdering = supportOrdering; return this; } @@ -344,7 +344,7 @@ public CreateTopicOptions setMaxSizeInMegabytes(long maxSizeInMegabytes) { * * @return the requiresDuplicateDetection value. */ - public Boolean requiresDuplicateDetection() { + public Boolean isDuplicateDetectionRequired() { return this.requiresDuplicateDetection; } @@ -355,7 +355,7 @@ public Boolean requiresDuplicateDetection() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setRequiresDuplicateDetection(boolean requiresDuplicateDetection) { + public CreateTopicOptions setDuplicateDetectionRequired(boolean requiresDuplicateDetection) { this.requiresDuplicateDetection = requiresDuplicateDetection; return this; } @@ -365,7 +365,7 @@ public CreateTopicOptions setRequiresDuplicateDetection(boolean requiresDuplicat * * @return the requiresSession value. */ - public Boolean requiresSession() { + public Boolean isSessionRequired() { return this.requiresSession; } @@ -376,7 +376,7 @@ public Boolean requiresSession() { * * @return the CreateTopicOptions object itself. */ - public CreateTopicOptions setRequiresSession(boolean requiresSession) { + public CreateTopicOptions setSessionRequired(boolean requiresSession) { this.requiresSession = requiresSession; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java index b17363f080961..eaf9f7911464e 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/QueueProperties.java @@ -64,7 +64,7 @@ public QueueDescription toImplementation(QueueProperties queue, List parameters = action.getProperties().entrySet().stream() @@ -183,7 +183,7 @@ public RuleFilterImpl toImplementation(RuleFilter model) { final SqlFilterImpl returned = new SqlFilterImpl() .setSqlExpression(filter.getSqlExpression()) .setCompatibilityLevel(filter.getCompatibilityLevel()) - .setRequiresPreprocessing(filter.getRequiresPreprocessing()); + .setRequiresPreprocessing(filter.isPreprocessingRequired()); if (!filter.getProperties().isEmpty()) { final List parameters = filter.getProperties().entrySet() diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java index ecfe30598dab4..be01a3323f1d9 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java @@ -69,7 +69,7 @@ String getCompatibilityLevel() { * * @return Whether or not requires preprocessing. */ - Boolean getRequiresPreprocessing() { + Boolean isPreprocessingRequired() { return requiresPreprocessing; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java index 32630779325c0..87ebd5f6b1622 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java @@ -75,7 +75,7 @@ String getCompatibilityLevel() { * * @return Whether or not requires preprocessing. */ - Boolean getRequiresPreprocessing() { + Boolean isPreprocessingRequired() { return requiresPreprocessing; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java index 7410ca1affef7..e02c203126130 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SubscriptionProperties.java @@ -53,8 +53,8 @@ public SubscriptionDescription toImplementation(SubscriptionProperties subscript .setAutoDeleteOnIdle(subscription.getAutoDeleteOnIdle()) .setCreatedAt(subscription.getCreatedAt()) .setDeadLetteringOnFilterEvaluationExceptions( - subscription.enableDeadLetteringOnFilterEvaluationExceptions()) - .setDeadLetteringOnMessageExpiration(subscription.deadLetteringOnMessageExpiration()) + subscription.isDeadLetteringOnFilterEvaluationExceptions()) + .setDeadLetteringOnMessageExpiration(subscription.isDeadLetteringOnMessageExpiration()) .setDefaultMessageTimeToLive(subscription.getDefaultMessageTimeToLive()) .setEnableBatchedOperations(subscription.enableBatchedOperations) .setEntityAvailabilityStatus(subscription.entityAvailabilityStatus) @@ -65,7 +65,7 @@ public SubscriptionDescription toImplementation(SubscriptionProperties subscript .setMessageCount(subscription.messageCount) .setMessageCountDetails(subscription.getMessageCountDetails()) .setStatus(subscription.getStatus()) - .setRequiresSession(subscription.requiresSession()) + .setRequiresSession(subscription.isSessionRequired()) .setUpdatedAt(subscription.getUpdatedAt()) .setUserMetadata(subscription.getUserMetadata()); } @@ -181,7 +181,7 @@ public SubscriptionProperties setLockDuration(Duration lockDuration) { * * @return the requiresSession value. */ - public boolean requiresSession() { + public boolean isSessionRequired() { return this.requiresSession; } @@ -215,7 +215,7 @@ public SubscriptionProperties setDefaultMessageTimeToLive(Duration defaultMessag * * @return the deadLetteringOnMessageExpiration value. */ - public boolean deadLetteringOnMessageExpiration() { + public boolean isDeadLetteringOnMessageExpiration() { return this.deadLetteringOnMessageExpiration; } @@ -237,7 +237,7 @@ public SubscriptionProperties setDeadLetteringOnMessageExpiration(boolean deadLe * * @return the deadLetteringOnFilterEvaluationExceptions value. */ - public boolean enableDeadLetteringOnFilterEvaluationExceptions() { + public boolean isDeadLetteringOnFilterEvaluationExceptions() { return this.deadLetteringOnFilterEvaluationExceptions; } @@ -302,7 +302,7 @@ public SubscriptionProperties setMaxDeliveryCount(int maxDeliveryCount) { * * @return the enableBatchedOperations value. */ - public boolean enableBatchedOperations() { + public boolean isBatchedOperationsEnabled() { return this.enableBatchedOperations; } @@ -313,7 +313,7 @@ public boolean enableBatchedOperations() { * @param enableBatchedOperations the enableBatchedOperations value to set. * @return the SubscriptionProperties object itself. */ - public SubscriptionProperties setEnableBatchedOperations(boolean enableBatchedOperations) { + public SubscriptionProperties setBatchedOperationsEnabled(boolean enableBatchedOperations) { this.enableBatchedOperations = enableBatchedOperations; return this; } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java index 9e77f77af6d1c..029ecc951aa39 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/TopicProperties.java @@ -63,7 +63,7 @@ public TopicDescription toImplementation(TopicProperties topic, List { assertEquals(queueName, queueDescription.getName()); - assertFalse(queueDescription.enablePartitioning()); - assertFalse(queueDescription.requiresSession()); + assertFalse(queueDescription.isPartitioningEnabled()); + assertFalse(queueDescription.isSessionRequired()); assertNotNull(queueDescription.getLockDuration()); final QueueRuntimeProperties runtimeProperties = new QueueRuntimeProperties(queueDescription); @@ -467,7 +467,7 @@ void getSubscription(HttpClient httpClient) { assertEquals(topicName, description.getTopicName()); assertEquals(subscriptionName, description.getSubscriptionName()); - assertTrue(description.requiresSession()); + assertTrue(description.isSessionRequired()); assertNotNull(description.getLockDuration()); final SubscriptionRuntimeProperties runtimeProperties = new SubscriptionRuntimeProperties(description); @@ -569,11 +569,11 @@ void getTopic(HttpClient httpClient) { .assertNext(topicDescription -> { assertEquals(topicName, topicDescription.getName()); - assertTrue(topicDescription.enableBatchedOperations()); - assertFalse(topicDescription.requiresDuplicateDetection()); + assertTrue(topicDescription.isBatchedOperationsEnabled()); + assertFalse(topicDescription.isDuplicateDetectionRequired()); assertNotNull(topicDescription.getDuplicateDetectionHistoryTimeWindow()); assertNotNull(topicDescription.getDefaultMessageTimeToLive()); - assertFalse(topicDescription.enablePartitioning()); + assertFalse(topicDescription.isPartitioningEnabled()); final TopicRuntimeProperties runtimeProperties = new TopicRuntimeProperties(topicDescription); assertNotNull(runtimeProperties.getCreatedAt()); @@ -703,9 +703,9 @@ void listQueues(HttpClient httpClient) { StepVerifier.create(client.listQueues()) .assertNext(queueDescription -> { assertNotNull(queueDescription.getName()); - assertTrue(queueDescription.enableBatchedOperations()); - assertFalse(queueDescription.requiresDuplicateDetection()); - assertFalse(queueDescription.enablePartitioning()); + assertTrue(queueDescription.isBatchedOperationsEnabled()); + assertFalse(queueDescription.isDuplicateDetectionRequired()); + assertFalse(queueDescription.isPartitioningEnabled()); }) .expectNextCount(9) .thenCancel() @@ -742,8 +742,8 @@ void listTopics(HttpClient httpClient) { StepVerifier.create(client.listTopics()) .assertNext(topics -> { assertNotNull(topics.getName()); - assertTrue(topics.enableBatchedOperations()); - assertFalse(topics.enablePartitioning()); + assertTrue(topics.isBatchedOperationsEnabled()); + assertFalse(topics.isPartitioningEnabled()); }) .expectNextCount(2) .thenCancel() diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java index 47318c3306701..413c7a08d0873 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/ServiceBusAdministrationAsyncClientTest.java @@ -505,18 +505,18 @@ private static boolean createBodyContentEquals(Object requestBody, CreateQueueOp return equals(expected.getAutoDeleteOnIdle(), properties.getAutoDeleteOnIdle()) && equals(expected.getDefaultMessageTimeToLive(), properties.getDefaultMessageTimeToLive()) - && equals(expected.deadLetteringOnMessageExpiration(), properties.isDeadLetteringOnMessageExpiration()) + && equals(expected.isDeadLetteringOnMessageExpiration(), properties.isDeadLetteringOnMessageExpiration()) && equals(expected.getDuplicateDetectionHistoryTimeWindow(), properties.getDuplicateDetectionHistoryTimeWindow()) - && equals(expected.enableBatchedOperations(), properties.isEnableBatchedOperations()) - && equals(expected.enablePartitioning(), properties.isEnablePartitioning()) + && equals(expected.isBatchedOperationsEnabled(), properties.isEnableBatchedOperations()) + && equals(expected.isPartitioningEnabled(), properties.isEnablePartitioning()) && equals(expected.getForwardTo(), properties.getForwardTo()) && equals(expected.getForwardDeadLetteredMessagesTo(), properties.getForwardDeadLetteredMessagesTo()) && equals(expected.getLockDuration(), properties.getLockDuration()) && equals(expected.getMaxDeliveryCount(), properties.getMaxDeliveryCount()) && equals(expected.getMaxSizeInMegabytes(), properties.getMaxSizeInMegabytes()) - && equals(expected.requiresDuplicateDetection(), properties.isRequiresDuplicateDetection()) - && equals(expected.requiresSession(), properties.isRequiresSession()) + && equals(expected.isDuplicateDetectionRequired(), properties.isRequiresDuplicateDetection()) + && equals(expected.isSessionRequired(), properties.isRequiresSession()) && equals(expected.getUserMetadata(), properties.getUserMetadata()) && "application/xml".equals(content.getType()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java index 12b242757ad93..1e6c5c2d29767 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateQueueOptionsTest.java @@ -38,14 +38,14 @@ void constructor() { assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); assertEquals(DEFAULT_DUPLICATE_DETECTION_DURATION, actual.getDuplicateDetectionHistoryTimeWindow()); - assertTrue(actual.enableBatchedOperations()); - assertFalse(actual.enablePartitioning()); + assertTrue(actual.isBatchedOperationsEnabled()); + assertFalse(actual.isPartitioningEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); assertEquals(DEFAULT_QUEUE_SIZE, actual.getMaxSizeInMegabytes()); - assertFalse(actual.requiresDuplicateDetection()); - assertFalse(actual.requiresSession()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isDuplicateDetectionRequired()); + assertFalse(actual.isSessionRequired()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertNull(actual.getUserMetadata()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); } @@ -73,15 +73,15 @@ void constructorWithOptions() { .setAutoDeleteOnIdle(Duration.ofSeconds(15)) .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDuplicateDetectionHistoryTimeWindow(Duration.ofSeconds(13)) - .setEnableBatchedOperations(false) - .setEnablePartitioning(true) + .setBatchedOperationsEnabled(false) + .setPartitioningEnabled(true) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) .setMaxSizeInMegabytes(2048) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setUserMetadata("Test-queue-Metadata") .setStatus(EntityStatus.DISABLED); @@ -98,17 +98,17 @@ void constructorWithOptions() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.enablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); + assertEquals(expected.isPartitioningEnabled(), actual.isPartitioningEnabled()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresDuplicateDetection(), actual.requiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.requiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isDuplicateDetectionRequired()); + assertEquals(expected.isSessionRequired(), actual.isSessionRequired()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java index 9ba69e6233ad7..6b5d12decefde 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptionsTest.java @@ -30,11 +30,11 @@ void constructor() { // Assert assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); - assertTrue(actual.enableBatchedOperations()); + assertTrue(actual.isBatchedOperationsEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); - assertFalse(actual.requiresSession()); - assertFalse(actual.deadLetteringOnMessageExpiration()); + assertFalse(actual.isSessionRequired()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); assertNull(actual.getUserMetadata()); } @@ -62,13 +62,13 @@ void constructorWithOptions() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertFalse(actual.deadLetteringOnMessageExpiration()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); + assertFalse(actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresSession(), actual.requiresSession()); + assertEquals(expected.isSessionRequired(), actual.isSessionRequired()); assertEquals(expected.getStatus(), actual.getStatus()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java index 4e87a8eb80b56..e524be52eb11a 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/administration/models/CreateTopicOptionsTest.java @@ -33,13 +33,13 @@ void constructor() { assertEquals(MAX_DURATION, actual.getAutoDeleteOnIdle()); assertEquals(MAX_DURATION, actual.getDefaultMessageTimeToLive()); assertEquals(DEFAULT_DUPLICATE_DETECTION_DURATION, actual.getDuplicateDetectionHistoryTimeWindow()); - assertTrue(actual.enableBatchedOperations()); - assertFalse(actual.enablePartitioning()); + assertTrue(actual.isBatchedOperationsEnabled()); + assertFalse(actual.isPartitioningEnabled()); assertEquals(DEFAULT_LOCK_DURATION, actual.getLockDuration()); assertEquals(DEFAULT_MAX_DELIVERY_COUNT, actual.getMaxDeliveryCount()); assertEquals(DEFAULT_TOPIC_SIZE, actual.getMaxSizeInMegabytes()); - assertFalse(actual.requiresDuplicateDetection()); - assertFalse(actual.requiresSession()); + assertFalse(actual.isDuplicateDetectionRequired()); + assertFalse(actual.isSessionRequired()); assertNull(actual.getUserMetadata()); assertEquals(EntityStatus.ACTIVE, actual.getStatus()); } @@ -68,9 +68,9 @@ void constructorWithOptions() { assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.enableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.enablePartitioning()); - assertEquals(expected.requiresDuplicateDetection(), actual.requiresDuplicateDetection()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isBatchedOperationsEnabled()); + assertEquals(expected.isPartitioningEnabled(), actual.isPartitioningEnabled()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isDuplicateDetectionRequired()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java index ebe5e571331b3..6cb2eda76868f 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/EntityHelperTest.java @@ -38,11 +38,11 @@ void createTopic() { assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expected.getMaxSizeInMegabytes(), actual.getMaxSizeInMegabytes()); assertEquals(expected.getStatus(), actual.getStatus()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); assertEquals(expected.isSupportOrdering(), actual.isSupportOrdering()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); } @@ -55,15 +55,15 @@ void createQueue() { .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDeadLetteringOnMessageExpiration(true) .setDuplicateDetectionHistoryTimeWindow(Duration.ofSeconds(13)) - .setEnableBatchedOperations(false) - .setEnablePartitioning(true) + .setBatchedOperationsEnabled(false) + .setPartitioningEnabled(true) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) .setMaxSizeInMegabytes(2048) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setUserMetadata("Test-queue-Metadata") .setStatus(EntityStatus.DISABLED); @@ -73,16 +73,16 @@ void createQueue() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } @@ -122,12 +122,12 @@ void createSubscription() { .setDefaultMessageTimeToLive(Duration.ofSeconds(50)) .setDeadLetteringOnMessageExpiration(true) .setEnableDeadLetteringOnFilterEvaluationExceptions(true) - .setEnableBatchedOperations(false) + .setBatchedOperationsEnabled(false) .setForwardTo("Forward-To-This-Queue") .setForwardDeadLetteredMessagesTo("Dead-Lettered-Forward-To") .setLockDuration(Duration.ofSeconds(120)) .setMaxDeliveryCount(15) - .setRequiresSession(true) + .setSessionRequired(true) .setStatus(EntityStatus.RECEIVE_DISABLED) .setUserMetadata("Test-topic-Metadata"); @@ -137,15 +137,15 @@ void createSubscription() { // Assert assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); - assertEquals(expected.enableDeadLetteringOnFilterEvaluationExceptions(), + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); + assertEquals(expected.isDeadLetteringOnFilterEvaluationExceptions(), actual.isDeadLetteringOnFilterEvaluationExceptions()); assertEquals(expected.getForwardTo(), actual.getForwardTo()); assertEquals(expected.getForwardDeadLetteredMessagesTo(), actual.getForwardDeadLetteredMessagesTo()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getUserMetadata(), actual.getUserMetadata()); assertEquals(expected.getStatus(), actual.getStatus()); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java index 8254de69c8a3c..03f07b4f8a900 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusManagementSerializerTest.java @@ -88,12 +88,12 @@ void deserializeCreateQueueDescription() throws IOException { .setDuplicateDetectionHistoryTimeWindow(null) .setLockDuration(Duration.ofMinutes(10)) .setMaxSizeInMegabytes(1028) - .setRequiresDuplicateDetection(false) - .setRequiresSession(true) + .setDuplicateDetectionRequired(false) + .setSessionRequired(true) .setDeadLetteringOnMessageExpiration(false) .setMaxDeliveryCount(5) - .setEnableBatchedOperations(true) - .setEnablePartitioning(false); + .setBatchedOperationsEnabled(true) + .setPartitioningEnabled(false); expected.getAuthorizationRules().add(rule); @@ -124,15 +124,15 @@ void deserializeQueueDescription() throws IOException { final CreateQueueOptions expected = new CreateQueueOptions() .setLockDuration(Duration.ofMinutes(5)) .setMaxSizeInMegabytes(1024) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setDefaultMessageTimeToLive(Duration.parse("PT3H20M10S")) .setDeadLetteringOnMessageExpiration(false) .setDuplicateDetectionHistoryTimeWindow(Duration.ofMinutes(10)) .setMaxDeliveryCount(10) - .setEnableBatchedOperations(true) + .setBatchedOperationsEnabled(true) .setAutoDeleteOnIdle(Duration.ofHours(5)) - .setEnablePartitioning(true); + .setPartitioningEnabled(true); // Act final QueueDescriptionEntry entry = serializer.deserialize(contents, QueueDescriptionEntry.class); @@ -204,15 +204,15 @@ void deserializeQueueDescriptionFeedPaged() throws IOException { final CreateQueueOptions options = new CreateQueueOptions() .setLockDuration(Duration.ofMinutes(10)) .setMaxSizeInMegabytes(102) - .setRequiresDuplicateDetection(true) - .setRequiresSession(true) + .setDuplicateDetectionRequired(true) + .setSessionRequired(true) .setDefaultMessageTimeToLive(Duration.ofSeconds(10)) .setDeadLetteringOnMessageExpiration(false) .setDuplicateDetectionHistoryTimeWindow(Duration.ofMinutes(10)) .setMaxDeliveryCount(10) - .setEnableBatchedOperations(true) + .setBatchedOperationsEnabled(true) .setAutoDeleteOnIdle(Duration.ofSeconds(5)) - .setEnablePartitioning(true); + .setPartitioningEnabled(true); final QueueDescription queueProperties = EntityHelper.getQueueDescription(options); final QueueDescriptionEntry entry1 = new QueueDescriptionEntry() @@ -368,7 +368,7 @@ void deserializeCreateSubscription() throws IOException { new CreateSubscriptionOptions() .setAutoDeleteOnIdle(Duration.parse("P10675199DT2H48M5.477S")) .setDefaultMessageTimeToLive(Duration.parse("P10675199DT2H48M5.477S")) - .setRequiresSession(false) + .setSessionRequired(false) .setLockDuration(Duration.ofSeconds(45)) .setMaxDeliveryCount(7)); @@ -446,12 +446,12 @@ void deserializeSubscriptionDescriptionFeed() throws IOException { .setAutoDeleteOnIdle(Duration.ofDays(1))); final SubscriptionDescription subscription2 = EntityHelper.getSubscriptionDescription( new CreateSubscriptionOptions() - .setRequiresSession(true) + .setSessionRequired(true) .setLockDuration(Duration.ofSeconds(15)) .setMaxDeliveryCount(5)); final SubscriptionDescription subscription3 = EntityHelper.getSubscriptionDescription( new CreateSubscriptionOptions() - .setRequiresSession(true) + .setSessionRequired(true) .setLockDuration(Duration.ofSeconds(15)) .setMaxDeliveryCount(5)); final List expectedDescriptions = Arrays.asList( @@ -732,16 +732,16 @@ private static void assertQueueEquals(CreateQueueOptions expected, EntityStatus assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); assertEquals(expected.getLockDuration(), actual.getLockDuration()); assertEquals(expected.getMaxSizeInMegabytes(), actual.getMaxSizeInMegabytes()); - assertEquals(expected.requiresDuplicateDetection(), actual.isRequiresDuplicateDetection()); - assertEquals(expected.requiresSession(), actual.isRequiresSession()); + assertEquals(expected.isDuplicateDetectionRequired(), actual.isRequiresDuplicateDetection()); + assertEquals(expected.isSessionRequired(), actual.isRequiresSession()); assertEquals(expected.getDefaultMessageTimeToLive(), actual.getDefaultMessageTimeToLive()); - assertEquals(expected.deadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); + assertEquals(expected.isDeadLetteringOnMessageExpiration(), actual.isDeadLetteringOnMessageExpiration()); assertEquals(expected.getDuplicateDetectionHistoryTimeWindow(), actual.getDuplicateDetectionHistoryTimeWindow()); assertEquals(expected.getMaxDeliveryCount(), actual.getMaxDeliveryCount()); - assertEquals(expected.enableBatchedOperations(), actual.isEnableBatchedOperations()); + assertEquals(expected.isBatchedOperationsEnabled(), actual.isEnableBatchedOperations()); assertEquals(expected.getAutoDeleteOnIdle(), actual.getAutoDeleteOnIdle()); - assertEquals(expected.enablePartitioning(), actual.isEnablePartitioning()); + assertEquals(expected.isPartitioningEnabled(), actual.isEnablePartitioning()); assertEquals(expectedStatus, actual.getStatus()); } From 16ba3267947842d567583d8f70fbce6024de1bff Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Thu, 29 Oct 2020 16:00:06 -0700 Subject: [PATCH 21/36] Fixed diagnostics information and other APIs on cosmos stored procedure response (#16946) * Fixed diagnostics information and other APIs on cosmos stored procedure response * Code review comments * Fixing conflict resolution policy CRUD test --- .../StoredProcedureResponse.java | 4 ++ .../azure/cosmos/models/CosmosResponse.java | 5 -- .../models/CosmosStoredProcedureResponse.java | 13 +++-- .../cosmos/CosmosSyncStoredProcTest.java | 53 +++++++++++++++---- .../rx/MultiMasterConflictResolutionTest.java | 2 +- 5 files changed, 57 insertions(+), 20 deletions(-) diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/StoredProcedureResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/StoredProcedureResponse.java index 02f2c869ed287..c32aeb55eb637 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/StoredProcedureResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/StoredProcedureResponse.java @@ -135,4 +135,8 @@ public String getScriptLog() { public CosmosDiagnostics getCosmosDiagnostics() { return this.response.getCosmosDiagnostics(); } + + public RxDocumentServiceResponse getRxDocumentServiceResponse() { + return response; + } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java index c2f5617c177a0..31b54f02c8318 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosResponse.java @@ -31,11 +31,6 @@ public class CosmosResponse { this.properties = properties; } - // Only used in CosmosStoredProcedureResponse compatibility with StoredProcedureResponse - CosmosResponse(StoredProcedureResponse response) { - this.resourceResponseWrapper = null; - } - /** * Gets properties. * diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosStoredProcedureResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosStoredProcedureResponse.java index d7aa3b91a6ec1..c2a14864ff4fd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosStoredProcedureResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosStoredProcedureResponse.java @@ -24,9 +24,8 @@ public class CosmosStoredProcedureResponse extends CosmosResponse(response.getRxDocumentServiceResponse(), StoredProcedure.class)); this.storedProcedureResponse = response; - } /** @@ -96,7 +95,10 @@ public double getRequestCharge() { * @return the response as a string. */ public String getResponseAsString() { - return this.storedProcedureResponse.getResponseAsString(); + if (storedProcedureResponse != null) { + return storedProcedureResponse.getResponseAsString(); + } + return null; } /** @@ -105,6 +107,9 @@ public String getResponseAsString() { * @return the output string from the stored procedure console.log() statements. */ public String getScriptLog() { - return this.storedProcedureResponse.getScriptLog(); + if (storedProcedureResponse != null) { + return this.storedProcedureResponse.getScriptLog(); + } + return null; } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java index f4d84f3e3a6a9..2284e0504be87 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosSyncStoredProcTest.java @@ -4,10 +4,10 @@ package com.azure.cosmos; import com.azure.cosmos.implementation.HttpConstants; -import com.azure.cosmos.models.CosmosStoredProcedureResponse; +import com.azure.cosmos.models.CosmosQueryRequestOptions; import com.azure.cosmos.models.CosmosStoredProcedureProperties; import com.azure.cosmos.models.CosmosStoredProcedureRequestOptions; -import com.azure.cosmos.models.CosmosQueryRequestOptions; +import com.azure.cosmos.models.CosmosStoredProcedureResponse; import com.azure.cosmos.models.PartitionKey; import com.azure.cosmos.models.SqlQuerySpec; import com.azure.cosmos.rx.TestSuiteBase; @@ -17,10 +17,10 @@ import org.testng.annotations.Factory; import org.testng.annotations.Test; -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; @@ -58,6 +58,7 @@ public void createStoredProcedure() throws Exception { CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedureDef); validateResponse(storedProcedureDef, response); + validateDiagnostics(response, false); storedProcedureDef.setId(UUID.randomUUID().toString()); storedProcedureDef.setBody("function() {var x = 11;}"); @@ -65,6 +66,7 @@ public void createStoredProcedure() throws Exception { .createStoredProcedure(storedProcedureDef, new CosmosStoredProcedureRequestOptions()); validateResponse(storedProcedureDef, response1); + validateDiagnostics(response1, false); } @@ -74,6 +76,7 @@ public void createSproc_alreadyExists() throws Exception { CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedureDef); validateResponse(storedProcedureDef, response); + validateDiagnostics(response, false); // Test for conflict try { @@ -90,14 +93,17 @@ public void readStoredProcedure() throws Exception { CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedureDef); validateResponse(storedProcedureDef, response); + validateDiagnostics(response, false); CosmosStoredProcedure storedProcedure = container.getScripts().getStoredProcedure(storedProcedureDef.getId()); CosmosStoredProcedureResponse readResponse = storedProcedure.read(); validateResponse(storedProcedureDef, readResponse); + validateDiagnostics(readResponse, false); CosmosStoredProcedureResponse readResponse2 = storedProcedure.read(new CosmosStoredProcedureRequestOptions()); validateResponse(storedProcedureDef, readResponse2); + validateDiagnostics(readResponse2, false); } @Test(groups = {"simple"}, timeOut = TIMEOUT) @@ -106,11 +112,13 @@ public void replaceStoredProcedure() throws Exception { CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedureDef); validateResponse(storedProcedureDef, response); + validateDiagnostics(response, false); CosmosStoredProcedureResponse readResponse = container.getScripts() .getStoredProcedure(storedProcedureDef.getId()) .read(); validateResponse(storedProcedureDef, readResponse); + validateDiagnostics(readResponse, false); //replace storedProcedureDef = readResponse.getProperties(); storedProcedureDef.setBody("function(){ var y = 20;}"); @@ -118,6 +126,7 @@ public void replaceStoredProcedure() throws Exception { .getStoredProcedure(storedProcedureDef.getId()) .replace(storedProcedureDef); validateResponse(storedProcedureDef, replaceResponse); + validateDiagnostics(replaceResponse, false); storedProcedureDef.setBody("function(){ var z = 2;}"); CosmosStoredProcedureResponse replaceResponse2 = container.getScripts() @@ -125,6 +134,7 @@ public void replaceStoredProcedure() throws Exception { .replace(storedProcedureDef, new CosmosStoredProcedureRequestOptions()); validateResponse(storedProcedureDef, replaceResponse2); + validateDiagnostics(replaceResponse2, false); } @@ -143,6 +153,8 @@ public void deleteStoredProcedure() throws Exception { CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedureDef); validateResponse(storedProcedureDef, response); + validateDiagnostics(response, false); + container.getScripts() .getStoredProcedure(storedProcedureDef.getId()) .delete(); @@ -164,7 +176,8 @@ public void executeStoredProcedure() throws Exception { " }" + "}"); - container.getScripts().createStoredProcedure(storedProcedure); + CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedure); + validateDiagnostics(response, false); CosmosStoredProcedureRequestOptions options = new CosmosStoredProcedureRequestOptions(); options.setPartitionKey(PartitionKey.NONE); CosmosStoredProcedureResponse executeResponse = container.getScripts() @@ -173,6 +186,7 @@ public void executeStoredProcedure() throws Exception { assertThat(executeResponse.getActivityId()).isNotEmpty(); assertThat(executeResponse.getScriptLog()).isNull(); + validateDiagnostics(executeResponse, true); } @Test(groups = "simple", timeOut = TIMEOUT) @@ -192,7 +206,8 @@ public void executeStoredProcedureWithScriptLoggingEnabled() throws Exception { " }" + "}"); - container.getScripts().createStoredProcedure(storedProcedure); + CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(storedProcedure); + validateDiagnostics(response, false); CosmosStoredProcedureRequestOptions options = new CosmosStoredProcedureRequestOptions(); options.setScriptLoggingEnabled(true); options.setPartitionKey(PartitionKey.NONE); @@ -203,12 +218,15 @@ public void executeStoredProcedureWithScriptLoggingEnabled() throws Exception { String logResult = "The value of x is 1."; assertThat(executeResponse.getScriptLog()).isEqualTo(logResult); + validateDiagnostics(executeResponse, true); } @Test(groups = {"simple"}, timeOut = TIMEOUT) - private void readAllSprocs() throws Exception { + public void readAllSprocs() throws Exception { CosmosStoredProcedureProperties storedProcedureDef = getCosmosStoredProcedureProperties(); - container.getScripts().createStoredProcedure(storedProcedureDef); + CosmosStoredProcedureResponse response = + container.getScripts().createStoredProcedure(storedProcedureDef); + validateDiagnostics(response, false); CosmosQueryRequestOptions cosmosQueryRequestOptions = new CosmosQueryRequestOptions(); @@ -219,9 +237,10 @@ private void readAllSprocs() throws Exception { } @Test(groups = {"simple"}, timeOut = TIMEOUT) - private void querySprocs() throws Exception { + public void querySprocs() throws Exception { CosmosStoredProcedureProperties properties = getCosmosStoredProcedureProperties(); - container.getScripts().createStoredProcedure(properties); + CosmosStoredProcedureResponse response = container.getScripts().createStoredProcedure(properties); + validateDiagnostics(response, false); String query = String.format("SELECT * from c where c.id = '%s'", properties.getId()); CosmosQueryRequestOptions cosmosQueryRequestOptions = new CosmosQueryRequestOptions(); @@ -245,4 +264,18 @@ private void validateResponse(CosmosStoredProcedureProperties properties, .isEqualTo(properties.getId()); } + + private void validateDiagnostics(CosmosStoredProcedureResponse response, boolean storedProcedureExecuted ) { + CosmosDiagnostics diagnostics = response.getDiagnostics(); + Duration duration = response.getDuration(); + Map responseHeaders = response.getResponseHeaders(); + assertThat(diagnostics).isNotNull(); + assertThat(duration).isNotNull(); + assertThat(duration.toMillis()).isGreaterThan(0); + assertThat(responseHeaders).isNotEmpty(); + if (storedProcedureExecuted) { + String responseAsString = response.getResponseAsString(); + assertThat(responseAsString).isNotNull(); + } + } } diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java index e4c781f6f62a4..9953ff84d20c3 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/MultiMasterConflictResolutionTest.java @@ -81,7 +81,7 @@ public void conflictResolutionPolicyCRUD() { // when (e.StatusCode == HttpStatusCode.BadRequest) CosmosException dce = Utils.as(e, CosmosException.class); if (dce != null && dce.getStatusCode() == 400) { - assertThat(dce.getMessage()).contains("Invalid path '\\/a\\/b' for last writer wins conflict resolution"); + assertThat(dce.getMessage()).contains("Invalid path '\\\\\\/a\\\\\\/b' for last writer wins conflict resolution"); } else { throw e; } From cc20791aeda439b658e0c6d0464c8c363d20ca4a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:25:33 -0700 Subject: [PATCH 22/36] Sync eng/common directory with azure-sdk-tools for PR 1146 (#16968) * Remove resource group asynchronously and do not wait for completion * Verify resource group has reached Deleting state before exiting script * Use $_ instead of $Error[0] for resource group removal handling Co-authored-by: Ben Broderick Phillips --- .../TestResources/Remove-TestResources.ps1 | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/eng/common/TestResources/Remove-TestResources.ps1 b/eng/common/TestResources/Remove-TestResources.ps1 index 37f3f5851c603..83b1a58c347f9 100644 --- a/eng/common/TestResources/Remove-TestResources.ps1 +++ b/eng/common/TestResources/Remove-TestResources.ps1 @@ -137,9 +137,31 @@ if (![string]::IsNullOrWhiteSpace($ServiceDirectory)) { } } +$verifyDeleteScript = { + try { + $group = Get-AzResourceGroup -name $ResourceGroupName + } catch { + if ($_.ToString().Contains("Provided resource group does not exist")) { + Write-Verbose "Resource group '$ResourceGroupName' not found. Continuing..." + return + } + throw $_ + } + + if ($group.ProvisioningState -ne "Deleting") + { + throw "Resource group is in '$($group.ProvisioningState)' state, expected 'Deleting'" + } +} + Log "Deleting resource group '$ResourceGroupName'" -if (Retry { Remove-AzResourceGroup -Name "$ResourceGroupName" -Force:$Force }) { - Write-Verbose "Successfully deleted resource group '$ResourceGroupName'" +if ($Force) { + Remove-AzResourceGroup -Name "$ResourceGroupName" -Force:$Force -AsJob + Retry $verifyDeleteScript 3 + Write-Verbose "Requested async deletion of resource group '$ResourceGroupName'" +} else { + # Don't swallow interactive confirmation when Force is false + Remove-AzResourceGroup -Name "$ResourceGroupName" -Force:$Force } $exitActions.Invoke() @@ -194,4 +216,4 @@ resource group whose name is stored in the environment variable AZURE_RESOURCEGROUP_NAME. .LINK New-TestResources.ps1 -#> \ No newline at end of file +#> From 6ae58f4eaa6ff145abb2c7b3d6f64e43694f678d Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:28:37 -0700 Subject: [PATCH 23/36] Update VM OS Image (#16976) --- .../templates/stages/archetype-java-release-pom-only.yml | 4 ++-- eng/pipelines/templates/stages/archetype-java-release.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml index f048862cf43d6..730920e682b1f 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml @@ -60,7 +60,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: runOnce: deploy: @@ -81,7 +81,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: runOnce: deploy: diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 7b9048ce10963..f4ae987c344b3 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -101,7 +101,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: runOnce: deploy: @@ -122,7 +122,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: runOnce: deploy: @@ -163,7 +163,7 @@ stages: CIConfigs: "{'targets':[{'path_to_config':'package.json','mode':'Preview','monikerid':'1'},{'path_to_config':'package.json','mode':'Latest','monikerid':'0'}]}" skipComponentGovernanceDetection: true pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: runOnce: deploy: @@ -268,7 +268,7 @@ stages: value: https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-java-pr/maven/v1 pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 steps: - checkout: self path: azure-sdk-for-java From 18c303069b6a0e77b460d28c4da12f1a81f5eab3 Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Thu, 29 Oct 2020 16:43:00 -0700 Subject: [PATCH 24/36] Fix digital twins client not deserializing date times correctly (#16975) Also fix BasicDigitalTwinMetadata to use the DigitalTwinPropertyMetadata class --- .../digitaltwins/core/BasicDigitalTwinMetadata.java | 6 +++--- .../core/DigitalTwinPropertyMetadata.java | 4 +++- .../digitaltwins/core/DigitalTwinsAsyncClient.java | 6 ++++-- .../digitaltwins/core/ComponentSyncSamples.java | 12 +++++++++++- .../digitaltwins/core/DigitalTwinsTestBase.java | 3 ++- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java index 4eeb513d2a6a4..963dd912e9d71 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwinMetadata.java @@ -25,7 +25,7 @@ public final class BasicDigitalTwinMetadata { private String modelId; @JsonIgnore - private final Map propertyMetadata = new HashMap<>(); + private final Map propertyMetadata = new HashMap<>(); /** * Creates an instance of digital twin metadata. @@ -56,7 +56,7 @@ public BasicDigitalTwinMetadata setModelId(String modelId) { * @return The metadata about changes on properties on a component. */ @JsonAnyGetter - public Map getPropertyMetadata() { + public Map getPropertyMetadata() { return propertyMetadata; } @@ -68,7 +68,7 @@ public Map getPropertyMetadata() { * @return The BasicDigitalTwin object itself. */ @JsonAnySetter - public BasicDigitalTwinMetadata addPropertyMetadata(String key, Object value) { + public BasicDigitalTwinMetadata addPropertyMetadata(String key, DigitalTwinPropertyMetadata value) { this.propertyMetadata.put(key, value); return this; } diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java index fca1389b51f66..891169ecddfde 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinPropertyMetadata.java @@ -3,6 +3,7 @@ package com.azure.digitaltwins.core; +import com.azure.core.annotation.Fluent; import com.azure.digitaltwins.core.models.DigitalTwinsJsonPropertyNames; import com.fasterxml.jackson.annotation.JsonProperty; @@ -11,7 +12,8 @@ /** * Contains metadata about changes on properties on a digital twin or component. */ -public class DigitalTwinPropertyMetadata { +@Fluent +public final class DigitalTwinPropertyMetadata { @JsonProperty(value = DigitalTwinsJsonPropertyNames.METADATA_PROPERTY_LAST_UPDATE_TIME, required = true) private OffsetDateTime lastUpdatedOn; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java index 95c0b77ce0b0b..e445ab52a9438 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import reactor.core.publisher.Mono; import java.util.ArrayList; @@ -53,7 +54,7 @@ @ServiceClient(builder = DigitalTwinsClientBuilder.class, isAsync = true) public final class DigitalTwinsAsyncClient { private static final ClientLogger logger = new ClientLogger(DigitalTwinsAsyncClient.class); - private static final ObjectMapper mapper = new ObjectMapper(); + private ObjectMapper mapper; private final DigitalTwinsServiceVersion serviceVersion; private final AzureDigitalTwinsAPIImpl protocolLayer; private static final Boolean includeModelDefinitionOnGet = true; @@ -61,9 +62,10 @@ public final class DigitalTwinsAsyncClient { DigitalTwinsAsyncClient(String serviceEndpoint, HttpPipeline pipeline, DigitalTwinsServiceVersion serviceVersion, JsonSerializer jsonSerializer) { final SimpleModule stringModule = new SimpleModule("String Serializer"); - stringModule.addSerializer(new DigitalTwinsStringSerializer(String.class, mapper)); JacksonAdapter jacksonAdapter = new JacksonAdapter(); + mapper = jacksonAdapter.serializer(); // Use the same mapper in this layer that the generated layer will use + stringModule.addSerializer(new DigitalTwinsStringSerializer(String.class, mapper)); jacksonAdapter.serializer().registerModule(stringModule); this.serviceVersion = serviceVersion; diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java index b60698067d071..324dd08805d73 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/ComponentSyncSamples.java @@ -13,10 +13,15 @@ import com.azure.identity.ClientSecretCredentialBuilder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import javax.net.ssl.HttpsURLConnection; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Random; import java.util.function.Function; public class ComponentSyncSamples { @@ -46,6 +51,10 @@ public static void main(String[] args) throws IOException { .setLogLevel(parsedArguments.getHttpLogDetailLevel())) .buildClient(); + // This mapper gets used to deserialize a digital twin that has a date time within a property metadata, so it + // needs to have this module in order to correctly deserialize that date time + mapper.registerModule(new JavaTimeModule()); + runComponentSample(); } @@ -145,6 +154,7 @@ public static void runComponentSample() throws JsonProcessingException { ConsoleLogger.print("Retrieved component for digital twin " + basicDigitalTwinId + " :"); for (String key : getComponentResponse.getContents().keySet()) { ConsoleLogger.print("\t" + key + " : " + getComponentResponse.getContents().get(key)); + ConsoleLogger.print("\t\tLast updated on: " + getComponentResponse.getMetadata().get(key).getLastUpdatedOn()); } // Clean up diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java index 2a91f03d7d770..08a7fdc0441be 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java @@ -12,6 +12,7 @@ import com.azure.identity.ClientSecretCredentialBuilder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import reactor.core.publisher.Mono; import java.time.OffsetDateTime; @@ -125,6 +126,6 @@ public Mono getToken(TokenRequestContext tokenRequestContext) { // Used for converting json strings into BasicDigitalTwins, BasicRelationships, etc. static T deserializeJsonString(String rawJsonString, Class clazz) throws JsonProcessingException { - return new ObjectMapper().readValue(rawJsonString, clazz); + return new ObjectMapper().registerModule(new JavaTimeModule()).readValue(rawJsonString, clazz); } } From a300aa4f165005870e56f6a2a6e5c295645be807 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Thu, 29 Oct 2020 18:08:45 -0600 Subject: [PATCH 25/36] Addressing SpotBugs issues (#16894) * Addressing SpotBugs issues Co-authored-by: Victor Colin Amador --- .../resources/spotbugs/spotbugs-exclude.xml | 18 +++++++++++++++--- .../azure-security-keyvault-jca/pom.xml | 12 ++---------- .../keyvault/jca/KeyVaultKeyManager.java | 7 ++++++- .../keyvault/jca/KeyVaultKeyStore.java | 7 ++++--- .../keyvault/jca/model/CertificateBundle.java | 5 +++++ .../keyvault/jca/model/CertificateItem.java | 5 +++++ .../jca/model/CertificateListResult.java | 5 +++++ .../keyvault/jca/model/CertificatePolicy.java | 5 +++++ .../keyvault/jca/model/KeyProperties.java | 5 +++++ .../keyvault/jca/model/OAuthToken.java | 5 +++++ .../keyvault/jca/model/SecretBundle.java | 5 +++++ 11 files changed, 62 insertions(+), 17 deletions(-) diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml index 05a4da3620eee..61537fcf6e576 100755 --- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml +++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml @@ -2458,23 +2458,35 @@ - + - + - + + + + + + + + + + + + + diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index ec8978c88a2ab..e0afd670e7129 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -122,14 +122,6 @@ - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - true - - org.revapi revapi-maven-plugin @@ -148,12 +140,12 @@ 5.0.3 true     + org.conscrypt conscrypt-openjdk-uber - compile + provided 2.2.1 - true diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java index 1cf099d84b0f7..4e42e1505b564 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java @@ -50,7 +50,12 @@ public class KeyVaultKeyManager extends X509ExtendedKeyManager { public KeyVaultKeyManager(KeyStore keystore, char[] password) { LOGGER.entering("KeyVaultKeyManager", "", new Object[] { keystore, password }); this.keystore = keystore; - this.password = password; + if (password != null) { + this.password = new char[password.length]; + System.arraycopy(password, 0, this.password, 0, password.length); + } else { + this.password = null; + } } @Override diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java index 2f473d5013d91..5fc5d1ff27750 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java @@ -9,6 +9,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.security.Key; import java.security.KeyStore; import java.security.KeyStoreException; @@ -33,7 +34,7 @@ /** * The Azure Key Vault implementation of the KeyStoreSpi. */ -public class KeyVaultKeyStore extends KeyStoreSpi { +public final class KeyVaultKeyStore extends KeyStoreSpi { /** * Stores the logger. @@ -161,7 +162,7 @@ public Certificate[] engineGetCertificateChain(String alias) { @Override public Date engineGetCreationDate(String alias) { - return creationDate; + return new Date(creationDate.getTime()); } @Override @@ -274,7 +275,7 @@ private String[] getFilenames(String path) throws IOException { List filenames = new ArrayList<>(); try (InputStream in = getClass().getResourceAsStream(path)) { if (in != null) { - try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) { + try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) { String resource; while ((resource = br.readLine()) != null) { filenames.add(resource); diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java index f106f2d0fe8ed..9caa0759d8880 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateBundle.java @@ -9,6 +9,11 @@ * The CertificateBundle REST model. */ public class CertificateBundle implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the CER bytes. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java index aff9778a16639..7b98c945c1a84 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateItem.java @@ -9,6 +9,11 @@ * The CertificateItem REST model. */ public class CertificateItem implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the id. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java index 814b40dd666eb..bd71a4fc2f979 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificateListResult.java @@ -10,6 +10,11 @@ * The CertificateItem REST model. */ public class CertificateListResult implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the value. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java index a1eeff89c1d8b..f4bdb82f083ef 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/CertificatePolicy.java @@ -10,6 +10,11 @@ * The CertificatePolicy REST model. */ public class CertificatePolicy implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the key properties. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java index ccf41316f47b4..c374f0cc5f6a0 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/KeyProperties.java @@ -9,6 +9,11 @@ * The KeyProperties REST model. */ public class KeyProperties implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores if the key is exportable. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java index ae5624c373ea0..1841d960159dc 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/OAuthToken.java @@ -9,6 +9,11 @@ * An OAuth2 token. */ public class OAuthToken implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the access token. diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java index 250546a233b1e..7e77605c7d082 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java @@ -9,6 +9,11 @@ * The SecretBundle REST model. */ public class SecretBundle implements Serializable { + + /** + * Stores the serial version UID. + */ + private static final long serialVersionUID = 1L; /** * Stores the value. From a71780184547d4395bd31ae77ca10f1c83e35d5d Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:41:11 -0700 Subject: [PATCH 26/36] Add manual merge instructions to eng/common workflow (#16971) Co-authored-by: Mike Harder --- eng/common/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/README.md b/eng/common/README.md index 7bda6ec942087..f85e3396ae400 100644 --- a/eng/common/README.md +++ b/eng/common/README.md @@ -23,3 +23,4 @@ The 'Sync eng/common directory' PRs will be created in the language repositories 6. Sign off on CreateSyncPRs stage of the sync pipeline using the approval gate. This stage will create the **Sync PRs** in the various language repos. A link to each of the **Sync PRs** will show up in the **Tools PR** for you to click and review. 7. Go review and approve each of your **Sync PRs**. 8. Sign Off on the VerifyAndMerge stage. This will merge any remaining open **Sync PR** and also append `auto-merge` to the **Tools PR**. + * If a **Sync PR** has any failing checks, it will need to be manually merged, even if `/check-enforcer override` has been run ([azure-sdk-tools#1147](https://github.com/Azure/azure-sdk-tools/issues/1147)). From e42ac844b6554e5db71dbd8d19e06cfb2672c495 Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 18:07:28 -0700 Subject: [PATCH 27/36] Add PR Validation for Long Paths (#16980) * Shorten test name that is too long for Windows git * Disable long path validation and reverted OS image changes * Reenable length check with different base path length * Remove accidentally added file --- .../templates/jobs/archetype-sdk-client.yml | 7 +++- .../archetype-java-release-pom-only.yml | 4 +-- .../stages/archetype-java-release.yml | 8 ++--- ...VirtualMachineScaleSetOperationsTests.java | 36 ++++++++++--------- ...erentPoolOfZoneResilientLoadBalancer.json} | 0 5 files changed, 32 insertions(+), 23 deletions(-) rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json => VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json} (100%) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6b27ca53c68c2..ef89732b40cdc 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -170,6 +170,12 @@ jobs: Directory: sdk/${{ parameters.ServiceDirectory }} CheckLinkGuidance: $true + # Use BasePathLength of 38 instead of the default 49 as some GA'd files fail when the number is higher. + - template: /eng/common/pipelines/templates/steps/verify-path-length.yml + parameters: + SourceDirectory: $(Build.SourcesDirectory) + BasePathLength: 38 + - ${{if ne(parameters.SDKType, 'data')}}: - ${{ each artifact in parameters.Artifacts }}: - template: /eng/common/pipelines/templates/steps/verify-changelog.yml @@ -351,4 +357,3 @@ jobs: inputs: mergeTestResults: true testRunTitle: $(RunTitle) - \ No newline at end of file diff --git a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml index 730920e682b1f..f048862cf43d6 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml @@ -60,7 +60,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -81,7 +81,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index f4ae987c344b3..7b9048ce10963 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -101,7 +101,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -122,7 +122,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -163,7 +163,7 @@ stages: CIConfigs: "{'targets':[{'path_to_config':'package.json','mode':'Preview','monikerid':'1'},{'path_to_config':'package.json','mode':'Latest','monikerid':'0'}]}" skipComponentGovernanceDetection: true pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -268,7 +268,7 @@ stages: value: https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-java-pr/maven/v1 pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 steps: - checkout: self path: azure-sdk-for-java diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java index 18736030e9b37..953b5a5013214 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java @@ -10,7 +10,11 @@ import com.azure.core.http.HttpResponse; import com.azure.core.http.netty.NettyAsyncHttpClientBuilder; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.Region; import com.azure.core.management.SubResource; +import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.authorization.models.BuiltInRole; +import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.OperatingSystemTypes; import com.azure.resourcemanager.compute.models.PowerState; @@ -28,8 +32,6 @@ import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetSkuTypes; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetVM; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetVMs; -import com.azure.resourcemanager.authorization.models.BuiltInRole; -import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.keyvault.models.Secret; import com.azure.resourcemanager.keyvault.models.Vault; import com.azure.resourcemanager.network.models.ApplicationSecurityGroup; @@ -44,14 +46,20 @@ import com.azure.resourcemanager.network.models.SecurityRuleProtocol; import com.azure.resourcemanager.network.models.VirtualMachineScaleSetNetworkInterface; import com.azure.resourcemanager.network.models.VirtualMachineScaleSetNicIpConfiguration; +import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.test.utils.TestUtilities; -import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; -import com.azure.core.management.Region; -import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.storage.models.StorageAccount; import com.azure.resourcemanager.storage.models.StorageAccountKey; +import com.azure.resourcemanager.test.utils.TestUtilities; +import com.azure.storage.blob.BlobContainerClient; +import com.azure.storage.blob.BlobServiceClient; +import com.azure.storage.blob.BlobServiceClientBuilder; +import com.azure.storage.blob.specialized.BlockBlobClient; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.BufferedInputStream; import java.io.File; @@ -62,15 +70,6 @@ import java.util.List; import java.util.Map; -import com.azure.storage.blob.BlobContainerClient; -import com.azure.storage.blob.BlobServiceClient; -import com.azure.storage.blob.BlobServiceClientBuilder; -import com.azure.storage.blob.specialized.BlockBlobClient; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - public class VirtualMachineScaleSetOperationsTests extends ComputeManagementTest { private String rgName = ""; private final Region region = Region.US_WEST; @@ -724,9 +723,14 @@ public void canCreateVirtualMachineScaleSet() throws Exception { Assertions.assertTrue(nicCount > 0); } + /* + * Previously name + * canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer + * but this was too long for some OSes and would cause git checkout to fail. + */ @Test public void - canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer() + canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer() throws Exception { // Zone resilient resource -> resources deployed in all zones by the service and it will be served by all AZs // all the time. diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json From 996f3d1f40fd870f58add76903a7bf8d63f8733f Mon Sep 17 00:00:00 2001 From: timtay-microsoft Date: Thu, 29 Oct 2020 18:18:13 -0700 Subject: [PATCH 28/36] Add etag property to BasicRelationship (#16981) Also renamed property and setter/getter in BasicDigitalTwin to match it --- .../digitaltwins/core/BasicDigitalTwin.java | 10 ++++----- .../digitaltwins/core/BasicRelationship.java | 21 +++++++++++++++++++ .../core/RelationshipsSyncSamples.java | 4 +++- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java index 33d67cb6210fd..e36e2e5376822 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicDigitalTwin.java @@ -29,7 +29,7 @@ public final class BasicDigitalTwin { private String id; @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_ETAG, required = true) - private String twinETag; + private String etag; @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_METADATA, required = true) private BasicDigitalTwinMetadata metadata; @@ -62,16 +62,16 @@ public String getId() { * @return A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. */ public String getETag() { - return twinETag; + return etag; } /** * Sets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. - * @param twinETag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @param etag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. * @return The BasicDigitalTwin object itself. */ - public BasicDigitalTwin setETag(String twinETag) { - this.twinETag = twinETag; + public BasicDigitalTwin setETag(String etag) { + this.etag = etag; return this; } diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java index 2c7637a2eca62..bf305d5af8351 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/BasicRelationship.java @@ -37,6 +37,9 @@ public final class BasicRelationship { @JsonProperty(value = DigitalTwinsJsonPropertyNames.RELATIONSHIP_NAME, required = true) private String name; + @JsonProperty(value = DigitalTwinsJsonPropertyNames.DIGITAL_TWIN_ETAG) + private String etag; + @JsonIgnore private final Map properties = new HashMap<>(); @@ -94,6 +97,24 @@ public String getName() { return name; } + /** + * Gets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @return A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + */ + public String getETag() { + return etag; + } + + /** + * Sets a string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @param etag A string representing a weak ETag for the entity that this request performs an operation against, as per RFC7232. + * @return The BasicRelationship object itself. + */ + public BasicRelationship setETag(String etag) { + this.etag = etag; + return this; + } + /** * Gets the additional custom properties defined in the model. This field will contain any properties of the relationship that are not already defined by the other strong types of this class. * @return The additional custom properties defined in the model. This field will contain any properties of the relationship that are not already defined by the other strong types of this class. diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java index c5ada665870fc..699e3ba17e009 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java/com/azure/digitaltwins/core/RelationshipsSyncSamples.java @@ -120,7 +120,9 @@ public static void runRelationshipsSample() throws JsonProcessingException { BasicRelationship retrievedRelationship = getRelationshipResponse.getValue(); ConsoleLogger.printSuccess("Retrieved relationship: " + retrievedRelationship.getId() + " from twin: " + retrievedRelationship.getSourceId() + "\n\t" + "Prop1: " + retrievedRelationship.getProperties().get("Prop1") + "\n\t" + - "Prop2: " + retrievedRelationship.getProperties().get("Prop2")); + "Prop2: " + retrievedRelationship.getProperties().get("Prop2") + "\n"); + + ConsoleLogger.printSuccess("Retrieved relationship has ETag: " + retrievedRelationship.getETag() + "\n\t"); } ConsoleLogger.printHeader("List relationships"); From 945d7ddb9d7fdc96b334a5721bda4be2465c3b3a Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Thu, 29 Oct 2020 19:11:13 -0700 Subject: [PATCH 29/36] Test the common Generate_docindex scripts in each lang repo. (#16974) --- eng/docgeneration/Generate-DocIndex.ps1 | 282 +++++++++++------------- eng/pipelines/docindex.yml | 21 +- eng/scripts/Language-Settings.ps1 | 18 +- 3 files changed, 163 insertions(+), 158 deletions(-) diff --git a/eng/docgeneration/Generate-DocIndex.ps1 b/eng/docgeneration/Generate-DocIndex.ps1 index 3e939723413ee..b03f239c2f0f2 100644 --- a/eng/docgeneration/Generate-DocIndex.ps1 +++ b/eng/docgeneration/Generate-DocIndex.ps1 @@ -1,164 +1,150 @@ +# Generates an index page for cataloging different versions of the Docs [CmdletBinding()] Param ( + $DocFx, $RepoRoot, $DocGenDir ) - -Write-Verbose "Name Reccuring paths with variable names" -$DocFxTool = "${RepoRoot}/docfx/docfx.exe" -$DocOutDir = "${RepoRoot}/docfx_project" - -Write-Verbose "Initializing Default DocFx Site..." -& "${DocFxTool}" init -q -o "${DocOutDir}" - -Write-Verbose "Copying template and configuration..." -New-Item -Path "${DocOutDir}" -Name "templates" -ItemType "directory" -Copy-Item "${DocGenDir}/templates/*" -Destination "${DocOutDir}/templates" -Force -Recurse -Copy-Item "${DocGenDir}/docfx.json" -Destination "${DocOutDir}/" -Force - -Write-Verbose "Creating Index using service directory and package names from repo..." -# The service mapper is used to map the directory names to the service names to produce -# a more friendly index. If something isn't in the mapper then the default will just be -# the service name in all caps -$serviceMapHash = Get-Content -Path "${DocGenDir}/service-mapper.json" | ConvertFrom-Json -AsHashtable - -# There are some artifact that show up, due to the way we do discovery, that are never shipped. -# Keep a list of those here and anything we don't want to ship can be added to here which will -# cause them to get skipped when generating the DocIndex -$ArtifactsToSkip = ( -'azure-cosmos-benchmark', -'azure-sdk-template' -) - -# The list of services is being constructed from the directory list under the sdk folder -# which, right now, only contains client/data directories. When management is moved to -# the under sdk it'll automatically get picked up. -$ServiceListData = Get-ChildItem "${RepoRoot}/sdk" -Directory -$YmlPath = "${DocOutDir}/api" -New-Item -Path $YmlPath -Name "toc.yml" -Force -foreach ($Dir in $ServiceListData) -{ - $mappedDir = "" - if ($serviceMapHash.ContainsKey($Dir.Name)) - { - $mappedDir = $serviceMapHash[$Dir.Name] - } - else - { - $mappedDir = $Dir.Name.ToUpper() +. "${PSScriptRoot}\..\common\scripts\common.ps1" +$GetGithubIoDocIndexFn = "Get-${Language}-GithubIoDocIndex" + +# Given the metadata url under https://github.com/Azure/azure-sdk/tree/master/_data/releases/latest, +# the function will return the csv metadata back as part of response. +function Get-CSVMetadata ([string]$MetadataUri) { + $metadataResponse = Invoke-RestMethod -Uri $MetadataUri -method "GET" -MaximumRetryCount 3 -RetryIntervalSec 10 | ConvertFrom-Csv + return $metadataResponse +} + +# Given the github io blob storage url and language regex, +# the helper function will return a list of artifact names. +function Get-BlobStorage-Artifacts($blobStorageUrl, $blobDirectoryRegex, $blobArtifactsReplacement) { + LogDebug "Reading artifact from storage blob ..." + $returnedArtifacts = @() + $pageToken = "" + Do { + $resp = "" + if (!$pageToken) { + # First page call. + $resp = Invoke-RestMethod -Method Get -Uri $blobStorageUrl + } + else { + # Next page call + $blobStorageUrlPageToken = $blobStorageUrl + "&marker=$pageToken" + $resp = Invoke-RestMethod -Method Get -Uri $blobStorageUrlPageToken + } + # Convert to xml documents. + $xmlDoc = [xml](removeBomFromString $resp) + foreach ($elem in $xmlDoc.EnumerationResults.Blobs.BlobPrefix) { + # What service return like "dotnet/Azure.AI.Anomalydetector/", needs to fetch out "Azure.AI.Anomalydetector" + $artifact = $elem.Name -replace $blobDirectoryRegex, $blobArtifactsReplacement + $returnedArtifacts += $artifact + } + # Fetch page token + $pageToken = $xmlDoc.EnumerationResults.NextMarker + } while ($pageToken) + return $returnedArtifacts + } + +# The sequence of Bom bytes differs by different encoding. +# The helper function here is only to strip the utf-8 encoding system as it is used by blob storage list api. +# Return the original string if not in BOM utf-8 sequence. +function RemoveBomFromString([string]$bomAwareString) { + if ($bomAwareString.length -le 3) { + return $bomAwareString } - - # Store the list of artifacts into the arrays and write them into the .md file - # after processing the list of subdirectories. This will allow the correct - # division of the artifacts under the Client or Management headings - $clientArr = @() - $mgmtArr = @() - - $PkgList = Get-ChildItem $Dir.FullName -Directory -Exclude changelog, faq, .github, build - if (($PkgList | Measure-Object).count -eq 0) - { - continue + $bomPatternByteArray = [byte[]] (0xef, 0xbb, 0xbf) + # The default encoding for powershell is ISO-8859-1, so converting bytes with the encoding. + $bomAwareBytes = [Text.Encoding]::GetEncoding(28591).GetBytes($bomAwareString.Substring(0, 3)) + if (@(Compare-Object $bomPatternByteArray $bomAwareBytes -SyncWindow 0).Length -eq 0) { + return $bomAwareString.Substring(3) } - foreach ($Pkg in $PkgList) - { - # Load the pom file to pull the artifact name and grab the - # parent's relative path to see which parent pom is being - # used to determine whether or not the artifact is client - # or management. - $PomPath = Join-Path -Path $Pkg -ChildPath "pom.xml" - - # no pom file = nothing to process - if (Test-Path -path $PomPath) - { - $xml = New-Object xml - $xml.Load($PomPath) - - # Get the artifactId from the POM - $artifactId = $xml.project.artifactId - - $parent = $xml.project.parent.relativePath - - # If this is an artifact that isn't shipping then just - # move on to the next one - if ($ArtifactsToSkip -contains $artifactId) - { - Write-Output "skipping $artifactId" - continue - } - - # If the parent is null or empty then the pom isn't directly including - # one of the pom.[client|data|management].xml and needs to be specially - # handled - if (("" -eq $parent) -or ($null -eq $parent)) - { - # Cosmos has a root pom which includes pom.client.xml that won't - # be detected by this logic. It's easier to deal with specially - # than it is to try and climb the pom chain here. - if ($Dir.BaseName -eq 'cosmos') - { - $clientArr += $artifactId - } - else - { - Write-Host "*snowflake* Pom $PomPath, has a null or empty relative path." - } - } - else - { - if (($parent.IndexOf('azure-client-sdk-parent') -ne -1) -or ($parent.IndexOf('azure-data-sdk-parent') -ne -1)) - { - $clientArr += $artifactId - } - else - { - $mgmtArr += $artifactId - } + return $bomAwareString +} + +function Get-TocMapping { + Param ( + [Parameter(Mandatory = $true)] [Object[]] $metadata, + [Parameter(Mandatory = $true)] [String[]] $artifacts + ) + # Used for sorting the toc display order + $orderServiceMapping = @{} + + foreach ($artifact in $artifacts) { + $packageInfo = $metadata | ? {$_.Package -eq $artifact} + + if ($packageInfo -and $packageInfo[0].Hide -eq 'true') { + LogDebug "The artifact $artifact set 'Hide' to 'true'." + continue + } + $serviceName = "" + if (!$packageInfo -or !$packageInfo[0].ServiceName) { + LogWarning "There is no service name for artifact $artifact. Please check csv of Azure/azure-sdk/_data/release/latest repo if this is intended. " + # If no service name retrieved, print out warning message, and put it into Other page. + $serviceName = "Other" + } + else { + if ($packageInfo.Length -gt 1) { + LogWarning "There are more than 1 packages fetched out for artifact $artifact. Please check csv of Azure/azure-sdk/_data/release/latest repo if this is intended. " } + $serviceName = $packageInfo[0].ServiceName.Trim() } + $orderServiceMapping[$artifact] = $serviceName } - # Only create this if there's something to create - #if (($clientArr.Count -gt 0) -or ($mgmtArr.Count -gt 0)) - if ($clientArr.Count -gt 0) - { - New-Item -Path $YmlPath -Name "$($Dir.Name).md" -Force - Add-Content -Path "$($YmlPath)/toc.yml" -Value "- name: $($mappedDir)`r`n href: $($Dir.Name).md" - # loop through the arrays and add the appropriate artifacts under the appropriate headings - if ($clientArr.Count -gt 0) - { - Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "# Client Libraries" - foreach($lib in $clientArr) - { - Write-Host "Write $($lib) to $($Dir.Name).md" - Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "#### $lib" + return $orderServiceMapping +} + +function GenerateDocfxTocContent([Hashtable]$tocContent, [String]$lang) { + LogDebug "Start generating the docfx toc and build docfx site..." + $DocOutDir = "${RepoRoot}/docfx_project" + + LogDebug "Initializing Default DocFx Site..." + & $($DocFx) init -q -o "${DocOutDir}" + # The line below is used for testing in local + # docfx init -q -o "${DocOutDir}" + LogDebug "Copying template and configuration..." + New-Item -Path "${DocOutDir}" -Name "templates" -ItemType "directory" -Force + Copy-Item "${DocGenDir}/templates/*" -Destination "${DocOutDir}/templates" -Force -Recurse + Copy-Item "${DocGenDir}/docfx.json" -Destination "${DocOutDir}/" -Force + $YmlPath = "${DocOutDir}/api" + New-Item -Path $YmlPath -Name "toc.yml" -Force + $visitedService = @{} + # Sort and display toc service name by alphabetical order. + foreach ($serviceMapping in $tocContent.getEnumerator() | Sort Value) { + $artifact = $serviceMapping.Key + $serviceName = $serviceMapping.Value + $fileName = ($serviceName -replace '\s', '').ToLower().Trim() + if ($visitedService.ContainsKey($serviceName)) { + Add-Content -Path "$($YmlPath)/${fileName}.md" -Value "#### $artifact" + } + else { + Add-Content -Path "$($YmlPath)/toc.yml" -Value "- name: ${serviceName}`r`n href: ${fileName}.md" + New-Item -Path $YmlPath -Name "${fileName}.md" -Force + Add-Content -Path "$($YmlPath)/${fileName}.md" -Value "#### $artifact" + $visitedService[$serviceName] = $true } } - # For the moment there are no management docs and with the way some of the libraries - # in management are versioned is a bit wonky. They aren't versioned by releasing a new - # version with the same groupId/artifactId, they're versioned with the same artifactId - # and version with a different groupId and the groupId happens to include the date. For - # example, the artifact/version of azure-mgmt-storage:1.0.0-beta has several different - # groupIds. com.microsoft.azure.storage.v2016_01_01, com.microsoft.azure.storage.v2017_10_01, - # com.microsoft.azure.storage.v2018_11_01 etc. - #if ($mgmtArr.Count -gt 0) - #{ - # Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "# Management Libraries" - # foreach($lib in $mgmtArr) - # { - # Write-Output "Write $($lib) to $($Dir.Name).md" - # Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "#### $lib" - # } - #} - } -} -Write-Verbose "Creating Site Title and Navigation..." -New-Item -Path "${DocOutDir}" -Name "toc.yml" -Force -Add-Content -Path "${DocOutDir}/toc.yml" -Value "- name: Azure SDK for Java APIs`r`n href: api/`r`n homepage: api/index.md" + # Generate toc homepage. + LogDebug "Creating Site Title and Navigation..." + New-Item -Path "${DocOutDir}" -Name "toc.yml" -Force + Add-Content -Path "${DocOutDir}/toc.yml" -Value "- name: Azure SDK for $lang APIs`r`n href: api/`r`n homepage: api/index.md" -Write-Verbose "Copying root markdowns" -Copy-Item "$($RepoRoot)/README.md" -Destination "${DocOutDir}/api/index.md" -Force + LogDebug "Copying root markdowns" + Copy-Item "$($RepoRoot)/README.md" -Destination "${DocOutDir}/api/index.md" -Force + Copy-Item "$($RepoRoot)/CONTRIBUTING.md" -Destination "${DocOutDir}/api/CONTRIBUTING.md" -Force -Write-Verbose "Building site..." -& "${DocFxTool}" build "${DocOutDir}/docfx.json" + LogDebug "Building site..." + & $($DocFx) build "${DocOutDir}/docfx.json" + # The line below is used for testing in local + # docfx build "${DocOutDir}/docfx.json" + Copy-Item "${DocGenDir}/assets/logo.svg" -Destination "${DocOutDir}/_site/" -Force +} -Copy-Item "${DocGenDir}/assets/logo.svg" -Destination "${DocOutDir}/_site/" -Force \ No newline at end of file +if ((Get-ChildItem -Path Function: | ? { $_.Name -eq $GetGithubIoDocIndexFn }).Count -gt 0) +{ + &$GetGithubIoDocIndexFn +} +else +{ + LogWarning "The function '$GetGithubIoDocIndexFn' was not found." +} \ No newline at end of file diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml index 49ff9d7cb1d64..0fa45efa9a207 100644 --- a/eng/pipelines/docindex.yml +++ b/eng/pipelines/docindex.yml @@ -10,21 +10,24 @@ jobs: inputs: versionSpec: '3.6' - - template: /eng/common/pipelines/templates/steps/replace-relative-links.yml - parameters: - TargetFolder: . - RootFolder: . - BuildSHA: $(Build.SourceVersion) - - pwsh: | Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v2.43.2/docfx.zip" ` - -OutFile "docfx.zip" | Wait-Process; Expand-Archive -Path "docfx.zip" -DestinationPath "./docfx/" + -OutFile "docfx.zip" | Wait-Process; Expand-Archive -Path "docfx.zip" -DestinationPath ./docfx + echo "##vso[task.setvariable variable=docfxPath;isOutput=true]$(Build.SourcesDirectory)/docfx/docfx.exe" workingDirectory: $(Build.SourcesDirectory) displayName: Download and Extract DocFX + name: setupDocfxTool - - pwsh: | - $(Build.SourcesDirectory)/eng/docgeneration/Generate-DocIndex.ps1 -RepoRoot $(Build.SourcesDirectory) -DocGenDir "$(Build.SourcesDirectory)/eng/docgeneration" -verbose + - task: PowerShell@2 displayName: 'Generate Doc Index' + inputs: + pwsh: true + filePath: $(Build.SourcesDirectory)/eng/docgeneration/Generate-DocIndex.ps1 + arguments: > + -Docfx $(setupDocfxTool.docfxPath) + -RepoRoot $(Build.SourcesDirectory) + -DocGenDir "$(Build.SourcesDirectory)/eng/docgeneration" + -verbose - task: UsePythonVersion@0 displayName: 'Use Python 3.6' diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 2ae35484ae759..19f906ece0dcb 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -2,6 +2,7 @@ $Language = "java" $PackageRepository = "Maven" $packagePattern = "*.pom" $MetadataUri = "https://raw.githubusercontent.com/Azure/azure-sdk/master/_data/releases/latest/java-packages.csv" +$BlobStorageUrl = "https://azuresdkdocs.blob.core.windows.net/%24web?restype=container&comp=list&prefix=java%2F&delimiter=%2F" function Get-java-PackageInfoFromRepo ($pkgPath, $serviceDirectory, $pkgName) { @@ -152,4 +153,19 @@ function Publish-java-GithubIODocs ($DocLocation, $PublicArtifactLocation) } } } -} \ No newline at end of file +} + +function Get-java-GithubIoDocIndex() { + # Fetch out all package metadata from csv file. + $metadata = Get-CSVMetadata -MetadataUri $MetadataUri + # Leave the track 2 packages if multiple packages fetched out. + $clientPackages = $metadata | Where-Object { $_.GroupId -eq 'com.azure' } + $nonClientPackages = $metadata | Where-Object { $_.GroupId -ne 'com.azure' -and !$clientPackages.Package.Contains($_.Package) } + $uniquePackages = $clientPackages + $nonClientPackages + # Get the artifacts name from blob storage + $artifacts = Get-BlobStorage-Artifacts -blobStorageUrl $BlobStorageUrl -blobDirectoryRegex "^java/(.*)/$" -blobArtifactsReplacement '$1' + # Build up the artifact to service name mapping for GithubIo toc. + $tocContent = Get-TocMapping -metadata $uniquePackages -artifacts $artifacts + # Generate yml/md toc files and build site. + GenerateDocfxTocContent -tocContent $tocContent -lang "Java" +} From 4ed9c17986f2282df20ec0cc88ef1f4aade7adee Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 30 Oct 2020 10:19:33 +0800 Subject: [PATCH 30/36] mgmt, appservice onedeploy (#16957) * support onedeploy * add live test for onedeploy * changelog --- .../CHANGELOG.md | 1 + .../implementation/DeploymentSlotImpl.java | 59 +++++++++++ .../appservice/implementation/KuduClient.java | 100 +++++++++--------- .../appservice/implementation/WebAppImpl.java | 60 +++++++++++ .../appservice/models/DeployOptions.java | 75 +++++++++++++ .../appservice/models/DeployType.java | 72 +++++++++++++ .../appservice/models/DeploymentSlot.java | 1 + .../appservice/models/SupportsOneDeploy.java | 91 ++++++++++++++++ .../appservice/models/WebApp.java | 2 +- .../appservice/OneDeployTests.java | 47 ++++++++ 10 files changed, 458 insertions(+), 50 deletions(-) create mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployOptions.java create mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployType.java create mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/SupportsOneDeploy.java create mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md index cbdafd04c20a5..7751255bcfd94 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md @@ -2,6 +2,7 @@ ## 2.1.0-beta.1 (Unreleased) +- Supported OneDeploy feature ## 2.0.0 (2020-10-19) diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/DeploymentSlotImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/DeploymentSlotImpl.java index 8d0b26b13dd78..ad82bb6ac6904 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/DeploymentSlotImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/DeploymentSlotImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.appservice.implementation; +import com.azure.resourcemanager.appservice.models.DeployOptions; +import com.azure.resourcemanager.appservice.models.DeployType; import com.azure.resourcemanager.appservice.models.DeploymentSlot; import com.azure.resourcemanager.appservice.models.DeploymentSlotBase; import com.azure.resourcemanager.appservice.models.WebApp; @@ -12,6 +14,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.util.Objects; import reactor.core.publisher.Mono; @@ -113,4 +116,60 @@ public Mono zipDeployAsync(File zipFile) { return Mono.error(e); } } + + @Override + public void deploy(DeployType type, File file) { + deployAsync(type, file).block(); + } + + @Override + public Mono deployAsync(DeployType type, File file) { + return deployAsync(type, file, new DeployOptions()); + } + + @Override + public void deploy(DeployType type, File file, DeployOptions deployOptions) { + deployAsync(type, file, deployOptions).block(); + } + + @Override + public Mono deployAsync(DeployType type, File file, DeployOptions deployOptions) { + Objects.requireNonNull(type); + Objects.requireNonNull(file); + if (deployOptions == null) { + deployOptions = new DeployOptions(); + } + try { + return kuduClient.deployAsync(type, file, + deployOptions.path(), deployOptions.restartSite(), deployOptions.cleanDeployment()); + } catch (IOException e) { + return Mono.error(e); + } + } + + @Override + public void deploy(DeployType type, InputStream file, long length) { + deployAsync(type, file, length).block(); + } + + @Override + public Mono deployAsync(DeployType type, InputStream file, long length) { + return deployAsync(type, file, length, new DeployOptions()); + } + + @Override + public void deploy(DeployType type, InputStream file, long length, DeployOptions deployOptions) { + deployAsync(type, file, length, deployOptions).block(); + } + + @Override + public Mono deployAsync(DeployType type, InputStream file, long length, DeployOptions deployOptions) { + Objects.requireNonNull(type); + Objects.requireNonNull(file); + if (deployOptions == null) { + deployOptions = new DeployOptions(); + } + return kuduClient.deployAsync(type, file, length, + deployOptions.path(), deployOptions.restartSite(), deployOptions.cleanDeployment()); + } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/KuduClient.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/KuduClient.java index 11d925f161712..1689de1ffde6f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/KuduClient.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/KuduClient.java @@ -17,21 +17,21 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.rest.RestProxy; import com.azure.core.http.rest.StreamResponse; -import com.azure.core.management.exception.ManagementException; import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.resourcemanager.appservice.models.DeployType; import com.azure.resourcemanager.appservice.models.KuduAuthenticationPolicy; import com.azure.resourcemanager.appservice.models.WebAppBase; import com.azure.resourcemanager.resources.fluentcore.policy.AuthenticationPolicy; import com.azure.resourcemanager.resources.fluentcore.policy.AuxiliaryAuthenticationPolicy; import com.azure.resourcemanager.resources.fluentcore.policy.ProviderRegistrationPolicy; -import com.fasterxml.jackson.core.JsonParseException; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.SocketTimeoutException; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousFileChannel; import java.nio.charset.StandardCharsets; @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.concurrent.TimeoutException; import reactor.core.Exceptions; import reactor.core.publisher.Flux; @@ -87,38 +88,18 @@ class KuduClient { @Host("{$host}") @ServiceInterface(name = "KuduService") private interface KuduService { - @Headers({ - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps streamApplicationLogs", - "x-ms-body-logging: false" - }) @Get("api/logstream/application") Mono streamApplicationLogs(@HostParam("$host") String host); - @Headers({ - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps streamHttpLogs", - "x-ms-body-logging: false" - }) @Get("api/logstream/http") Mono streamHttpLogs(@HostParam("$host") String host); - @Headers({ - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps streamTraceLogs", - "x-ms-body-logging: false" - }) @Get("api/logstream/kudu/trace") Mono streamTraceLogs(@HostParam("$host") String host); - @Headers({ - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps streamDeploymentLogs", - "x-ms-body-logging: false" - }) @Get("api/logstream/kudu/deployment") Mono streamDeploymentLogs(@HostParam("$host") String host); - @Headers({ - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps streamAllLogs", - "x-ms-body-logging: false" - }) @Get("api/logstream") Mono streamAllLogs(@HostParam("$host") String host); @@ -133,11 +114,7 @@ private interface KuduService { // @BodyParam("application/octet-stream") byte[] warFile, // @QueryParam("name") String appName); - @Headers({ - "Content-Type: application/octet-stream", - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps warDeploy", - "x-ms-body-logging: false" - }) + @Headers({"Content-Type: application/octet-stream"}) @Post("api/wardeploy") Mono warDeploy( @HostParam("$host") String host, @@ -155,16 +132,22 @@ Mono warDeploy( // @HostParam("$host") String host, // @BodyParam("application/octet-stream") byte[] zipFile); - @Headers({ - "Content-Type: application/octet-stream", - "x-ms-logging-context: com.microsoft.azure.management.appservice.WebApps zipDeploy", - "x-ms-body-logging: false" - }) + @Headers({"Content-Type: application/octet-stream"}) @Post("api/zipdeploy") Mono zipDeploy( @HostParam("$host") String host, @BodyParam("application/octet-stream") Flux zipFile, @HeaderParam("content-length") long size); + + @Headers({"Content-Type: application/octet-stream"}) + @Post("api/publish") + Mono deploy(@HostParam("$host") String host, + @BodyParam("application/octet-stream") Flux file, + @HeaderParam("content-length") long size, + @QueryParam("type") DeployType type, + @QueryParam("path") String path, + @QueryParam("restart") Boolean restart, + @QueryParam("clean") Boolean clean); } Flux streamApplicationLogsAsync() { @@ -266,19 +249,19 @@ private static int findByte(ByteBuffer byteBuffer, byte b) { Mono warDeployAsync(InputStream warFile, long length, String appName) { Flux flux = FluxUtil.toFluxByteBuffer(warFile); - return withRetry(service.warDeploy(host, flux, length, appName)); + return retryOnError(service.warDeploy(host, flux, length, appName)); } Mono warDeployAsync(File warFile, String appName) throws IOException { AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(warFile.toPath(), StandardOpenOption.READ); - return withRetry(service.warDeploy(host, FluxUtil.readFile(fileChannel), fileChannel.size(), appName) + return retryOnError(service.warDeploy(host, FluxUtil.readFile(fileChannel), fileChannel.size(), appName)) .doFinally(ignored -> { try { fileChannel.close(); } catch (IOException e) { logger.logThrowableAsError(e); } - })); + }); } // Mono zipDeployAsync(InputStream zipFile) { @@ -292,19 +275,41 @@ Mono warDeployAsync(File warFile, String appName) throws IOException { Mono zipDeployAsync(InputStream zipFile, long length) { Flux flux = FluxUtil.toFluxByteBuffer(zipFile); - return withRetry(service.zipDeploy(host, flux, length)); + return retryOnError(service.zipDeploy(host, flux, length)); } Mono zipDeployAsync(File zipFile) throws IOException { AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(zipFile.toPath(), StandardOpenOption.READ); - return withRetry(service.zipDeploy(host, FluxUtil.readFile(fileChannel), fileChannel.size()) + return retryOnError(service.zipDeploy(host, FluxUtil.readFile(fileChannel), fileChannel.size())) + .doFinally(ignored -> { + try { + fileChannel.close(); + } catch (IOException e) { + logger.logThrowableAsError(e); + } + }); + } + + Mono deployAsync(DeployType type, + InputStream file, long length, + String path, Boolean restart, Boolean clean) { + Flux flux = FluxUtil.toFluxByteBuffer(file); + return retryOnError(service.deploy(host, flux, length, type, path, restart, clean)); + } + + Mono deployAsync(DeployType type, + File file, + String path, Boolean restart, Boolean clean) throws IOException { + AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(file.toPath(), StandardOpenOption.READ); + return retryOnError(service.deploy(host, FluxUtil.readFile(fileChannel), fileChannel.size(), + type, path, restart, clean)) .doFinally(ignored -> { try { fileChannel.close(); } catch (IOException e) { logger.logThrowableAsError(e); } - })); + }); } // private InputStreamFlux fluxFromInputStream(InputStream inputStream) { @@ -338,26 +343,23 @@ Mono zipDeployAsync(File zipFile) throws IOException { // private long size; // } - private Mono withRetry(Mono observable) { + private Mono retryOnError(Mono observable) { + final int retryCount = 5 + 1; // retryCount is 5, last 1 is guard return observable .retryWhen(Retry.withThrowable( flux -> flux .zipWith( - Flux.range(1, 6), - (Throwable throwable, Integer integer) -> { - if (throwable instanceof ManagementException - && ((ManagementException) throwable).getResponse().getStatusCode() == 502 - || throwable instanceof JsonParseException -// || throwable instanceof TimeoutException -// || throwable instanceof SocketTimeoutException - ) { - return integer; + Flux.range(1, retryCount), + (Throwable throwable, Integer count) -> { + if (count < retryCount + && (throwable instanceof TimeoutException + || throwable instanceof SocketTimeoutException)) { + return count; } else { throw logger.logExceptionAsError(Exceptions.propagate(throwable)); } }) .flatMap(i -> Mono.delay(Duration.ofSeconds(((long) i) * 10))))); } - } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppImpl.java index 81b2cf9267aa4..feab1b1619fd2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppImpl.java @@ -5,6 +5,8 @@ import com.azure.resourcemanager.appservice.AppServiceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; +import com.azure.resourcemanager.appservice.models.DeployOptions; +import com.azure.resourcemanager.appservice.models.DeployType; import com.azure.resourcemanager.appservice.models.DeploymentSlots; import com.azure.resourcemanager.appservice.models.OperatingSystem; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -21,6 +23,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.HashMap; +import java.util.Objects; + import reactor.core.publisher.Mono; /** The implementation for WebApp. */ @@ -278,4 +282,60 @@ Mono listMetadata() { Mono updateMetadata(StringDictionaryInner inner) { return this.manager().serviceClient().getWebApps().updateMetadataAsync(resourceGroupName(), name(), inner); } + + @Override + public void deploy(DeployType type, File file) { + deployAsync(type, file).block(); + } + + @Override + public Mono deployAsync(DeployType type, File file) { + return deployAsync(type, file, new DeployOptions()); + } + + @Override + public void deploy(DeployType type, File file, DeployOptions deployOptions) { + deployAsync(type, file, deployOptions).block(); + } + + @Override + public Mono deployAsync(DeployType type, File file, DeployOptions deployOptions) { + Objects.requireNonNull(type); + Objects.requireNonNull(file); + if (deployOptions == null) { + deployOptions = new DeployOptions(); + } + try { + return kuduClient.deployAsync(type, file, + deployOptions.path(), deployOptions.restartSite(), deployOptions.cleanDeployment()); + } catch (IOException e) { + return Mono.error(e); + } + } + + @Override + public void deploy(DeployType type, InputStream file, long length) { + deployAsync(type, file, length).block(); + } + + @Override + public Mono deployAsync(DeployType type, InputStream file, long length) { + return deployAsync(type, file, length, new DeployOptions()); + } + + @Override + public void deploy(DeployType type, InputStream file, long length, DeployOptions deployOptions) { + deployAsync(type, file, length, deployOptions).block(); + } + + @Override + public Mono deployAsync(DeployType type, InputStream file, long length, DeployOptions deployOptions) { + Objects.requireNonNull(type); + Objects.requireNonNull(file); + if (deployOptions == null) { + deployOptions = new DeployOptions(); + } + return kuduClient.deployAsync(type, file, length, + deployOptions.path(), deployOptions.restartSite(), deployOptions.cleanDeployment()); + } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployOptions.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployOptions.java new file mode 100644 index 0000000000000..f4c3bc983753b --- /dev/null +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployOptions.java @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.resourcemanager.appservice.models; + +/** + * The options for OneDeploy. + */ +public class DeployOptions { + + private String path; + private Boolean restartSite; + private Boolean cleanDeployment; + + /** + * @return the path for deploy + */ + public String path() { + return path; + } + + /** + * Specifies the path for deploy. Some some deploy type, path is required. + * + * @param path the path for deploy + * @return the DeployOptions object + */ + public DeployOptions withPath(String path) { + this.path = path; + return this; + } + + /** + * @return whether to restart site after deployment + */ + public Boolean restartSite() { + return restartSite; + } + + /** + * Specifies whether to restart site after deployment. + * + * By default, any OneDeploy call will restart the site. This behavior can be altered by this option. + * + * @param restartSite whether to restart side after deployment + * @return the DeployOptions object + */ + public DeployOptions withRestartSite(Boolean restartSite) { + this.restartSite = restartSite; + return this; + } + + /** + * @return whether to perform clean deployment + */ + public Boolean cleanDeployment() { + return cleanDeployment; + } + + /** + * Specifies whether to perform clean deployment. + * + * By default {@code type=zip} and {@code type=war&path=webapps/} performs clean deployment. + * All other types of artifacts will be deployed incrementally. + * The default behavior for any artifact type can be changed by this option. + * A clean deployment nukes the default directory associated with the type of artifact being deployed. + * + * @param cleanDeployment whether to perform clean deployment + * @return the DeployOptions object + */ + public DeployOptions withCleanDeployment(Boolean cleanDeployment) { + this.cleanDeployment = cleanDeployment; + return this; + } +} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployType.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployType.java new file mode 100644 index 0000000000000..71318aad4db0f --- /dev/null +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeployType.java @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.resourcemanager.appservice.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; + +import java.util.Collection; + +/** + * OneDeploy type. + */ +public class DeployType extends ExpandableStringEnum { + + /** + * Deploy the war file to {@code /home/site/wwwroot/app.war}. + * + * If {@code DeployOptions.path} is provided, {@code path=webapps/} will behave exactly like wardeploy by + * unzipping app to {@code /home/site/wwwroot/webapps/}. + */ + public static final DeployType WAR = fromString("war"); + + /** + * Deploy the jar file to {@code /home/site/wwwroot/app.jar}. + */ + public static final DeployType JAR = fromString("jar"); + + /** + * Deploy the ear file to {@code /home/site/wwwroot/app.ear}. + */ + public static final DeployType EAR = fromString("ear"); + + /** + * Deploy the jar to {@code /home/site/libs}. {@code DeployOptions.path} parameter needs to be specified. + */ + public static final DeployType JAR_LIB = fromString("lib"); + + /** + * Deploy the static file to {@code /home/site/wwwroot/}. + * {@code DeployOptions.path} parameter needs to be specified. + */ + public static final DeployType STATIC = fromString("static"); + + /** + * Deploy the script as startup.sh (Linux) or startup.cmd (Windows) to {@code /home/site/scripts/}. + * {@code DeployOptions.path} parameter is not supported. + */ + public static final DeployType SCRIPT_STARTUP = fromString("startup"); + + /** + * unzip the zip to {@code /home/site/wwwroot}. {@code DeployOptions.path} parameter is optional. + */ + public static final DeployType ZIP = fromString("zip"); + + /** + * Creates or finds a DeployType from its string representation. + * @param name a name to look for + * @return the corresponding DeployType + */ + @JsonCreator + public static DeployType fromString(String name) { + return fromString(name, DeployType.class); + } + + /** + * @return known DeployType type values + */ + public static Collection values() { + return values(DeployType.class); + } +} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeploymentSlot.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeploymentSlot.java index d2ff013ac38e5..1e522cc6c7ff6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeploymentSlot.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/DeploymentSlot.java @@ -19,6 +19,7 @@ public interface DeploymentSlot extends IndependentChildResource, WebDeploymentSlotBasic, + SupportsOneDeploy, DeploymentSlotBase, Updatable>, HasParent { diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/SupportsOneDeploy.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/SupportsOneDeploy.java new file mode 100644 index 0000000000000..1c00dc7459d6e --- /dev/null +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/SupportsOneDeploy.java @@ -0,0 +1,91 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.resourcemanager.appservice.models; + +import reactor.core.publisher.Mono; + +import java.io.File; +import java.io.InputStream; + +/** + * Provides access to OneDeploy. + */ +public interface SupportsOneDeploy { + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + */ + void deploy(DeployType type, File file); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @return the completable of the operation + */ + Mono deployAsync(DeployType type, File file); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param deployOptions the deploy options + */ + void deploy(DeployType type, File file, DeployOptions deployOptions); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param deployOptions the deploy options + * @return the completable of the operation + */ + Mono deployAsync(DeployType type, File file, DeployOptions deployOptions); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param length the length of the file + */ + void deploy(DeployType type, InputStream file, long length); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param length the length of the file + * @return the completable of the operation + */ + Mono deployAsync(DeployType type, InputStream file, long length); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param length the length of the file + * @param deployOptions the deploy options + */ + void deploy(DeployType type, InputStream file, long length, DeployOptions deployOptions); + + /** + * Deploy a file to Azure site. + * + * @param type the deploy type + * @param file the file to upload + * @param length the length of the file + * @param deployOptions the deploy options + * @return the completable of the operation + */ + Mono deployAsync(DeployType type, InputStream file, long length, DeployOptions deployOptions); +} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/WebApp.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/WebApp.java index 88ce8a6ac8325..7f6f34b575be9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/WebApp.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/WebApp.java @@ -15,7 +15,7 @@ /** An immutable client-side representation of an Azure Web App. */ @Fluent -public interface WebApp extends WebAppBasic, WebAppBase, Updatable { +public interface WebApp extends WebAppBasic, SupportsOneDeploy, WebAppBase, Updatable { /** @return the entry point to deployment slot management API under the web app */ DeploymentSlots deploymentSlots(); diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java new file mode 100644 index 0000000000000..b87bc155ddc13 --- /dev/null +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.resourcemanager.appservice; + +import com.azure.core.management.Region; +import com.azure.core.test.annotation.DoNotRecord; +import com.azure.resourcemanager.appservice.models.DeployType; +import com.azure.resourcemanager.appservice.models.JavaVersion; +import com.azure.resourcemanager.appservice.models.PricingTier; +import com.azure.resourcemanager.appservice.models.WebApp; +import com.azure.resourcemanager.appservice.models.WebContainer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.File; + +public class OneDeployTests extends AppServiceTest { + + @Test + @DoNotRecord + public void canDeployZip() throws Exception { + if (skipInPlayback()) { + return; + } + + String webAppName1 = generateRandomResourceName("webapp", 10); + + WebApp webApp1 = + appServiceManager + .webApps() + .define(webAppName1) + .withRegion(Region.US_CENTRAL) + .withNewResourceGroup(rgName) + .withNewWindowsPlan(PricingTier.BASIC_B1) + .withJavaVersion(JavaVersion.JAVA_8_NEWEST) + .withWebContainer(WebContainer.TOMCAT_8_5_NEWEST) + .withHttpsOnly(true) + .create(); + + File zipFile = new File(OneDeployTests.class.getResource("/webapps.zip").getPath()); + webApp1.deploy(DeployType.ZIP, zipFile); + + String response = curl("https://" + webAppName1 + ".azurewebsites.net/" + "helloworld/").getValue(); + Assertions.assertTrue(response.contains("Hello")); + } +} From 8152105ff50e9bf3022c4b8457c3fb53b0cafbec Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 29 Oct 2020 21:21:31 -0700 Subject: [PATCH 31/36] Increment version for core releases (#17004) * Increment package version after release of com.azure azure-core * Increment package version after release of com.azure azure-core-test * Increment package version after release of com.azure azure-core-experimental * Increment package version after release of com.azure azure-core-http-okhttp * Increment package version after release of com.azure azure-core-serializer-avro-apache * Increment package version after release of com.azure azure-core-http-netty * Increment package version after release of com.azure azure-core-serializer-json-jackson * Increment package version after release of com.azure azure-core-serializer-json-gson * Removed unreleased azure-core version Co-authored-by: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> --- common/perf-test-core/pom.xml | 2 +- eng/jacoco-test-coverage/pom.xml | 14 +++++++------- eng/versioning/version_client.txt | 17 ++++++++--------- .../azure-ai-anomalydetector/pom.xml | 6 +++--- .../azure-data-appconfiguration/pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../azure-communication-administration/pom.xml | 6 +++--- .../azure-communication-chat/pom.xml | 6 +++--- .../azure-communication-common/pom.xml | 4 ++-- .../azure-communication-sms/pom.xml | 6 +++--- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-experimental/CHANGELOG.md | 3 +++ sdk/core/azure-core-experimental/pom.xml | 4 ++-- sdk/core/azure-core-http-jdk-httpclient/pom.xml | 8 ++++---- sdk/core/azure-core-http-netty/CHANGELOG.md | 3 +++ sdk/core/azure-core-http-netty/pom.xml | 10 +++++----- sdk/core/azure-core-http-okhttp/CHANGELOG.md | 3 +++ sdk/core/azure-core-http-okhttp/pom.xml | 10 +++++----- sdk/core/azure-core-management/pom.xml | 4 ++-- .../CHANGELOG.md | 3 +++ .../azure-core-serializer-avro-apache/pom.xml | 6 +++--- .../azure-core-serializer-avro-jackson/pom.xml | 4 ++-- .../CHANGELOG.md | 3 +++ .../azure-core-serializer-json-gson/pom.xml | 4 ++-- .../CHANGELOG.md | 3 +++ .../azure-core-serializer-json-jackson/pom.xml | 4 ++-- sdk/core/azure-core-test/CHANGELOG.md | 3 +++ sdk/core/azure-core-test/pom.xml | 4 ++-- .../azure-core-tracing-opentelemetry/pom.xml | 4 ++-- sdk/core/azure-core/CHANGELOG.md | 3 +++ sdk/core/azure-core/pom.xml | 2 +- sdk/cosmos/azure-cosmos/pom.xml | 4 ++-- .../azure-digitaltwins-core/pom.xml | 8 ++++---- sdk/e2e/pom.xml | 6 +++--- sdk/eventgrid/azure-messaging-eventgrid/pom.xml | 8 ++++---- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 4 ++-- .../azure-ai-formrecognizer/pom.xml | 8 ++++---- sdk/identity/azure-identity/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 8 ++++---- .../azure-security-keyvault-keys/pom.xml | 8 ++++---- .../azure-security-keyvault-secrets/pom.xml | 8 ++++---- .../microsoft-azure-loganalytics/pom.xml | 2 +- .../azure-ai-metricsadvisor/pom.xml | 8 ++++---- .../pom.xml | 6 +++--- .../azure-resourcemanager-appplatform/pom.xml | 2 +- .../azure-resourcemanager-appservice/pom.xml | 2 +- .../azure-resourcemanager-authorization/pom.xml | 2 +- .../azure-resourcemanager-cdn/pom.xml | 2 +- .../azure-resourcemanager-compute/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-cosmos/pom.xml | 2 +- .../azure-resourcemanager-dns/pom.xml | 2 +- .../azure-resourcemanager-eventhubs/pom.xml | 2 +- .../azure-resourcemanager-keyvault/pom.xml | 2 +- .../azure-resourcemanager-monitor/pom.xml | 2 +- .../azure-resourcemanager-msi/pom.xml | 2 +- .../azure-resourcemanager-network/pom.xml | 2 +- .../azure-resourcemanager-privatedns/pom.xml | 2 +- .../azure-resourcemanager-redis/pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 4 ++-- .../azure-resourcemanager-servicebus/pom.xml | 2 +- .../azure-resourcemanager-sql/pom.xml | 2 +- .../azure-resourcemanager-storage/pom.xml | 2 +- .../azure-resourcemanager-test/pom.xml | 6 +++--- .../pom.xml | 2 +- .../azure-resourcemanager/pom.xml | 2 +- .../azure-data-schemaregistry-avro/pom.xml | 2 +- .../azure-data-schemaregistry/pom.xml | 4 ++-- sdk/search/azure-search-documents/pom.xml | 8 ++++---- .../azure-messaging-servicebus/pom.xml | 8 ++++---- sdk/storage/azure-storage-blob-batch/pom.xml | 6 +++--- .../azure-storage-blob-changefeed/pom.xml | 6 +++--- .../azure-storage-blob-cryptography/pom.xml | 6 +++--- sdk/storage/azure-storage-blob-nio/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 6 +++--- sdk/storage/azure-storage-common/pom.xml | 6 +++--- sdk/storage/azure-storage-file-datalake/pom.xml | 4 ++-- sdk/storage/azure-storage-file-share/pom.xml | 4 ++-- sdk/storage/azure-storage-queue/pom.xml | 6 +++--- sdk/tables/azure-data-tables/pom.xml | 4 ++-- sdk/template/azure-sdk-template/pom.xml | 2 +- .../azure-ai-textanalytics/pom.xml | 8 ++++---- 85 files changed, 206 insertions(+), 183 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 3b4b8cf167830..71370bd057e11 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -78,7 +78,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index dd8963ecfa6a2..fa54bb0a6f3f8 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -79,7 +79,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.azure @@ -94,7 +94,7 @@ com.azure azure-core-experimental - 1.0.0-beta.8 + 1.0.0-beta.9 com.azure @@ -104,12 +104,12 @@ com.azure azure-core-http-netty - 1.6.3 + 1.7.0-beta.1 com.azure azure-core-http-okhttp - 1.3.3 + 1.4.0-beta.1 com.azure @@ -119,17 +119,17 @@ com.azure azure-core-serializer-avro-apache - 1.0.0-beta.5 + 1.0.0-beta.6 com.azure azure-core-serializer-json-gson - 1.0.3 + 1.1.0-beta.1 com.azure azure-core-serializer-json-jackson - 1.1.0 + 1.2.0-beta.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 771188a9ae5ba..f9d89d18ea30c 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -12,19 +12,19 @@ com.azure:azure-communication-chat;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-common;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-administration;1.0.0-beta.2;1.0.0-beta.3 com.azure:azure-communication-sms;1.0.0-beta.2;1.0.0-beta.3 -com.azure:azure-core;1.9.0;1.10.0 +com.azure:azure-core;1.10.0;1.11.0-beta.1 com.azure:azure-core-amqp;1.6.0;1.7.0-beta.1 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-experimental;1.0.0-beta.7;1.0.0-beta.8 +com.azure:azure-core-experimental;1.0.0-beta.8;1.0.0-beta.9 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-http-netty;1.6.2;1.6.3 -com.azure:azure-core-http-okhttp;1.3.2;1.3.3 +com.azure:azure-core-http-netty;1.6.3;1.7.0-beta.1 +com.azure:azure-core-http-okhttp;1.3.3;1.4.0-beta.1 com.azure:azure-core-management;1.0.0;1.1.0-beta.1 -com.azure:azure-core-serializer-avro-apache;1.0.0-beta.4;1.0.0-beta.5 +com.azure:azure-core-serializer-avro-apache;1.0.0-beta.5;1.0.0-beta.6 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2 -com.azure:azure-core-serializer-json-gson;1.0.2;1.0.3 -com.azure:azure-core-serializer-json-jackson;1.0.2;1.1.0 -com.azure:azure-core-test;1.5.0;1.5.1 +com.azure:azure-core-serializer-json-gson;1.0.3;1.1.0-beta.1 +com.azure:azure-core-serializer-json-jackson;1.1.0;1.2.0-beta.1 +com.azure:azure-core-test;1.5.1;1.6.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.6;1.0.0-beta.7 com.azure:azure-cosmos;4.8.0;4.9.0-beta.1 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 @@ -143,7 +143,6 @@ com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.1;2.0.0-beta.1 # unreleased_:;dependency-version # note: The unreleased dependencies will not be manipulated with the automatic PR creation code. unreleased_com.azure:azure-core-amqp;1.7.0-beta.1 -unreleased_com.azure:azure-core;1.10.0 unreleased_com.azure:azure-identity;1.2.0-beta.2 unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7 unreleased_com.azure:azure-messaging-eventhubs;5.3.0 diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml index 1939e89b83c08..fa6670b8a7f0f 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml +++ b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml @@ -38,12 +38,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 @@ -68,7 +68,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index aa57767ebb95f..d914fc2303e3a 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -36,25 +36,25 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 86d0c888a45ba..8334a407ccc1c 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -77,7 +77,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 org.hibernate.validator diff --git a/sdk/communication/azure-communication-administration/pom.xml b/sdk/communication/azure-communication-administration/pom.xml index 229aa9023cbf3..f4b3f744568cc 100644 --- a/sdk/communication/azure-communication-administration/pom.xml +++ b/sdk/communication/azure-communication-administration/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -95,7 +95,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test @@ -107,7 +107,7 @@ com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/communication/azure-communication-chat/pom.xml b/sdk/communication/azure-communication-chat/pom.xml index 1ce8bdc2ae88c..b1a63b77ef902 100644 --- a/sdk/communication/azure-communication-chat/pom.xml +++ b/sdk/communication/azure-communication-chat/pom.xml @@ -39,7 +39,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -54,7 +54,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test @@ -84,7 +84,7 @@ com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index 7301f338da57f..44d7916ad26eb 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -44,12 +44,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 compile diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml index 3bb1e4c5e0a38..1e1f1fadab95a 100644 --- a/sdk/communication/azure-communication-sms/pom.xml +++ b/sdk/communication/azure-communication-sms/pom.xml @@ -49,7 +49,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -59,7 +59,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test @@ -95,7 +95,7 @@ com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 1236049c26c5e..726f81b2186ab 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.microsoft.azure diff --git a/sdk/core/azure-core-experimental/CHANGELOG.md b/sdk/core/azure-core-experimental/CHANGELOG.md index 749e243ea4464..969052d191b75 100644 --- a/sdk/core/azure-core-experimental/CHANGELOG.md +++ b/sdk/core/azure-core-experimental/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.0.0-beta.9 (Unreleased) + + ## 1.0.0-beta.8 (2020-10-29) ### New Features diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 8e0f557cf0f26..7bf8c94b7b98b 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-experimental jar - 1.0.0-beta.8 + 1.0.0-beta.9 Microsoft Azure Java Core Experimental Library This package contains experimental core types for Azure Java clients. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index de7826591b461..c9d31ef68d399 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -62,27 +62,27 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.azure azure-core - 1.10.0 + 1.11.0-beta.1 test-jar test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-http-netty/CHANGELOG.md b/sdk/core/azure-core-http-netty/CHANGELOG.md index 1930f64404745..b1566a1d9452e 100644 --- a/sdk/core/azure-core-http-netty/CHANGELOG.md +++ b/sdk/core/azure-core-http-netty/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.7.0-beta.1 (Unreleased) + + ## 1.6.3 (2020-10-29) ### Dependency updates diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 9c0bb9de3fbbb..e7189713c7434 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-netty jar - 1.6.3 + 1.7.0-beta.1 Microsoft Azure Netty HTTP Client Library This package contains the Netty HTTP client plugin for azure-core. @@ -60,7 +60,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 @@ -117,20 +117,20 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 test-jar test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/CHANGELOG.md b/sdk/core/azure-core-http-okhttp/CHANGELOG.md index 39fe13c9b75f3..42ff5b0f8b871 100644 --- a/sdk/core/azure-core-http-okhttp/CHANGELOG.md +++ b/sdk/core/azure-core-http-okhttp/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.4.0-beta.1 (Unreleased) + + ## 1.3.3 (2020-10-29) ### Dependency updates diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 9391eee3ad42f..481a09195d2b1 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-okhttp jar - 1.3.3 + 1.4.0-beta.1 Microsoft Azure OkHttp HTTP Client Library This package contains the OkHttp HTTP client plugin for azure-core. @@ -60,7 +60,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 @@ -73,20 +73,20 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 test-jar test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test-jar test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 5274cba29c5f8..9ec1df4b20dd4 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -59,7 +59,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 @@ -83,7 +83,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md index b77b1449cc510..93497ce14ad81 100644 --- a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.0.0-beta.6 (Unreleased) + + ## 1.0.0-beta.5 (2020-10-28) ### Dependency updates diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 4c0d990d50f1c..a943277102236 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-avro-apache jar - 1.0.0-beta.5 + 1.0.0-beta.6 Microsoft Azure Apache Avro Serializer Library This package contains the Apache Avro serializer client plugin for azure-core. @@ -58,12 +58,12 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.azure azure-core-experimental - 1.0.0-beta.8 + 1.0.0-beta.9 diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index acae5c278d4c9..22fd57285b297 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -58,12 +58,12 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.azure azure-core-experimental - 1.0.0-beta.8 + 1.0.0-beta.9 diff --git a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md index 0fe322ac2ffc0..f4284c4ceffbd 100644 --- a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.1.0-beta.1 (Unreleased) + + ## 1.0.3 (2020-10-28) ### Dependency updates diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index 5e6bc1c08f25c..0452acc477b7b 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-gson jar - 1.0.3 + 1.1.0-beta.1 Microsoft Azure Gson JSON Serializer Library This package contains the Gson JSON serializer client plugin for azure-core. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 diff --git a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md index 87a8766b929ab..31f208e21c8f8 100644 --- a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.2.0-beta.1 (Unreleased) + + ## 1.1.0 (2020-10-28) ### Breaking Changes diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 64a1169ca24cb..c7b8efed3ff54 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-jackson jar - 1.1.0 + 1.2.0-beta.1 Microsoft Azure Jackson JSON Serializer Library This package contains the Jackson JSON serializer client plugin for azure-core. @@ -58,7 +58,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index d42a9311f83d2..e2b1d6cc1d67f 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.6.0-beta.1 (Unreleased) + + ## 1.5.1 (2020-10-29) ### Dependency updates diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 3179f2f0de7b3..be83e54be1521 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-test jar - 1.5.1 + 1.6.0-beta.1 Microsoft Azure Java Core Test Library This package contains core test types for Azure Java clients. @@ -37,7 +37,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 8a5f90c1e427d..e3a56a19c2686 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -40,7 +40,7 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 io.grpc @@ -58,7 +58,7 @@ com.azure azure-core-http-netty - 1.6.3 + 1.7.0-beta.1 test diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index c96302301162f..9edc873f0413a 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.11.0-beta.1 (Unreleased) + + ## 1.10.0 (2020-10-29) ### New Features diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index e9b374603857c..d74b6910d96e0 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core jar - 1.10.0 + 1.11.0-beta.1 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index f21332693cb58..7c191de9c7f11 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -65,7 +65,7 @@ Licensed under the MIT License. com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -77,7 +77,7 @@ Licensed under the MIT License. com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index c8a6e1e5c51cc..d096211f6ff90 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -36,12 +36,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.fasterxml.jackson.core @@ -53,7 +53,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test @@ -65,7 +65,7 @@ com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 3268feac7c56e..e5b8956a384d2 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -23,12 +23,12 @@ com.azure azure-core - 1.10.0 + 1.11.0-beta.1 com.azure azure-core-http-netty - 1.6.3 + 1.7.0-beta.1 com.azure @@ -64,7 +64,7 @@ com.azure azure-core-test - 1.5.1 + 1.6.0-beta.1 test diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 4f37693c592b3..f0352fa32e8dd 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -64,17 +64,17 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-serializer-json-jackson - 1.0.2 + 1.1.0 @@ -105,7 +105,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 49019fc37adc9..3e90bdeeda0cb 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -37,7 +37,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -55,7 +55,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml index f8684b94be86d..f5a7b59b22d65 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml @@ -36,25 +36,25 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 6c332a487dd5e..eb720b1682b59 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -27,12 +27,12 @@ com.azure azure-core - 1.10.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 net.minidev diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index f740dcbffe2e1..4c8832ba594ef 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -36,12 +36,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 @@ -77,13 +77,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 996d9c2eb5286..c99c895119a46 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -36,13 +36,13 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 @@ -84,14 +84,14 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index d8860e370d89f..715d56bb26338 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -50,13 +50,13 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 @@ -93,13 +93,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 0185784ae558c..2b9ad33b9395e 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -47,20 +47,20 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test @@ -98,7 +98,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml index 66bcfafeb2e2f..cbefa25faad7e 100644 --- a/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml +++ b/sdk/loganalytics/microsoft-azure-loganalytics/pom.xml @@ -71,7 +71,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml index 39c7eca60cecb..b24c6af500ed5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml @@ -43,25 +43,25 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/monitor/opentelemetry-exporters-azuremonitor/pom.xml b/sdk/monitor/opentelemetry-exporters-azuremonitor/pom.xml index 666a17ce9618c..7a616aa087568 100644 --- a/sdk/monitor/opentelemetry-exporters-azuremonitor/pom.xml +++ b/sdk/monitor/opentelemetry-exporters-azuremonitor/pom.xml @@ -34,12 +34,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 io.opentelemetry @@ -80,7 +80,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml index 1e9dcb75d5d31..2e04a1a5760a1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml @@ -86,7 +86,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml index a230cb3bfe44a..7cd637a48cc98 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml @@ -95,7 +95,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml index f750a897ee420..5a2e34068bfd6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml @@ -75,7 +75,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml index 63053ef07ea16..66da1a12953fd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml index bc6ddbf719082..acb2180915fe5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml @@ -95,7 +95,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml index 619c24b9285fc..e3dc664e3ad09 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml @@ -96,7 +96,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml index f39fe45dc8d17..d6ff15edf5c1d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml @@ -76,7 +76,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml index fdc657504a6ce..f7273c5d0b5b4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml @@ -71,7 +71,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml index 44863d234984a..3b936d40f494d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml @@ -83,7 +83,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml index 707f928823437..caace665bed44 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml @@ -81,7 +81,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml index c8c3d6deb9b14..ea474a9df93a3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml @@ -74,7 +74,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml index 90345ecaa66ff..326a169124ddc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml @@ -96,7 +96,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml index 6708ed7e7e616..acb393cdd2dad 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml @@ -65,7 +65,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml index 22499d6313a87..cca54e4dde77f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml @@ -64,7 +64,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml index 6f38d56fcd905..27da94eff83c6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml index bf55e550a06b8..10ccc855bf7df 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml @@ -75,7 +75,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml index c8f1be5126cc4..34b160c28fa77 100644 --- a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 0e2685c81992f..eb635eac54b65 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -52,7 +52,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -80,7 +80,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml index 6d492483c7ef1..26cff6a262edd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml index f7afc9fb6618b..3052952c34683 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml @@ -80,7 +80,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml index 78baca8e95f95..371648ef0ca5c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml index fd433feeb6c50..8565df404509a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml @@ -52,12 +52,12 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -72,7 +72,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml index 3dd8d81a9c5bb..af1c28394cf34 100644 --- a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml @@ -69,7 +69,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index ee6a3b5772b5d..301d23e480cae 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -131,7 +131,7 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml index 4ed9a3368edfb..78e92cf52d650 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml @@ -49,7 +49,7 @@ com.azure azure-core-serializer-avro-apache - 1.0.0-beta.4 + 1.0.0-beta.5 diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index 64c9ae2e7f54c..f893a01d6dbbd 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -47,12 +47,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index 6c80ab1ee4d6d..e6c3e1614648b 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -28,17 +28,17 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-serializer-json-jackson - 1.0.2 + 1.1.0 + 1.5.1 test diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 43ace5c1beffc..2a2ddb2cc679e 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -42,7 +42,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -52,20 +52,20 @@ com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index 50cb087eb3d10..72ab68676d3e8 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -55,12 +55,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure @@ -81,7 +81,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index fec5dfb6ff735..874e201188820 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -55,12 +55,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure @@ -81,7 +81,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml index 1c3cd31f1cecf..530c943decee4 100644 --- a/sdk/storage/azure-storage-blob-cryptography/pom.xml +++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml @@ -41,12 +41,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 com.azure @@ -56,7 +56,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index f835ad12477ce..94cb5eec92e0a 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -60,7 +60,7 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index ed4b0b66ecd4c..c8ffc52e52f73 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -55,7 +55,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -80,13 +80,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index 9f7c6b4acb87d..642e084ae242f 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -41,12 +41,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 + 1.5.1 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 129c29315a5bd..177374bf204b2 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -71,13 +71,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index 9b7e7acb91af2..30efd7138d20d 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -52,13 +52,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 0e4f83487ed9e..a3a153da3a633 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -36,7 +36,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -46,13 +46,13 @@ com.azure azure-core-test - 1.5.0 + 1.5.1 test com.azure azure-core-http-netty - 1.6.2 + 1.6.3 test diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index 54afb192bf19b..24f68364a506b 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -40,7 +40,7 @@ Licensed under the MIT License. com.azure azure-core - 1.9.0 + 1.10.0 com.azure @@ -74,7 +74,7 @@ Licensed under the MIT License. com.azure azure-core-test - 1.5.0 + 1.5.1 test diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index f49044988d148..dfc0bc15155d2 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -31,7 +31,7 @@ com.azure azure-core - 1.9.0 + 1.10.0 org.junit.jupiter diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml index 4ff516187fc95..0b4f09670c3d8 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml +++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml @@ -36,12 +36,12 @@ com.azure azure-core - 1.9.0 + 1.10.0 com.azure azure-core-http-netty - 1.6.2 + 1.6.3 + 1.5.1 test com.azure azure-core-http-okhttp - 1.3.2 + 1.3.3 test From f7796e20a321fe80595329a9a2473fca134b8b93 Mon Sep 17 00:00:00 2001 From: Srikanta <51379715+srnagar@users.noreply.github.com> Date: Fri, 30 Oct 2020 00:40:17 -0700 Subject: [PATCH 32/36] Close client and check for link id when link is stolen (#16977) * Close client and check for link id when link is stolen * Fix checkstyle --- .../eventhubs/PartitionBasedLoadBalancer.java | 23 +++++++++++++++---- .../AmqpReceiveLinkProcessor.java | 18 +++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancer.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancer.java index 60085e873de91..2bb6d9ffd0798 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancer.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancer.java @@ -125,17 +125,19 @@ void loadBalance() { * Retrieve the list of partition ids from the Event Hub. */ Mono> partitionsMono; - if (partitionsCache.get() == null || partitionsCache.get().isEmpty()) { + if (CoreUtils.isNullOrEmpty(partitionsCache.get())) { // Call Event Hubs service to get the partition ids if the cache is empty + logger.info("Getting partitions from Event Hubs service for {}", eventHubName); partitionsMono = eventHubAsyncClient .getPartitionIds() .timeout(Duration.ofMinutes(1)) .collectList(); } else { partitionsMono = Mono.just(partitionsCache.get()); + // we have the partitions, the client can be closed now + closeClient(); } - Mono.zip(partitionOwnershipMono, partitionsMono) .flatMap(this::loadBalance) .then() @@ -170,8 +172,9 @@ private Mono loadBalance(final Tuple2, Lis } partitionsCache.set(partitionIds); int numberOfPartitions = partitionIds.size(); - logger.info("CheckpointStore returned {} ownership records", partitionOwnershipMap.size()); - logger.info("Event Hubs service returned {} partitions", numberOfPartitions); + logger.info("Number of ownership records {}, number of partitions {}", partitionOwnershipMap.size(), + numberOfPartitions); + if (!isValid(partitionOwnershipMap)) { // User data is corrupt. throw logger.logExceptionAsError(Exceptions.propagate( @@ -275,6 +278,18 @@ private Mono loadBalance(final Tuple2, Lis }); } + /* + * Closes the client used by load balancer to get the partitions. + */ + private void closeClient() { + try { + // this is an idempotent operation, calling close on an already closed client is just a no-op. + this.eventHubAsyncClient.close(); + } catch (Exception ex) { + logger.warning("Failed to close the client", ex); + } + } + /* * This method renews the ownership of currently owned partitions */ diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessor.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessor.java index c3dbc0a137fe8..3e49c28f33be4 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessor.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessor.java @@ -5,6 +5,9 @@ import com.azure.core.amqp.AmqpEndpointState; import com.azure.core.amqp.AmqpRetryPolicy; +import com.azure.core.amqp.exception.AmqpErrorCondition; +import com.azure.core.amqp.exception.AmqpException; +import com.azure.core.amqp.exception.LinkErrorContext; import com.azure.core.amqp.implementation.AmqpReceiveLink; import com.azure.core.util.logging.ClientLogger; import org.apache.qpid.proton.message.Message; @@ -166,6 +169,21 @@ public void onNext(AmqpReceiveLink next) { } }, error -> { + if (error instanceof AmqpException) { + AmqpException amqpException = (AmqpException) error; + if (amqpException.getErrorCondition() == AmqpErrorCondition.LINK_STOLEN + && amqpException.getContext() != null + && amqpException.getContext() instanceof LinkErrorContext) { + LinkErrorContext errorContext = (LinkErrorContext) amqpException.getContext(); + if (currentLink != null + && !currentLink.getLinkName().equals(errorContext.getTrackingId())) { + logger.info("EntityPath[{}]: Link lost signal received for a link " + + "that is not current. Ignoring the error. Current link {}, link lost {}", + entityPath, linkName, errorContext.getTrackingId()); + return; + } + } + } currentLink = null; logger.warning("linkName[{}] entityPath[{}]. Error occurred in link.", linkName, entityPath); onError(error); From bd750d5fe4a84bf5e255bf3558412927f13acbaa Mon Sep 17 00:00:00 2001 From: Yijun Xie <48257664+YijunXieMS@users.noreply.github.com> Date: Fri, 30 Oct 2020 02:09:44 -0700 Subject: [PATCH 33/36] Add ServiceBus Session Receiver Client (#16690) --- .../checkstyle/checkstyle-suppressions.xml | 4 + .../azure-messaging-servicebus/README.md | 29 +- .../messaging/servicebus/ReceiverOptions.java | 15 +- .../servicebus/ServiceBusClientBuilder.java | 91 +++-- .../ServiceBusReceiverAsyncClient.java | 193 ++++++----- .../servicebus/ServiceBusReceiverClient.java | 113 +++---- .../servicebus/ServiceBusSessionManager.java | 20 +- .../ServiceBusSessionReceiverAsyncClient.java | 129 +++++++ .../ServiceBusSessionReceiverClient.java | 83 +++++ .../servicebus/implementation/Messages.java | 1 - .../messaging/servicebus/ReadmeSamples.java | 8 +- .../ReceiveMultipleSessionsAsyncSample.java | 77 ----- .../ReceiveNamedSessionAsyncSample.java | 15 +- .../servicebus/ReceiveNamedSessionSample.java | 7 +- .../ReceiveSingleSessionAsyncSample.java | 9 +- .../SendAndReceiveSessionMessageSample.java | 9 +- ...ReceiverAsyncClientJavaDocCodeSamples.java | 40 +-- ...iceBusReceiverClientJavaDocCodeSample.java | 33 ++ .../ServiceBusAsyncConsumerTest.java | 9 +- ...BusReceiverAsyncClientIntegrationTest.java | 41 ++- .../ServiceBusReceiverAsyncClientTest.java | 4 +- ...rviceBusReceiverClientIntegrationTest.java | 26 +- .../ServiceBusReceiverClientTest.java | 80 +++-- ...rviceBusSessionManagerIntegrationTest.java | 68 +--- .../ServiceBusSessionManagerTest.java | 12 +- ...viceBusSessionReceiverAsyncClientTest.java | 320 ++++++++++++++++++ .../ServiceBusSessionReceiverClientTest.java | 80 +++++ 27 files changed, 1019 insertions(+), 497 deletions(-) create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClient.java create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClient.java delete mode 100644 sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClientTest.java create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClientTest.java diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml index f9211243ee09a..fdb1247176555 100755 --- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml +++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -167,6 +167,10 @@ the main ServiceBusClientBuilder. --> + + + + diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md index 0d360fbd8c0f8..cbbdb6ac30dc4 100644 --- a/sdk/servicebus/azure-messaging-servicebus/README.md +++ b/sdk/servicebus/azure-messaging-servicebus/README.md @@ -57,7 +57,7 @@ Both the asynchronous and synchronous Service Bus sender and receiver clients ar `ServiceBusClientBuilder`. The snippets below create a synchronous Service Bus sender and an asynchronous receiver, respectively. - + ```java ServiceBusSenderClient sender = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") @@ -66,7 +66,7 @@ ServiceBusSenderClient sender = new ServiceBusClientBuilder() .buildClient(); ``` - + ```java ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") @@ -102,7 +102,7 @@ refer to [the associated documentation][aad_authorization]. Use the returned token credential to authenticate the client: - + ```java TokenCredential credential = new DefaultAzureCredentialBuilder() .build(); @@ -152,7 +152,7 @@ a topic. The snippet below creates a synchronous [`ServiceBusSenderClient`][ServiceBusSenderClient] to publish a message to a queue. - + ```java ServiceBusSenderClient sender = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") @@ -187,7 +187,7 @@ queue or topic/subscriber. The snippet below creates a [`ServiceBusReceiverClient`][ServiceBusReceiverClient] to receive messages from a topic subscription. - + ```java ServiceBusReceiverClient receiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") @@ -214,7 +214,7 @@ receiver.close(); The asynchronous [`ServiceBusReceiverAsyncClient`][ServiceBusReceiverAsyncClient] continuously fetches messages until the `subscription` is disposed. - + ```java ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") @@ -247,7 +247,7 @@ When a message is received, it can be settled using any of the `complete()`, `ab overloads. The sample below completes a received message from synchronous [`ServiceBusReceiverClient`][ServiceBusReceiverClient]. - + ```java // This fetches a batch of 10 messages or until the default operation timeout has elapsed. receiver.receiveMessages(10).forEach(context -> { @@ -287,7 +287,7 @@ Create a [`ServiceBusSenderClient`][ServiceBusSenderClient] for a session enable `ServiceBusMessage.setSessionId(String)` on a `ServiceBusMessage` will publish the message to that session. If the session does not exist, it is created. - + ```java // Setting sessionId publishes that message to a specific session, in this case, "greeting". ServiceBusMessage message = new ServiceBusMessage("Hello world") @@ -300,25 +300,26 @@ sender.sendMessage(message); Receivers can fetch messages from a specific session or the first available, unlocked session. - + ```java // Creates a session-enabled receiver that gets messages from the session "greetings". -ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() +ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") .sessionReceiver() .queueName("<< QUEUE NAME >>") - .sessionId("greetings") .buildAsyncClient(); +Mono receiverAsyncClient = sessionReceiver.acceptSession("greetings"); ``` - + ```java // Creates a session-enabled receiver that gets messages from the first available session. -ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() +ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") .sessionReceiver() .queueName("<< QUEUE NAME >>") .buildAsyncClient(); +Mono receiverAsyncClient = sessionReceiver.acceptNextSession(); ``` ### Create a dead-letter queue Receiver @@ -328,7 +329,7 @@ The dead-letter queue doesn't need to be explicitly created and can't be deleted of the main entity. For session enabled or non-session queue or topic subscriptions, the dead-letter receiver can be created the same way as shown below. Learn more about dead-letter queue [here][dead-letter-queue]. - + ```java ServiceBusReceiverClient receiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ReceiverOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ReceiverOptions.java index bc388dfc4232b..a3748b714d98d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ReceiverOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ReceiverOptions.java @@ -3,7 +3,6 @@ package com.azure.messaging.servicebus; -import com.azure.core.util.CoreUtils; import com.azure.messaging.servicebus.models.ReceiveMode; import java.time.Duration; @@ -16,28 +15,22 @@ class ReceiverOptions { private final int prefetchCount; private final boolean enableAutoComplete; private final String sessionId; - private final boolean isRollingSessionReceiver; private final Integer maxConcurrentSessions; - private final boolean isSessionReceiver; private final Duration maxLockRenewDuration; ReceiverOptions(ReceiveMode receiveMode, int prefetchCount, Duration maxLockRenewDuration, boolean enableAutoComplete) { - this(receiveMode, prefetchCount, maxLockRenewDuration, enableAutoComplete, null, false, null); + this(receiveMode, prefetchCount, maxLockRenewDuration, enableAutoComplete, null, null); } ReceiverOptions(ReceiveMode receiveMode, int prefetchCount, Duration maxLockRenewDuration, - boolean enableAutoComplete, String sessionId, boolean isRollingSessionReceiver, - Integer maxConcurrentSessions) { - + boolean enableAutoComplete, String sessionId, Integer maxConcurrentSessions) { this.receiveMode = receiveMode; this.prefetchCount = prefetchCount; this.enableAutoComplete = enableAutoComplete; this.sessionId = sessionId; - this.isRollingSessionReceiver = isRollingSessionReceiver; this.maxConcurrentSessions = maxConcurrentSessions; this.maxLockRenewDuration = maxLockRenewDuration; - this.isSessionReceiver = !CoreUtils.isNullOrEmpty(sessionId) || isRollingSessionReceiver; } /** @@ -90,7 +83,7 @@ boolean isAutoLockRenewEnabled() { * @return true if it is a session-aware receiver; false otherwise. */ boolean isSessionReceiver() { - return isSessionReceiver; + return sessionId != null || maxConcurrentSessions != null; } /** @@ -100,7 +93,7 @@ boolean isSessionReceiver() { * false} otherwise. */ public boolean isRollingSessionReceiver() { - return isRollingSessionReceiver; + return maxConcurrentSessions != null && maxConcurrentSessions > 0 && sessionId == null; } /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusClientBuilder.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusClientBuilder.java index 5a97bf81f9912..98b47ad619e04 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusClientBuilder.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusClientBuilder.java @@ -628,7 +628,6 @@ public final class ServiceBusSessionReceiverClientBuilder { private int prefetchCount = DEFAULT_PREFETCH_COUNT; private String queueName; private ReceiveMode receiveMode = ReceiveMode.PEEK_LOCK; - private String sessionId; private String subscriptionName; private String topicName; private Duration maxAutoLockRenewDuration = MAX_LOCK_RENEW_DEFAULT_DURATION; @@ -674,7 +673,7 @@ public ServiceBusSessionReceiverClientBuilder maxAutoLockRenewDuration(Duration * @return The modified {@link ServiceBusSessionReceiverClientBuilder} object. * @throws IllegalArgumentException if {@code maxConcurrentSessions} is less than 1. */ - public ServiceBusSessionReceiverClientBuilder maxConcurrentSessions(int maxConcurrentSessions) { + ServiceBusSessionReceiverClientBuilder maxConcurrentSessions(int maxConcurrentSessions) { if (maxConcurrentSessions < 1) { throw logger.logExceptionAsError(new IllegalArgumentException( "maxConcurrentSessions cannot be less than 1.")); @@ -728,18 +727,6 @@ public ServiceBusSessionReceiverClientBuilder receiveMode(ReceiveMode receiveMod return this; } - /** - * Sets the session id. - * - * @param sessionId session id. - * - * @return The modified {@link ServiceBusSessionReceiverClientBuilder} object. - */ - public ServiceBusSessionReceiverClientBuilder sessionId(String sessionId) { - this.sessionId = sessionId; - return this; - } - /** * Sets the name of the subscription in the topic to listen to. {@link #topicName(String)} must also be set. * @@ -780,8 +767,8 @@ public ServiceBusSessionReceiverClientBuilder topicName(String topicName) { * @throws IllegalArgumentException Queue or topic name are not set via {@link #queueName(String) * queueName()} or {@link #topicName(String) topicName()}, respectively. */ - public ServiceBusReceiverAsyncClient buildAsyncClient() { - return buildAsyncClient(true); + ServiceBusReceiverAsyncClient buildAsyncClientForProcessor() { + return buildAsyncClientForProcessor(true); } /** @@ -797,11 +784,11 @@ public ServiceBusReceiverAsyncClient buildAsyncClient() { * @throws IllegalArgumentException Queue or topic name are not set via {@link #queueName(String) * queueName()} or {@link #topicName(String) topicName()}, respectively. */ - public ServiceBusReceiverClient buildClient() { - return new ServiceBusReceiverClient(buildAsyncClient(false), retryOptions.getTryTimeout()); + ServiceBusReceiverClient buildClientForProcessor() { + return new ServiceBusReceiverClient(buildAsyncClientForProcessor(false), retryOptions.getTryTimeout()); } - private ServiceBusReceiverAsyncClient buildAsyncClient(boolean isAutoCompleteAllowed) { + private ServiceBusReceiverAsyncClient buildAsyncClientForProcessor(boolean isAutoCompleteAllowed) { final MessagingEntityType entityType = validateEntityPaths(logger, connectionStringEntityName, topicName, queueName); final String entityPath = getEntityPath(logger, entityType, queueName, topicName, subscriptionName, @@ -822,7 +809,7 @@ private ServiceBusReceiverAsyncClient buildAsyncClient(boolean isAutoCompleteAll final ServiceBusConnectionProcessor connectionProcessor = getOrCreateConnectionProcessor(messageSerializer); final ReceiverOptions receiverOptions = new ReceiverOptions(receiveMode, prefetchCount, - maxAutoLockRenewDuration, enableAutoComplete, sessionId, isRollingSessionReceiver(), + maxAutoLockRenewDuration, enableAutoComplete, null, maxConcurrentSessions); final ServiceBusSessionManager sessionManager = new ServiceBusSessionManager(entityPath, entityType, @@ -834,22 +821,66 @@ maxAutoLockRenewDuration, enableAutoComplete, sessionId, isRollingSessionReceive } /** - * This is a rolling session receiver only if maxConcurrentSessions is > 0 AND sessionId is null or empty. If - * there is a sessionId, this is going to be a single, named session receiver. + * Creates an asynchronous, session-aware Service Bus receiver responsible for reading {@link + * ServiceBusMessage messages} from a specific queue or topic. + * + * @return An new {@link ServiceBusSessionReceiverAsyncClient} that receives messages from a queue or topic. + * @throws IllegalStateException if {@link #queueName(String) queueName} or {@link #topicName(String) + * topicName} are not set or, both of these fields are set. It is also thrown if the Service Bus {@link + * #connectionString(String) connectionString} contains an {@code EntityPath} that does not match one set in + * {@link #queueName(String) queueName} or {@link #topicName(String) topicName}. Lastly, if a {@link + * #topicName(String) topicName} is set, but {@link #subscriptionName(String) subscriptionName} is not. + * @throws IllegalArgumentException Queue or topic name are not set via {@link #queueName(String) + * queueName()} or {@link #topicName(String) topicName()}, respectively. + */ + public ServiceBusSessionReceiverAsyncClient buildAsyncClient() { + return buildAsyncClient(true); + } + + /** + * Creates a synchronous, session-aware Service Bus receiver responsible for reading {@link + * ServiceBusMessage messages} from a specific queue or topic. * - * @return {@code true} if this is an unnamed rolling session receiver; {@code false} otherwise. + * @return An new {@link ServiceBusReceiverClient} that receives messages from a queue or topic. + * @throws IllegalStateException if {@link #queueName(String) queueName} or {@link #topicName(String) + * topicName} are not set or, both of these fields are set. It is also thrown if the Service Bus {@link + * #connectionString(String) connectionString} contains an {@code EntityPath} that does not match one set in + * {@link #queueName(String) queueName} or {@link #topicName(String) topicName}. Lastly, if a {@link + * #topicName(String) topicName} is set, but {@link #subscriptionName(String) subscriptionName} is not. + * @throws IllegalArgumentException Queue or topic name are not set via {@link #queueName(String) + * queueName()} or {@link #topicName(String) topicName()}, respectively. */ - private boolean isRollingSessionReceiver() { - if (maxConcurrentSessions == null) { - return false; + public ServiceBusSessionReceiverClient buildClient() { + return new ServiceBusSessionReceiverClient(buildAsyncClient(false), + retryOptions.getTryTimeout()); + } + + private ServiceBusSessionReceiverAsyncClient buildAsyncClient(boolean isAutoCompleteAllowed) { + final MessagingEntityType entityType = validateEntityPaths(logger, connectionStringEntityName, topicName, + queueName); + final String entityPath = getEntityPath(logger, entityType, queueName, topicName, subscriptionName, + SubQueue.NONE); + + if (!isAutoCompleteAllowed && enableAutoComplete) { + logger.warning( + "'enableAutoComplete' is not supported in synchronous client except through callback receive."); + enableAutoComplete = false; + } else if (enableAutoComplete && receiveMode == ReceiveMode.RECEIVE_AND_DELETE) { + throw logger.logExceptionAsError(new IllegalStateException( + "'enableAutoComplete' is not valid for RECEIVE_AND_DELETE mode.")); } - if (maxConcurrentSessions < 1) { - throw logger.logExceptionAsError( - new IllegalArgumentException("Maximum number of concurrent sessions must be positive.")); + if (receiveMode == ReceiveMode.RECEIVE_AND_DELETE) { + maxAutoLockRenewDuration = Duration.ZERO; } - return CoreUtils.isNullOrEmpty(sessionId); + final ServiceBusConnectionProcessor connectionProcessor = getOrCreateConnectionProcessor(messageSerializer); + final ReceiverOptions receiverOptions = new ReceiverOptions(receiveMode, prefetchCount, + maxAutoLockRenewDuration, enableAutoComplete, null, maxConcurrentSessions); + + return new ServiceBusSessionReceiverAsyncClient(connectionProcessor.getFullyQualifiedNamespace(), + entityPath, entityType, receiverOptions, connectionProcessor, tracerProvider, messageSerializer, + ServiceBusClientBuilder.this::onClientClose); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java index 6151a7387dc25..d7daa14710447 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java @@ -63,21 +63,17 @@ * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.receiveWithReceiveAndDeleteMode} * *

    Receive messages from a specific session

    - *

    To fetch messages from a specific session, set {@link ServiceBusSessionReceiverClientBuilder#sessionId(String)}. + *

    To fetch messages from a specific session, switch to {@link ServiceBusSessionReceiverClientBuilder} and + * build the session receiver client. Use {@link ServiceBusSessionReceiverAsyncClient#acceptSession(String)} to create a + * session-bound {@link ServiceBusReceiverAsyncClient}. *

    * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#sessionId} * - *

    Process messages from multiple sessions

    - *

    To process messages from multiple sessions, set - * {@link ServiceBusSessionReceiverClientBuilder#maxConcurrentSessions(int)}. This will process in parallel at most - * {@code maxConcurrentSessions}. In addition, when all the messages in a session have been consumed, it will find the - * next available session to process.

    - * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#multiplesessions} - * *

    Process messages from the first available session

    *

    To process messages from the first available session, switch to {@link ServiceBusSessionReceiverClientBuilder} and - * build the receiver client. It will find the first available session to process messages from.

    - * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#singlesession} + * build the session receiver client. Use {@link ServiceBusSessionReceiverAsyncClient#acceptNextSession()} to + * find the first available session to process messages from.

    + * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#nextsession} * *

    Rate limiting consumption of messages from Service Bus resource

    *

    For message receivers that need to limit the number of messages they receive at a given time, they can use @@ -374,28 +370,13 @@ public Mono deadLetter(ServiceBusReceivedMessage message, DeadLetterOption } /** - * Gets the state of a session given its identifier. - * - * @param sessionId Identifier of session to get. + * Gets the state of the session if this receiver is a session receiver. * * @return The session state or an empty Mono if there is no state set for the session. * @throws IllegalStateException if the receiver is a non-session receiver. */ - public Mono getSessionState(String sessionId) { - if (isDisposed.get()) { - return monoError(logger, new IllegalStateException( - String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "getSessionState"))); - } else if (!receiverOptions.isSessionReceiver()) { - return monoError(logger, new IllegalStateException("Cannot get session state on a non-session receiver.")); - } - - if (sessionManager != null) { - return sessionManager.getSessionState(sessionId); - } else { - return connectionProcessor - .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) - .flatMap(channel -> channel.getSessionState(sessionId, getLinkName(sessionId))); - } + public Mono getSessionState() { + return getSessionState(receiverOptions.getSessionId()); } /** @@ -421,12 +402,11 @@ public Mono peekMessage() { * @throws IllegalStateException if the receiver is disposed. * @see Message browsing */ - public Mono peekMessage(String sessionId) { + Mono peekMessage(String sessionId) { if (isDisposed.get()) { return monoError(logger, new IllegalStateException( String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "peek"))); } - return connectionProcessor .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) .flatMap(channel -> { @@ -467,12 +447,11 @@ public Mono peekMessageAt(long sequenceNumber) { * @return A peeked {@link ServiceBusReceivedMessage}. * @see Message browsing */ - public Mono peekMessageAt(long sequenceNumber, String sessionId) { + Mono peekMessageAt(long sequenceNumber, String sessionId) { if (isDisposed.get()) { return monoError(logger, new IllegalStateException( String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "peekAt"))); } - return connectionProcessor .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) .flatMap(node -> node.peek(sequenceNumber, sessionId, getLinkName(sessionId))); @@ -501,7 +480,7 @@ public Flux peekMessages(int maxMessages) { * @throws IllegalArgumentException if {@code maxMessages} is not a positive integer. * @see Message browsing */ - public Flux peekMessages(int maxMessages, String sessionId) { + Flux peekMessages(int maxMessages, String sessionId) { if (isDisposed.get()) { return fluxError(logger, new IllegalStateException( String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "peekBatch"))); @@ -564,7 +543,7 @@ public Flux peekMessagesAt(int maxMessages, long sequ * @throws IllegalArgumentException if {@code maxMessages} is not a positive integer. * @see Message browsing */ - public Flux peekMessagesAt(int maxMessages, long sequenceNumber, String sessionId) { + Flux peekMessagesAt(int maxMessages, long sequenceNumber, String sessionId) { if (isDisposed.get()) { return fluxError(logger, new IllegalStateException( String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "peekBatchAt"))); @@ -637,7 +616,7 @@ public Mono receiveDeferredMessage(long sequenceNumbe * * @return A deferred message with the matching {@code sequenceNumber}. */ - public Mono receiveDeferredMessage(long sequenceNumber, String sessionId) { + Mono receiveDeferredMessage(long sequenceNumber, String sessionId) { return connectionProcessor .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) .flatMap(node -> node.receiveDeferredMessages(receiverOptions.getReceiveMode(), @@ -677,13 +656,12 @@ public Flux receiveDeferredMessages(Iterable se * * @return An {@link IterableStream} of deferred {@link ServiceBusReceivedMessage messages}. */ - public Flux receiveDeferredMessages(Iterable sequenceNumbers, + Flux receiveDeferredMessages(Iterable sequenceNumbers, String sessionId) { if (isDisposed.get()) { return fluxError(logger, new IllegalStateException( String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "receiveDeferredMessageBatch"))); } - return connectionProcessor .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) .flatMapMany(node -> node.receiveDeferredMessages(receiverOptions.getReceiveMode(), @@ -794,34 +772,18 @@ public Mono renewMessageLock(ServiceBusReceivedMessage message, Duration m } /** - * Renews the session lock. - * - * @param sessionId Identifier of session to get. + * Renews the session lock if this receiver is a session receiver. * * @return The next expiration time for the session lock. * @throws IllegalStateException if the receiver is a non-session receiver. */ - public Mono renewSessionLock(String sessionId) { - if (isDisposed.get()) { - return monoError(logger, new IllegalStateException( - String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "renewSessionLock"))); - } else if (!receiverOptions.isSessionReceiver()) { - return monoError(logger, new IllegalStateException("Cannot renew session lock on a non-session receiver.")); - } - - final String linkName = sessionManager != null - ? sessionManager.getLinkName(sessionId) - : null; - - return connectionProcessor - .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) - .flatMap(channel -> channel.renewSessionLock(sessionId, linkName)); + public Mono renewSessionLock() { + return renewSessionLock(receiverOptions.getSessionId()); } /** - * Starts the auto lock renewal for a session id. + * Starts the auto lock renewal for the session this receiver works for. * - * @param sessionId Id for the session to renew. * @param maxLockRenewalDuration Maximum duration to keep renewing the session lock. * * @return A lock renewal operation for the message. @@ -829,55 +791,20 @@ public Mono renewSessionLock(String sessionId) { * @throws IllegalArgumentException if {@code sessionId} is an empty string. * @throws IllegalStateException if the receiver is a non-session receiver or the receiver is disposed. */ - public Mono renewSessionLock(String sessionId, Duration maxLockRenewalDuration) { - if (isDisposed.get()) { - return monoError(logger, new IllegalStateException( - String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "getAutoRenewSessionLock"))); - } else if (!receiverOptions.isSessionReceiver()) { - return monoError(logger, new IllegalStateException( - "Cannot renew session lock on a non-session receiver.")); - } else if (maxLockRenewalDuration == null) { - return monoError(logger, new NullPointerException("'maxLockRenewalDuration' cannot be null.")); - } else if (maxLockRenewalDuration.isNegative()) { - return monoError(logger, new IllegalArgumentException( - "'maxLockRenewalDuration' cannot be negative.")); - } else if (Objects.isNull(sessionId)) { - return monoError(logger, new NullPointerException("'sessionId' cannot be null.")); - } else if (sessionId.isEmpty()) { - return monoError(logger, new IllegalArgumentException("'sessionId' cannot be empty.")); - } - - final LockRenewalOperation operation = new LockRenewalOperation(sessionId, maxLockRenewalDuration, true, - this::renewSessionLock); - - renewalContainer.addOrUpdate(sessionId, OffsetDateTime.now().plus(maxLockRenewalDuration), operation); - return operation.getCompletionOperation(); + public Mono renewSessionLock(Duration maxLockRenewalDuration) { + return this.renewSessionLock(receiverOptions.getSessionId(), maxLockRenewalDuration); } /** - * Sets the state of a session given its identifier. + * Sets the state of the session this receiver works for. * - * @param sessionId Identifier of session to get. * @param sessionState State to set on the session. * * @return A Mono that completes when the session is set * @throws IllegalStateException if the receiver is a non-session receiver. */ - public Mono setSessionState(String sessionId, byte[] sessionState) { - if (isDisposed.get()) { - return monoError(logger, new IllegalStateException( - String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "setSessionState"))); - } else if (!receiverOptions.isSessionReceiver()) { - return monoError(logger, new IllegalStateException("Cannot set session state on a non-session receiver.")); - } - - final String linkName = sessionManager != null - ? sessionManager.getLinkName(sessionId) - : null; - - return connectionProcessor - .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) - .flatMap(channel -> channel.setSessionState(sessionId, sessionState, linkName)); + public Mono setSessionState(byte[] sessionState) { + return this.setSessionState(receiverOptions.getSessionId(), sessionState); } /** @@ -1136,4 +1063,76 @@ private String getLinkName(String sessionId) { return existing != null ? existing.getLinkName() : null; } } + + Mono renewSessionLock(String sessionId) { + if (isDisposed.get()) { + return monoError(logger, new IllegalStateException( + String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "renewSessionLock"))); + } else if (!receiverOptions.isSessionReceiver()) { + return monoError(logger, new IllegalStateException("Cannot renew session lock on a non-session receiver.")); + } + final String linkName = sessionManager != null + ? sessionManager.getLinkName(sessionId) + : null; + + return connectionProcessor + .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) + .flatMap(channel -> channel.renewSessionLock(sessionId, linkName)); + } + + Mono renewSessionLock(String sessionId, Duration maxLockRenewalDuration) { + if (isDisposed.get()) { + return monoError(logger, new IllegalStateException( + String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "getAutoRenewSessionLock"))); + } else if (!receiverOptions.isSessionReceiver()) { + return monoError(logger, new IllegalStateException( + "Cannot renew session lock on a non-session receiver.")); + } else if (maxLockRenewalDuration == null) { + return monoError(logger, new NullPointerException("'maxLockRenewalDuration' cannot be null.")); + } else if (maxLockRenewalDuration.isNegative()) { + return monoError(logger, new IllegalArgumentException( + "'maxLockRenewalDuration' cannot be negative.")); + } else if (Objects.isNull(sessionId)) { + return monoError(logger, new NullPointerException("'sessionId' cannot be null.")); + } else if (sessionId.isEmpty()) { + return monoError(logger, new IllegalArgumentException("'sessionId' cannot be empty.")); + } + final LockRenewalOperation operation = new LockRenewalOperation(sessionId, + maxLockRenewalDuration, true, this::renewSessionLock); + + renewalContainer.addOrUpdate(sessionId, OffsetDateTime.now().plus(maxLockRenewalDuration), operation); + return operation.getCompletionOperation(); + } + + Mono setSessionState(String sessionId, byte[] sessionState) { + if (isDisposed.get()) { + return monoError(logger, new IllegalStateException( + String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "setSessionState"))); + } else if (!receiverOptions.isSessionReceiver()) { + return monoError(logger, new IllegalStateException("Cannot set session state on a non-session receiver.")); + } + final String linkName = sessionManager != null + ? sessionManager.getLinkName(sessionId) + : null; + + return connectionProcessor + .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) + .flatMap(channel -> channel.setSessionState(sessionId, sessionState, linkName)); + } + + Mono getSessionState(String sessionId) { + if (isDisposed.get()) { + return monoError(logger, new IllegalStateException( + String.format(INVALID_OPERATION_DISPOSED_RECEIVER, "getSessionState"))); + } else if (!receiverOptions.isSessionReceiver()) { + return monoError(logger, new IllegalStateException("Cannot get session state on a non-session receiver.")); + } + if (sessionManager != null) { + return sessionManager.getSessionState(sessionId); + } else { + return connectionProcessor + .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) + .flatMap(channel -> channel.getSessionState(sessionId, getLinkName(sessionId))); + } + } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java index 38c550a96a151..66acf0c326d57 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java @@ -210,15 +210,13 @@ public void deadLetter(ServiceBusReceivedMessage message, DeadLetterOptions opti } /** - * Gets the state of a session given its identifier. - * - * @param sessionId Identifier of session to get. + * Gets the state of the session if this receiver is a session receiver. * * @return The session state or null if there is no state set for the session. * @throws IllegalStateException if the receiver is a non-session receiver. */ - public byte[] getSessionState(String sessionId) { - return asyncClient.getSessionState(sessionId).block(operationTimeout); + public byte[] getSessionState() { + return this.getSessionState(asyncClient.getReceiverOptions().getSessionId()); } /** @@ -230,7 +228,7 @@ public byte[] getSessionState(String sessionId) { * @see Message browsing */ public ServiceBusReceivedMessage peekMessage() { - return asyncClient.peekMessage().block(operationTimeout); + return this.peekMessage(asyncClient.getReceiverOptions().getSessionId()); } /** @@ -243,10 +241,9 @@ public ServiceBusReceivedMessage peekMessage() { * @return A peeked {@link ServiceBusReceivedMessage}. * @see Message browsing */ - public ServiceBusReceivedMessage peekMessage(String sessionId) { + ServiceBusReceivedMessage peekMessage(String sessionId) { return asyncClient.peekMessage(sessionId).block(operationTimeout); } - /** * Starting from the given sequence number, reads next the active message without changing the state of the receiver * or the message source. @@ -257,7 +254,7 @@ public ServiceBusReceivedMessage peekMessage(String sessionId) { * @see Message browsing */ public ServiceBusReceivedMessage peekMessageAt(long sequenceNumber) { - return asyncClient.peekMessageAt(sequenceNumber).block(operationTimeout); + return this.peekMessageAt(sequenceNumber, asyncClient.getReceiverOptions().getSessionId()); } /** @@ -270,7 +267,7 @@ public ServiceBusReceivedMessage peekMessageAt(long sequenceNumber) { * @return A peeked {@link ServiceBusReceivedMessage}. * @see Message browsing */ - public ServiceBusReceivedMessage peekMessageAt(long sequenceNumber, String sessionId) { + ServiceBusReceivedMessage peekMessageAt(long sequenceNumber, String sessionId) { return asyncClient.peekMessageAt(sequenceNumber, sessionId).block(operationTimeout); } @@ -284,18 +281,7 @@ public ServiceBusReceivedMessage peekMessageAt(long sequenceNumber, String sessi * @see Message browsing */ public IterableStream peekMessages(int maxMessages) { - if (maxMessages <= 0) { - throw logger.logExceptionAsError(new IllegalArgumentException( - "'maxMessages' cannot be less than or equal to 0. maxMessages: " + maxMessages)); - } - - final Flux messages = asyncClient.peekMessages(maxMessages) - .timeout(operationTimeout); - - // Subscribe so we can kick off this operation. - messages.subscribe(); - - return new IterableStream<>(messages); + return this.peekMessages(maxMessages, asyncClient.getReceiverOptions().getSessionId()); } /** @@ -308,7 +294,7 @@ public IterableStream peekMessages(int maxMessages) { * @throws IllegalArgumentException if {@code maxMessages} is not a positive integer. * @see Message browsing */ - public IterableStream peekMessages(int maxMessages, String sessionId) { + IterableStream peekMessages(int maxMessages, String sessionId) { if (maxMessages <= 0) { throw logger.logExceptionAsError(new IllegalArgumentException( "'maxMessages' cannot be less than or equal to 0. maxMessages: " + maxMessages)); @@ -335,18 +321,7 @@ public IterableStream peekMessages(int maxMessages, S * @see Message browsing */ public IterableStream peekMessagesAt(int maxMessages, long sequenceNumber) { - if (maxMessages <= 0) { - throw logger.logExceptionAsError(new IllegalArgumentException( - "'maxMessages' cannot be less than or equal to 0. maxMessages: " + maxMessages)); - } - - final Flux messages = asyncClient.peekMessagesAt(maxMessages, sequenceNumber) - .timeout(operationTimeout); - - // Subscribe so we can kick off this operation. - messages.subscribe(); - - return new IterableStream<>(messages); + return this.peekMessagesAt(maxMessages, sequenceNumber, asyncClient.getReceiverOptions().getSessionId()); } /** @@ -361,7 +336,7 @@ public IterableStream peekMessagesAt(int maxMessages, * @throws IllegalArgumentException if {@code maxMessages} is not a positive integer. * @see Message browsing */ - public IterableStream peekMessagesAt(int maxMessages, long sequenceNumber, + IterableStream peekMessagesAt(int maxMessages, long sequenceNumber, String sessionId) { if (maxMessages <= 0) { throw logger.logExceptionAsError(new IllegalArgumentException( @@ -431,7 +406,7 @@ public IterableStream receiveMessages(int maxM * @return A deferred message with the matching {@code sequenceNumber}. */ public ServiceBusReceivedMessage receiveDeferredMessage(long sequenceNumber) { - return asyncClient.receiveDeferredMessage(sequenceNumber).block(operationTimeout); + return this.receiveDeferredMessage(sequenceNumber, asyncClient.getReceiverOptions().getSessionId()); } /** @@ -444,7 +419,7 @@ public ServiceBusReceivedMessage receiveDeferredMessage(long sequenceNumber) { * * @return A deferred message with the matching {@code sequenceNumber}. */ - public ServiceBusReceivedMessage receiveDeferredMessage(long sequenceNumber, String sessionId) { + ServiceBusReceivedMessage receiveDeferredMessage(long sequenceNumber, String sessionId) { return asyncClient.receiveDeferredMessage(sequenceNumber, sessionId).block(operationTimeout); } @@ -457,13 +432,7 @@ public ServiceBusReceivedMessage receiveDeferredMessage(long sequenceNumber, Str * @return An {@link IterableStream} of deferred {@link ServiceBusReceivedMessage messages}. */ public IterableStream receiveDeferredMessageBatch(Iterable sequenceNumbers) { - final Flux messages = asyncClient.receiveDeferredMessages(sequenceNumbers) - .timeout(operationTimeout); - - // Subscribe so we can kick off this operation. - messages.subscribe(); - - return new IterableStream<>(messages); + return this.receiveDeferredMessageBatch(sequenceNumbers, asyncClient.getReceiverOptions().getSessionId()); } /** @@ -475,7 +444,7 @@ public IterableStream receiveDeferredMessageBatch(Ite * * @return An {@link IterableStream} of deferred {@link ServiceBusReceivedMessage messages}. */ - public IterableStream receiveDeferredMessageBatch(Iterable sequenceNumbers, + IterableStream receiveDeferredMessageBatch(Iterable sequenceNumbers, String sessionId) { final Flux messages = asyncClient.receiveDeferredMessages(sequenceNumbers, sessionId).timeout(operationTimeout); @@ -529,23 +498,20 @@ public void renewMessageLock(ServiceBusReceivedMessage message, Duration maxLock } /** - * Sets the state of a session given its identifier. - * - * @param sessionId Identifier of session to get. + * Sets the state of the session if this receiver is a session receiver. * * @return The next expiration time for the session lock. * @throws NullPointerException if {@code sessionId} is null. * @throws IllegalArgumentException if {@code sessionId} is an empty string. * @throws IllegalStateException if the receiver is a non-session receiver. */ - public OffsetDateTime renewSessionLock(String sessionId) { - return asyncClient.renewSessionLock(sessionId).block(operationTimeout); + public OffsetDateTime renewSessionLock() { + return this.renewSessionLock(asyncClient.getReceiverOptions().getSessionId()); } /** - * Starts the auto lock renewal for a session id. + * Starts the auto lock renewal for the session that this receiver works for. * - * @param sessionId Id for the session to renew. * @param maxLockRenewalDuration Maximum duration to keep renewing the session. * @param onError A function to call when an error occurs during lock renewal. * @@ -553,27 +519,19 @@ public OffsetDateTime renewSessionLock(String sessionId) { * @throws IllegalArgumentException if {@code sessionId} is an empty string. * @throws IllegalStateException if the receiver is a non-session receiver or the receiver is disposed. */ - public void renewSessionLock(String sessionId, Duration maxLockRenewalDuration, Consumer onError) { - final Consumer throwableConsumer = onError != null - ? onError - : error -> logger.warning("Exception occurred while renewing session: '{}'.", sessionId, error); - - asyncClient.renewSessionLock(sessionId, maxLockRenewalDuration).subscribe( - v -> logger.verbose("Completed renewing session: '{}'", sessionId), - throwableConsumer, - () -> logger.verbose("Auto session lock renewal operation completed: {}", sessionId)); + public void renewSessionLock(Duration maxLockRenewalDuration, Consumer onError) { + this.renewSessionLock(asyncClient.getReceiverOptions().getSessionId(), maxLockRenewalDuration, onError); } /** - * Sets the state of a session given its identifier. + * Sets the state of the session if this receiver is a session receiver. * - * @param sessionId Identifier of session to get. * @param sessionState State to set on the session. * * @throws IllegalStateException if the receiver is a non-session receiver. */ - public void setSessionState(String sessionId, byte[] sessionState) { - asyncClient.setSessionState(sessionId, sessionState).block(operationTimeout); + public void setSessionState(byte[] sessionState) { + this.setSessionState(asyncClient.getReceiverOptions().getSessionId(), sessionState); } /** @@ -651,4 +609,27 @@ private void queueWork(int maximumMessageCount, Duration maxWaitTime, } logger.verbose("[{}] Receive request queued up.", work.getId()); } + + OffsetDateTime renewSessionLock(String sessionId) { + return asyncClient.renewSessionLock(sessionId).block(operationTimeout); + } + + void renewSessionLock(String sessionId, Duration maxLockRenewalDuration, Consumer onError) { + final Consumer throwableConsumer = onError != null + ? onError + : error -> logger.warning("Exception occurred while renewing session: '{}'.", sessionId, error); + + asyncClient.renewSessionLock(maxLockRenewalDuration).subscribe( + v -> logger.verbose("Completed renewing session: '{}'", sessionId), + throwableConsumer, + () -> logger.verbose("Auto session lock renewal operation completed: {}", sessionId)); + } + + void setSessionState(String sessionId, byte[] sessionState) { + asyncClient.setSessionState(sessionId, sessionState).block(operationTimeout); + } + + byte[] getSessionState(String sessionId) { + return asyncClient.getSessionState(sessionId).block(operationTimeout); + } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionManager.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionManager.java index 11a80b5cbab8b..26bb783d7b000 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionManager.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionManager.java @@ -55,6 +55,7 @@ class ServiceBusSessionManager implements AutoCloseable { private final String entityPath; private final MessagingEntityType entityType; private final ReceiverOptions receiverOptions; + private final ServiceBusReceiveLink receiveLink; private final ServiceBusConnectionProcessor connectionProcessor; private final Duration operationTimeout; private final TracerProvider tracerProvider; @@ -77,7 +78,7 @@ class ServiceBusSessionManager implements AutoCloseable { ServiceBusSessionManager(String entityPath, MessagingEntityType entityType, ServiceBusConnectionProcessor connectionProcessor, TracerProvider tracerProvider, - MessageSerializer messageSerializer, ReceiverOptions receiverOptions) { + MessageSerializer messageSerializer, ReceiverOptions receiverOptions, ServiceBusReceiveLink receiveLink) { this.entityPath = entityPath; this.entityType = entityType; this.receiverOptions = receiverOptions; @@ -103,6 +104,14 @@ class ServiceBusSessionManager implements AutoCloseable { this.processor = EmitterProcessor.create(numberOfSchedulers, false); this.sessionReceiveSink = processor.sink(); + this.receiveLink = receiveLink; + } + + ServiceBusSessionManager(String entityPath, MessagingEntityType entityType, + ServiceBusConnectionProcessor connectionProcessor, TracerProvider tracerProvider, + MessageSerializer messageSerializer, ReceiverOptions receiverOptions) { + this(entityPath, entityType, connectionProcessor, tracerProvider, + messageSerializer, receiverOptions, null); } /** @@ -247,7 +256,10 @@ private Mono createSessionReceiveLink() { * @return A Mono that completes when an unnamed session becomes available. * @throws AmqpException if the session manager is already disposed. */ - private Mono getActiveLink() { + Mono getActiveLink() { + if (this.receiveLink != null) { + return Mono.just(this.receiveLink); + } return Mono.defer(() -> createSessionReceiveLink() .flatMap(link -> link.getEndpointStates() .takeUntil(e -> e == AmqpEndpointState.ACTIVE) @@ -282,7 +294,7 @@ private Mono getActiveLink() { */ private Flux getSession(Scheduler scheduler, boolean disposeOnIdle) { return getActiveLink().flatMap(link -> link.getSessionId() - .map(linkName -> sessionReceivers.compute(linkName, (key, existing) -> { + .map(sessionId -> sessionReceivers.compute(sessionId, (key, existing) -> { if (existing != null) { return existing; } @@ -290,7 +302,7 @@ private Flux getSession(Scheduler scheduler, b receiverOptions.getPrefetchCount(), disposeOnIdle, scheduler, this::renewSessionLock, maxSessionLockRenewDuration); }))) - .flatMapMany(session -> session.receive().doFinally(signalType -> { + .flatMapMany(sessionReceiver -> sessionReceiver.receive().doFinally(signalType -> { logger.verbose("Adding scheduler back to pool."); availableSchedulers.push(scheduler); if (receiverOptions.isRollingSessionReceiver()) { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClient.java new file mode 100644 index 0000000000000..3594b8aca09e3 --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClient.java @@ -0,0 +1,129 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import com.azure.core.amqp.implementation.MessageSerializer; +import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.messaging.servicebus.implementation.MessagingEntityType; +import com.azure.messaging.servicebus.implementation.ServiceBusConnectionProcessor; +import com.azure.messaging.servicebus.implementation.ServiceBusConstants; +import reactor.core.publisher.Mono; + +import java.util.Objects; + +import static com.azure.core.util.FluxUtil.monoError; + +/** + * This session receiver client is used to acquire session locks from a queue or topic and create + * {@link ServiceBusReceiverAsyncClient} instances that are tied to the locked sessions. + * + * Use {@link #acceptSession(String)} to acquire the lock of a session if you know the session id. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#nextsession} + * + * Use {@link #acceptNextSession()} to acquire the lock of the next available session without specifying the session id. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#sessionId} + * + */ +@ServiceClient(builder = ServiceBusClientBuilder.class, isAsync = true) +public final class ServiceBusSessionReceiverAsyncClient implements AutoCloseable { + private final String fullyQualifiedNamespace; + private final String entityPath; + private final MessagingEntityType entityType; + private final ReceiverOptions receiverOptions; + private final ServiceBusConnectionProcessor connectionProcessor; + private final TracerProvider tracerProvider; + private final MessageSerializer messageSerializer; + private final Runnable onClientClose; + private final ServiceBusSessionManager unNamedSessionManager; // for acceptNextSession() + private final ClientLogger logger = new ClientLogger(ServiceBusSessionReceiverAsyncClient.class); + + ServiceBusSessionReceiverAsyncClient(String fullyQualifiedNamespace, String entityPath, + MessagingEntityType entityType, ReceiverOptions receiverOptions, + ServiceBusConnectionProcessor connectionProcessor, TracerProvider tracerProvider, + MessageSerializer messageSerializer, Runnable onClientClose) { + this.fullyQualifiedNamespace = Objects.requireNonNull(fullyQualifiedNamespace, + "'fullyQualifiedNamespace' cannot be null."); + this.entityPath = Objects.requireNonNull(entityPath, "'entityPath' cannot be null."); + this.entityType = Objects.requireNonNull(entityType, "'entityType' cannot be null."); + this.receiverOptions = Objects.requireNonNull(receiverOptions, "'receiveOptions cannot be null.'"); + this.connectionProcessor = Objects.requireNonNull(connectionProcessor, "'connectionProcessor' cannot be null."); + this.tracerProvider = Objects.requireNonNull(tracerProvider, "'tracerProvider' cannot be null."); + this.messageSerializer = Objects.requireNonNull(messageSerializer, "'messageSerializer' cannot be null."); + this.onClientClose = Objects.requireNonNull(onClientClose, "'onClientClose' cannot be null."); + this.unNamedSessionManager = new ServiceBusSessionManager(entityPath, entityType, connectionProcessor, + tracerProvider, messageSerializer, receiverOptions); + } + + /** + * Acquires a session lock for the next available session and create a {@link ServiceBusReceiverAsyncClient} + * to receive messages from the session. It will wait until a session is available if no one is available + * immediately. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#nextsession} + * + * @return A {@link ServiceBusReceiverAsyncClient} that is tied to the available session. + * @throws UnsupportedOperationException if the queue or topic subscription is not session-enabled. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono acceptNextSession() { + return unNamedSessionManager.getActiveLink().flatMap(receiveLink -> receiveLink.getSessionId() + .map(sessionId -> { + final ReceiverOptions newReceiverOptions = new ReceiverOptions(receiverOptions.getReceiveMode(), + receiverOptions.getPrefetchCount(), receiverOptions.getMaxLockRenewDuration(), + receiverOptions.isAutoLockRenewEnabled(), sessionId, null); + final ServiceBusSessionManager sessionSpecificManager = new ServiceBusSessionManager(entityPath, + entityType, connectionProcessor, tracerProvider, messageSerializer, newReceiverOptions, + receiveLink); + return new ServiceBusReceiverAsyncClient(fullyQualifiedNamespace, entityPath, + entityType, newReceiverOptions, connectionProcessor, ServiceBusConstants.OPERATION_TIMEOUT, + tracerProvider, messageSerializer, () -> { }, sessionSpecificManager); + })); + } + + /** + * Acquires a session lock for {@code sessionId} and create a {@link ServiceBusReceiverAsyncClient} + * to receive messages from the session. If the session is already locked by another client, an + * {@link com.azure.core.amqp.exception.AmqpException} is thrown. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#sessionId} + * + * @param sessionId The session Id. + * @return A {@link ServiceBusReceiverAsyncClient} that is tied to the specified session. + * @throws NullPointerException if {@code sessionId} is null. + * @throws IllegalArgumentException if {@code sessionId} is empty. + * @throws UnsupportedOperationException if the queue or topic subscription is not session-enabled. + * @throws com.azure.core.amqp.exception.AmqpException if the lock cannot be acquired. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono acceptSession(String sessionId) { + if (sessionId == null) { + return monoError(logger, new NullPointerException("'sessionId' cannot be null")); + } + if (CoreUtils.isNullOrEmpty(sessionId)) { + return monoError(logger, new IllegalArgumentException("'sessionId' cannot be empty")); + } + final ReceiverOptions newReceiverOptions = new ReceiverOptions(receiverOptions.getReceiveMode(), + receiverOptions.getPrefetchCount(), receiverOptions.getMaxLockRenewDuration(), + receiverOptions.isAutoLockRenewEnabled(), sessionId, null); + final ServiceBusSessionManager sessionSpecificManager = new ServiceBusSessionManager(entityPath, entityType, + connectionProcessor, tracerProvider, messageSerializer, newReceiverOptions); + + return sessionSpecificManager.getActiveLink().map(receiveLink -> new ServiceBusReceiverAsyncClient( + fullyQualifiedNamespace, entityPath, entityType, newReceiverOptions, connectionProcessor, + ServiceBusConstants.OPERATION_TIMEOUT, tracerProvider, messageSerializer, () -> { }, + sessionSpecificManager)); + } + + @Override + public void close() { + this.onClientClose.run(); + } +} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClient.java new file mode 100644 index 0000000000000..57078cfc28eed --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClient.java @@ -0,0 +1,83 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceClient; +import com.azure.core.annotation.ServiceMethod; + +import java.time.Duration; +import java.util.Objects; + +/** + * This session receiver client is used to acquire session locks from a queue or topic and create + * {@link ServiceBusReceiverClient} instances that are tied to the locked sessions. + * Use {@link #acceptSession(String)} to acquire the lock of a session if you know the session id. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#nextsession} + * + * Use {@link #acceptNextSession()} to acquire the lock of the next available session without specifying the session id. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#sessionId} + * + */ +@ServiceClient(builder = ServiceBusClientBuilder.class) +public final class ServiceBusSessionReceiverClient implements AutoCloseable { + private final ServiceBusSessionReceiverAsyncClient sessionAsyncClient; + private final Duration operationTimeout; + + ServiceBusSessionReceiverClient(ServiceBusSessionReceiverAsyncClient asyncClient, Duration operationTimeout) { + this.sessionAsyncClient = Objects.requireNonNull(asyncClient, "'asyncClient' cannot be null."); + this.operationTimeout = operationTimeout; + } + + /** + * Acquires a session lock for the next available session and create a {@link ServiceBusReceiverClient} + * to receive messages from the session. It will wait until a session is available if no one is available + * immediately. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#nextsession} + * + * @return A {@link ServiceBusReceiverClient} that is tied to the available session. + * @throws UnsupportedOperationException if the queue or topic subscription is not session-enabled. + * @throws IllegalStateException if the operation times out. The timeout duration is the tryTimeout + * of when you build this client with the + * {@link ServiceBusClientBuilder#retryOptions(com.azure.core.amqp.AmqpRetryOptions)}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ServiceBusReceiverClient acceptNextSession() { + return sessionAsyncClient.acceptNextSession() + .map(asyncClient -> new ServiceBusReceiverClient(asyncClient, operationTimeout)) + .block(operationTimeout); + } + + /** + * Acquires a session lock for {@code sessionId} and create a {@link ServiceBusReceiverClient} + * to receive messages from the session. If the session is already locked by another client, an + * {@link com.azure.core.amqp.exception.AmqpException} is thrown immediately. + * + * {@codesnippet com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#sessionId} + * + * @param sessionId The session Id. + * @return A {@link ServiceBusReceiverClient} that is tied to the specified session. + * @throws NullPointerException if {@code sessionId} is null. + * @throws IllegalArgumentException if {@code sessionId} is empty. + * @throws UnsupportedOperationException if the queue or topic subscription is not session-enabled. + * @throws com.azure.core.amqp.exception.AmqpException if the lock cannot be acquired. + * @throws IllegalStateException if the operation times out. The timeout duration is the tryTimeout + * of when you build this client with the + * {@link ServiceBusClientBuilder#retryOptions(com.azure.core.amqp.AmqpRetryOptions)}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ServiceBusReceiverClient acceptSession(String sessionId) { + return sessionAsyncClient.acceptSession(sessionId) + .map(asyncClient -> new ServiceBusReceiverClient(asyncClient, operationTimeout)) + .block(operationTimeout); + } + + @Override + public void close() { + sessionAsyncClient.close(); + } +} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java index c6b70756564f4..2375bdc6c2c1b 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/Messages.java @@ -20,7 +20,6 @@ public class Messages { public static final String CLASS_NOT_A_SUPPORTED_TYPE = getMessage("CLASS_NOT_A_SUPPORTED_TYPE"); public static final String INVALID_OPERATION_DISPOSED_RECEIVER = getMessage("INVALID_OPERATION_DISPOSED_RECEIVER"); - public static final String INVALID_LOCK_TOKEN_STRING = getMessage("INVALID_LOCK_TOKEN_STRING"); public static final String MESSAGE_NOT_OF_TYPE = getMessage("MESSAGE_NOT_OF_TYPE"); public static final String REQUEST_VALUE_NOT_VALID = getMessage("REQUEST_VALUE_NOT_VALID"); public static final String PROCESS_SPAN_SCOPE_TYPE_ERROR = getMessage("PROCESS_SPAN_SCOPE_TYPE_ERROR"); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java index 9dc191505b668..40433c6e00a1c 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReadmeSamples.java @@ -9,6 +9,7 @@ import com.azure.messaging.servicebus.models.ReceiveMode; import com.azure.messaging.servicebus.models.SubQueue; import reactor.core.Disposable; +import reactor.core.publisher.Mono; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -173,12 +174,12 @@ public void createSessionMessage() { */ public void namedSessionReceiver() { // Creates a session-enabled receiver that gets messages from the session "greetings". - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") .sessionReceiver() .queueName("<< QUEUE NAME >>") - .sessionId("greetings") .buildAsyncClient(); + Mono receiverAsyncClient = sessionReceiver.acceptSession("greetings"); } /** @@ -186,11 +187,12 @@ public void namedSessionReceiver() { */ public void unnamedSessionReceiver() { // Creates a session-enabled receiver that gets messages from the first available session. - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("<< CONNECTION STRING FOR THE SERVICE BUS NAMESPACE >>") .sessionReceiver() .queueName("<< QUEUE NAME >>") .buildAsyncClient(); + Mono receiverAsyncClient = sessionReceiver.acceptNextSession(); } /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java deleted file mode 100644 index 87f06985bbe11..0000000000000 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveMultipleSessionsAsyncSample.java +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.messaging.servicebus; - -import reactor.core.Disposable; -import reactor.core.publisher.Mono; - -import java.security.SecureRandom; -import java.util.concurrent.TimeUnit; - -/** - * Sample demonstrates how to receive and process multiple sessions. In the sample, at most 3 sessions are processed - * concurrently. When there are no more messages in a session, the receiver finds the next available session to - * process. - */ -public class ReceiveMultipleSessionsAsyncSample { - private static final SecureRandom RANDOM = new SecureRandom(); - - /** - * Main method to invoke this demo on how to receive messages from multiple sessions in an Azure Service Bus Queue. - * - * @param args Unused arguments to the program. - * - * @throws InterruptedException If the program is unable to sleep while waiting for the operations to complete. - */ - public static void main(String[] args) throws InterruptedException { - - // The connection string value can be obtained by: - // 1. Going to your Service Bus namespace in Azure Portal. - // 2. Go to "Shared access policies" - // 3. Copy the connection string for the "RootManageSharedAccessKey" policy. - String connectionString = "Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" - + "SharedAccessKey={key}"; - - // Create a receiver. - // "<>" will be the name of the Service Bus session-enabled queue instance you created inside the - // Service Bus namespace. - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() - .connectionString(connectionString) - .sessionReceiver() - .maxConcurrentSessions(3) - .queueName("<>") - .buildAsyncClient(); - - Disposable subscription = receiver.receiveMessages() - .flatMap(context -> { - if (context.hasError()) { - System.out.printf("An error occurred in session %s. Error: %s%n", - context.getSessionId(), context.getThrowable()); - - return Mono.empty(); - } - - System.out.println("Processing message from session: " + context.getSessionId()); - - // Change the `messageProcessed` according to you business logic and if you are able to process the - // message successfully. In this case, we randomly get a boolean to determine if processing was - // successful or not. - boolean messageProcessed = RANDOM.nextBoolean(); - if (messageProcessed) { - return receiver.complete(context.getMessage()); - } else { - return receiver.abandon(context.getMessage()); - } - }).subscribe(); - - // Subscribe is not a blocking call so we sleep here so the program does not end. - TimeUnit.SECONDS.sleep(60); - - // Disposing of the subscription will cancel the receive() operation. - subscription.dispose(); - - // Close the receiver. - receiver.close(); - } -} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java index 0c764c0774c83..cec638475786b 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionAsyncSample.java @@ -33,15 +33,15 @@ public static void main(String[] args) throws InterruptedException { // Create a receiver. // "<>" will be the name of the Service Bus session-enabled queue instance you created inside the // Service Bus namespace. - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString(connectionString) .sessionReceiver() - .sessionId("greetings") .receiveMode(ReceiveMode.PEEK_LOCK) .queueName("<>") .buildAsyncClient(); - Disposable subscription = receiver.receiveMessages() + Mono receiverMono = sessionReceiver.acceptSession("greetings"); + Disposable subscription = receiverMono.flatMapMany(receiver -> receiver.receiveMessages() .flatMap(context -> { if (context.hasError()) { System.out.printf("An error occurred in session %s. Error: %s%n", @@ -52,18 +52,19 @@ public static void main(String[] args) throws InterruptedException { System.out.println("Processing message from session: " + context.getSessionId()); // Process message then complete it. - return receiver.complete(context.getMessage()); - }) + //return receiver.complete(context.getMessage()); + return Mono.empty(); + })) .subscribe(aVoid -> { }, error -> System.err.println("Error occurred: " + error)); // Subscribe is not a blocking call so we sleep here so the program does not end. - TimeUnit.SECONDS.sleep(60); + TimeUnit.SECONDS.sleep(10); // Disposing of the subscription will cancel the receive() operation. subscription.dispose(); // Close the receiver. - receiver.close(); + sessionReceiver.close(); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionSample.java index 7e71405c23bfe..4d2a824c87827 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveNamedSessionSample.java @@ -39,13 +39,12 @@ public static void main(String[] args) { // Create a receiver. // "<>" will be the name of the Service Bus session-enabled queue instance you created inside the // Service Bus namespace. - ServiceBusReceiverClient receiver = new ServiceBusClientBuilder() + ServiceBusSessionReceiverClient sessionReceiver = new ServiceBusClientBuilder() .connectionString(connectionString) .sessionReceiver() - .sessionId("greetings") .queueName("<>") .buildClient(); - + ServiceBusReceiverClient receiver = sessionReceiver.acceptSession("greetings"); while (isRunning.get()) { IterableStream messages = receiver.receiveMessages(10, Duration.ofSeconds(30)); @@ -64,7 +63,7 @@ public static void main(String[] args) { } // Close the receiver. - receiver.close(); + sessionReceiver.close(); } private static boolean processMessage(ServiceBusReceivedMessage message) { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java index c7e178ca23277..fa9d8ef9cc6ec 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ReceiveSingleSessionAsyncSample.java @@ -32,7 +32,7 @@ public static void main(String[] args) throws InterruptedException { // Create a receiver. // "<>" will be the name of the Service Bus topic you created inside the Service Bus namespace. // "<>" will be the name of the session-enabled subscription. - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString(connectionString) .sessionReceiver() .receiveMode(ReceiveMode.PEEK_LOCK) @@ -40,7 +40,8 @@ public static void main(String[] args) throws InterruptedException { .subscriptionName("<>") .buildAsyncClient(); - Disposable subscription = receiver.receiveMessages() + Mono receiverMono = sessionReceiver.acceptNextSession(); + Disposable subscription = receiverMono.flatMapMany(receiver -> receiver.receiveMessages() .flatMap(context -> { if (context.hasError()) { System.out.printf("An error occurred in session %s. Error: %s%n", @@ -52,7 +53,7 @@ public static void main(String[] args) throws InterruptedException { // Process message return receiver.complete(context.getMessage()); - }).subscribe(aVoid -> { + })).subscribe(aVoid -> { }, error -> System.err.println("Error occurred: " + error)); // Subscribe is not a blocking call so we sleep here so the program does not end. @@ -62,6 +63,6 @@ public static void main(String[] args) throws InterruptedException { subscription.dispose(); // Close the receiver. - receiver.close(); + sessionReceiver.close(); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendAndReceiveSessionMessageSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendAndReceiveSessionMessageSample.java index 23c579d462806..cfabe68fa6798 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendAndReceiveSessionMessageSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendAndReceiveSessionMessageSample.java @@ -50,10 +50,9 @@ public static void main(String[] args) throws InterruptedException { .buildAsyncClient(); // Instantiate a client that will be used to receive messages from the session. - ServiceBusReceiverAsyncClient receiver = builder.sessionReceiver() + ServiceBusSessionReceiverAsyncClient sessionReceiver = builder.sessionReceiver() .receiveMode(ReceiveMode.PEEK_LOCK) .queueName(queueName) - .sessionId(sessionId) .buildAsyncClient(); List messages = Arrays.asList( @@ -82,7 +81,7 @@ public static void main(String[] args) throws InterruptedException { () -> System.out.println("Batch send complete.")); // After sending that message, we receive the messages for that sessionId. - receiver.receiveMessages().flatMap(context -> { + sessionReceiver.acceptSession(sessionId).flatMapMany(receiver -> receiver.receiveMessages().flatMap(context -> { ServiceBusReceivedMessage message = context.getMessage(); System.out.println("Received Message Id: " + message.getMessageId()); @@ -90,13 +89,13 @@ public static void main(String[] args) throws InterruptedException { System.out.println("Received Message: " + new String(message.getBody())); return receiver.complete(message); - }).subscribe(); + })).subscribe(); // subscribe() is not a blocking call. We sleep here so the program does not end before the send is complete. TimeUnit.SECONDS.sleep(10); // Close the sender and receiver. sender.close(); - receiver.close(); + sessionReceiver.close(); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientJavaDocCodeSamples.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientJavaDocCodeSamples.java index ceef613e1d9f5..2d4a63b83d718 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientJavaDocCodeSamples.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientJavaDocCodeSamples.java @@ -145,52 +145,34 @@ public void receiveAll() { * Demonstrates how to create a session receiver for a single, first available session. */ public void sessionReceiverSingleInstantiation() { - // BEGIN: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#singlesession - ServiceBusReceiverAsyncClient receiver = new ServiceBusClientBuilder() + // BEGIN: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#nextsession + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" + "SharedAccessKey={key};EntityPath={eh-name}") .sessionReceiver() .queueName("<< QUEUE NAME >>") .buildAsyncClient(); - // END: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#singlesession + Mono receiverMono = sessionReceiver.acceptNextSession(); + // END: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#nextsession - receiver.close(); + sessionReceiver.close(); } /** - * Demonstrates how to create a session receiver for a specific session. + * Demonstrates how to create a session receiver for a single know session id. */ - public void sessionReceiverNamedInstantiation() { + public void sessionReceiverSessionIdInstantiation() { // BEGIN: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#sessionId - ServiceBusReceiverAsyncClient consumer = new ServiceBusClientBuilder() + ServiceBusSessionReceiverAsyncClient sessionReceiver = new ServiceBusClientBuilder() .connectionString("Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" + "SharedAccessKey={key};EntityPath={eh-name}") .sessionReceiver() - .topicName("<< TOPIC NAME >>") - .subscriptionName("<< SUBSCRIPTION NAME >>") - .sessionId("<< my-session-id >>") + .queueName("<< QUEUE NAME >>") .buildAsyncClient(); + Mono receiverMono = sessionReceiver.acceptSession("<< my-session-id >>"); // END: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#sessionId - consumer.close(); - } - - /** - * Demonstrates how to create a session receiver for processing multiple sessions. - */ - public void sessionReceiverMultipleInstantiation() { - // BEGIN: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#multiplesessions - ServiceBusReceiverAsyncClient consumer = new ServiceBusClientBuilder() - .connectionString("Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" - + "SharedAccessKey={key};EntityPath={eh-name}") - .sessionReceiver() - .topicName("<< TOPIC NAME >>") - .subscriptionName("<< SUBSCRIPTION NAME >>") - .maxConcurrentSessions(3) - .buildAsyncClient(); - // END: com.azure.messaging.servicebus.servicebusasyncreceiverclient.instantiation#multiplesessions - - consumer.close(); + sessionReceiver.close(); } public void createTransaction() { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverClientJavaDocCodeSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverClientJavaDocCodeSample.java index 57da95ac8ff87..9732f361355f6 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverClientJavaDocCodeSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/ServiceBusReceiverClientJavaDocCodeSample.java @@ -24,4 +24,37 @@ public void instantiate() { receiver.close(); } + + /** + * Demonstrates how to create a session receiver for a single, first available session. + */ + public void sessionReceiverSingleInstantiation() { + // BEGIN: com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#nextsession + ServiceBusSessionReceiverClient sessionReceiver = new ServiceBusClientBuilder() + .connectionString("Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" + + "SharedAccessKey={key};EntityPath={eh-name}") + .sessionReceiver() + .queueName("<< QUEUE NAME >>") + .buildClient(); + ServiceBusReceiverClient receiver = sessionReceiver.acceptNextSession(); + // END: com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#nextsession + sessionReceiver.close(); + } + + /** + * Demonstrates how to create a session receiver for a single know session id. + */ + public void sessionReceiverSessionIdInstantiation() { + // BEGIN: com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#sessionId + ServiceBusSessionReceiverClient sessionReceiver = new ServiceBusClientBuilder() + .connectionString("Endpoint={fully-qualified-namespace};SharedAccessKeyName={policy-name};" + + "SharedAccessKey={key};EntityPath={eh-name}") + .sessionReceiver() + .queueName("<< QUEUE NAME >>") + .buildClient(); + ServiceBusReceiverClient receiver = sessionReceiver.acceptSession("<< my-session-id >>"); + // END: com.azure.messaging.servicebus.servicebusreceiverclient.instantiation#sessionId + + sessionReceiver.close(); + } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java index 4515af7588197..98bc1ec053727 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java @@ -116,8 +116,7 @@ void receiveNoAutoComplete() { final Duration maxAutoLockRenewDuration = Duration.ofSeconds(0); final OffsetDateTime lockedUntil = OffsetDateTime.now().plusSeconds(3); final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.RECEIVE_AND_DELETE, prefetch, - maxAutoLockRenewDuration, false, "sessionId", false, - 1); + maxAutoLockRenewDuration, false, "sessionId", null); final ServiceBusAsyncConsumer consumer = new ServiceBusAsyncConsumer(LINK_NAME, linkProcessor, serializer, receiverOptions); @@ -164,8 +163,7 @@ void canDispose() { final OffsetDateTime lockedUntil = OffsetDateTime.now().plusSeconds(3); final String lockToken = UUID.randomUUID().toString(); final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.RECEIVE_AND_DELETE, prefetch, - maxAutoLockRenewDuration, false, "sessionId", false, - 1); + maxAutoLockRenewDuration, false, "sessionId", null); final ServiceBusAsyncConsumer consumer = new ServiceBusAsyncConsumer(LINK_NAME, linkProcessor, serializer, receiverOptions); @@ -205,8 +203,7 @@ void onError() { final OffsetDateTime lockedUntil = OffsetDateTime.now().plusSeconds(3); final String lockToken = UUID.randomUUID().toString(); final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.RECEIVE_AND_DELETE, prefetch, - maxAutoLockRenewDuration, false, "sessionId", false, - 1); + maxAutoLockRenewDuration, false, "sessionId", null); final ServiceBusAsyncConsumer consumer = new ServiceBusAsyncConsumer(LINK_NAME, linkProcessor, serializer, receiverOptions); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java index e107af34a79e3..756e008f63aa5 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java @@ -68,6 +68,7 @@ class ServiceBusReceiverAsyncClientIntegrationTest extends IntegrationTestBase { * Receiver used to clean up resources in {@link #afterTest()}. */ private ServiceBusReceiverAsyncClient receiveAndDeleteReceiver; + private Mono receiveAndDeleteReceiverMono; ServiceBusReceiverAsyncClientIntegrationTest() { super(new ClientLogger(ServiceBusReceiverAsyncClientIntegrationTest.class)); @@ -85,12 +86,19 @@ protected void afterTest() { final int pendingDeferred = messagesDeferredPending.size(); if (pending < 1 && pendingDeferred < 1) { dispose(receiver, sender, receiveAndDeleteReceiver); + if (receiveAndDeleteReceiverMono != null) { + dispose(receiveAndDeleteReceiverMono.block()); + } return; } // In the case that this test failed... we're going to drain the queue or subscription. try { + dispose(receiver, sender); if (pending > 0) { + if (receiveAndDeleteReceiverMono != null) { + receiveAndDeleteReceiver = receiveAndDeleteReceiverMono.block(); + } receiveAndDeleteReceiver.receiveMessages() .map(message -> { logger.info("Message received: {}", message.getMessage().getSequenceNumber()); @@ -118,7 +126,7 @@ protected void afterTest() { } catch (Exception e) { logger.warning("Error occurred when draining for deferred messages.", e); } finally { - dispose(receiver, sender, receiveAndDeleteReceiver); + dispose(receiveAndDeleteReceiver); } } @@ -312,19 +320,14 @@ void receiveTwoMessagesAutoComplete(MessagingEntityType entityType, boolean isSe if (isSessionEnabled) { assertNotNull(sessionId, "'sessionId' should have been set."); this.receiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) - .sessionId(sessionId) - .buildAsyncClient(); - this.receiveAndDeleteReceiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, + .buildAsyncClient().acceptSession(sessionId).block(); + this.receiveAndDeleteReceiverMono = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) - .sessionId(sessionId) .receiveMode(ReceiveMode.RECEIVE_AND_DELETE) - .buildAsyncClient(); + .buildAsyncClient().acceptSession(sessionId); } else { this.receiver = getReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) .buildAsyncClient(); - this.receiveAndDeleteReceiver = getReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) - .receiveMode(ReceiveMode.RECEIVE_AND_DELETE) - .buildAsyncClient(); } final String messageId = UUID.randomUUID().toString(); @@ -360,13 +363,11 @@ void receiveMessageAutoComplete(MessagingEntityType entityType, boolean isSessio if (isSessionEnabled) { assertNotNull(sessionId, "'sessionId' should have been set."); this.receiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) - .sessionId(sessionId) - .buildAsyncClient(); - this.receiveAndDeleteReceiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, + .buildAsyncClient().acceptSession(sessionId).block(); + this.receiveAndDeleteReceiverMono = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) - .sessionId(sessionId) .receiveMode(ReceiveMode.RECEIVE_AND_DELETE) - .buildAsyncClient(); + .buildAsyncClient().acceptSession(sessionId); } else { this.receiver = getReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) .buildAsyncClient(); @@ -941,12 +942,12 @@ void setAndGetSessionState(MessagingEntityType entityType) { logger.info("SessionId: {}. LockToken: {}. LockedUntil: {}. Message received.", m.getSessionId(), m.getMessage().getLockToken(), m.getMessage().getLockedUntil()); receivedMessage.set(m.getMessage()); - return receiver.setSessionState(sessionId, sessionState); + return receiver.setSessionState(sessionState); })) .expectComplete() .verify(); - StepVerifier.create(receiver.getSessionState(sessionId)) + StepVerifier.create(receiver.getSessionState()) .assertNext(state -> { logger.info("State received: {}", new String(state, UTF_8)); assertArrayEquals(sessionState, state); @@ -1265,14 +1266,12 @@ private void setSenderAndReceiver(MessagingEntityType entityType, int entityInde assertNotNull(sessionId, "'sessionId' should have been set."); this.receiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) .disableAutoComplete() - .sessionId(sessionId) - .buildAsyncClient(); - this.receiveAndDeleteReceiver = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, + .buildAsyncClient().acceptSession(sessionId).block(); + this.receiveAndDeleteReceiverMono = getSessionReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) .disableAutoComplete() - .sessionId(sessionId) .receiveMode(ReceiveMode.RECEIVE_AND_DELETE) - .buildAsyncClient(); + .buildAsyncClient().acceptSession(sessionId); } else { this.receiver = getReceiverBuilder(useCredentials, entityType, entityIndex, shareConnection) .disableAutoComplete() diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java index 8948e8349c0d1..bfdd9d0d7f643 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java @@ -178,7 +178,7 @@ CbsAuthorizationType.SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, new AmqpRe sessionReceiver = new ServiceBusReceiverAsyncClient(NAMESPACE, ENTITY_PATH, MessagingEntityType.QUEUE, new ReceiverOptions(ReceiveMode.PEEK_LOCK, PREFETCH, null, false, "Some-Session", - false, null), + null), connectionProcessor, CLEANUP_INTERVAL, tracerProvider, messageSerializer, onClientClose); } @@ -939,7 +939,7 @@ void autoCompleteMessageSessionReceiver() { final List messages = getMessages(); final String lockToken = UUID.randomUUID().toString(); final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, PREFETCH, null, - true, "Some-Session", false, null); + true, "Some-Session", null); final ServiceBusReceiverAsyncClient sessionReceiver2 = new ServiceBusReceiverAsyncClient(NAMESPACE, ENTITY_PATH, MessagingEntityType.QUEUE, receiverOptions, connectionProcessor, CLEANUP_INTERVAL, tracerProvider, messageSerializer, onClientClose); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java index 4cef38641f7ea..daac1f6d6c42e 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; +import reactor.core.publisher.Mono; import java.time.Duration; import java.time.OffsetDateTime; @@ -54,6 +55,7 @@ class ServiceBusReceiverClientIntegrationTest extends IntegrationTestBase { * Receiver used to clean up resources in {@link #afterTest()}. */ private ServiceBusReceiverClient receiveAndDeleteReceiver; + private Mono receiveAndDeleteReceiverMono; protected ServiceBusReceiverClientIntegrationTest() { super(new ClientLogger(ServiceBusReceiverClientIntegrationTest.class)); @@ -69,11 +71,18 @@ protected void afterTest() { final int pending = messagesPending.get(); if (pending < 1 && messagesDeferred.get().size() < 1) { dispose(receiver, sender, receiveAndDeleteReceiver); + if (receiveAndDeleteReceiverMono != null) { + dispose(receiveAndDeleteReceiverMono.block()); + } return; } // In the case that this test failed... we're going to drain the queue or subscription. if (pending > 0) { + dispose(receiver, sender); + if (receiveAndDeleteReceiverMono != null) { + receiveAndDeleteReceiver = receiveAndDeleteReceiverMono.block(); + } try { IterableStream removedMessage = receiveAndDeleteReceiver.receiveMessages( pending, Duration.ofSeconds(15)); @@ -99,7 +108,7 @@ protected void afterTest() { } } - dispose(receiver, sender, receiveAndDeleteReceiver); + dispose(receiveAndDeleteReceiver); } /** @@ -732,11 +741,8 @@ void receiveAndDefer(MessagingEntityType entityType, boolean isSessionEnabled) { // cleanup final ServiceBusReceivedMessage deferred; - if (isSessionEnabled) { - deferred = receiver.receiveDeferredMessage(receivedMessage.getSequenceNumber(), sessionId); - } else { - deferred = receiver.receiveDeferredMessage(receivedMessage.getSequenceNumber()); - } + deferred = receiver.receiveDeferredMessage(receivedMessage.getSequenceNumber()); + receiver.complete(deferred); messagesPending.addAndGet(-maxMessages); } @@ -817,13 +823,11 @@ private void setSenderAndReceiver(MessagingEntityType entityType, int entityInde if (isSessionEnabled) { assertNotNull(sessionId, "'sessionId' should have been set."); this.receiver = getSessionReceiverBuilder(false, entityType, entityIndex, sharedConnection) - .sessionId(sessionId) - .buildClient(); - this.receiveAndDeleteReceiver = getSessionReceiverBuilder(false, entityType, entityIndex, + .buildClient().acceptSession(sessionId); + this.receiveAndDeleteReceiverMono = Mono.fromCallable(() -> getSessionReceiverBuilder(false, entityType, entityIndex, sharedConnection) - .sessionId(sessionId) .receiveMode(ReceiveMode.RECEIVE_AND_DELETE) - .buildClient(); + .buildClient().acceptSession(sessionId)); } else { this.receiver = getReceiverBuilder(false, entityType, entityIndex, sharedConnection) .buildClient(); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java index b026ff44c458c..c975b62fa26e2 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientTest.java @@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -55,6 +54,7 @@ class ServiceBusReceiverClientTest { private static final String NAMESPACE = "test-namespace"; private static final String ENTITY_PATH = "test-entity-path"; private static final String LOCK_TOKEN = UUID.randomUUID().toString(); + private static final String SESSION_ID = "test-session-id"; private static final Duration OPERATION_TIMEOUT = Duration.ofSeconds(5); @@ -72,6 +72,8 @@ class ServiceBusReceiverClientTest { private ServiceBusReceivedMessage message; @Mock private Consumer onErrorConsumer; + @Mock + private ReceiverOptions sessionReceiverOptions; @BeforeEach void setup() { @@ -79,7 +81,7 @@ void setup() { when(asyncClient.getEntityPath()).thenReturn(ENTITY_PATH); when(asyncClient.getFullyQualifiedNamespace()).thenReturn(NAMESPACE); when(asyncClient.getReceiverOptions()).thenReturn(new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, null, false)); - + when(sessionReceiverOptions.getSessionId()).thenReturn(SESSION_ID); client = new ServiceBusReceiverClient(asyncClient, OPERATION_TIMEOUT); } @@ -221,13 +223,13 @@ void autoRenewSessionLock() { fail("On error should not have been invoked."); return null; }).when(onErrorConsumer).accept(any()); - when(asyncClient.renewSessionLock(LOCK_TOKEN, maxDuration)).thenReturn(publisher.mono()); + when(asyncClient.renewSessionLock(maxDuration)).thenReturn(publisher.mono()); // Act - client.renewSessionLock(LOCK_TOKEN, maxDuration, onErrorConsumer); + client.renewSessionLock(maxDuration, onErrorConsumer); // Assert - verify(asyncClient).renewSessionLock(LOCK_TOKEN, maxDuration); + verify(asyncClient).renewSessionLock(maxDuration); } /** @@ -240,15 +242,15 @@ void autoRenewSessionLockFails() { final TestPublisher publisher = TestPublisher.create(); final Throwable testError = new IllegalAccessException("Some exception"); - when(asyncClient.renewSessionLock(LOCK_TOKEN, maxDuration)).thenReturn(publisher.mono()); + when(asyncClient.renewSessionLock(maxDuration)).thenReturn(publisher.mono()); - client.renewSessionLock(LOCK_TOKEN, maxDuration, onErrorConsumer); + client.renewSessionLock(maxDuration, onErrorConsumer); // Act publisher.error(testError); // Assert - verify(asyncClient).renewSessionLock(LOCK_TOKEN, maxDuration); + verify(asyncClient).renewSessionLock(maxDuration); verify(onErrorConsumer).accept(testError); } @@ -262,15 +264,15 @@ void autoRenewSessionLockFailsNull() { final TestPublisher publisher = TestPublisher.create(); final Throwable testError = new IllegalAccessException("Some exception"); - when(asyncClient.renewSessionLock(LOCK_TOKEN, maxDuration)).thenReturn(publisher.mono()); + when(asyncClient.renewSessionLock(maxDuration)).thenReturn(publisher.mono()); - client.renewSessionLock(LOCK_TOKEN, maxDuration, null); + client.renewSessionLock(maxDuration, null); // Act publisher.error(testError); // Assert - verify(asyncClient).renewSessionLock(LOCK_TOKEN, maxDuration); + verify(asyncClient).renewSessionLock(maxDuration); verify(onErrorConsumer, never()).accept(testError); } @@ -392,12 +394,12 @@ void deadLetterMessageWithOptions() { @Test void getSessionState() { // Arrange - final String sessionId = "a-session-id"; final byte[] contents = new byte[]{10, 111, 23}; - when(asyncClient.getSessionState(sessionId)).thenReturn(Mono.just(contents)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.getSessionState(SESSION_ID)).thenReturn(Mono.just(contents)); // Act - final byte[] actual = client.getSessionState(sessionId); + final byte[] actual = client.getSessionState(); // Assert assertEquals(contents, actual); @@ -406,11 +408,11 @@ void getSessionState() { @Test void getSessionStateNull() { // Arrange - final String sessionId = "a-session-id"; - when(asyncClient.getSessionState(sessionId)).thenReturn(Mono.empty()); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.getSessionState(SESSION_ID)).thenReturn(Mono.empty()); // Act - final byte[] actual = client.getSessionState(sessionId); + final byte[] actual = client.getSessionState(); // Assert assertNull(actual); @@ -420,7 +422,8 @@ void getSessionStateNull() { void peekMessage() { // Arrange final ServiceBusReceivedMessage message = mock(ServiceBusReceivedMessage.class); - when(asyncClient.peekMessage()).thenReturn(Mono.just(message)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessage(SESSION_ID)).thenReturn(Mono.just(message)); // Act final ServiceBusReceivedMessage actual = client.peekMessage(); @@ -432,7 +435,8 @@ void peekMessage() { @Test void peekMessageEmptyEntity() { // Arrange - when(asyncClient.peekMessage()).thenReturn(Mono.empty()); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessage(SESSION_ID)).thenReturn(Mono.empty()); // Act final ServiceBusReceivedMessage actual = client.peekMessage(); @@ -446,7 +450,8 @@ void peekMessageFromSequence() { // Arrange final long sequenceNumber = 154; final ServiceBusReceivedMessage message = mock(ServiceBusReceivedMessage.class); - when(asyncClient.peekMessageAt(sequenceNumber)).thenReturn(Mono.just(message)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessageAt(sequenceNumber, SESSION_ID)).thenReturn(Mono.just(message)); // Act final ServiceBusReceivedMessage actual = client.peekMessageAt(sequenceNumber); @@ -462,7 +467,8 @@ void peekMessageFromSequence() { void peekMessagesEmptyEntity() { // Arrange final int maxMessages = 10; - when(asyncClient.peekMessages(maxMessages)).thenReturn(Flux.empty()); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessages(maxMessages, SESSION_ID)).thenReturn(Flux.empty()); // Act final IterableStream actual = client.peekMessages(maxMessages); @@ -505,7 +511,9 @@ void peekMessagesMax() { }); }); - when(asyncClient.peekMessages(maxMessages)).thenReturn(messages); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessages(maxMessages, SESSION_ID)).thenReturn(messages); + // Act final IterableStream actual = client.peekMessages(maxMessages); @@ -549,7 +557,8 @@ void peekMessagesLessThan() { }); }); - when(asyncClient.peekMessages(maxMessages)).thenReturn(messages); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessages(maxMessages, SESSION_ID)).thenReturn(messages); // Act final IterableStream actual = client.peekMessages(maxMessages); @@ -576,7 +585,8 @@ void peekMessagesMaxSequenceNumber() { sink.complete(); })); - when(asyncClient.peekMessagesAt(maxMessages, sequenceNumber)).thenReturn(messages); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.peekMessagesAt(maxMessages, sequenceNumber, SESSION_ID)).thenReturn(messages); // Act final IterableStream actual = client.peekMessagesAt(maxMessages, sequenceNumber); @@ -758,7 +768,8 @@ void receiveDeferredMessage() { // Arrange final long sequenceNumber = 231412; final ServiceBusReceivedMessage message = mock(ServiceBusReceivedMessage.class); - when(asyncClient.receiveDeferredMessage(anyLong())).thenReturn(Mono.just(message)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.receiveDeferredMessage(sequenceNumber, SESSION_ID)).thenReturn(Mono.just(message)); // Act final ServiceBusReceivedMessage actual = client.receiveDeferredMessage(sequenceNumber); @@ -766,7 +777,7 @@ void receiveDeferredMessage() { // Assert assertEquals(message, actual); - verify(asyncClient).receiveDeferredMessage(sequenceNumber); + verify(asyncClient).receiveDeferredMessage(sequenceNumber, SESSION_ID); } @Test @@ -776,7 +787,8 @@ void receiveDeferredMessageBatch() { final long sequenceNumber2 = 13124; final ServiceBusReceivedMessage message = mock(ServiceBusReceivedMessage.class); final ServiceBusReceivedMessage message2 = mock(ServiceBusReceivedMessage.class); - when(asyncClient.receiveDeferredMessages(any())).thenReturn(Flux.just(message, message2)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.receiveDeferredMessages(any(), eq(SESSION_ID))).thenReturn(Flux.just(message, message2)); List collection = Arrays.asList(sequenceNumber, sequenceNumber2); // Act @@ -809,10 +821,12 @@ void renewSessionLock() { // Arrange final String sessionId = "a-session-id"; final OffsetDateTime response = Instant.ofEpochSecond(1585259339).atOffset(ZoneOffset.UTC); - when(asyncClient.renewSessionLock(sessionId)).thenReturn(Mono.just(response)); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.renewSessionLock(SESSION_ID)).thenReturn(Mono.just(response)); + // Act - final OffsetDateTime actual = client.renewSessionLock(sessionId); + final OffsetDateTime actual = client.renewSessionLock(); // Assert assertEquals(response, actual); @@ -821,14 +835,14 @@ void renewSessionLock() { @Test void setSessionState() { // Arrange - final String sessionId = "a-session-id"; final byte[] contents = new byte[]{10, 111, 23}; - when(asyncClient.setSessionState(sessionId, contents)).thenReturn(Mono.empty()); + when(asyncClient.getReceiverOptions()).thenReturn(sessionReceiverOptions); + when(asyncClient.setSessionState(SESSION_ID, contents)).thenReturn(Mono.empty()); // Act - client.setSessionState(sessionId, contents); + client.setSessionState(contents); // Assert - verify(asyncClient).setSessionState(sessionId, contents); + verify(asyncClient).setSessionState(SESSION_ID, contents); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerIntegrationTest.java index fe6687796376a..68b32b6ab0952 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerIntegrationTest.java @@ -8,7 +8,6 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder.ServiceBusSessionReceiverClientBuilder; import com.azure.messaging.servicebus.implementation.MessagingEntityType; import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import reactor.core.Disposable; @@ -20,14 +19,12 @@ import java.time.Duration; import java.time.OffsetDateTime; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.Collectors; -import java.util.stream.IntStream; import static com.azure.messaging.servicebus.TestUtils.getServiceBusMessage; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -103,69 +100,6 @@ void singleUnnamedSession(MessagingEntityType entityType) { } } - /** - * Verifies that we can roll over to a next session. - */ - @Test - void multipleSessions() { - // Arrange - final int entityIndex = TestUtils.USE_CASE_MULTIPLE_SESSION; - final String messageId = "singleUnnamedSession"; - final String now = OffsetDateTime.now().toString(); - final List sessionIds = IntStream.range(0, 3) - .mapToObj(number -> String.join("-", String.valueOf(number), "singleUnnamedSession", now)) - .collect(Collectors.toList()); - - logger.info("------ Session ids ------"); - for (int i = 0; i < sessionIds.size(); i++) { - logger.info("[{}]: {}", i, sessionIds.get(i)); - } - - final String contents = "Some-contents"; - final int numberToSend = 3; - final int maxMessages = numberToSend * sessionIds.size(); - final int maxConcurrency = 2; - final Set set = new HashSet<>(); - - setSenderAndReceiver(MessagingEntityType.SUBSCRIPTION, entityIndex, - builder -> builder.maxConcurrentSessions(maxConcurrency)); - - final Disposable subscription = Flux.interval(Duration.ofMillis(500)) - .take(maxMessages) - .flatMap(index -> { - final int i = (int) (index % sessionIds.size()); - final String id = sessionIds.get(i); - final ServiceBusMessage message = getServiceBusMessage(contents, messageId) - .setSessionId(id); - messagesPending.incrementAndGet(); - return sender.sendMessage(message).thenReturn( - String.format("sessionId[%s] sent[%s] Message sent.", id, index)); - }).subscribe( - message -> logger.info(message), - error -> logger.error("Error encountered.", error), - () -> logger.info("Finished sending.")); - - // Act & Assert - try { - StepVerifier.create(receiver.receiveMessages()) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency, messageId, contents, context)) - - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency + 1, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency + 1, messageId, contents, context)) - .assertNext(context -> assertFromSession(sessionIds, set, maxConcurrency + 1, messageId, contents, context)) - .thenCancel() - .verify(Duration.ofMinutes(2)); - } finally { - subscription.dispose(); - } - } - private void assertFromSession(List sessionIds, Set currentSessions, int maxSize, String messageId, String contents, ServiceBusReceivedMessageContext context) { logger.info("Verifying message: {}", context.getSessionId()); @@ -192,7 +126,7 @@ private void setSenderAndReceiver(MessagingEntityType entityType, int entityInde .buildAsyncClient(); ServiceBusSessionReceiverClientBuilder sessionBuilder = getSessionReceiverBuilder(false, entityType, entityIndex, false); - this.receiver = onBuild.apply(sessionBuilder).buildAsyncClient(); + this.receiver = onBuild.apply(sessionBuilder).buildAsyncClient().acceptSession(sessionId).block(); } private static void assertMessageEquals(String sessionId, String messageId, String contents, diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java index bd0260b853ffb..833b78e2b5610 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java @@ -155,8 +155,7 @@ void afterEach(TestInfo testInfo) { @Test void receiveNull() { // Arrange - ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, MAX_LOCK_RENEWAL, false, null, - true, 5); + ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, MAX_LOCK_RENEWAL, false, null, 5); sessionManager = new ServiceBusSessionManager(ENTITY_PATH, ENTITY_TYPE, connectionProcessor, tracerProvider, messageSerializer, receiverOptions); @@ -173,7 +172,7 @@ void receiveNull() { void singleUnnamedSession() { // Arrange ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, MAX_LOCK_RENEWAL, false, null, - true, 5); + 5); sessionManager = new ServiceBusSessionManager(ENTITY_PATH, ENTITY_TYPE, connectionProcessor, tracerProvider, messageSerializer, receiverOptions); @@ -226,7 +225,7 @@ void singleUnnamedSession() { void multipleSessions() { // Arrange final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, MAX_LOCK_RENEWAL, true, - null, true, 5); + null, 5); sessionManager = new ServiceBusSessionManager(ENTITY_PATH, ENTITY_TYPE, connectionProcessor, tracerProvider, messageSerializer, receiverOptions); @@ -348,8 +347,9 @@ void multipleSessions() { void multipleReceiveUnnamedSession() { // Arrange final int expectedLinksCreated = 2; + final Callable onRenewal = () -> OffsetDateTime.now().plus(Duration.ofSeconds(5)); final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, Duration.ZERO, false, - null, false, 1); + null, 1); sessionManager = new ServiceBusSessionManager(ENTITY_PATH, ENTITY_TYPE, connectionProcessor, tracerProvider, messageSerializer, receiverOptions); @@ -359,6 +359,7 @@ void multipleReceiveUnnamedSession() { when(amqpReceiveLink.getLinkName()).thenReturn(linkName); when(amqpReceiveLink.getSessionId()).thenReturn(Mono.just(sessionId)); + when(amqpReceiveLink.getSessionLockedUntil()).thenReturn(Mono.fromCallable(onRenewal)); // Session 2's final ServiceBusReceiveLink amqpReceiveLink2 = mock(ServiceBusReceiveLink.class); @@ -373,6 +374,7 @@ void multipleReceiveUnnamedSession() { when(amqpReceiveLink2.getEndpointStates()).thenReturn(endpointProcessor); when(amqpReceiveLink2.getLinkName()).thenReturn(linkName2); when(amqpReceiveLink2.getSessionId()).thenReturn(Mono.just(sessionId2)); + when(amqpReceiveLink2.getSessionLockedUntil()).thenReturn(Mono.fromCallable(onRenewal)); final AtomicInteger count = new AtomicInteger(); when(connection.createReceiveLink(anyString(), eq(ENTITY_PATH), any(ReceiveMode.class), isNull(), diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClientTest.java new file mode 100644 index 0000000000000..069cb8901a56e --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverAsyncClientTest.java @@ -0,0 +1,320 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import com.azure.core.amqp.AmqpEndpointState; +import com.azure.core.amqp.AmqpRetryOptions; +import com.azure.core.amqp.AmqpTransportType; +import com.azure.core.amqp.ProxyOptions; +import com.azure.core.amqp.implementation.CbsAuthorizationType; +import com.azure.core.amqp.implementation.ConnectionOptions; +import com.azure.core.amqp.implementation.MessageSerializer; +import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.credential.TokenCredential; +import com.azure.core.util.ClientOptions; +import com.azure.core.util.logging.ClientLogger; +import com.azure.messaging.servicebus.implementation.MessagingEntityType; +import com.azure.messaging.servicebus.implementation.ServiceBusAmqpConnection; +import com.azure.messaging.servicebus.implementation.ServiceBusConnectionProcessor; +import com.azure.messaging.servicebus.implementation.ServiceBusManagementNode; +import com.azure.messaging.servicebus.implementation.ServiceBusReceiveLink; +import com.azure.messaging.servicebus.models.ReceiveMode; +import org.apache.qpid.proton.amqp.messaging.Accepted; +import org.apache.qpid.proton.engine.SslDomain; +import org.apache.qpid.proton.message.Message; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import reactor.core.publisher.EmitterProcessor; +import reactor.core.publisher.Flux; +import reactor.core.publisher.FluxSink; +import reactor.core.publisher.Mono; +import reactor.core.publisher.ReplayProcessor; +import reactor.core.scheduler.Schedulers; +import reactor.test.StepVerifier; +import reactor.test.publisher.TestPublisher; + +import java.time.Duration; +import java.time.OffsetDateTime; +import java.util.Collections; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class ServiceBusSessionReceiverAsyncClientTest { + private static final ClientOptions CLIENT_OPTIONS = new ClientOptions(); + private static final Duration TIMEOUT = Duration.ofSeconds(10); + private static final Duration MAX_LOCK_RENEWAL = Duration.ofSeconds(5); + + private static final String NAMESPACE = "my-namespace-foo.net"; + private static final String ENTITY_PATH = "queue-name"; + private static final MessagingEntityType ENTITY_TYPE = MessagingEntityType.QUEUE; + + private final ClientLogger logger = new ClientLogger(ServiceBusReceiverAsyncClientTest.class); + private final ReplayProcessor endpointProcessor = ReplayProcessor.cacheLast(); + private final FluxSink endpointSink = endpointProcessor.sink(FluxSink.OverflowStrategy.BUFFER); + private final EmitterProcessor messageProcessor = EmitterProcessor.create(); + private final FluxSink messageSink = messageProcessor.sink(FluxSink.OverflowStrategy.BUFFER); + private final TracerProvider tracerProvider = new TracerProvider(Collections.emptyList()); + + private ServiceBusConnectionProcessor connectionProcessor; + private ServiceBusSessionManager sessionManager; + + @Mock + private ServiceBusReceiveLink amqpReceiveLink; + @Mock + private ServiceBusAmqpConnection connection; + @Mock + private TokenCredential tokenCredential; + @Mock + private MessageSerializer messageSerializer; + @Mock + private ServiceBusManagementNode managementNode; + + + @BeforeAll + static void beforeAll() { + StepVerifier.setDefaultTimeout(Duration.ofSeconds(60)); + } + + @AfterAll + static void afterAll() { + StepVerifier.resetDefaultTimeout(); + } + + @BeforeEach + void beforeEach(TestInfo testInfo) { + logger.info("===== [{}] Setting up. =====", testInfo.getDisplayName()); + + MockitoAnnotations.initMocks(this); + + // Forcing us to publish the messages we receive on the AMQP link on single. Similar to how it is done + // in ReactorExecutor. + when(amqpReceiveLink.receive()).thenReturn(messageProcessor.publishOn(Schedulers.single())); + + when(amqpReceiveLink.getHostname()).thenReturn(NAMESPACE); + when(amqpReceiveLink.getEntityPath()).thenReturn(ENTITY_PATH); + when(amqpReceiveLink.getEndpointStates()).thenReturn(endpointProcessor); + + ConnectionOptions connectionOptions = new ConnectionOptions(NAMESPACE, tokenCredential, + CbsAuthorizationType.SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, + new AmqpRetryOptions().setTryTimeout(TIMEOUT), ProxyOptions.SYSTEM_DEFAULTS, Schedulers.boundedElastic(), + CLIENT_OPTIONS, SslDomain.VerifyMode.VERIFY_PEER_NAME); + + when(connection.getEndpointStates()).thenReturn(endpointProcessor); + endpointSink.next(AmqpEndpointState.ACTIVE); + + when(connection.getManagementNode(ENTITY_PATH, ENTITY_TYPE)) + .thenReturn(Mono.just(managementNode)); + + connectionProcessor = + Flux.create(sink -> sink.next(connection)) + .subscribeWith(new ServiceBusConnectionProcessor(connectionOptions.getFullyQualifiedNamespace(), + connectionOptions.getRetry())); + } + + @AfterEach + void afterEach(TestInfo testInfo) { + logger.info("===== [{}] Tearing down. =====", testInfo.getDisplayName()); + + if (sessionManager != null) { + sessionManager.close(); + } + + if (connectionProcessor != null) { + connectionProcessor.dispose(); + } + + Mockito.framework().clearInlineMocks(); + } + + @Test + void acceptSession() { + // Arrange + ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, Duration.ZERO, false, null, null); + final String lockToken = "a-lock-token"; + final String linkName = "my-link-name"; + final String sessionId = linkName; + final OffsetDateTime sessionLockedUntil = OffsetDateTime.now().plus(Duration.ofSeconds(30)); + + final Message message = mock(Message.class); + final ServiceBusReceivedMessage receivedMessage = mock(ServiceBusReceivedMessage.class); + + when(messageSerializer.deserialize(message, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage); + when(receivedMessage.getSessionId()).thenReturn(sessionId); + when(receivedMessage.getLockToken()).thenReturn(lockToken); + + final int numberOfMessages = 5; + + when(amqpReceiveLink.getLinkName()).thenReturn(linkName); + when(amqpReceiveLink.getSessionId()).thenReturn(Mono.just(sessionId)); + when(amqpReceiveLink.getSessionLockedUntil()) + .thenAnswer(invocation -> Mono.just(sessionLockedUntil)); + when(amqpReceiveLink.updateDisposition(lockToken, Accepted.getInstance())).thenReturn(Mono.empty()); + + when(connection.createReceiveLink(anyString(), eq(ENTITY_PATH), any(ReceiveMode.class), isNull(), + any(MessagingEntityType.class), eq(sessionId))).thenReturn(Mono.just(amqpReceiveLink)); + + ServiceBusSessionReceiverAsyncClient client = new ServiceBusSessionReceiverAsyncClient( + NAMESPACE, ENTITY_PATH, + MessagingEntityType.QUEUE, receiverOptions, + connectionProcessor, tracerProvider, + messageSerializer, () -> { } + ); + + // Act & Assert + StepVerifier.create(client.acceptSession(sessionId).flatMapMany(ServiceBusReceiverAsyncClient::receiveMessages)) + .then(() -> { + for (int i = 0; i < numberOfMessages; i++) { + messageSink.next(message); + } + }) + .assertNext(context -> assertMessageEquals(sessionId, receivedMessage, context)) + .assertNext(context -> assertMessageEquals(sessionId, receivedMessage, context)) + .assertNext(context -> assertMessageEquals(sessionId, receivedMessage, context)) + .assertNext(context -> assertMessageEquals(sessionId, receivedMessage, context)) + .assertNext(context -> assertMessageEquals(sessionId, receivedMessage, context)) + .thenCancel().verify(); + } + + @Test + void acceptNextSession() { + // Arrange + ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, 1, Duration.ZERO, false, null, null); + sessionManager = new ServiceBusSessionManager(ENTITY_PATH, ENTITY_TYPE, connectionProcessor, + tracerProvider, messageSerializer, receiverOptions); + + final int numberOfMessages = 5; + final Callable onRenewal = () -> OffsetDateTime.now().plus(Duration.ofSeconds(5)); + + final String sessionId = "session-1"; + final String lockToken = "a-lock-token"; + final String linkName = "my-link-name"; + + final Message message = mock(Message.class); + final ServiceBusReceivedMessage receivedMessage = mock(ServiceBusReceivedMessage.class); + + when(receivedMessage.getSessionId()).thenReturn(sessionId); + when(receivedMessage.getLockToken()).thenReturn(lockToken); + + when(amqpReceiveLink.getLinkName()).thenReturn(linkName); + when(amqpReceiveLink.getSessionId()).thenReturn(Mono.just(sessionId)); + when(amqpReceiveLink.getSessionLockedUntil()).thenReturn(Mono.fromCallable(onRenewal)); + when(amqpReceiveLink.updateDisposition(lockToken, Accepted.getInstance())).thenReturn(Mono.empty()); + + // Session 2's messages + final ServiceBusReceiveLink amqpReceiveLink2 = mock(ServiceBusReceiveLink.class); + final Message message2 = mock(Message.class); + final ServiceBusReceivedMessage receivedMessage2 = mock(ServiceBusReceivedMessage.class); + final String sessionId2 = "session-2"; + final String lockToken2 = "a-lock-token-2"; + final String linkName2 = "my-link-name-2"; + final TestPublisher messagePublisher2 = TestPublisher.create(); + final Flux messageFlux2 = messagePublisher2.flux(); + + when(receivedMessage2.getSessionId()).thenReturn(sessionId2); + when(receivedMessage2.getLockToken()).thenReturn(lockToken2); + + when(amqpReceiveLink2.receive()).thenReturn(messageFlux2); + when(amqpReceiveLink2.getHostname()).thenReturn(NAMESPACE); + when(amqpReceiveLink2.getEntityPath()).thenReturn(ENTITY_PATH); + when(amqpReceiveLink2.getEndpointStates()).thenReturn(endpointProcessor); + when(amqpReceiveLink2.getLinkName()).thenReturn(linkName2); + when(amqpReceiveLink2.getSessionId()).thenReturn(Mono.just(sessionId2)); + when(amqpReceiveLink2.getSessionLockedUntil()).thenReturn(Mono.fromCallable(onRenewal)); + when(amqpReceiveLink2.updateDisposition(lockToken2, Accepted.getInstance())).thenReturn(Mono.empty()); + + final AtomicInteger count = new AtomicInteger(); + when(connection.createReceiveLink(anyString(), eq(ENTITY_PATH), any(ReceiveMode.class), isNull(), + any(MessagingEntityType.class), isNull())).thenAnswer(invocation -> { + final int number = count.getAndIncrement(); + switch (number) { + case 0: + return Mono.just(amqpReceiveLink); + case 1: + return Mono.just(amqpReceiveLink2); + default: + return Mono.empty(); + } + }); + + when(messageSerializer.deserialize(message, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage); + when(messageSerializer.deserialize(message2, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage2); + + when(managementNode.renewSessionLock(sessionId, linkName)).thenReturn(Mono.fromCallable(onRenewal)); + when(managementNode.renewSessionLock(sessionId2, linkName2)).thenReturn(Mono.fromCallable(onRenewal)); + + ServiceBusSessionReceiverAsyncClient client = new ServiceBusSessionReceiverAsyncClient( + NAMESPACE, ENTITY_PATH, + MessagingEntityType.QUEUE, receiverOptions, + connectionProcessor, tracerProvider, + messageSerializer, () -> { } + ); + + // Act & Assert + StepVerifier.create(client.acceptNextSession().flatMapMany(ServiceBusReceiverAsyncClient::receiveMessages)) + .then(() -> { + for (int i = 0; i < numberOfMessages; i++) { + messageSink.next(message); + } + }) + .assertNext(context -> { + assertMessageEquals(sessionId, receivedMessage, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId, receivedMessage, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId, receivedMessage, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId, receivedMessage, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId, receivedMessage, context); + }) + .thenAwait(Duration.ofSeconds(1)).thenCancel().verify(); + + StepVerifier.create(client.acceptNextSession().flatMapMany(ServiceBusReceiverAsyncClient::receiveMessages)) + .then(() -> { + for (int i = 0; i < 3; i++) { + messagePublisher2.next(message2); + } + }) + .assertNext(context -> { + assertMessageEquals(sessionId2, receivedMessage2, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId2, receivedMessage2, context); + }) + .assertNext(context -> { + assertMessageEquals(sessionId2, receivedMessage2, context); + }) + .thenAwait(Duration.ofSeconds(1)) + .thenCancel() + .verify(); + } + + private static void assertMessageEquals(String sessionId, ServiceBusReceivedMessage expected, + ServiceBusReceivedMessageContext actual) { + assertEquals(sessionId, actual.getSessionId()); + assertNull(actual.getThrowable()); + + assertEquals(expected, actual.getMessage()); + } +} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClientTest.java new file mode 100644 index 0000000000000..189636025e762 --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReceiverClientTest.java @@ -0,0 +1,80 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import reactor.core.publisher.Mono; + +import java.time.Duration; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + +class ServiceBusSessionReceiverClientTest { + + @Mock + private ServiceBusSessionReceiverAsyncClient sessionAsyncClient; + + @Mock + private ServiceBusReceiverAsyncClient asyncClient; + + @BeforeEach + void beforeEach(TestInfo testInfo) { + MockitoAnnotations.initMocks(this); + } + + @AfterEach + void afterEach(TestInfo testInfo) { + Mockito.framework().clearInlineMocks(); + } + + + @Test + void acceptSession() { + when(sessionAsyncClient.acceptSession(anyString())).thenReturn(Mono.just(asyncClient)); + ServiceBusSessionReceiverClient sessionClient = new ServiceBusSessionReceiverClient(sessionAsyncClient, + Duration.ofMillis(100)); + + assertNotNull(sessionClient.acceptSession("sessionId")); + } + + @Test + void acceptSessionTimeout() { + when(sessionAsyncClient.acceptSession(anyString())).thenReturn(Mono.just(asyncClient) + .delayElement(Duration.ofMillis(100))); + ServiceBusSessionReceiverClient sessionClient = new ServiceBusSessionReceiverClient(sessionAsyncClient, + Duration.ofMillis(50)); + + assertThrows(IllegalStateException.class, + () -> sessionClient.acceptSession("sessionId")); + } + + @Test + void acceptNextSession() { + when(sessionAsyncClient.acceptNextSession()).thenReturn(Mono.just(asyncClient)); + ServiceBusSessionReceiverClient sessionClient = new ServiceBusSessionReceiverClient(sessionAsyncClient, + Duration.ofMillis(100)); + + assertNotNull(sessionClient.acceptNextSession()); + } + + @Test + void acceptNextSessionTimeout() { + when(sessionAsyncClient.acceptNextSession()).thenReturn(Mono.just(asyncClient) + .delayElement(Duration.ofMillis(100))); + ServiceBusSessionReceiverClient sessionClient = new ServiceBusSessionReceiverClient(sessionAsyncClient, + Duration.ofMillis(50)); + + assertThrows(IllegalStateException.class, + () -> sessionClient.acceptNextSession()); + } +} From 0106095cdad3bbf9f17e6794a06b33966f879ffb Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Fri, 30 Oct 2020 09:07:22 -0700 Subject: [PATCH 34/36] API ServiceBusErrorSource to represent source of error (#16710) ErrorSource to populate when autocomplete is on and for processor model. --- .../servicebus/ServiceBusAmqpException.java | 34 ++++ .../servicebus/ServiceBusErrorSource.java | 39 ++++ .../servicebus/ServiceBusReceivedMessage.java | 2 +- .../ServiceBusReceiverAsyncClient.java | 73 ++++++-- .../ServiceBusReceiverAsyncClientTest.java | 169 ++++++++++++++++++ 5 files changed, 297 insertions(+), 20 deletions(-) create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusAmqpException.java create mode 100644 sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusErrorSource.java diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusAmqpException.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusAmqpException.java new file mode 100644 index 0000000000000..61b52d7cca5e2 --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusAmqpException.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import com.azure.core.amqp.exception.AmqpException; + +/** + * Defines {@link ServiceBusAmqpException} which has additional information about the operation that caused the error. + * + * @see ServiceBusErrorSource + */ +public final class ServiceBusAmqpException extends AmqpException { + private final transient ServiceBusErrorSource errorSource; + + /** + * @param amqpException for the error hapened. + * @param errorSource indicating which api caused the error. + */ + ServiceBusAmqpException(AmqpException amqpException, ServiceBusErrorSource errorSource) { + super(amqpException.isTransient(), amqpException.getErrorCondition(), amqpException.getMessage(), + amqpException.getCause(), amqpException.getContext()); + this.errorSource = errorSource; + } + + /** + * Gets the {@link ServiceBusErrorSource} in case of any errors. + * + * @return the {@link ServiceBusErrorSource} + */ + public ServiceBusErrorSource getErrorSource() { + return errorSource; + } +} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusErrorSource.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusErrorSource.java new file mode 100644 index 0000000000000..43f3be2609af4 --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusErrorSource.java @@ -0,0 +1,39 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.messaging.servicebus; + +import com.azure.core.util.ExpandableStringEnum; + +/** + * Represent the operation this sdk was performing when the error happened. + */ +public final class ServiceBusErrorSource extends ExpandableStringEnum { + + /** Error while abandoning the message.*/ + public static final ServiceBusErrorSource ABANDONED = fromString("ABANDONED", ServiceBusErrorSource.class); + + /** Error while completing the message.*/ + public static final ServiceBusErrorSource COMPLETE = fromString("COMPLETE", ServiceBusErrorSource.class); + + /** Error while receiving the message(s).*/ + public static final ServiceBusErrorSource RECEIVE = fromString("RECEIVE", ServiceBusErrorSource.class); + + /** Error while renewing lock.*/ + public static final ServiceBusErrorSource RENEW_LOCK = fromString("RENEW_LOCK", ServiceBusErrorSource.class); + + /** Error when we could not determine the source.*/ + public static final ServiceBusErrorSource UNKNOWN = fromString("UNKNOWN", ServiceBusErrorSource.class); + + /** Error while user's code is running for a message.*/ + public static final ServiceBusErrorSource USER_CALLBACK = fromString("USER_CALLBACK", + ServiceBusErrorSource.class); + + /** Error while session is accepted.*/ + public static final ServiceBusErrorSource ACCEPT_SESSION = fromString("ACCEPT_SESSION", + ServiceBusErrorSource.class); + + /** Error while session is closed.*/ + public static final ServiceBusErrorSource CLOSE_SESSION = fromString("CLOSE_SESSION", + ServiceBusErrorSource.class); +} diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java index d8378ef5548c0..7957ca5fcbe5d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java @@ -378,7 +378,7 @@ public long getSequenceNumber() { * @return Session Id of the {@link ServiceBusReceivedMessage}. */ public String getSessionId() { - return amqpAnnotatedMessage.getProperties().getGroupId(); + return getAmqpAnnotatedMessage().getProperties().getGroupId(); } /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java index d7daa14710447..f63cdc509641e 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java @@ -590,7 +590,8 @@ public Flux receiveMessages() { withAutoComplete = withAutoLockRenewal; } - return withAutoComplete; + return withAutoComplete + .onErrorMap(throwable -> mapError(throwable, ServiceBusErrorSource.RECEIVE)); } /** @@ -711,7 +712,8 @@ public Mono renewMessageLock(ServiceBusReceivedMessage message) String.format("Cannot renew message lock [%s] for a session receiver.", message.getLockToken()))); } - return renewMessageLock(message.getLockToken()); + return renewMessageLock(message.getLockToken()) + .onErrorMap(throwable -> mapError(throwable, ServiceBusErrorSource.RENEW_LOCK)); } /** @@ -768,7 +770,8 @@ public Mono renewMessageLock(ServiceBusReceivedMessage message, Duration m renewalContainer.addOrUpdate(message.getLockToken(), OffsetDateTime.now().plus(maxLockRenewalDuration), operation); - return operation.getCompletionOperation(); + return operation.getCompletionOperation() + .onErrorMap(throwable -> mapError(throwable, ServiceBusErrorSource.RENEW_LOCK)); } /** @@ -975,9 +978,10 @@ deadLetterErrorDescription, propertiesToModify, sessionId, getLinkName(sessionId renewalContainer.remove(lockToken); })); + Mono updateDispositionOperation; if (sessionManager != null) { - return sessionManager.updateDisposition(lockToken, sessionId, dispositionStatus, propertiesToModify, - deadLetterReason, deadLetterErrorDescription, transactionContext) + updateDispositionOperation = sessionManager.updateDisposition(lockToken, sessionId, dispositionStatus, + propertiesToModify, deadLetterReason, deadLetterErrorDescription, transactionContext) .flatMap(isSuccess -> { if (isSuccess) { renewalContainer.remove(lockToken); @@ -987,20 +991,38 @@ deadLetterErrorDescription, propertiesToModify, sessionId, getLinkName(sessionId logger.info("Could not perform on session manger. Performing on management node."); return performOnManagement; }); - } - - final ServiceBusAsyncConsumer existingConsumer = consumer.get(); - if (isManagementToken(lockToken) || existingConsumer == null) { - return performOnManagement; } else { - return existingConsumer.updateDisposition(lockToken, dispositionStatus, deadLetterReason, - deadLetterErrorDescription, propertiesToModify, transactionContext) - .then(Mono.fromRunnable(() -> { - logger.info("{}: Update completed. Disposition: {}. Lock: {}.", - entityPath, dispositionStatus, lockToken); - renewalContainer.remove(lockToken); - })); + final ServiceBusAsyncConsumer existingConsumer = consumer.get(); + if (isManagementToken(lockToken) || existingConsumer == null) { + updateDispositionOperation = performOnManagement; + } else { + updateDispositionOperation = existingConsumer.updateDisposition(lockToken, dispositionStatus, + deadLetterReason, deadLetterErrorDescription, propertiesToModify, transactionContext) + .then(Mono.fromRunnable(() -> { + logger.info("{}: Update completed. Disposition: {}. Lock: {}.", + entityPath, dispositionStatus, lockToken); + renewalContainer.remove(lockToken); + })); + } } + return updateDispositionOperation + .onErrorMap(throwable -> { + // We only populate ErrorSource only when AutoComplete is enabled. + if (receiverOptions.isEnableAutoComplete() && throwable instanceof AmqpException) { + switch (dispositionStatus) { + case COMPLETED: + return new ServiceBusAmqpException((AmqpException) throwable, + ServiceBusErrorSource.COMPLETE); + case ABANDONED: + return new ServiceBusAmqpException((AmqpException) throwable, + ServiceBusErrorSource.ABANDONED); + default: + // Do nothing + } + } + return throwable; + + }); } private ServiceBusAsyncConsumer getOrCreateConsumer() { @@ -1077,7 +1099,8 @@ Mono renewSessionLock(String sessionId) { return connectionProcessor .flatMap(connection -> connection.getManagementNode(entityPath, entityType)) - .flatMap(channel -> channel.renewSessionLock(sessionId, linkName)); + .flatMap(channel -> channel.renewSessionLock(sessionId, linkName)) + .onErrorMap(throwable -> mapError(throwable, ServiceBusErrorSource.RENEW_LOCK)); } Mono renewSessionLock(String sessionId, Duration maxLockRenewalDuration) { @@ -1101,7 +1124,8 @@ Mono renewSessionLock(String sessionId, Duration maxLockRenewalDuration) { maxLockRenewalDuration, true, this::renewSessionLock); renewalContainer.addOrUpdate(sessionId, OffsetDateTime.now().plus(maxLockRenewalDuration), operation); - return operation.getCompletionOperation(); + return operation.getCompletionOperation() + .onErrorMap(throwable -> mapError(throwable, ServiceBusErrorSource.RENEW_LOCK)); } Mono setSessionState(String sessionId, byte[] sessionState) { @@ -1135,4 +1159,15 @@ Mono getSessionState(String sessionId) { .flatMap(channel -> channel.getSessionState(sessionId, getLinkName(sessionId))); } } + + /** + * Map the error to {@link ServiceBusAmqpException} + */ + private Throwable mapError(Throwable throwable, ServiceBusErrorSource errorSource) { + if ((throwable instanceof ServiceBusAmqpException) || !(throwable instanceof AmqpException)) { + return throwable; + } else { + return new ServiceBusAmqpException((AmqpException) throwable, errorSource); + } + } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java index bfdd9d0d7f643..7b9866f3aeb31 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java @@ -7,6 +7,7 @@ import com.azure.core.amqp.AmqpRetryOptions; import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyOptions; +import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.implementation.CbsAuthorizationType; import com.azure.core.amqp.implementation.ConnectionOptions; import com.azure.core.amqp.implementation.MessageSerializer; @@ -29,6 +30,7 @@ import com.azure.messaging.servicebus.models.ReceiveMode; import org.apache.qpid.proton.amqp.messaging.Accepted; import org.apache.qpid.proton.amqp.messaging.Rejected; +import org.apache.qpid.proton.amqp.transport.DeliveryState; import org.apache.qpid.proton.amqp.transport.DeliveryState.DeliveryStateType; import org.apache.qpid.proton.engine.SslDomain; import org.apache.qpid.proton.message.Message; @@ -40,7 +42,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; @@ -65,6 +69,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.IntStream; +import java.util.stream.Stream; import static com.azure.messaging.servicebus.TestUtils.getMessage; import static java.nio.charset.StandardCharsets.UTF_8; @@ -75,6 +80,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -443,6 +449,163 @@ void deadLetterWithDescription() { verify(amqpReceiveLink).updateDisposition(eq(lockToken1), isA(Rejected.class)); } + /** + * Verifies that error source is populated when any error happened while renewing lock. + */ + @Test + void errorSourceOnRenewMessageLock() { + // Arrange + final Duration maxDuration = Duration.ofSeconds(8); + final String lockToken = "some-token"; + + when(receivedMessage.getLockToken()).thenReturn(lockToken); + when(managementNode.renewMessageLock(lockToken, null)) + .thenReturn(Mono.error(new AmqpException(false, "some error occurred.", null))); + + // Act & Assert + StepVerifier.create(receiver.renewMessageLock(receivedMessage, maxDuration)) + .verifyErrorSatisfies(throwable -> { + Assertions.assertTrue(throwable instanceof ServiceBusAmqpException); + final ServiceBusErrorSource actual = ((ServiceBusAmqpException) throwable).getErrorSource(); + Assertions.assertEquals(ServiceBusErrorSource.RENEW_LOCK, actual); + }); + + verify(managementNode, times(1)).renewMessageLock(lockToken, null); + } + + /** + * Verifies that error source is populated when any error happened while renewing lock. + */ + @Test + void errorSourceOnSessionLock() { + // Arrange + when(managementNode.renewSessionLock(SESSION_ID, null)).thenReturn(Mono.error(new AmqpException(false, "some error occurred.", null))); + + // Act & Assert + StepVerifier.create(sessionReceiver.renewSessionLock(SESSION_ID)) + .verifyErrorSatisfies(throwable -> { + Assertions.assertTrue(throwable instanceof ServiceBusAmqpException); + final ServiceBusErrorSource actual = ((ServiceBusAmqpException) throwable).getErrorSource(); + Assertions.assertEquals(ServiceBusErrorSource.RENEW_LOCK, actual); + }); + } + + /** + * Verifies that error source is not populated when there is no autoComplete. Because user wanted to settle on their + * own, we do not need to populate ErrorSource. + */ + @ParameterizedTest + @MethodSource + void errorSourceNoneOnSettlement(DispositionStatus dispositionStatus, DeliveryStateType expectedDeliveryState) { + + final UUID lockTokenUuid = UUID.randomUUID(); + final String lockToken1 = lockTokenUuid.toString(); + + final MessageWithLockToken message = mock(MessageWithLockToken.class); + + when(receivedMessage.getLockToken()).thenReturn(lockToken1); + + when(messageSerializer.deserialize(message, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage); + + when(amqpReceiveLink.updateDisposition(eq(lockToken1), argThat(e -> e.getType() == expectedDeliveryState))) + .thenReturn(Mono.error(new AmqpException(false, "some error occurred.", null))); + + // Act & Assert + StepVerifier.create(receiver.receiveMessages().take(1) + .flatMap(context -> { + final Mono operation; + switch (dispositionStatus) { + case ABANDONED: + operation = receiver.abandon(context.getMessage()); + break; + case COMPLETED: + operation = receiver.complete(context.getMessage()); + break; + default: + throw new IllegalArgumentException("Unrecognized operation: " + dispositionStatus); + } + return operation; + }) + ) + .then(() -> messageSink.next(message)) + .expectNext() + .verifyErrorSatisfies(throwable -> { + Assertions.assertFalse(throwable instanceof ServiceBusAmqpException); + Assertions.assertTrue(throwable instanceof AmqpException); + }); + + verify(amqpReceiveLink).updateDisposition(eq(lockToken1), any(DeliveryState.class)); + } + + /** + * Ensure that we throw right error source when there is any issue during autocomplete. Error source should be + * {@link ServiceBusErrorSource#COMPLETE} + */ + @Test + void errorSourceAutoCompleteMessage() { + // Arrange + final int numberOfEvents = 2; + final int messagesToReceive = 1; + final List messages = getMessages(); + final String lockToken = UUID.randomUUID().toString(); + final ReceiverOptions receiverOptions = new ReceiverOptions(ReceiveMode.PEEK_LOCK, PREFETCH, null, true); + final ServiceBusReceiverAsyncClient receiver2 = new ServiceBusReceiverAsyncClient(NAMESPACE, ENTITY_PATH, + MessagingEntityType.QUEUE, receiverOptions, connectionProcessor, CLEANUP_INTERVAL, tracerProvider, + messageSerializer, onClientClose); + + when(receivedMessage.getLockToken()).thenReturn(lockToken); + when(messageSerializer.deserialize(any(Message.class), eq(ServiceBusReceivedMessage.class))) + .thenReturn(receivedMessage); + + when(amqpReceiveLink.updateDisposition(lockToken, Accepted.getInstance())).thenReturn(Mono.error(new AmqpException(false, "some error occurred.", null))); + + try { + // Act & Assert + StepVerifier.create(receiver2.receiveMessages().take(numberOfEvents)) + .then(() -> messages.forEach(m -> messageSink.next(m))) + .expectNextCount(messagesToReceive) + .verifyErrorSatisfies(throwable -> { + Assertions.assertTrue(throwable instanceof ServiceBusAmqpException); + final ServiceBusErrorSource actual = ((ServiceBusAmqpException) throwable).getErrorSource(); + Assertions.assertEquals(ServiceBusErrorSource.COMPLETE, actual); + }); + } finally { + receiver2.close(); + } + + verify(amqpReceiveLink, atLeast(messagesToReceive)).updateDisposition(lockToken, Accepted.getInstance()); + } + + /** + * Verifies that error source is populated when there is any error during receiving of message. + */ + @Test + void errorSourceOnReceiveMessage() { + final String lockToken = UUID.randomUUID().toString(); + + final OffsetDateTime expiration = OffsetDateTime.now().plus(Duration.ofMinutes(5)); + + final MessageWithLockToken message = mock(MessageWithLockToken.class); + + when(messageSerializer.deserialize(message, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage); + + when(receivedMessage.getLockToken()).thenReturn(lockToken); + when(receivedMessage.getLockedUntil()).thenReturn(expiration); + + when(connection.createReceiveLink(anyString(), anyString(), any(ReceiveMode.class), any(), + any(MessagingEntityType.class))).thenReturn(Mono.error(new AmqpException(false, "some receive link Error.", null))); + + // Act & Assert + StepVerifier.create(receiver.receiveMessages().take(1)) + .verifyErrorSatisfies(throwable -> { + Assertions.assertTrue(throwable instanceof ServiceBusAmqpException); + final ServiceBusErrorSource actual = ((ServiceBusAmqpException) throwable).getErrorSource(); + Assertions.assertEquals(ServiceBusErrorSource.RECEIVE, actual); + }); + + verify(amqpReceiveLink, never()).updateDisposition(eq(lockToken), any(DeliveryState.class)); + } + /** * Verifies that the user can complete settlement methods on received message. */ @@ -970,4 +1133,10 @@ private List getMessages() { .mapToObj(index -> getMessage(PAYLOAD_BYTES, messageTrackingUUID, map)) .collect(Collectors.toList()); } + + private static Stream errorSourceNoneOnSettlement() { + return Stream.of( + Arguments.of(DispositionStatus.COMPLETED, DeliveryStateType.Accepted), + Arguments.of(DispositionStatus.ABANDONED, DeliveryStateType.Modified)); + } } From 895ee2a13dda8fe80c45a19af4e5d51891849e5c Mon Sep 17 00:00:00 2001 From: Ramya Rao Date: Fri, 30 Oct 2020 09:27:07 -0700 Subject: [PATCH 35/36] [Service Bus] Migration Guide (#17003) --- .../migration-guide.md | 377 ++++++++++++++++++ 1 file changed, 377 insertions(+) create mode 100644 sdk/servicebus/azure-messaging-servicebus/migration-guide.md diff --git a/sdk/servicebus/azure-messaging-servicebus/migration-guide.md b/sdk/servicebus/azure-messaging-servicebus/migration-guide.md new file mode 100644 index 0000000000000..b3c4b9ef1942c --- /dev/null +++ b/sdk/servicebus/azure-messaging-servicebus/migration-guide.md @@ -0,0 +1,377 @@ +# Guide for migrating to azure-messaging-servicebus + +This guide assists in the migration to version 7 of the Service Bus client library +[`com.azure:azure-messaging-servicebus`](https://search.maven.org/artifact/com.azure/azure-messaging-servicebus) from +version 3 of +[`com.microsoft.azure:azure-servicebus`](https://search.maven.org/artifact/com.microsoft.azure/azure-servicebus/). It +will focus on side-by-side comparisons for similar operations between the two packages. + +Familiarity with the `com.microsoft.azure:azure-servicebus` library is assumed. For those new to the Service Bus client +library for Java, please refer to the +[README](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/servicebus/azure-messaging-servicebus/README.md) +and [Service Bus +samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus) +for the `azure-messaging-servicebus` library rather than this guide. + +## Table of contents + +- [Guide for migrating to azure-messaging-servicebus](#guide-for-migrating-to-azure-messaging-servicebus) + - [Table of contents](#table-of-contents) + - [Migration benefits](#migration-benefits) + - [General changes](#general-changes) + - [Group id, artifact id, and package names](#group-id-artifact-id-and-package-names) + - [Client hierarchy](#client-hierarchy) + - [Async programming model](#async-programming-model) + - [Connection Pooling](#connection-pooling) + - [Migration Samples](#migration-samples) + - [Instantiating clients](#instantiating-clients) + - [Sending messages](#sending-messages) + - [Receiving messages](#receiving-messages) + - [Working with sessions](#working-with-sessions) + - [Additional samples](#additional-samples) + +## Migration benefits + +A natural question to ask when considering whether or not to adopt a new version or library is what the benefits of +doing so would be. As Azure has matured and been embraced by a more diverse group of developers, we have been focused on +learning the patterns and practices to best support developer productivity and to understand the gaps that the Java +client libraries have. + +There were several areas of consistent feedback expressed across the Azure client library ecosystem. One of the most +important is that the client libraries for different Azure services have not had a consistent approach to organization, +naming, and API structure. Additionally, many developers have felt that the learning curve was difficult, and the APIs +did not offer a good, approachable, and consistent onboarding story for those learning Azure or exploring a specific +Azure service. + +To improve the development experience across Azure services, including Service Bus, a set of uniform [design +guidelines](https://azure.github.io/azure-sdk/general_introduction.html) was created for all languages to drive a +consistent experience with established API patterns for all services. A set of [Java specific +guidelines](https://azure.github.io/azure-sdk/java_introduction.html) was also introduced to ensure that Java clients +have a natural and idiomatic feel that mirrors that of Java developers. Further details are available in the guidelines +for those interested. + +The new Service Bus library `azure-messaging-servicebus` provides the ability to share in some of the cross-service +improvements made to the Azure development experience, such as using the new `azure-identity` library to share a single +authentication between clients and a unified diagnostics pipeline offering a common view of the activities across each +of the client libraries. + +While we believe that there is significant benefit to adopting the new Service Bus library `azure-messaging-servicebus`, +it is important to be aware that the previous version `azure-servicebus` have not been officially deprecated. They will +continue to be supported with security and bug fixes as well as receiving some minor refinements. However, in the near +future they will not be under active development and new features are unlikely to be added to them. + +## General changes + +### Group id, artifact id, and package names + +Artifact and package names for the modern Azure client libraries for Java have changed. Legacy clients have the +`com.microsoft.azure` group id where-as, the new clients use `com.azure`. In addition, each will follow the artifact id +pattern `azure-[area].[service]` where the legacy clients followed the pattern `azure-[service]`. This provides a quick +and accessible means to help understand, at a glance, whether you are using the modern or legacy clients. + +In the case of Service Bus, the new client libraries have packages and namespaces that begin with +`com.azure.messaging.servicebus` and were released beginning with version 7. The legacy client libraries have packages +and namespaces that begin with `com.microsoft.azure.servicebus` and a version of 3.x.x or below. + +### Client hierarchy + +As part of the new Java SDK guidelines, all clients are instantiated from a builder which is the single entry point to the library. +Each client is expected to have a sync and async version that can be instantiated via `buildAsyncClient()` or `buildClient()` methods +on the builder. + +In the new Service Bus library, this single entry point is the `ServiceBusClientBuilder` which can be used to create sender and receiver +clients to the queue/topic/subscription/session of your choice and start sending/receiving messages. + +### Async programming model + +Usage of `CompletableFuture` for async operations is replaced with a different programming model that uses [Project Reactor](https://projectreactor.io). +This is a shift to thinking about data as a Stream of information. + +Project Reactor has many bridge APIs to quickly migrate code using `CompletableFuture`. A few examples are: +* [Mono.fromFuture(CompletableFuture)](https://projectreactor.io/docs/core/release/api/reactor/core/publisher/Mono.html#fromFuture-java.util.concurrent.CompletableFuture-) +* [Mono.fromCompletionStage(CompletionStage completionStage)](https://projectreactor.io/docs/core/release/api/reactor/core/publisher/Mono.html#fromCompletionStage-java.util.concurrent.CompletionStage-) +* For more: [Mono](https://projectreactor.io/docs/core/release/api/reactor/core/publisher/Mono.html) + +### Connection Pooling + +By using a single top-level client builder, we can implicitly share a single AMQP connection for all operations that an +application performs. In the previous library `azure-servicebus`, connection sharing was explicit. You had to pass in a +`MessagingFactory` object to share a connection. + +By making this connection sharing be implicit to a `ServiceBusClientBuilder` instance, we can help ensure that +applications will not use multiple connections unless they explicitly opt in by creating multiple client builder +instances. + +## Migration Samples + +### Instantiating clients + +While we continue to support connection strings when constructing a client, the main difference is when using Azure +Active Directory. We now use the new [azure-identity](https://search.maven.org/artifact/com.azure/azure-identity) +library to share a single authentication solution between clients of different Azure services. + +```java +// Create a sender client that will authenticate through Active Directory +TokenCredential credential = new DefaultAzureCredentialBuilder() + .build(); +String fullyQualifiedNamespace = "yournamespace.servicebus.windows.net"; +ServiceBusSenderClient client = new ServiceBusClientBuilder() + .credential(fullyQualifiedNamespace, credential) + .sender() + .queueName("my-queue") + .buildClient(); + +// Create a sender client that will authenticate using a connection string +String connectionString = "Endpoint=sb://yournamespace.servicebus.windows.net/;SharedAccessKeyName=your-key-name;SharedAccessKey=your-key"; +ServiceBusSenderClient client = new ServiceBusClientBuilder() + .connectionString(connectionString) + .sender() + .queueName("my-queue") + .buildClient(); +``` + +### Sending messages + +Previously, in `azure-servicebus`, you could send messages either by using a `IQueueClient` (or `ITopicClient` if you +are targeting a topic) or the `IMessageSender`. + +While the `IQueueClient` supported the simple send operation, the `IMessageSender` supported that and advanced scenarios +like scheduling to send messages at a later time and cancelling such scheduled messages. + +```java +String queueName = "my-queue"; +String connectionString = "Endpoint=sb://yournamespace.servicebus.windows.net/;" + + "SharedAccessKeyName=your-key-name;SharedAccessKey=your-key"; + +// create a message to send +Message message = new Message("content"); + +// send using the QueueClient +QueueClient client = new QueueClient(new ConnectionStringBuilder(connectionString, queueName), + ReceiveMode.PEEKLOCK); +client.send(message); + +// send using the IMessageSender +IMessageSender sender = ClientFactory.createMessageSenderFromConnectionStringBuilder( + new ConnectionStringBuilder(connectionString, queueName)); +sender.send(message); +``` + +Now in `azure-messaging-servicebus`, we combine all send related features under a common class `ServiceBusSenderClient` +and its async counterpart `ServiceBusSenderAsyncClient`. You can create these from the top-level client builder using the `sender()` method to +get a sub-builder. The sub builder takes the queue or topic you want to target. This way, we give you a one stop shop for +all your send related needs. + +We continue to support sending bytes in the message. Though, if you are working with strings, you can now create a +message directly without having to convert it to bytes first. The snippet below demonstrates the sync sender client. + +```java +// create the sync sender via the builder and its sub-builder +ServiceBusSenderClient client = new ServiceBusClientBuilder() + .connectionString(connectionString) + .sender() + .queueName("my-queue") + .buildClient(); + +// create a message to send +ServiceBusMessage message = new ServiceBusMessage("Hello world!"); + +// send the message +sender.sendMessage(message); +``` + +The feature to send a list of messages in a single call was previously implemented by batching all the messages into a single AMQP +message and sending that to the service. + +While we continue to support this feature, it always had the potential to fail unexpectedly when the resulting batched +AMQP message exceeded the size limit of the sender. To help with this, we now provide a safe way to batch multiple +messages to be sent at once using the new `ServiceBusMessageBatch` class. + +In the below code snippet, `inputMessageArray` is an array of messages which we will loop over to safely batch and then +send. This uses the sync sender as well. + +```java +// create the sync sender via the builder and its sub-builder +ServiceBusSenderClient client = new ServiceBusClientBuilder() + .connectionString(connectionString) + .sender() + .queueName("my-queue") + .buildClient(); + +ServiceBusMessage[] inputMessageArray = new ServiceBusMessage[10]; +ServiceBusMessageBatch messageBatch = sender.createBatch(); + +for (int i = 0; i < inputMessageArray.length; i++) { + if (!messageBatch.tryAdd(inputMessageArray[i])) { + if (messageBatch.getCount() == 0) { + System.err.println("Failed to fit message number in a batch. i:" + i); + break; + } + + // Decrement counter so that message number i can get another chance in a new batch + i--; + + // send the message batch and create a new batch + sender.sendMessages(messageBatch); + messageBatch = sender.createBatch(); + } +} + +// send the final batch +if (messageBatch.getCount() > 0) { + sender.sendMessages(messageBatch); +} +``` + +### Receiving messages + +Previously, in `azure-servicebus`, you could receive messages either by using a `IQueueClient` (or `ISubscriptionClient` +if you are targeting a subscription) or the `IMessageReceiver`. + +While the `IQueueClient` and supported the simple push model where you could register message and error +handlers/callbacks, the `IMessageReceiver` provided you with ways to receive messages (both normal and deferred) in +batches, settle messages and renew locks. + +```java +QueueClient client = new QueueClient(new ConnectionStringBuilder(connectionString, queueName), + ReceiveMode.PEEKLOCK); + +int maxConcurrentCalls = 3; +boolean isAutoComplete = false; +Duration maxAutoRenewDuration = Duration.ofMinutes(5); +Duration maxMessageWaitDuration = Duration.ofSeconds(10); +MessageHandlerOptions options = new MessageHandlerOptions(maxConcurrentCalls, isAutoComplete, + maxAutoRenewDuration, maxMessageWaitDuration); +ExecutorService executor = Executors.newWorkStealingPool(maxConcurrentCalls); + +try { + client.registerMessageHandler(new IMessageHandler() { + @Override + public CompletableFuture onMessageAsync(IMessage message) { + MessageBody messageBody = message.getMessageBody(); + List binary = messageBody.getBinaryData(); + byte[] bytes = binary.get(0); + System.out.printf("Received message with Binary body: %s%n", + new String(bytes)); + + return client.completeAsync(message.getLockToken()); + } + + @Override + public void notifyException(Throwable exception, ExceptionPhase phase) { + System.err.printf("Message handler encountered an exception. %s Phase: %s%n", + exception, phase); + } + }, options, executor); +} finally { + executor.shutdown(); +} +``` + +The new Java SDK provides a dedicated processor client to which you can pass your message and error handlers. +Like the older SDK, this supports auto completion of messages and automatica renewal of message/session locks. + +For a more fine grained control and advanced features, you still have the `ServiceBusReceiverClient` and it's async +counterpart `ServiceBusReceiverAsyncClient`. + +```java + +// Sample code that processes a single message +Consumer processMessage = messageContext -> { + try { + System.out.println(messageContext.getMessage().getMessageId()); + // other message processing code + messageContext.complete(); + } catch (Exception ex) { + messageContext.abandon(); + } +} + +// Sample code that gets called if there's an error +Consumer processError = throwable -> { + logError(throwable); + metrics.recordError(throwable); +} + +// create the processor client via the builder and its sub-builder +ServiceBusProcessorClient processorClient = new ServiceBusClientBuilder() + .connectionString("connection-string") + .processor() + .queueName("queue-name") + .processMessage(processMessage) + .processError(processError) + .buildProcessorClient(); + +// Starts the processor in the background and returns immediately +processorClient.start(); + +``` + +### Working with sessions + +Previously, you had the below options to receive messages from a session enabled queue/subscription +- Register message and error handlers using the `QueueClient.registerSessionHandler()` method to receive messages from + multiple sessions as controlled by the `maxConcurrentSessions` option. +- Use the `ClientFactory.acceptMessageSessionAsync()` method to get an instance of the `IMessageSession` class that will be tied to a given sessionId or to the next available session if no sessionId is provided. + +Now, we simplify this by giving session variants of the same methods and classes that are available when working with +queues/subscriptions that do not have sessions enabled. + +To get the session counterpart of the processor client described in the previous section, you would use the `sessionProcessor()` on the builder to get the session variant of the sub builder for the processor client. + +The below code snippet shows you how to use the processor client to receive messages from at most three different sessions at a given point. + +```java +// Sample code that processes a single message +Consumer processMessage = messageContext -> { + try { + System.out.println(messageContext.getMessage().getMessageId()); + // other message processing code + messageContext.complete(); + } catch (Exception ex) { + messageContext.abandon(); + } +} + +// Sample code that gets called if there's an error +Consumer processError = throwable -> { + logError(throwable); + metrics.recordError(throwable); +} + +// create the processor client via the builder and its sub-builder +ServiceBusProcessorClient processorClient = new ServiceBusClientBuilder() + .connectionString("connection-string") + .processor() + .queueName("queue-name") + .maxConcurrentSessions(3) + .processMessage(processMessage) + .processError(processError) + .buildProcessorClient(); + +processorClient.start(); +``` + +For a more fine grained control and advanced features, you still have the `ServiceBusReceiverClient` and it's async +counterpart `ServiceBusReceiverAsyncClient` which are tied to a single session. To get the such receiver clients, you +would use the `sessionReceiver()` on the builder to get an intermediate `ServiceBusSessionReceiverClient`/`ServiceBusSessionReceiverAsyncClient` +which acts like a factory for you to get receiver clients for individual sessions. + +Please note that getting such a receiver client is an async operation because the library will need to get a lock on the session by connecting to the service first. + +While the below code uses `acceptSession()` that takes a sessionId, you can also use `acceptNextSession()` that will result in the service attempting to get a lock on the next available session for you. + +```java +ServiceBusSessionReceiverClient sessionClient = new ServiceBusClientBuilder() + .connectionString(connectionString) + .sessionReceiver() + .queueName("queue") + .buildClient(); + +ServiceBusReceiverClient receiverClient = sessionClient.acceptSession("my-session-id"); +``` + +## Additional samples + +More examples can be found at: +- [Service Bus samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus) From 5f2c8b9c7fa9b666add5e0fc4a69835ba893d75f Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Mon, 2 Nov 2020 08:53:52 -0700 Subject: [PATCH 36/36] Add PEM support --- .../security/keyvault/jca/KeyVaultClient.java | 68 ++++++++++++++++--- .../keyvault/jca/KeyVaultKeyStore.java | 3 + .../keyvault/jca/model/SecretBundle.java | 23 +++++++ 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java index 4c24037edb8a1..7ea0c267afd05 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultClient.java @@ -8,20 +8,26 @@ import com.azure.security.keyvault.jca.model.CertificatePolicy; import com.azure.security.keyvault.jca.model.KeyProperties; import com.azure.security.keyvault.jca.model.SecretBundle; +import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.security.Key; +import java.security.KeyFactory; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; import java.security.UnrecoverableKeyException; import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; import java.util.ArrayList; import java.util.Base64; import java.util.HashMap; @@ -249,16 +255,25 @@ Key getKey(String alias, char[] password) { if (body != null) { JsonConverter converter = JsonConverterFactory.createJsonConverter(); SecretBundle secretBundle = (SecretBundle) converter.fromJson(body, SecretBundle.class); - try { - KeyStore keyStore = KeyStore.getInstance("PKCS12"); - keyStore.load( - new ByteArrayInputStream(Base64.getDecoder().decode(secretBundle.getValue())), - "".toCharArray() - ); - alias = keyStore.aliases().nextElement(); - key = keyStore.getKey(alias, "".toCharArray()); - } catch (IOException | KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException | CertificateException ex) { - LOGGER.log(WARNING, "Unable to decode key", ex); + if (secretBundle.getContentType().equals("application/x-pkcs12")) { + try { + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + keyStore.load( + new ByteArrayInputStream(Base64.getDecoder().decode(secretBundle.getValue())), + "".toCharArray() + ); + alias = keyStore.aliases().nextElement(); + key = keyStore.getKey(alias, "".toCharArray()); + } catch (IOException | KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException | CertificateException ex) { + LOGGER.log(WARNING, "Unable to decode key", ex); + } + } + if (secretBundle.getContentType().equals("application/x-pem-file")) { + try { + key = createPrivateKeyFromPem(secretBundle.getValue()); + } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException | IllegalArgumentException ex) { + LOGGER.log(WARNING, "Unable to decode key", ex); + } } } } @@ -271,4 +286,37 @@ Key getKey(String alias, char[] password) { LOGGER.exiting("KeyVaultClient", "getKey", key); return key; } + + /** + * Get the private key from the PEM string. + * + * @param pemString the PEM file in string format. + * @return the private key + * @throws IOException when an I/O error occurs. + * @throws NoSuchAlgorithmException when algorithm is unavailable. + * @throws InvalidKeySpecException when the private key cannot be generated. + */ + private PrivateKey createPrivateKeyFromPem(String pemString) + throws IOException, NoSuchAlgorithmException, InvalidKeySpecException { + + StringBuilder builder = new StringBuilder(); + try (BufferedReader reader = new BufferedReader(new StringReader(pemString))) { + String line = reader.readLine(); + if (line == null || !line.contains("BEGIN PRIVATE KEY")) { + throw new IllegalArgumentException("No PRIVATE KEY found"); + } + line = ""; + while (line != null) { + if (line.contains("END PRIVATE KEY")) { + break; + } + builder.append(line); + line = reader.readLine(); + } + } + byte[] bytes = Base64.getDecoder().decode(builder.toString()); + PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytes); + KeyFactory factory = KeyFactory.getInstance("RSA"); + return factory.generatePrivate(spec); + } } diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java index 5fc5d1ff27750..3b1557f0538f4 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java @@ -179,6 +179,9 @@ public Key engineGetKey(String alias, char[] password) { key = keyVaultClient.getKey(alias, password); if (key != null) { certificateKeys.put(alias, key); + if (aliases == null) { + aliases = keyVaultClient.getAliases(); + } if (!aliases.contains(alias)) { aliases.add(alias); } diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java index 7e77605c7d082..b955d7c968f17 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java +++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/model/SecretBundle.java @@ -14,12 +14,26 @@ public class SecretBundle implements Serializable { * Stores the serial version UID. */ private static final long serialVersionUID = 1L; + + /** + * Stores the content type. + */ + private String contentType; /** * Stores the value. */ private String value; + /** + * Get the content type. + * + * @return the content type. + */ + public String getContentType() { + return contentType; + } + /** * Get the value. * @@ -28,6 +42,15 @@ public class SecretBundle implements Serializable { public String getValue() { return value; } + + /** + * Set the content type. + * + * @param contentType the content type. + */ + public void setContentType(String contentType) { + this.contentType = contentType; + } /** * Set the value.