Fix Management Bug (Azure#22122)

* Adding missing return statement. * Using common logic for status codes. * Adding isSuccessful.
conniey · Jun 10, 2021 · a90b19e · a90b19e
1 parent e80d82e
commit a90b19e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/...e/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ManagementChannel.java b/...e/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ManagementChannel.java
@@ -116,14 +116,13 @@ private Mono<Void> isAuthorized() {
             .next()
             .switchIfEmpty(Mono.error(new AmqpException(false, "Did not get response from tokenManager: " + entityPath, getErrorContext())))
             .handle((response, sink) -> {
-                if (response != AmqpResponseCode.ACCEPTED && response != AmqpResponseCode.OK) {
+                if (RequestResponseUtils.isSuccessful(response)) {
+                    sink.complete();
+                } else {
                     final String message = String.format("User does not have authorization to perform operation "
                         + "on entity [%s]. Response: [%s]", entityPath, response);
                     sink.error(ExceptionUtil.amqpResponseCodeToException(response.getValue(), message,
                         getErrorContext()));
-
-                } else {
-                    sink.complete();
                 }
             });
     }

diff --git a/...zure-core-amqp/src/main/java/com/azure/core/amqp/implementation/RequestResponseUtils.java b/...zure-core-amqp/src/main/java/com/azure/core/amqp/implementation/RequestResponseUtils.java
@@ -28,6 +28,10 @@ public class RequestResponseUtils {
 
     public static boolean isSuccessful(Message message) {
         final AmqpResponseCode statusCode = getStatusCode(message);
+        return isSuccessful(statusCode);
+    }
+
+    public static boolean isSuccessful(AmqpResponseCode statusCode) {
         return statusCode == AmqpResponseCode.OK || statusCode == AmqpResponseCode.ACCEPTED;
     }
 

diff --git a/...enthubs/src/main/java/com/azure/messaging/eventhubs/implementation/ManagementChannel.java b/...enthubs/src/main/java/com/azure/messaging/eventhubs/implementation/ManagementChannel.java
@@ -162,14 +162,14 @@ private <T> Mono<T> getProperties(Map<String, Object> properties, Class<T> respo
                 .handle((message, sink) -> {
                     if (RequestResponseUtils.isSuccessful(message)) {
                         sink.next(messageSerializer.deserialize(message, responseType));
-                    }
-
-                    final AmqpResponseCode statusCode = RequestResponseUtils.getStatusCode(message);
-                    final String statusDescription = RequestResponseUtils.getStatusDescription(message);
-                    final Throwable error = ExceptionUtil.amqpResponseCodeToException(statusCode.getValue(),
-                        statusDescription, channel.getErrorContext());
+                    } else {
+                        final AmqpResponseCode statusCode = RequestResponseUtils.getStatusCode(message);
+                        final String statusDescription = RequestResponseUtils.getStatusDescription(message);
+                        final Throwable error = ExceptionUtil.amqpResponseCodeToException(statusCode.getValue(),
+                            statusDescription, channel.getErrorContext());
 
-                    sink.error(logger.logExceptionAsWarning(Exceptions.propagate(error)));
+                        sink.error(logger.logExceptionAsWarning(Exceptions.propagate(error)));
+                    }
                 }));
         });
     }