This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 83e9958f4 [type:refactor] refactor shenyu-plugin-logging. (#3917)
83e9958f4 is described below
commit 83e9958f480851825ea1aa8412ff99838fd5b772
Author: yunlongn <[email protected]>
AuthorDate: Mon Sep 5 21:12:13 2022 +0800
[type:refactor] refactor shenyu-plugin-logging. (#3917)
* [type:refactor] refactor shenyu-plugin-logging.
* [type:refactor] remove useless attributes.
* [type:refactor] refactor shenyu-plugin-logging.
* [type:refactor] refactor shenyu-plugin-logging.
---
.../sls/client/AliyunSlsLogCollectClient.java | 9 +-
.../sls/collector/AliyunSlsLogCollector.java | 6 +-
.../client/ClickHouseLogCollectClient.java | 5 +-
.../collector/ClickHouseLogCollector.java | 6 +-
.../LoggingClickHousePluginDataHandler.java | 3 +-
.../common/client/AbstractLogConsumeClient.java | 7 +-
.../common/collector/AbstractLogCollector.java | 10 +-
.../common/constant/GenericLoggingConstant.java | 140 ---------------------
.../client/ElasticSearchLogCollectClient.java | 9 +-
.../collector/ElasticSearchLogCollector.java | 6 +-
.../kafka/client/KafkaLogCollectClient.java | 9 +-
.../logging/kafka/collector/KafkaLogCollector.java | 6 +-
.../pulsar/client/PulsarLogCollectClient.java | 14 +--
.../pulsar/collector/PulsarLogCollector.java | 6 +-
.../rocketmq/client/RocketMQLogCollectClient.java | 9 +-
.../rocketmq/collector/RocketMQLogCollector.java | 6 +-
.../cls/client/TencentClsLogCollectClient.java | 9 +-
.../cls/collector/TencentClsSlsLogCollector.java | 6 +-
18 files changed, 53 insertions(+), 213 deletions(-)
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/client/AliyunSlsLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/client/AliyunSlsLogCollectClient.java
index ad95eedb7..feb6cb3b9 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/client/AliyunSlsLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/client/AliyunSlsLogCollectClient.java
@@ -32,7 +32,6 @@ import com.aliyun.openservices.log.exception.LogException;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.common.concurrent.ShenyuThreadFactory;
import org.apache.shenyu.common.utils.GsonUtils;
@@ -42,6 +41,7 @@ import
org.apache.shenyu.plugin.logging.common.constant.GenericLoggingConstant;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -74,7 +74,7 @@ public class AliyunSlsLogCollectClient extends
AbstractLogConsumeClient<AliyunLo
* @param config config
*/
@Override
- public void initClient0(final AliyunLogCollectConfig.AliyunSlsLogConfig
config) {
+ public void initClient0(@NonNull final
AliyunLogCollectConfig.AliyunSlsLogConfig config) {
String accessId = config.getAccessId();
String accessKey = config.getAccessKey();
String host = config.getHost();
@@ -107,10 +107,7 @@ public class AliyunSlsLogCollectClient extends
AbstractLogConsumeClient<AliyunLo
* @param logs list of log
*/
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
logs.forEach(this::sendLog);
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
index 4977cf77b..eb45af10d 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
@@ -17,15 +17,15 @@
package org.apache.shenyu.plugin.aliyun.sls.collector;
+import org.apache.shenyu.plugin.aliyun.sls.client.AliyunSlsLogCollectClient;
import
org.apache.shenyu.plugin.aliyun.sls.handler.LoggingAliyunSlsPluginDataHandler;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
/**
* aliyun sls log collector，depend a LogConsumeClient for consume logs.
*/
-public class AliyunSlsLogCollector extends AbstractLogCollector {
+public class AliyunSlsLogCollector extends
AbstractLogCollector<AliyunSlsLogCollectClient> {
private static final LogCollector INSTANCE = new AliyunSlsLogCollector();
@@ -39,7 +39,7 @@ public class AliyunSlsLogCollector extends
AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected AliyunSlsLogCollectClient getLogConsumeClient() {
return
LoggingAliyunSlsPluginDataHandler.getAliyunSlsLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
index 363195408..f457c3b08 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
@@ -34,6 +34,7 @@ import
org.apache.shenyu.plugin.logging.clickhouse.config.ClickHouseLogCollectCo
import
org.apache.shenyu.plugin.logging.clickhouse.constant.ClickHouseLoggingConstant;
import org.apache.shenyu.plugin.logging.common.client.AbstractLogConsumeClient;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
+import org.springframework.lang.NonNull;
import java.util.List;
import java.util.Objects;
@@ -49,7 +50,7 @@ public class ClickHouseLogCollectClient extends
AbstractLogConsumeClient<ClickHo
private ClickHouseNode endpoint;
@Override
- public void consume0(final List<ShenyuRequestLog> logs) throws Exception {
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) throws
Exception {
if (CollectionUtils.isNotEmpty(logs)) {
Object[][] datas = new Object[logs.size()][];
for (int i = 0; i < logs.size(); i++) {
@@ -115,7 +116,7 @@ public class ClickHouseLogCollectClient extends
AbstractLogConsumeClient<ClickHo
* @param config properties.
*/
@Override
- public void initClient0(final
ClickHouseLogCollectConfig.ClickHouseLogConfig config) {
+ public void initClient0(@NonNull final
ClickHouseLogCollectConfig.ClickHouseLogConfig config) {
final String username = config.getUsername();
final String password = config.getPassword();
endpoint = ClickHouseNode.builder()
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
index 784ce0409..8545a73a6 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
@@ -17,12 +17,12 @@
package org.apache.shenyu.plugin.logging.clickhouse.collector;
+import
org.apache.shenyu.plugin.logging.clickhouse.client.ClickHouseLogCollectClient;
import
org.apache.shenyu.plugin.logging.clickhouse.handler.LoggingClickHousePluginDataHandler;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
-public class ClickHouseLogCollector extends AbstractLogCollector {
+public class ClickHouseLogCollector extends
AbstractLogCollector<ClickHouseLogCollectClient> {
private static final LogCollector INSTANCE = new ClickHouseLogCollector();
@@ -36,7 +36,7 @@ public class ClickHouseLogCollector extends
AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected ClickHouseLogCollectClient getLogConsumeClient() {
return
LoggingClickHousePluginDataHandler.getClickHouseLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/handler/LoggingClickHousePluginDataHandler.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/handler/LoggingClickHousePluginDataHandler.java
index 2b5ddab57..dc710ae88 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/handler/LoggingClickHousePluginDataHandler.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/handler/LoggingClickHousePluginDataHandler.java
@@ -21,7 +21,6 @@ import org.apache.shenyu.common.enums.PluginEnum;
import
org.apache.shenyu.plugin.logging.clickhouse.client.ClickHouseLogCollectClient;
import
org.apache.shenyu.plugin.logging.clickhouse.collector.ClickHouseLogCollector;
import
org.apache.shenyu.plugin.logging.clickhouse.config.ClickHouseLogCollectConfig;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.config.GenericApiConfig;
import
org.apache.shenyu.plugin.logging.common.handler.AbstractLogPluginDataHandler;
@@ -62,7 +61,7 @@ public class LoggingClickHousePluginDataHandler extends
AbstractLogPluginDataHan
*
* @return LogConsumeClient
*/
- public static LogConsumeClient getClickHouseLogCollectClient() {
+ public static ClickHouseLogCollectClient getClickHouseLogCollectClient() {
return CLICK_HOUSE_LOG_COLLECT_CLIENT;
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/client/AbstractLogConsumeClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/client/AbstractLogConsumeClient.java
index da8b2aa31..a5cc136e5 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/client/AbstractLogConsumeClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/client/AbstractLogConsumeClient.java
@@ -17,6 +17,7 @@
package org.apache.shenyu.plugin.logging.common.client;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.shenyu.plugin.logging.common.config.GenericGlobalConfig;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.slf4j.Logger;
@@ -52,7 +53,7 @@ public abstract class AbstractLogConsumeClient<T extends
GenericGlobalConfig> im
* @param logs logs
* @throws Exception error
*/
- public abstract void consume0(List<ShenyuRequestLog> logs) throws
Exception;
+ public abstract void consume0(@NonNull List<ShenyuRequestLog> logs) throws
Exception;
/**
* close0.
@@ -67,7 +68,7 @@ public abstract class AbstractLogConsumeClient<T extends
GenericGlobalConfig> im
this.close();
}
if (ObjectUtils.isEmpty(config)) {
- LOG.error("{} config is null.", this.getClass().getSimpleName());
+ LOG.error("{} config is null, client not init.",
this.getClass().getSimpleName());
return;
}
this.initClient0(config);
@@ -93,7 +94,7 @@ public abstract class AbstractLogConsumeClient<T extends
GenericGlobalConfig> im
@Override
public void consume(final List<ShenyuRequestLog> logs) throws Exception {
- if (!isStarted.get()) {
+ if (CollectionUtils.isEmpty(logs) || !isStarted.get()) {
return;
}
this.consume0(logs);
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
index f43433707..89ed8e4f9 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
@@ -24,7 +24,7 @@ import org.apache.shenyu.common.config.ShenyuConfig;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.Singleton;
import org.apache.shenyu.common.utils.ThreadUtils;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
+import org.apache.shenyu.plugin.logging.common.client.AbstractLogConsumeClient;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
import org.slf4j.Logger;
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
/**
* abstract log collector,Contains common methods.
*/
-public abstract class AbstractLogCollector implements LogCollector {
+public abstract class AbstractLogCollector<T extends
AbstractLogConsumeClient<?>> implements LogCollector {
private static final Logger LOG =
LoggerFactory.getLogger(AbstractLogCollector.class);
@@ -94,7 +94,7 @@ public abstract class AbstractLogCollector implements
LogCollector {
int batchSize = 100;
if (size >= batchSize || timeDiffMs > diffTimeMSForPush) {
bufferQueue.drainTo(logs, batchSize);
- LogConsumeClient logCollectClient = getLogConsumeClient();
+ AbstractLogConsumeClient<?> logCollectClient =
getLogConsumeClient();
if (Objects.nonNull(logCollectClient)) {
logCollectClient.consume(logs);
}
@@ -114,12 +114,12 @@ public abstract class AbstractLogCollector implements
LogCollector {
*
* @return log consume client
*/
- protected abstract LogConsumeClient getLogConsumeClient();
+ protected abstract T getLogConsumeClient();
@Override
public void close() throws Exception {
started.set(false);
- LogConsumeClient logCollectClient = getLogConsumeClient();
+ AbstractLogConsumeClient<?> logCollectClient = getLogConsumeClient();
if (logCollectClient != null) {
logCollectClient.close();
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/constant/GenericLoggingConstant.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/constant/GenericLoggingConstant.java
index 80c3bca59..1d01da8a0 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/constant/GenericLoggingConstant.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/constant/GenericLoggingConstant.java
@@ -37,116 +37,6 @@ public class GenericLoggingConstant {
*/
public static final String SHENYU_AGENT_TRACE_ID = "shenyu-agent-trace-id";
- /**
- * aliyun sls accessId.
- */
- public static final String ACCESS_ID = "AccessId";
-
- /**
- * aliyun sls accessKey.
- */
- public static final String ACCESS_KEY = "AccessKey";
-
- /**
- * aliyun sls project.
- */
- public static final String PROJECT_NAME = "ProjectName";
-
- /**
- * aliyun sls logstore name.
- */
- public static final String LOG_STORE = "LogStore";
-
- /**
- * aliyun sls ttl in day.
- */
- public static final String TTL_IN_DAY = "TtlInDay";
-
- /**
- * aliyun sls shard count.
- */
- public static final String SHARD_COUNT = "ShardCount";
-
- /**
- * aliyun sls topic.
- */
- public static final String TOPIC = "topic";
-
- /**
- * tencent cls secretId.
- */
- public static final String SECRET_ID = "secretId";
-
- /**
- * tencent cls secretKey.
- */
- public static final String SECRET_KEY = "secretKey";
-
- /**
- * tencent cls endpoint.
- */
- public static final String ENDPOINT = "endpoint";
-
- /**
- * tencent cls totalSizeInBytes.
- */
- public static final String TOTAL_SIZE_IN_BYTES = "totalSizeInBytes";
-
- /**
- * tencent cls maxSendThreadCount.
- */
- public static final String MAX_SEND_THREAD_COUNT = "maxSendThreadCount";
-
- /**
- * tencent cls maxBlockSec.
- */
- public static final String MAX_BLOCK_SEC = "maxBlockSec";
-
- /**
- * tencent cls maxBatchSize.
- */
- public static final String MAX_BATCH_SIZE = "maxBatchSize";
-
- /**
- * tencent cls maxBatchCount.
- */
- public static final String MAX_BATCH_COUNT = "maxBatchCount";
-
- /**
- * tencent cls lingerMs.
- */
- public static final String LINGER_MS = "lingerMs";
-
- /**
- * tencent cls retries.
- */
- public static final String RETRIES = "retries";
-
- /**
- * tencent cls maxReservedAttempts.
- */
- public static final String MAX_RESERVED_ATTEMPTS = "maxReservedAttempts";
-
- /**
- * tencent cls baseRetryBackoffMs.
- */
- public static final String BASE_RETRY_BACKOFF_MS = "baseRetryBackoffMs";
-
- /**
- * tencent cls maxRetryBackoffMs.
- */
- public static final String MAX_RETRY_BACKOFF_MS = "maxRetryBackoffMs";
-
- /**
- * send thread config.
- */
- public static final String SEND_THREAD_COUNT = "sendThreadCount";
-
- /**
- * io thread count.
- */
- public static final String IO_THREAD_COUNT = "ioThreadCount";
-
/**
* system default, max threads.
*/
@@ -166,35 +56,5 @@ public class GenericLoggingConstant {
* The constant INDEX.
*/
public static final String INDEX = "shenyu-access-logging";
-
- /**
- * The constant PORT.
- */
- public static final String PORT = "port";
-
- /**
- * The constant NAMESERVER_ADDRESS.
- */
- public static final String NAMESERVER_ADDRESS = "namesrvAddr";
-
- /**
- * The constant SERVICE_URL.
- */
- public static final String SERVICE_URL = "serviceUrl";
-
- /**
- * The constant PRODUCER_GROUP.
- */
- public static final String PRODUCER_GROUP = "producerGroup";
-
- /**
- * The constant USERNAME.
- */
- public static final String USERNAME = "username";
-
- /**
- * The constant PASSWORD.
- */
- public static final String PASSWORD = "password";
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
index 85f83ed2f..0f17eb7b3 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/client/ElasticSearchLogCollectClient.java
@@ -23,7 +23,6 @@ import co.elastic.clients.json.jackson.JacksonJsonpMapper;
import co.elastic.clients.transport.ElasticsearchTransport;
import co.elastic.clients.transport.endpoints.BooleanResponse;
import co.elastic.clients.transport.rest_client.RestClientTransport;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
@@ -38,6 +37,7 @@ import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
import java.io.IOException;
import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
* @param config elasticsearch client config
*/
@Override
- public void initClient0(final
ElasticSearchLogCollectConfig.ElasticSearchLogConfig config) {
+ public void initClient0(@NonNull final
ElasticSearchLogCollectConfig.ElasticSearchLogConfig config) {
RestClientBuilder builder = RestClient
.builder(new HttpHost(config.getHost(),
Integer.parseInt(config.getPort())));
@@ -92,10 +92,7 @@ public class ElasticSearchLogCollectClient extends
AbstractLogConsumeClient<Elas
}
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
List<BulkOperation> bulkOperations = new ArrayList<>();
logs.forEach(log -> {
try {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
index e8b7d96e0..84b920f8f 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
@@ -17,15 +17,15 @@
package org.apache.shenyu.plugin.logging.elasticsearch.collector;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
+import
org.apache.shenyu.plugin.logging.elasticsearch.client.ElasticSearchLogCollectClient;
import
org.apache.shenyu.plugin.logging.elasticsearch.handler.LoggingElasticSearchPluginDataHandler;
/**
* elastic search log collector，depend a LogConsumeClient for consume logs.
*/
-public class ElasticSearchLogCollector extends AbstractLogCollector {
+public class ElasticSearchLogCollector extends
AbstractLogCollector<ElasticSearchLogCollectClient> {
private static final LogCollector INSTANCE = new
ElasticSearchLogCollector();
@@ -39,7 +39,7 @@ public class ElasticSearchLogCollector extends
AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected ElasticSearchLogCollectClient getLogConsumeClient() {
return
LoggingElasticSearchPluginDataHandler.getElasticSearchLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/client/KafkaLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/client/KafkaLogCollectClient.java
index c16acb86e..da2deb516 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/client/KafkaLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/client/KafkaLogCollectClient.java
@@ -19,7 +19,6 @@ package org.apache.shenyu.plugin.logging.kafka.client;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.producer.KafkaProducer;
@@ -37,6 +36,7 @@ import
org.apache.shenyu.plugin.logging.common.entity.LZ4CompressData;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
import org.apache.shenyu.plugin.logging.kafka.config.KafkaLogCollectConfig;
+import org.springframework.lang.NonNull;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
@@ -63,7 +63,7 @@ public class KafkaLogCollectClient extends
AbstractLogConsumeClient<KafkaLogColl
* @param config kafka props
*/
@Override
- public void initClient0(final KafkaLogCollectConfig.KafkaLogConfig config)
{
+ public void initClient0(@NonNull final
KafkaLogCollectConfig.KafkaLogConfig config) {
if (Objects.isNull(config)
|| StringUtils.isBlank(config.getNamesrvAddr())
|| StringUtils.isBlank(config.getTopic())) {
@@ -114,10 +114,7 @@ public class KafkaLogCollectClient extends
AbstractLogConsumeClient<KafkaLogColl
* @param logs list of log
*/
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
logs.forEach(log -> {
String logTopic =
StringUtils.defaultIfBlank(LogCollectConfigUtils.getTopic(log.getPath(),
apiTopicMap), topic);
try {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
index a82c1d259..ba8c75cc4 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
@@ -17,15 +17,15 @@
package org.apache.shenyu.plugin.logging.kafka.collector;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
+import org.apache.shenyu.plugin.logging.kafka.client.KafkaLogCollectClient;
import
org.apache.shenyu.plugin.logging.kafka.handler.LoggingKafkaPluginDataHandler;
/**
* kafka log collector，depend a LogConsumeClient for consume logs.
*/
-public class KafkaLogCollector extends AbstractLogCollector {
+public class KafkaLogCollector extends
AbstractLogCollector<KafkaLogCollectClient> {
private static final LogCollector INSTANCE = new KafkaLogCollector();
@@ -39,7 +39,7 @@ public class KafkaLogCollector extends AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected KafkaLogCollectClient getLogConsumeClient() {
return LoggingKafkaPluginDataHandler.getKafkaLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/client/PulsarLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/client/PulsarLogCollectClient.java
index f8906e557..6cf96ee0d 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/client/PulsarLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/client/PulsarLogCollectClient.java
@@ -19,7 +19,6 @@ package org.apache.shenyu.plugin.logging.pulsar.client;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
@@ -31,6 +30,7 @@ import
org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.pulsar.config.PulsarLogCollectConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -52,7 +52,7 @@ public class PulsarLogCollectClient extends
AbstractLogConsumeClient<PulsarLogCo
* @param config pulsar props
*/
@Override
- public void initClient0(final PulsarLogCollectConfig.PulsarLogConfig
config) {
+ public void initClient0(@NonNull final
PulsarLogCollectConfig.PulsarLogConfig config) {
String topic = config.getTopic();
String serviceUrl = config.getServiceUrl();
if (StringUtils.isBlank(topic) || StringUtils.isBlank(serviceUrl)) {
@@ -68,17 +68,11 @@ public class PulsarLogCollectClient extends
AbstractLogConsumeClient<PulsarLogCo
} catch (PulsarClientException e) {
LOG.error("init PulsarLogCollectClient error, ", e);
}
-
}
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
- logs.forEach(log -> {
- producer.sendAsync(toBytes(log));
- });
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
+ logs.forEach(log -> producer.sendAsync(toBytes(log)));
}
private byte[] toBytes(final ShenyuRequestLog log) {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
index 2b885c90e..338637ec8 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
@@ -17,12 +17,12 @@
package org.apache.shenyu.plugin.logging.pulsar.collector;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
+import org.apache.shenyu.plugin.logging.pulsar.client.PulsarLogCollectClient;
import
org.apache.shenyu.plugin.logging.pulsar.handler.LoggingPulsarPluginDataHandler;
-public class PulsarLogCollector extends AbstractLogCollector {
+public class PulsarLogCollector extends
AbstractLogCollector<PulsarLogCollectClient> {
private static final LogCollector INSTANCE = new PulsarLogCollector();
@@ -36,7 +36,7 @@ public class PulsarLogCollector extends AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected PulsarLogCollectClient getLogConsumeClient() {
return LoggingPulsarPluginDataHandler.getPulsarLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
index f7e2b9cb9..0dbc66627 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
@@ -19,7 +19,6 @@ package org.apache.shenyu.plugin.logging.rocketmq.client;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials;
@@ -34,6 +33,7 @@ import
org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
import
org.apache.shenyu.plugin.logging.rocketmq.config.RocketMQLogCollectConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -63,7 +63,7 @@ public class RocketMQLogCollectClient extends
AbstractLogConsumeClient<RocketMQL
* @param config rocketmq props
*/
@Override
- public void initClient0(final RocketMQLogCollectConfig.RocketMQLogConfig
config) {
+ public void initClient0(@NonNull final
RocketMQLogCollectConfig.RocketMQLogConfig config) {
String topic = config.getTopic();
String nameserverAddress = config.getNamesrvAddr();
String producerGroup = config.getProducerGroup();
@@ -104,10 +104,7 @@ public class RocketMQLogCollectClient extends
AbstractLogConsumeClient<RocketMQL
* @param logs list of log
*/
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
logs.forEach(log -> {
String logTopic =
StringUtils.defaultIfBlank(LogCollectConfigUtils.getTopic(log.getPath(),
apiTopicMap), topic);
try {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
index e17b3ab50..821e89054 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
@@ -17,15 +17,15 @@
package org.apache.shenyu.plugin.logging.rocketmq.collector;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
+import
org.apache.shenyu.plugin.logging.rocketmq.client.RocketMQLogCollectClient;
import
org.apache.shenyu.plugin.logging.rocketmq.handler.LoggingRocketMQPluginDataHandler;
/**
* default log collector，depend a LogConsumeClient for consume logs.
*/
-public class RocketMQLogCollector extends AbstractLogCollector {
+public class RocketMQLogCollector extends
AbstractLogCollector<RocketMQLogCollectClient> {
private static final LogCollector INSTANCE = new RocketMQLogCollector();
@@ -39,7 +39,7 @@ public class RocketMQLogCollector extends
AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected RocketMQLogCollectClient getLogConsumeClient() {
return LoggingRocketMQPluginDataHandler.getRocketMqLogCollectClient();
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/client/TencentClsLogCollectClient.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/client/TencentClsLogCollectClient.java
index d94dc943e..b024752cf 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/client/TencentClsLogCollectClient.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/client/TencentClsLogCollectClient.java
@@ -29,7 +29,6 @@ import
com.tencentcloudapi.cls.producer.errors.MaxBatchCountExceedException;
import com.tencentcloudapi.cls.producer.errors.ProducerException;
import com.tencentcloudapi.cls.producer.errors.ResultFailedException;
import com.tencentcloudapi.cls.producer.util.NetworkUtils;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.common.concurrent.ShenyuThreadFactory;
import org.apache.shenyu.common.utils.GsonUtils;
@@ -39,6 +38,7 @@ import
org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.tencent.cls.config.TencentLogCollectConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -66,7 +66,7 @@ public class TencentClsLogCollectClient extends
AbstractLogConsumeClient<Tencent
* @param shenyuConfig shenyu log config
*/
@Override
- public void initClient0(final TencentLogCollectConfig.TencentClsLogConfig
shenyuConfig) {
+ public void initClient0(@NonNull final
TencentLogCollectConfig.TencentClsLogConfig shenyuConfig) {
String secretId = shenyuConfig.getSecretId();
String secretKey = shenyuConfig.getSecretKey();
String endpoint = shenyuConfig.getEndpoint();
@@ -116,10 +116,7 @@ public class TencentClsLogCollectClient extends
AbstractLogConsumeClient<Tencent
* @param logs list of log
*/
@Override
- public void consume0(final List<ShenyuRequestLog> logs) {
- if (CollectionUtils.isEmpty(logs)) {
- return;
- }
+ public void consume0(@NonNull final List<ShenyuRequestLog> logs) {
logs.forEach(this::sendLog);
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
index 58a3cf122..110739a43 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
@@ -17,15 +17,15 @@
package org.apache.shenyu.plugin.tencent.cls.collector;
-import org.apache.shenyu.plugin.logging.common.client.LogConsumeClient;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
+import org.apache.shenyu.plugin.tencent.cls.client.TencentClsLogCollectClient;
import
org.apache.shenyu.plugin.tencent.cls.handler.LoggingTencentClsPluginDataHandler;
/**
* Tencent cls log collector，depend a LogConsumeClient for consume logs.
*/
-public class TencentClsSlsLogCollector extends AbstractLogCollector {
+public class TencentClsSlsLogCollector extends
AbstractLogCollector<TencentClsLogCollectClient> {
private static final LogCollector INSTANCE = new
TencentClsSlsLogCollector();
@@ -39,7 +39,7 @@ public class TencentClsSlsLogCollector extends
AbstractLogCollector {
}
@Override
- protected LogConsumeClient getLogConsumeClient() {
+ protected TencentClsLogCollectClient getLogConsumeClient() {
return
LoggingTencentClsPluginDataHandler.getTencentClsLogCollectClient();
}
}
