commit 86270c7282bb32f4a3dbc73919e3497f48c293df
author andreasvaldma <andreas.valdmanortal.com> Thu Feb 25 09:25:05 2021 +0200
committer Benoit Tellier <btellier@linagora.com> Wed Mar 03 13:54:06 2021 +0700
tree a6f3e7bacb7d3d5c10ead3a28b10b6f90dfa1f4a
parent 362b6a18c12e83214d97ae9d223b1f0d8256d930

JAMES-3502, rabbitmqmanagementapi refactor

backends-common/rabbitmq/pom.xml

diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 0ff6f4e..87c7a74 100644
--- a/backends-common/rabbitmq/pom.xml
+++ b/backends-common/rabbitmq/pom.xml
@@ -95,13 +95,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.5</version>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.5</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java

diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
index 8e4762d..d6b4f67 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
@@ -319,11 +319,9 @@
     }
 
     static RabbitMQManagementAPI from(RabbitMQConfiguration configuration) {
-        RabbitMQConfiguration.ManagementCredentials credentials = configuration.getManagementCredentials();
-
-        RabbitMQManagementAPI rabbitMQManagementAPI = null;
         try {
-            rabbitMQManagementAPI = Feign.builder()
+            RabbitMQConfiguration.ManagementCredentials credentials = configuration.getManagementCredentials();
+            RabbitMQManagementAPI rabbitMQManagementAPI = Feign.builder()
                     .client(getClient(configuration))
                     .requestInterceptor(new BasicAuthRequestInterceptor(credentials.getUser(), new String(credentials.getPassword())))
                     .logger(new Slf4jLogger(RabbitMQManagementAPI.class))
@@ -333,11 +331,11 @@
                     .retryer(new Retryer.Default())
                     .errorDecoder(RETRY_500)
                     .target(RabbitMQManagementAPI.class, configuration.getManagementUri().toString());
+
+            return rabbitMQManagementAPI;
         } catch (KeyManagementException | NoSuchAlgorithmException | CertificateException | KeyStoreException | IOException | UnrecoverableKeyException e) {
             throw new RuntimeException(e);
         }
-
-        return rabbitMQManagementAPI;
     }
 
     private static Client getClient(RabbitMQConfiguration configuration) throws KeyManagementException, NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, UnrecoverableKeyException {