From 4e93f7cf92ec3755249fc687dfa1e3e41e8e00f7 Mon Sep 17 00:00:00 2001 From: mingri31164 <3116430062@qq.com> Date: Thu, 23 Oct 2025 20:24:30 +0800 Subject: [PATCH] fix: Enable inline mock maker to support static mocks --- dependencies/pom.xml | 2 +- .../src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java | 4 ++-- .../mockito-extensions/org.mockito.plugins.MockMaker | 1 + .../mockito-extensions/org.mockito.plugins.MockMaker | 2 ++ .../AdapterThreadPoolElasticSearchMonitorHandler.java | 1 - 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker create mode 100644 threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3838abda..342a8849 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -18,7 +18,7 @@ 2.11.1 2.1.214 4.11.0 - 1.12.23 + 1.14.11 3.0.5 2.6.12 1.7.7 diff --git a/infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java index c19118b2..2e43cb29 100644 --- a/infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java +++ b/infra/common/src/test/java/cn/hippo4j/common/toolkit/BeanUtilTest.java @@ -37,7 +37,7 @@ import java.util.Set; public class BeanUtilTest { @Test - public void beanToBeanConvertTest(){ + public void beanToBeanConvertTest() { final Person person = new Person(); person.setName("Hippo4j"); person.setAge(1); @@ -222,7 +222,7 @@ public class BeanUtilTest { @Getter @Setter - static class GoodPerson extends Person{ + static class GoodPerson extends Person { /** * gender diff --git a/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 00000000..1f0955d4 --- /dev/null +++ b/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 00000000..be144a36 --- /dev/null +++ b/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1,2 @@ +mock-maker-inline + diff --git a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/AdapterThreadPoolElasticSearchMonitorHandler.java b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/AdapterThreadPoolElasticSearchMonitorHandler.java index cf0f0d2f..52d769fa 100644 --- a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/AdapterThreadPoolElasticSearchMonitorHandler.java +++ b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/AdapterThreadPoolElasticSearchMonitorHandler.java @@ -181,4 +181,3 @@ public class AdapterThreadPoolElasticSearchMonitorHandler extends AbstractAdapte private String alias; } } -