[type:fix] (logging-rabbitmq): Fixed the issue where Rabbitmq log configuration was not refreshed correctly after modification.

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfig.java

@@ -333,6 +333,8 @@ public boolean equals(final Object o) {
                     && Objects.equals(getExchangeName(), that.getExchangeName())
                     && Objects.equals(getHost(), that.getHost())
                     && Objects.equals(getPort(), that.getPort())
+                    && Objects.equals(getUsername(), that.getUsername())
+                    && Objects.equals(getPassword(), that.getPassword())
                     && Objects.equals(getExchangeType(), that.getExchangeType())
                     && Objects.equals(getVirtualHost(), that.getVirtualHost())
                     && Objects.equals(getDurable(), that.getDurable())
@@ -347,7 +349,8 @@ public boolean equals(final Object o) {
 
         @Override
         public int hashCode() {
-            return Objects.hash(routingKey, queueName, exchangeName, host, port, exchangeType, virtualHost, durable, autoDelete, exchangeType, args);
+            return Objects.hash(routingKey, queueName, exchangeName, host, port, exchangeType, virtualHost, durable, autoDelete, exchangeType, args,
+                    username, password, getSampleRate(), getBufferQueueSize(), getMaxResponseBody(), getMaxRequestBody());
         }
     }
 

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/LoggingRabbitmqPluginTest.java → shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/LoggingRabbitmqPluginTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.plulgin.logging.rabbitmq;
+package org.apache.shenyu.plugin.logging.rabbitmq;
 
 import org.apache.shenyu.common.constant.Constants;
 import org.apache.shenyu.common.dto.RuleData;
@@ -25,7 +25,6 @@
 import org.apache.shenyu.plugin.api.ShenyuPluginChain;
 import org.apache.shenyu.plugin.api.context.ShenyuContext;
 import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.apache.shenyu.plugin.logging.rabbitmq.LoggingRabbitmqPlugin;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java → shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java

@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.plulgin.logging.rabbitmq.client;
+package org.apache.shenyu.plugin.logging.rabbitmq.client;
 
 import org.apache.shenyu.common.dto.PluginData;
 import org.apache.shenyu.common.utils.GsonUtils;
 import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.rabbitmq.client.RabbitmqLogCollectClient;
 import org.apache.shenyu.plugin.logging.rabbitmq.config.RabbitmqLogCollectConfig;
 import org.junit.Assert;
 import org.junit.Before;

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java → shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.plulgin.logging.rabbitmq.collector;
+package org.apache.shenyu.plugin.logging.rabbitmq.collector;
 
 import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
 import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java → shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.plulgin.logging.rabbitmq.config;
+package org.apache.shenyu.plugin.logging.rabbitmq.config;
 
 import org.apache.shenyu.plugin.logging.rabbitmq.config.RabbitmqLogCollectConfig.RabbitmqLogConfig;
 import org.junit.Assert;

shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java

@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shenyu.plugin.logging.rabbitmq.handler;
+
+import org.apache.shenyu.common.dto.ConditionData;
+import org.apache.shenyu.common.dto.PluginData;
+import org.apache.shenyu.common.dto.SelectorData;
+import org.apache.shenyu.common.enums.ParamTypeEnum;
+import org.apache.shenyu.common.enums.PluginEnum;
+import org.apache.shenyu.common.enums.SelectorTypeEnum;
+import org.apache.shenyu.common.utils.GsonUtils;
+import org.apache.shenyu.common.utils.Singleton;
+import org.apache.shenyu.plugin.logging.rabbitmq.client.RabbitmqLogCollectClient;
+import org.apache.shenyu.plugin.logging.rabbitmq.config.RabbitmqLogCollectConfig;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * The Test Case For LoggingRabbitmqPluginDataHandler.
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public final class LoggingRabbitmqPluginDataHandlerTest {
+
+    private final SelectorData selectorData = new SelectorData();
+
+    private final ConditionData conditionData = new ConditionData();
+
+    private final PluginData pluginData = new PluginData();
+
+    private final String config
+            = "{\"host\":\"127.0.0.1\",\"port\":5672,\"password\":\"admin\",\"username\":\"admin\",\"exchangeName\":\"exchange.logging.plugin\",\"queueName\":\"queue.logging.plugin\"}";
+
+    private LoggingRabbitmqPluginDataHandler loggingRabbitmqPluginDataHandler;
+
+    @BeforeEach
+    public void setUp() {
+        loggingRabbitmqPluginDataHandler = Mockito.spy(new LoggingRabbitmqPluginDataHandler());
+        selectorData.setId("1");
+        selectorData.setType(SelectorTypeEnum.CUSTOM_FLOW.getCode());
+        selectorData.setHandle("{\"routingKey\":\"routingKey.logging.rabbitmq\", \"sampleRate\":\"1\"}");
+
+        conditionData.setParamName("id");
+        conditionData.setParamType(ParamTypeEnum.URI.getName());
+        conditionData.setParamValue("https://shenyu.apache.org/");
+        conditionData.setOperator("=");
+
+        List<ConditionData> list = new ArrayList<>();
+        list.add(conditionData);
+        selectorData.setConditionList(list);
+        pluginData.setEnabled(true);
+        pluginData.setId(UUID.randomUUID().toString().replace("-", ""));
+        pluginData.setConfig(config);
+    }
+
+    @Test
+    public void testHandlerPlugin() throws Exception {
+        loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData);
+        Field field = loggingRabbitmqPluginDataHandler.getClass().getDeclaredField("RABBITMQ_LOG_COLLECT_CLIENT");
+        field.setAccessible(Boolean.TRUE);
+        Assertions.assertEquals(field.get(loggingRabbitmqPluginDataHandler).getClass(), RabbitmqLogCollectClient.class);
+        pluginData.setEnabled(Boolean.FALSE);
+        loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData);
+    }
+
+    @Test
+    public void testPluginNamed() {
+        Assertions.assertEquals(loggingRabbitmqPluginDataHandler.pluginNamed(), PluginEnum.LOGGING_RABBITMQ.getName());
+    }
+
+    @Test
+    public void testGetRabbitmqLogCollectClient() {
+        Assertions.assertEquals(LoggingRabbitmqPluginDataHandler.getRabbitmqLogCollectClient().getClass(), RabbitmqLogCollectClient.class);
+    }
+
+    @Test
+    public void testGetSelectApiConfigMap() {
+        Assertions.assertEquals(LoggingRabbitmqPluginDataHandler.getSelectApiConfigMap().getClass(), ConcurrentHashMap.class);
+    }
+
+    @Test
+    public void testHandlerPluginUpdateSameConfig() {
+        RabbitmqLogCollectConfig.RabbitmqLogConfig existingConfig = createValidConfig();
+        Singleton.INST.single(existingConfig.getClass(), existingConfig);
+
+        PluginData pluginData = createPluginData();
+        pluginData.setConfig(GsonUtils.getGson().toJson(existingConfig));
+
+        loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData);
+
+        verify(loggingRabbitmqPluginDataHandler, never()).doRefreshConfig(any());
+    }
+
+    @Test
+    public void testHandlerPluginUpdateDifferentConfig() {
+        RabbitmqLogCollectConfig.RabbitmqLogConfig existingConfig = createValidConfig();
+        Singleton.INST.single(existingConfig.getClass(), existingConfig);
+
+        RabbitmqLogCollectConfig.RabbitmqLogConfig updatedConfig = createValidConfig();
+        updatedConfig.setUsername("updatedUsername");
+        updatedConfig.setPassword("updatedPassword");
+        PluginData pluginData = createPluginData();
+        pluginData.setConfig(GsonUtils.getGson().toJson(updatedConfig));
+
+        doNothing().when(loggingRabbitmqPluginDataHandler).doRefreshConfig(any());
+
+        loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData);
+
+        verify(loggingRabbitmqPluginDataHandler, times(1)).doRefreshConfig(any());
+    }
+
+    private PluginData createPluginData() {
+        PluginData pluginData = new PluginData();
+        pluginData.setEnabled(true);
+        pluginData.setId(UUID.randomUUID().toString().replace("-", ""));
+        return pluginData;
+    }
+
+    private RabbitmqLogCollectConfig.RabbitmqLogConfig createValidConfig() {
+        RabbitmqLogCollectConfig.RabbitmqLogConfig config = new RabbitmqLogCollectConfig.RabbitmqLogConfig();
+        config.setHost("127.0.0.1");
+        config.setPort(5672);
+        config.setPassword("admin");
+        config.setUsername("admin");
+        config.setExchangeName("exchange.logging.plugin");
+        config.setQueueName("queue.logging.plugin");
+        config.setRoutingKey("topic.logging");
+        config.setVirtualHost("/");
+        config.setExchangeType("direct");
+        config.setDurable(true);
+        config.setExclusive(false);
+        config.setAutoDelete(false);
+        config.setSampleRate("1");
+        return config;
+    }
+
+}