Merge remote-tracking branch 'upstream/develop' into config_change_verify

README.md

@@ -2,7 +2,7 @@
 
 # 动态可观测线程池框架，提高线上运行保障能力
 
-[![Gitee](https://gitee.com/agentart/hippo4j/badge/star.svg?theme=gvp)](https://gitee.com/agentart/hippo4j) [![GitHub](https://img.shields.io/github/stars/opengoofy/hippo4j)](https://github.com/opengoofy/hippo4j) [![Docker Pulls](https://img.shields.io/docker/pulls/hippo4j/hippo4j-server.svg)](https://store.docker.com/community/images/hippo4j/hippo4j-server) [![Contributors](https://img.shields.io/github/contributors/opengoofy/hippo4j?color=3ba272)](https://github.com/opengoofy/hippo4j/graphs/contributors) [![License](https://img.shields.io/github/license/opengoofy/hippo4j?color=5470c6)](https://github.com/opengoofy/hippo4j/blob/develop/LICENSE)
+[![Gitee](https://gitee.com/itmachen/hippo4j/badge/star.svg?theme=gvp)](https://gitee.com/itmachen/hippo4j) [![GitHub](https://img.shields.io/github/stars/opengoofy/hippo4j)](https://github.com/opengoofy/hippo4j) [![Docker Pulls](https://img.shields.io/docker/pulls/hippo4j/hippo4j-server.svg)](https://store.docker.com/community/images/hippo4j/hippo4j-server) [![Contributors](https://img.shields.io/github/contributors/opengoofy/hippo4j?color=3ba272)](https://github.com/opengoofy/hippo4j/graphs/contributors) [![License](https://img.shields.io/github/license/opengoofy/hippo4j?color=5470c6)](https://github.com/opengoofy/hippo4j/blob/develop/LICENSE)
 
 -------
 
@@ -38,7 +38,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
 - 容器管理 - Tomcat、Jetty、Undertow 容器线程池运行时查看和线程数变更。
 - 中间件适配 - Dubbo、Hystrix、RocketMQ、RabbitMQ 等消费线程池运行时数据查看和线程数变更。
 
-> 开源作者为爱发电不容易，看完有收获，右上角帮忙点个小星星 🤩
+> 开源作者为爱发电不容易，看完有收获，右上角帮忙点个 Star 🤩
 
 ## 快速开始
 

hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/SingletonTest.java

@@ -17,5 +17,30 @@
 
 package cn.hippo4j.common.toolkit;
 
+import cn.hippo4j.common.model.ThreadPoolParameterInfo;
+import org.junit.Assert;
+import org.junit.Test;
+
 public class SingletonTest {
+
+    @Test
+    public void assertSingletonGet() {
+        Assert.assertNull(Singleton.get("userName"));
+        Singleton.put("userName", "hippo4j");
+        Assert.assertEquals("hippo4j", Singleton.get("userName"));
+        ThreadPoolParameterInfo threadPoolParameterInfo = ThreadPoolParameterInfo.builder().tenantId("prescription")
+                .itemId("dynamic-threadpool-example").tpId("message-consume").content("描述信息").corePoolSize(1)
+                .maximumPoolSize(2).queueType(1).capacity(4).keepAliveTime(513).executeTimeOut(null).rejectedType(4)
+                .isAlarm(1).capacityAlarm(80).livenessAlarm(80).allowCoreThreadTimeOut(1).build();
+        Singleton.put(threadPoolParameterInfo);
+        Assert.assertEquals(threadPoolParameterInfo, Singleton.get(ThreadPoolParameterInfo.class.getName()));
+    }
+
+    @Test
+    public void assertSingletonGet2() {
+        Assert.assertNull(Singleton.get("userName1", () -> null));
+        Assert.assertEquals("hippo4j", Singleton.get("userName1", () -> "hippo4j"));
+        Assert.assertEquals("123456", Singleton.get("pw", () -> "123456") + "");
+        Assert.assertNotEquals("135790", Singleton.get("pw", () -> "135790") + "");
+    }
 }

hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/BeanUtilTest.java

@@ -17,8 +17,108 @@
 
 package cn.hippo4j.config.toolkit;
 
+import cn.hippo4j.common.toolkit.Assert;
+import com.github.dozermapper.core.converters.ConversionException;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.*;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * BeanUtil Test
  */
 public class BeanUtilTest {
+
+    @Test
+    public void beanToMapConvertTest() {
+        // 测试BeanToMap
+        final Person person = new Person();
+        person.setName("Hippo4j");
+        person.setAge(1);
+        person.setAddress("hippo4j.cn");
+        person.setSize(999);
+        final Map<?, ?> convert = BeanUtil.convert(person, Map.class);
+        Assert.isTrue(Objects.equals("Hippo4j", convert.get("name")));
+        Assert.isTrue(Objects.equals(1, convert.get("age")));
+        Assert.isTrue(Objects.equals("hippo4j.cn", convert.get("address")));
+        Assert.isTrue(Objects.equals(999, convert.get("size")));
+    }
+
+    @Test
+    public void mapToBeanConvertTest() {
+        // 测试MapToBean
+        final HashMap<String, Object> map = Maps.newHashMap();
+        map.put("name", "Hippo4j");
+        map.put("age", 1);
+        map.put("address", "hippo4j.cn");
+        map.put("size", 999);
+        final Person person = BeanUtil.convert(map, Person.class);
+        Assert.isTrue(Objects.equals("Hippo4j", person.getName()));
+        Assert.isTrue(Objects.equals(1, person.getAge()));
+        Assert.isTrue(Objects.equals("hippo4j.cn", person.getAddress()));
+        Assert.isTrue(Objects.equals(999, person.getSize()));
+    }
+
+    @Test
+    public void ListToListConvertTest() {
+        final List<Person> list = Lists.newArrayList();
+        list.add(Person.builder().name("one").age(1).build());
+        list.add(Person.builder().name("two").age(2).build());
+        list.add(Person.builder().name("three").age(3).build());
+
+        final List<PersonVo> persons = BeanUtil.convert(list, PersonVo.class);
+        Assert.isTrue(Objects.equals(list.size(), persons.size()));
+    }
+
+    @Test
+    public void copyPropertiesBeanToMapTest() {
+        // 测试BeanToMap
+        final Person person = new Person();
+        person.setName("Hippo4j");
+
+        final Map<?, ?> convert = BeanUtil.convert(person, Map.class);
+        Assert.isTrue(Objects.equals("Hippo4j", convert.get("name")));
+
+        // static属性应被忽略
+        Assert.isTrue(!convert.containsKey("STATIC_NAME"));
+    }
+
+    /**
+     * 测试在不忽略错误情况下，转换失败需要报错。
+     */
+    @Test(expected = ConversionException.class)
+    public void mapToBeanWinErrorTest() {
+        final Map<String, String> map = new HashMap<>();
+        map.put("age", "Hippo4j");
+        BeanUtil.convert(map, Person.class);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+
+    @Getter
+    @Setter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Person {
+
+        public static final String STATIC_NAME = "STATIC_NAME";
+
+        private String name;
+        private int age;
+        private String address;
+        private Integer size;
+    }
+
+    @Setter
+    public static class PersonVo {
+
+        private String name;
+        private int age;
+    }
 }

hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/RequestUtilTest.java

@@ -17,8 +17,32 @@
 
 package cn.hippo4j.config.toolkit;
 
+import cn.hippo4j.common.toolkit.Assert;
+import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import java.util.Objects;
+
+import static cn.hippo4j.common.constant.Constants.LONG_PULLING_CLIENT_IDENTIFICATION;
+
 /**
  * RequestUtil Test
  */
 public class RequestUtilTest {
+
+    @Test
+    public void existClientIdentifyTest() {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.addHeader(LONG_PULLING_CLIENT_IDENTIFICATION, "test");
+        String clientIdentify = RequestUtil.getClientIdentify(request);
+        Assert.isTrue(Objects.equals(clientIdentify, "test"));
+    }
+
+    @Test
+    public void notExistClientIdentifyTest() {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        String clientIdentify = RequestUtil.getClientIdentify(request);
+        Assert.isTrue(Objects.equals(clientIdentify, ""));
+    }
+
 }