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 4a8cb8f6cf..c19118b26b 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 @@ -17,6 +17,7 @@ package cn.hippo4j.common.toolkit; +import com.github.dozermapper.core.converters.ConversionException; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -37,7 +38,6 @@ public class BeanUtilTest { @Test public void beanToBeanConvertTest(){ - // Test BeanToAnotherBean final Person person = new Person(); person.setName("Hippo4j"); person.setAge(1); @@ -53,7 +53,6 @@ public void beanToBeanConvertTest(){ @Test public void beanToMapConvertTest() { - // 测试BeanToMap final Person person = new Person(); person.setName("Hippo4j"); person.setAge(1); @@ -68,7 +67,6 @@ public void beanToMapConvertTest() { @Test public void mapToBeanConvertTest() { - // 测试MapToBean final HashMap map = new HashMap<>(); map.put("name", "Hippo4j"); map.put("age", 1); @@ -105,21 +103,16 @@ public void SetToSetConvertTest() { @Test public void copyPropertiesBeanToMapTest() { - // 测试BeanToMap final Person person = new Person(); person.setName("Hippo4j"); final Map convert = BeanUtil.convert(person, Map.class); Assert.assertEquals("Hippo4j", convert.get("name")); - // static属性应被忽略 Assert.assertFalse(convert.containsKey("STATIC_NAME")); } - /** - * 测试在不忽略错误情况下,转换失败需要报错。 - */ - // @Test(expected = ConversionException.class) + @Test(expected = ConversionException.class) public void mapToBeanWinErrorTest() { final Map map = new HashMap<>(); map.put("age", "Hippo4j"); @@ -157,18 +150,43 @@ public void testSetter() { @NoArgsConstructor public static class Person { + /** + * STATIC_NAME + */ public static final String STATIC_NAME = "STATIC_NAME"; + /** + * name + */ private String name; + + /** + * age + */ private int age; + + /** + * address + */ private String address; + + /** + * size + */ private Integer size; } @Setter public static class PersonVo { + /** + * name + */ private String name; + + /** + * age + */ private int age; } @@ -176,7 +194,14 @@ public static class PersonVo { @Setter static class Customer { + /** + * name + */ String name; + + /** + * statusCode + */ Integer statusCode; } @@ -184,7 +209,14 @@ static class Customer { @Setter static class PreCustomer { + /** + * name + */ String name; + + /** + * statusCode + */ Integer statusCode; } @@ -192,7 +224,14 @@ static class PreCustomer { @Setter static class GoodPerson extends Person{ - String gender; - String nature; + /** + * gender + */ + private String gender; + + /** + * nature + */ + private String nature; } } 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 c985a1f8c7..cf0f0d2fac 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 @@ -57,6 +57,7 @@ public class AdapterThreadPoolElasticSearchMonitorHandler extends AbstractAdapterThreadPoolMonitor { private AtomicBoolean isIndexExist = null; + @Override protected void execute(ThreadPoolAdapterState threadPoolAdapterState) { ElasticSearchThreadPoolRunStateInfo esThreadPoolRunStateInfo = BeanUtil.convert(threadPoolAdapterState, ElasticSearchThreadPoolRunStateInfo.class); @@ -149,12 +150,35 @@ public String getType() { @Builder private static class EsIndex { - String index; - String type; - String mapping; - Integer shards; - Integer replicas; - String alias; + /** + * index + */ + private String index; + + /** + * type + */ + private String type; + + /** + * mapping + */ + private String mapping; + + /** + * shards + */ + private Integer shards; + + /** + * replicas + */ + private Integer replicas; + + /** + * alias + */ + private String alias; } } diff --git a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/WebThreadPoolElasticSearchMonitorHandler.java b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/WebThreadPoolElasticSearchMonitorHandler.java index 13a55a804f..dd441a0486 100644 --- a/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/WebThreadPoolElasticSearchMonitorHandler.java +++ b/threadpool/monitor/elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/WebThreadPoolElasticSearchMonitorHandler.java @@ -56,6 +56,7 @@ public class WebThreadPoolElasticSearchMonitorHandler extends AbstractWebThreadPoolMonitor { private AtomicBoolean isIndexExist = null; + @Override protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) { ElasticSearchThreadPoolRunStateInfo esThreadPoolRunStateInfo = BeanUtil.convert(poolRunStateInfo, ElasticSearchThreadPoolRunStateInfo.class); @@ -147,11 +148,34 @@ public String getType() { @Builder private static class EsIndex { - String index; - String type; - String mapping; - Integer shards; - Integer replicas; - String alias; + /** + * index + */ + private String index; + + /** + * type + */ + private String type; + + /** + * mapping + */ + private String mapping; + + /** + * shards + */ + private Integer shards; + + /** + * replicas + */ + private Integer replicas; + + /** + * alias + */ + private String alias; } } \ No newline at end of file