From 75bf53cc25b3e38c56bb1d7518ce9338ece7bb7e Mon Sep 17 00:00:00 2001 From: yuqianwei Date: Sat, 12 Apr 2025 10:04:52 +0800 Subject: [PATCH 1/2] [type:fix] (logging-rabbitmq): Fixed the issue where Rabbitmq log configuration was not refreshed correctly after modification. --- .../config/RabbitmqLogCollectConfig.java | 5 +- .../rabbitmq/LoggingRabbitmqPluginTest.java | 3 +- .../client/RabbitmqLogCollectClientTest.java | 3 +- .../collector/RabbitmqLogCollectorTest.java | 2 +- .../config/RabbitmqLogCollectConfigTest.java | 2 +- .../LoggingRabbitmqPluginDataHandlerTest.java | 171 ++++++++++++++++++ .../LoggingRabbitmqPluginDataHandlerTest.java | 99 ---------- 7 files changed, 179 insertions(+), 106 deletions(-) rename shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin => plugin}/logging/rabbitmq/LoggingRabbitmqPluginTest.java (97%) rename shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin => plugin}/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java (95%) rename shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin => plugin}/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java (97%) rename shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin => plugin}/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java (98%) create mode 100644 shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java delete mode 100644 shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfig.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfig.java index d8e6d3f369c4..26a1e580f748 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfig.java +++ b/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()); } } diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/LoggingRabbitmqPluginTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/LoggingRabbitmqPluginTest.java similarity index 97% rename from shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/LoggingRabbitmqPluginTest.java rename to shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/LoggingRabbitmqPluginTest.java index 818bab82f9f5..c68108e0ddb5 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/LoggingRabbitmqPluginTest.java +++ b/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; diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java similarity index 95% rename from shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java rename to shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java index d08e43f5c426..f9848a98081e 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java +++ b/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; diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java similarity index 97% rename from shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java rename to shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java index eb28271dc547..20f40dd0cdfd 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java +++ b/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; diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java similarity index 98% rename from shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java rename to shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java index 01fbe27e53b9..266c9e448bf9 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java +++ b/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; diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java new file mode 100644 index 000000000000..c919454aaf38 --- /dev/null +++ b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java @@ -0,0 +1,171 @@ +/* + * 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; +import static org.mockito.Mockito.when; + +/** + * 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 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; + } + +} diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java deleted file mode 100644 index 10e043a3f20b..000000000000 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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.plulgin.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.plugin.logging.rabbitmq.client.RabbitmqLogCollectClient; -import org.apache.shenyu.plugin.logging.rabbitmq.handler.LoggingRabbitmqPluginDataHandler; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -/** - * The Test Case For LoggingRabbitmqPluginDataHandler. - */ -public 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; - - @Before - public void setUp() { - this.loggingRabbitmqPluginDataHandler = 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 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); - Assert.assertEquals(field.get(loggingRabbitmqPluginDataHandler).getClass(), RabbitmqLogCollectClient.class); - pluginData.setEnabled(Boolean.FALSE); - loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData); - } - - @Test - public void testPluginNamed() { - Assert.assertEquals(loggingRabbitmqPluginDataHandler.pluginNamed(), PluginEnum.LOGGING_RABBITMQ.getName()); - } - - @Test - public void testGetRabbitmqLogCollectClient() { - Assert.assertEquals(LoggingRabbitmqPluginDataHandler.getRabbitmqLogCollectClient().getClass(), RabbitmqLogCollectClient.class); - } - - @Test - public void testGetSelectApiConfigMap() { - Assert.assertEquals(LoggingRabbitmqPluginDataHandler.getSelectApiConfigMap().getClass(), ConcurrentHashMap.class); - } - -} From fbe06c73cddca0430bd4c9fc93769dd5c7a5224d Mon Sep 17 00:00:00 2001 From: yuqianwei Date: Wed, 16 Apr 2025 19:49:46 +0800 Subject: [PATCH 2/2] [type:fix] (logging-rabbitmq): Fixed the issue where Rabbitmq log configuration was not refreshed correctly after modification. --- .../rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java index c919454aaf38..ed15d0d141eb 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java +++ b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java @@ -47,7 +47,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * The Test Case For LoggingRabbitmqPluginDataHandler.