From fdccecfd15b635342a067f97d2f172de52b0c38d Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 16:24:15 -0700 Subject: [PATCH 01/10] Adding CbsAuthorizationType model. --- .../amqp/models/CbsAuthorizationType.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java new file mode 100644 index 000000000000..2cf0ebe1c62a --- /dev/null +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java @@ -0,0 +1,26 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.core.amqp.models; + +import com.azure.core.amqp.ClaimsBasedSecurityNode; +import com.azure.core.util.ExpandableStringEnum; + +/** + * An enumeration of supported authorization methods with the {@link ClaimsBasedSecurityNode}. + */ +public class CbsAuthorizationType extends ExpandableStringEnum { + /** + * Authorize with CBS through a shared access signature. + */ + public static final CbsAuthorizationType SHARED_ACCESS_SIGNATURE = + fromString("servicebus.windows.net:sastoken", CbsAuthorizationType.class); + /** + * Authorize with CBS using a JSON web token. + * + * This is used in the case where Azure Active Directory is used for authentication and the authenticated user + * wants to authorize with Azure Event Hubs. + */ + public static final CbsAuthorizationType JSON_WEB_TOKEN = + fromString("jwt", CbsAuthorizationType.class); +} From 9828992ee5f0e004ba9abb914371d2bf1f196df7 Mon Sep 17 00:00:00 2001 From: Connie Date: Tue, 1 Jun 2021 04:08:55 -0700 Subject: [PATCH 02/10] Deleting implementation CbsAuthorizationType. --- .../implementation/CbsAuthorizationType.java | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/CbsAuthorizationType.java diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/CbsAuthorizationType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/CbsAuthorizationType.java deleted file mode 100644 index 92390dd50305..000000000000 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/CbsAuthorizationType.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.core.amqp.implementation; - -import com.azure.core.amqp.ClaimsBasedSecurityNode; - -/** - * An enumeration of supported authorization methods with the {@link ClaimsBasedSecurityNode}. - */ -public enum CbsAuthorizationType { - /** - * Authorize with CBS through a shared access signature. - */ - SHARED_ACCESS_SIGNATURE("servicebus.windows.net:sastoken"), - /** - * Authorize with CBS using a JSON web token. - * - * This is used in the case where Azure Active Directory is used for authentication and the authenticated user - * wants to authorize with Azure Event Hubs. - */ - JSON_WEB_TOKEN("jwt"); - - private final String scheme; - - CbsAuthorizationType(String scheme) { - this.scheme = scheme; - } - - /** - * Gets the token type scheme. - * - * @return The token type scheme. - */ - public String getTokenType() { - return scheme; - } -} From 017608b379a3197b6fd8231c5f775f771a7de71b Mon Sep 17 00:00:00 2001 From: Connie Date: Tue, 1 Jun 2021 10:57:56 -0700 Subject: [PATCH 03/10] Update AzureTokenManagerProvider to use ExpandableEnum CbsAuthorizationType. --- .../AzureTokenManagerProvider.java | 16 +++++----- .../AzureTokenManagerProviderTest.java | 29 ++++++++++--------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/AzureTokenManagerProvider.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/AzureTokenManagerProvider.java index cef5dc3e8ee9..9641fb0ef688 100644 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/AzureTokenManagerProvider.java +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/AzureTokenManagerProvider.java @@ -4,6 +4,7 @@ package com.azure.core.amqp.implementation; import com.azure.core.amqp.ClaimsBasedSecurityNode; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.util.logging.ClientLogger; import reactor.core.publisher.Mono; @@ -57,14 +58,13 @@ public TokenManager getTokenManager(Mono cbsNodeMono, S */ @Override public String getScopesFromResource(String resource) { - switch (authorizationType) { - case JSON_WEB_TOKEN: - return activeDirectoryScope; - case SHARED_ACCESS_SIGNATURE: - return String.format(Locale.US, TOKEN_AUDIENCE_FORMAT, fullyQualifiedNamespace, resource); - default: - throw logger.logExceptionAsError(new IllegalArgumentException(String.format(Locale.US, - "'%s' is not supported authorization type for token audience.", authorizationType))); + if (CbsAuthorizationType.JSON_WEB_TOKEN.equals(authorizationType)) { + return activeDirectoryScope; + } else if (CbsAuthorizationType.SHARED_ACCESS_SIGNATURE.equals(authorizationType)) { + return String.format(Locale.US, TOKEN_AUDIENCE_FORMAT, fullyQualifiedNamespace, resource); + } else { + throw logger.logExceptionAsError(new IllegalArgumentException(String.format(Locale.US, + "'%s' is not supported authorization type for token audience.", authorizationType))); } } } diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AzureTokenManagerProviderTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AzureTokenManagerProviderTest.java index 8f3fb2bd5d5c..7cdfa44fed3f 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AzureTokenManagerProviderTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AzureTokenManagerProviderTest.java @@ -4,13 +4,14 @@ package com.azure.core.amqp.implementation; import com.azure.core.amqp.ClaimsBasedSecurityNode; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.AccessToken; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -20,6 +21,7 @@ import java.time.Duration; import java.time.OffsetDateTime; import java.util.Locale; +import java.util.stream.Stream; import static com.azure.core.amqp.implementation.AzureTokenManagerProvider.TOKEN_AUDIENCE_FORMAT; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -62,12 +64,16 @@ void constructorNullScope() { assertThrows(NullPointerException.class, () -> new AzureTokenManagerProvider(CbsAuthorizationType.JSON_WEB_TOKEN, HOST_NAME, null)); } + public static Stream getResourceString() { + return Stream.of(CbsAuthorizationType.JSON_WEB_TOKEN, CbsAuthorizationType.SHARED_ACCESS_SIGNATURE); + } + /** * Verifies that the correct resource string is returned when we pass in different authorization types. */ @ParameterizedTest - @EnumSource(CbsAuthorizationType.class) - void getResourceString(CbsAuthorizationType authorizationType) { + @MethodSource + public void getResourceString(CbsAuthorizationType authorizationType) { // Arrange final String scope = "some-scope"; final AzureTokenManagerProvider provider = new AzureTokenManagerProvider(authorizationType, HOST_NAME, scope); @@ -77,16 +83,13 @@ void getResourceString(CbsAuthorizationType authorizationType) { final String actual = provider.getScopesFromResource(entityPath); // Assert - switch (authorizationType) { - case SHARED_ACCESS_SIGNATURE: - final String expected = "amqp://" + HOST_NAME + "/" + entityPath; - Assertions.assertEquals(expected, actual); - break; - case JSON_WEB_TOKEN: - Assertions.assertEquals(scope, actual); - break; - default: - Assertions.fail("This authorization type is unknown: " + authorizationType); + if (CbsAuthorizationType.SHARED_ACCESS_SIGNATURE.equals(authorizationType)) { + final String expected = "amqp://" + HOST_NAME + "/" + entityPath; + Assertions.assertEquals(expected, actual); + } else if (CbsAuthorizationType.JSON_WEB_TOKEN.equals(authorizationType)) { + Assertions.assertEquals(scope, actual); + } else { + Assertions.fail("This authorization type is unknown: " + authorizationType); } } From 36ae8a1f83b0fc9c2c0e8c3bd722e860582aee8a Mon Sep 17 00:00:00 2001 From: Connie Date: Wed, 2 Jun 2021 10:55:50 -0700 Subject: [PATCH 04/10] Fix CbsAuthorizationType imports. --- .../amqp/implementation/ClaimsBasedSecurityChannel.java | 3 ++- .../core/amqp/implementation/ConnectionOptions.java | 1 + .../core/amqp/implementation/ReactorConnectionTest.java | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannel.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannel.java index 6e72b5acb2bf..5dee735fa688 100644 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannel.java +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannel.java @@ -7,6 +7,7 @@ import com.azure.core.amqp.ClaimsBasedSecurityNode; import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.exception.AmqpResponseCode; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.credential.TokenRequestContext; import com.azure.core.util.logging.ClientLogger; @@ -58,7 +59,7 @@ public Mono authorize(String tokenAudience, String scopes) { final Map properties = new HashMap<>(); properties.put(PUT_TOKEN_OPERATION, PUT_TOKEN_OPERATION_VALUE); properties.put(PUT_TOKEN_EXPIRY, Date.from(accessToken.getExpiresAt().toInstant())); - properties.put(PUT_TOKEN_TYPE, authorizationType.getTokenType()); + properties.put(PUT_TOKEN_TYPE, authorizationType.toString()); properties.put(PUT_TOKEN_AUDIENCE, tokenAudience); final ApplicationProperties applicationProperties = new ApplicationProperties(properties); diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ConnectionOptions.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ConnectionOptions.java index 5e5cb378dfca..5075a6c7529a 100644 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ConnectionOptions.java +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ConnectionOptions.java @@ -8,6 +8,7 @@ import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.handler.ConnectionHandler; import com.azure.core.amqp.implementation.handler.WebSocketsConnectionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.annotation.Immutable; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorConnectionTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorConnectionTest.java index f865fa579123..6f2083faeeec 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorConnectionTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorConnectionTest.java @@ -13,6 +13,7 @@ import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.implementation.handler.ConnectionHandler; import com.azure.core.amqp.implementation.handler.SessionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Header; @@ -32,7 +33,13 @@ import org.apache.qpid.proton.engine.Transport; import org.apache.qpid.proton.reactor.Reactor; import org.apache.qpid.proton.reactor.Selectable; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; From d47b01bc95e4a052d067d7d2ade047d9fa4ab9b8 Mon Sep 17 00:00:00 2001 From: Connie Date: Wed, 2 Jun 2021 11:10:20 -0700 Subject: [PATCH 05/10] Change ClaimsBasedSecurityChannelTest to use correct import. --- .../core/amqp/implementation/ClaimsBasedSecurityChannelTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannelTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannelTest.java index 3cfb11b4d835..436f8faadce0 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannelTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ClaimsBasedSecurityChannelTest.java @@ -8,6 +8,7 @@ import com.azure.core.amqp.exception.AmqpErrorCondition; import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.exception.AmqpResponseCode; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.AccessToken; import com.azure.core.credential.TokenCredential; import org.apache.qpid.proton.Proton; From 9fcdc26f1197c8fa9a8ba680f943e73ac7a42b6e Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 11:20:41 -0700 Subject: [PATCH 06/10] Making the CbsAuthorizationType final. --- .../java/com/azure/core/amqp/models/CbsAuthorizationType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java index 2cf0ebe1c62a..7e6828f43e53 100644 --- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java +++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java @@ -9,12 +9,13 @@ /** * An enumeration of supported authorization methods with the {@link ClaimsBasedSecurityNode}. */ -public class CbsAuthorizationType extends ExpandableStringEnum { +public final class CbsAuthorizationType extends ExpandableStringEnum { /** * Authorize with CBS through a shared access signature. */ public static final CbsAuthorizationType SHARED_ACCESS_SIGNATURE = fromString("servicebus.windows.net:sastoken", CbsAuthorizationType.class); + /** * Authorize with CBS using a JSON web token. * From c8bd1fca9cd1a486874cef1ca88996b858a78196 Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 16:22:00 -0700 Subject: [PATCH 07/10] Fixing more CbsAuthorizationType errors. --- .../azure/core/amqp/implementation/ConnectionOptionsTest.java | 1 + .../core/amqp/implementation/handler/ConnectionHandlerTest.java | 2 +- .../implementation/handler/WebSocketsConnectionHandlerTest.java | 2 +- .../handler/WebSocketsProxyConnectionHandlerTest.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ConnectionOptionsTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ConnectionOptionsTest.java index e4ef8fef13c0..a6426dfa83aa 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ConnectionOptionsTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ConnectionOptionsTest.java @@ -7,6 +7,7 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.handler.ConnectionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import org.apache.qpid.proton.engine.SslDomain; diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/ConnectionHandlerTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/ConnectionHandlerTest.java index 7f4f6d6d2e9f..763c2e6eca71 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/ConnectionHandlerTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/ConnectionHandlerTest.java @@ -6,9 +6,9 @@ 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.ClientConstants; import com.azure.core.amqp.implementation.ConnectionOptions; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Header; diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsConnectionHandlerTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsConnectionHandlerTest.java index 583a123e90a6..af00cfea64dd 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsConnectionHandlerTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsConnectionHandlerTest.java @@ -6,9 +6,9 @@ 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.ClientConstants; import com.azure.core.amqp.implementation.ConnectionOptions; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import org.apache.qpid.proton.Proton; diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsProxyConnectionHandlerTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsProxyConnectionHandlerTest.java index e5222d49bab5..c11a815e05a4 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsProxyConnectionHandlerTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/handler/WebSocketsProxyConnectionHandlerTest.java @@ -7,8 +7,8 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyAuthenticationType; 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.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Header; From 357ce1028e0dc19610ae88d5066f82f43d8dbaa3 Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 20:50:15 -0700 Subject: [PATCH 08/10] Fix imports for ReactorHandlerProviderTest --- .../core/amqp/implementation/ReactorHandlerProviderTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorHandlerProviderTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorHandlerProviderTest.java index 404771c67a35..0c3ad885e5a7 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorHandlerProviderTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/ReactorHandlerProviderTest.java @@ -10,6 +10,7 @@ import com.azure.core.amqp.implementation.handler.ConnectionHandler; import com.azure.core.amqp.implementation.handler.WebSocketsConnectionHandler; import com.azure.core.amqp.implementation.handler.WebSocketsProxyConnectionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Header; From b0d85af2f187e4614feb8aeb5d5d7e5742aa2291 Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 21:11:16 -0700 Subject: [PATCH 09/10] Fixing Event Hubs breaks. --- .../azure/messaging/eventhubs/EventHubClientBuilder.java | 2 +- .../eventhubs/EventHubConsumerAsyncClientTest.java | 2 +- .../messaging/eventhubs/EventHubConsumerClientTest.java | 2 +- .../eventhubs/EventHubProducerAsyncClientTest.java | 4 ++-- .../messaging/eventhubs/EventHubProducerClientTest.java | 2 +- .../eventhubs/implementation/CBSChannelTest.java | 9 ++++----- .../implementation/EventHubReactorConnectionTest.java | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java index ca295d97cec8..d2c59007da6d 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/main/java/com/azure/messaging/eventhubs/EventHubClientBuilder.java @@ -8,7 +8,6 @@ import com.azure.core.amqp.ProxyAuthenticationType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.AzureTokenManagerProvider; -import com.azure.core.amqp.implementation.CbsAuthorizationType; import com.azure.core.amqp.implementation.ConnectionOptions; import com.azure.core.amqp.implementation.ConnectionStringProperties; import com.azure.core.amqp.implementation.MessageSerializer; @@ -17,6 +16,7 @@ import com.azure.core.amqp.implementation.StringUtil; import com.azure.core.amqp.implementation.TokenManagerProvider; import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.annotation.ServiceClientProtocol; import com.azure.core.credential.TokenCredential; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java index 43f56d50b0b1..377d9e8ce904 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java @@ -8,9 +8,9 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.AmqpReceiveLink; -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.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java index 5dc2a40b6236..49d8c3cb19b0 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java @@ -8,9 +8,9 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.AmqpReceiveLink; -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.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.IterableStream; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java index 522dc4cf32c8..0bf81bc5a2bb 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerAsyncClientTest.java @@ -12,10 +12,10 @@ import com.azure.core.amqp.exception.AmqpErrorContext; import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.implementation.AmqpSendLink; -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.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Context; @@ -77,8 +77,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; class EventHubProducerAsyncClientTest { diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java index 4180a2d83a97..daa39bc7e652 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubProducerClientTest.java @@ -11,10 +11,10 @@ import com.azure.core.amqp.exception.AmqpErrorContext; import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.implementation.AmqpSendLink; -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.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.Context; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/CBSChannelTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/CBSChannelTest.java index 116c2aa64270..a1571fd908c8 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/CBSChannelTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/CBSChannelTest.java @@ -18,6 +18,7 @@ import com.azure.core.amqp.implementation.ReactorProvider; import com.azure.core.amqp.implementation.RequestResponseChannel; import com.azure.core.amqp.implementation.TokenManagerProvider; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.CoreUtils; @@ -43,8 +44,6 @@ import java.util.Arrays; import java.util.Map; -import static com.azure.core.amqp.implementation.CbsAuthorizationType.SHARED_ACCESS_SIGNATURE; - /** * Verifies we authorize with Event Hubs CBS node correctly. */ @@ -84,7 +83,7 @@ protected void beforeTest() { MockitoAnnotations.initMocks(this); connectionProperties = getConnectionStringProperties(); - azureTokenManagerProvider = new AzureTokenManagerProvider(SHARED_ACCESS_SIGNATURE, + azureTokenManagerProvider = new AzureTokenManagerProvider(CbsAuthorizationType.SHARED_ACCESS_SIGNATURE, connectionProperties.getEndpoint().getHost(), ClientConstants.AZURE_ACTIVE_DIRECTORY_SCOPE); tokenAudience = azureTokenManagerProvider.getScopesFromResource(connectionProperties.getEntityPath()); @@ -113,7 +112,7 @@ void successfullyAuthorizes() { TokenCredential tokenCredential = new EventHubSharedKeyCredential( connectionProperties.getSharedAccessKeyName(), connectionProperties.getSharedAccessKey()); ConnectionOptions connectionOptions = new ConnectionOptions(connectionProperties.getEndpoint().getHost(), - tokenCredential, SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, + tokenCredential, CbsAuthorizationType.SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, RETRY_OPTIONS, ProxyOptions.SYSTEM_DEFAULTS, Schedulers.elastic(), clientOptions, SslDomain.VerifyMode.VERIFY_PEER_NAME, "test-product", "test-client-version"); connection = new TestReactorConnection(CONNECTION_ID, connectionOptions, reactorProvider, handlerProvider, @@ -136,7 +135,7 @@ void unsuccessfulAuthorize() { connectionProperties.getSharedAccessKeyName(), "Invalid shared access key."); final ConnectionOptions connectionOptions = new ConnectionOptions(connectionProperties.getEndpoint().getHost(), - invalidToken, SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, RETRY_OPTIONS, ProxyOptions.SYSTEM_DEFAULTS, + invalidToken, CbsAuthorizationType.SHARED_ACCESS_SIGNATURE, AmqpTransportType.AMQP, RETRY_OPTIONS, ProxyOptions.SYSTEM_DEFAULTS, Schedulers.elastic(), clientOptions, SslDomain.VerifyMode.VERIFY_PEER, "test-product", "test-client-version"); connection = new TestReactorConnection(CONNECTION_ID, connectionOptions, reactorProvider, handlerProvider, diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/EventHubReactorConnectionTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/EventHubReactorConnectionTest.java index d1e97100ab8f..70a02f5f999e 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/EventHubReactorConnectionTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/EventHubReactorConnectionTest.java @@ -6,7 +6,6 @@ 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.ReactorDispatcher; @@ -17,6 +16,7 @@ import com.azure.core.amqp.implementation.handler.ReceiveLinkHandler; import com.azure.core.amqp.implementation.handler.SendLinkHandler; import com.azure.core.amqp.implementation.handler.SessionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.CoreUtils; From 658e330b202954ea708404c9a563bc17e134e1b6 Mon Sep 17 00:00:00 2001 From: Connie Date: Thu, 3 Jun 2021 21:10:55 -0700 Subject: [PATCH 10/10] Fix Service Bus breaks. --- .../com/azure/messaging/servicebus/ServiceBusClientBuilder.java | 2 +- .../implementation/ServiceBusReactorAmqpConnection.java | 2 +- .../messaging/servicebus/ServiceBusReceiverAsyncClientTest.java | 2 +- .../messaging/servicebus/ServiceBusSenderAsyncClientTest.java | 2 +- .../messaging/servicebus/ServiceBusSessionManagerTest.java | 2 +- .../servicebus/ServiceBusSessionReceiverAsyncClientTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 bc98e2c2d9ae..110619cac5a7 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 @@ -8,7 +8,6 @@ import com.azure.core.amqp.ProxyAuthenticationType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.AzureTokenManagerProvider; -import com.azure.core.amqp.implementation.CbsAuthorizationType; import com.azure.core.amqp.implementation.ConnectionOptions; import com.azure.core.amqp.implementation.ConnectionStringProperties; import com.azure.core.amqp.implementation.MessageSerializer; @@ -17,6 +16,7 @@ import com.azure.core.amqp.implementation.StringUtil; import com.azure.core.amqp.implementation.TokenManagerProvider; import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.annotation.ServiceClientProtocol; import com.azure.core.credential.TokenCredential; diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/ServiceBusReactorAmqpConnection.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/ServiceBusReactorAmqpConnection.java index 81fb67fc6f1b..f1c32b69dd1c 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/ServiceBusReactorAmqpConnection.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/implementation/ServiceBusReactorAmqpConnection.java @@ -8,7 +8,6 @@ import com.azure.core.amqp.AmqpSession; import com.azure.core.amqp.implementation.AmqpSendLink; import com.azure.core.amqp.implementation.AzureTokenManagerProvider; -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.ReactorConnection; @@ -18,6 +17,7 @@ import com.azure.core.amqp.implementation.TokenManager; import com.azure.core.amqp.implementation.TokenManagerProvider; import com.azure.core.amqp.implementation.handler.SessionHandler; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.util.logging.ClientLogger; import com.azure.messaging.servicebus.models.ServiceBusReceiveMode; import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode; 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 a87981fecc1f..bd7207a2dc97 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 @@ -9,10 +9,10 @@ import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.exception.AmqpErrorCondition; 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; import com.azure.core.amqp.implementation.TracerProvider; +import com.azure.core.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.exception.AzureException; import com.azure.core.util.ClientOptions; 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 2985c6b5ddc5..50f1699f1f2f 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 @@ -10,11 +10,11 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.amqp.ProxyOptions; import com.azure.core.amqp.implementation.AmqpSendLink; -import com.azure.core.amqp.implementation.CbsAuthorizationType; import com.azure.core.amqp.implementation.ConnectionOptions; 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.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.BinaryData; import com.azure.core.util.ClientOptions; 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 5c9e7dc55d20..cc58b9c3e46e 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 @@ -7,10 +7,10 @@ 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.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.logging.ClientLogger; 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 index fd607dafec9e..60710582addd 100644 --- 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 @@ -7,10 +7,10 @@ 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.amqp.models.CbsAuthorizationType; import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.logging.ClientLogger;