From 7cd84bed53b9bdf603cd23197252b1ac5a30c81b Mon Sep 17 00:00:00 2001 From: wulang Date: Mon, 7 Nov 2022 20:40:01 +0800 Subject: [PATCH] style:hippo4j-monitor CheckStyle --- ...ThreadPoolElasticSearchMonitorHandler.java | 36 +++++++++++++------ .../ElasticSearchClientHolder.java | 6 +--- .../ElasticSearchThreadPoolRunStateInfo.java | 2 +- ...terThreadPoolMicrometerMonitorHandler.java | 12 +++---- ...micThreadPoolMicrometerMonitorHandler.java | 12 +++---- ...WebThreadPoolMicrometerMonitorHandler.java | 10 +++--- 6 files changed, 45 insertions(+), 33 deletions(-) diff --git a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java index 36101cb8..203d2457 100644 --- a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java @@ -25,6 +25,8 @@ import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor; import cn.hippo4j.monitor.base.MonitorTypeEnum; import cn.hippo4j.monitor.elasticsearch.model.ElasticSearchThreadPoolRunStateInfo; +import lombok.Builder; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; @@ -63,7 +65,7 @@ public class DynamicThreadPoolElasticSearchMonitorHandler extends AbstractDynami List rawMapping = FileUtil.readLines(Thread.currentThread().getContextClassLoader().getResource("mapping.json").getPath(), StandardCharsets.UTF_8); String mapping = String.join(" ", rawMapping); // if index doesn't exsit, this function may try to create one, but recommend to create index manually. - this.createIndex(indexName, "_doc", mapping, null, null, null); + this.createIndex(EsIndex.builder().index(indexName).type("_doc").mapping(mapping).build()); } esThreadPoolRunStateInfo.setApplicationName(applicationName); esThreadPoolRunStateInfo.setId(indexName + "-" + System.currentTimeMillis()); @@ -104,20 +106,20 @@ public class DynamicThreadPoolElasticSearchMonitorHandler extends AbstractDynami return isIndexExist.get(); } - public void createIndex(String index, String type, String mapping, Integer shards, Integer replicas, String alias) { + public void createIndex(EsIndex esIndex) { RestHighLevelClient client = ElasticSearchClientHolder.getClient(); boolean acknowledged = false; - CreateIndexRequest request = new CreateIndexRequest(index); - if (StringUtils.hasText(mapping)) { - request.mapping(type, mapping, XContentType.JSON); + CreateIndexRequest request = new CreateIndexRequest(esIndex.getIndex()); + if (StringUtils.hasText(esIndex.getMapping())) { + request.mapping(esIndex.getType(), esIndex.getMapping(), XContentType.JSON); } - if (!Objects.isNull(shards) && !Objects.isNull(replicas)) { + if (!Objects.isNull(esIndex.getShards()) && !Objects.isNull(esIndex.getReplicas())) { request.settings(Settings.builder() - .put("index.number_of_shards", shards) // 5 - .put("index.number_of_replicas", replicas));// 1 + .put("index.number_of_shards", esIndex.getShards()) + .put("index.number_of_replicas", esIndex.getReplicas())); } - if (StringUtils.hasText(alias)) { - request.alias(new Alias(alias)); + if (StringUtils.hasText(esIndex.getAlias())) { + request.alias(new Alias(esIndex.getAlias())); } try { CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT); @@ -138,4 +140,18 @@ public class DynamicThreadPoolElasticSearchMonitorHandler extends AbstractDynami public String getType() { return MonitorTypeEnum.ELASTICSEARCH.name().toLowerCase(); } + + /** + * Es Index + */ + @Getter + @Builder + private static class EsIndex { + String index; + String type; + String mapping; + Integer shards; + Integer replicas; + String alias; + } } diff --git a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java index f30bbdc6..ba428722 100644 --- a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java +++ b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java @@ -28,8 +28,6 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.core.env.Environment; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import java.util.List; @@ -66,9 +64,7 @@ public class ElasticSearchClientHolder { log.info("[ES RestHighLevelClient] success to connect es！host:{},scheme:{}", host, scheme); return client; } catch (Exception ex) { - StringWriter stackTrace = new StringWriter(); - ex.printStackTrace(new PrintWriter(stackTrace)); - log.error("[ES RestHighLevelClient] fail to connect es! cause:{}", stackTrace); + log.error("[ES RestHighLevelClient] fail to connect es! cause:", ex); } return null; } diff --git a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/model/ElasticSearchThreadPoolRunStateInfo.java b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/model/ElasticSearchThreadPoolRunStateInfo.java index cc4da6e1..e72e9a27 100644 --- a/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/model/ElasticSearchThreadPoolRunStateInfo.java +++ b/hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/model/ElasticSearchThreadPoolRunStateInfo.java @@ -28,7 +28,7 @@ import lombok.Setter; @Setter public class ElasticSearchThreadPoolRunStateInfo extends ThreadPoolRunStateInfo { - private String Id; + private String id; private String applicationName; } diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java index 0db66c68..b5e20608 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java @@ -35,21 +35,21 @@ import java.util.concurrent.ConcurrentHashMap; */ public class AdapterThreadPoolMicrometerMonitorHandler extends AbstractAdapterThreadPoolMonitor { - private final static String METRIC_NAME_PREFIX = "adapter.thread-pool"; + private static final String METRIC_NAME_PREFIX = "adapter.thread-pool"; - private final static String ADAPTER_THREAD_POOL_ID_TAG = METRIC_NAME_PREFIX + ".id"; + private static final String ADAPTER_THREAD_POOL_ID_TAG = METRIC_NAME_PREFIX + ".id"; - private final static String APPLICATION_NAME_TAG = "application.name"; + private static final String APPLICATION_NAME_TAG = "application.name"; - private final Map RUN_STATE_CACHE = new ConcurrentHashMap<>(); + private final Map runStateCache = new ConcurrentHashMap<>(); @Override protected void execute(ThreadPoolAdapterState threadPoolAdapterState) { - ThreadPoolAdapterState stateInfo = RUN_STATE_CACHE.get(threadPoolAdapterState.getThreadPoolKey()); + ThreadPoolAdapterState stateInfo = runStateCache.get(threadPoolAdapterState.getThreadPoolKey()); if (stateInfo != null) { BeanUtil.convert(threadPoolAdapterState, stateInfo); } else { - RUN_STATE_CACHE.put(threadPoolAdapterState.getThreadPoolKey(), threadPoolAdapterState); + runStateCache.put(threadPoolAdapterState.getThreadPoolKey(), threadPoolAdapterState); } Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java index f9c9f1d8..19dac923 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java @@ -35,21 +35,21 @@ import java.util.concurrent.ConcurrentHashMap; */ public class DynamicThreadPoolMicrometerMonitorHandler extends AbstractDynamicThreadPoolMonitor { - private final static String METRIC_NAME_PREFIX = "dynamic.thread-pool"; + private static final String METRIC_NAME_PREFIX = "dynamic.thread-pool"; - private final static String DYNAMIC_THREAD_POOL_ID_TAG = METRIC_NAME_PREFIX + ".id"; + private static final String DYNAMIC_THREAD_POOL_ID_TAG = METRIC_NAME_PREFIX + ".id"; - private final static String APPLICATION_NAME_TAG = "application.name"; + private static final String APPLICATION_NAME_TAG = "application.name"; - private final Map RUN_STATE_CACHE = new ConcurrentHashMap<>(); + private final Map runStateCache = new ConcurrentHashMap<>(); @Override protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) { - ThreadPoolRunStateInfo stateInfo = RUN_STATE_CACHE.get(poolRunStateInfo.getTpId()); + ThreadPoolRunStateInfo stateInfo = runStateCache.get(poolRunStateInfo.getTpId()); if (stateInfo != null) { BeanUtil.convert(poolRunStateInfo, stateInfo); } else { - RUN_STATE_CACHE.put(poolRunStateInfo.getTpId(), poolRunStateInfo); + runStateCache.put(poolRunStateInfo.getTpId(), poolRunStateInfo); } Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java index 3c0795d9..078cb8c1 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java @@ -35,21 +35,21 @@ import java.util.concurrent.ConcurrentHashMap; */ public class WebThreadPoolMicrometerMonitorHandler extends AbstractWebThreadPoolMonitor { - private final static String METRIC_NAME_PREFIX = "web.thread-pool"; + private static final String METRIC_NAME_PREFIX = "web.thread-pool"; - private final static String APPLICATION_NAME_TAG = "application.name"; + private static final String APPLICATION_NAME_TAG = "application.name"; - private final Map RUN_STATE_CACHE = new ConcurrentHashMap<>(); + private final Map runStateCache = new ConcurrentHashMap<>(); @Override protected void execute(ThreadPoolRunStateInfo webThreadPoolRunStateInfo) { Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); - ThreadPoolRunStateInfo stateInfo = RUN_STATE_CACHE.get(applicationName); + ThreadPoolRunStateInfo stateInfo = runStateCache.get(applicationName); if (stateInfo != null) { BeanUtil.convert(webThreadPoolRunStateInfo, stateInfo); } else { - RUN_STATE_CACHE.put(applicationName, webThreadPoolRunStateInfo); + runStateCache.put(applicationName, webThreadPoolRunStateInfo); } Iterable tags = CollectionUtil.newArrayList(Tag.of(APPLICATION_NAME_TAG, applicationName)); Metrics.gauge(metricName("current.load"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getSimpleCurrentLoad);