This is an automated email from the ASF dual-hosted git repository.
liuhongyu 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 b85a3bc894 -- NameSrvAddr changed to BootstrapServer to conform to
Kafka Standards. (#5918)
b85a3bc894 is described below
commit b85a3bc89420add0aaea010fe3f3289112d7d290
Author: Pradeep <[email protected]>
AuthorDate: Mon Feb 10 07:08:18 2025 +0530
-- NameSrvAddr changed to BootstrapServer to conform to Kafka Standards.
(#5918)
-- Tests changed
Co-authored-by: aias00 <[email protected]>
Co-authored-by: xiaoyu <[email protected]>
---
.../logging/kafka/client/KafkaLogCollectClient.java | 6 +++---
.../logging/kafka/config/KafkaLogCollectConfig.java | 16 ++++++++--------
.../logging/kafka/config/KafkaLogCollectConfigTest.java | 6 +++---
.../kafka/handler/LoggingKafkaPluginDataHandlerTest.java | 2 +-
.../logging/kafka/kafka/KafkaLogCollectClientTest.java | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
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 2747619b1f..6d12c447ff 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
@@ -66,13 +66,13 @@ public class KafkaLogCollectClient extends
AbstractLogConsumeClient<KafkaLogColl
@Override
public void initClient0(@NonNull final
KafkaLogCollectConfig.KafkaLogConfig config) {
if (Objects.isNull(config)
- || StringUtils.isBlank(config.getNamesrvAddr())
+ || StringUtils.isBlank(config.getBootstrapServer())
|| StringUtils.isBlank(config.getTopic())) {
LOG.error("kafka props is empty. failed init kafka producer");
return;
}
String topic = config.getTopic();
- String nameserverAddress = config.getNamesrvAddr();
+ String nameserverAddress = config.getBootstrapServer();
if (StringUtils.isBlank(topic) ||
StringUtils.isBlank(nameserverAddress)) {
LOG.error("init kafkaLogCollectClient error, please check topic or
nameserverAddress");
@@ -83,7 +83,7 @@ public class KafkaLogCollectClient extends
AbstractLogConsumeClient<KafkaLogColl
Properties props = new Properties();
props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
StringSerializer.class.getName());
props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
StringSerializer.class.getName());
- props.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG,
config.getNamesrvAddr());
+ props.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG,
config.getBootstrapServer());
if (!StringUtils.isBlank(config.getSecurityProtocol())
&& !StringUtils.isBlank(config.getSaslMechanism())) {
props.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG,
config.getSecurityProtocol());
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfig.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfig.java
index 8cba4916ef..38b6f53f89 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfig.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfig.java
@@ -59,7 +59,7 @@ public class KafkaLogCollectConfig {
private String topic;
- private String namesrvAddr;
+ private String bootstrapServer;
private String producerGroup;
@@ -186,17 +186,17 @@ public class KafkaLogCollectConfig {
*
* @return kafka nameserver address
*/
- public String getNamesrvAddr() {
- return namesrvAddr;
+ public String getBootstrapServer() {
+ return bootstrapServer;
}
/**
* set kafka nameserver address.
*
- * @param namesrvAddr kafka nameserver address
+ * @param bootstrapServer kafka nameserver address
*/
- public void setNamesrvAddr(final String namesrvAddr) {
- this.namesrvAddr = namesrvAddr;
+ public void setBootstrapServer(final String bootstrapServer) {
+ this.bootstrapServer = bootstrapServer;
}
/**
@@ -230,7 +230,7 @@ public class KafkaLogCollectConfig {
KafkaLogConfig that = (KafkaLogConfig) o;
return Objects.equals(getTopic(), that.getTopic())
&& Objects.equals(getCompressAlg(), that.getCompressAlg())
- && Objects.equals(getNamesrvAddr(), that.getNamesrvAddr())
+ && Objects.equals(getBootstrapServer(),
that.getBootstrapServer())
&& Objects.equals(getProducerGroup(),
that.getProducerGroup())
&& Objects.equals(getSampleRate(), that.getSampleRate())
&& Objects.equals(getBufferQueueSize(),
that.getBufferQueueSize())
@@ -240,7 +240,7 @@ public class KafkaLogCollectConfig {
@Override
public int hashCode() {
- return Objects.hash(topic, compressAlg, namesrvAddr,
producerGroup);
+ return Objects.hash(topic, compressAlg, bootstrapServer,
producerGroup);
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfigTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfigTest.java
index 3ad6c1503a..e9edde3309 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfigTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/config/KafkaLogCollectConfigTest.java
@@ -68,10 +68,10 @@ public class KafkaLogCollectConfigTest {
}
@Test
- public void testSetGlobalLogConfigNamesrvAddr() {
+ public void testSetGlobalLogConfigBootstrapServer() {
KafkaLogCollectConfig.KafkaLogConfig kafkaLogConfig = new
KafkaLogCollectConfig.KafkaLogConfig();
- kafkaLogConfig.setNamesrvAddr("test");
- Assertions.assertEquals(kafkaLogConfig.getNamesrvAddr(), "test");
+ kafkaLogConfig.setBootstrapServer("test");
+ Assertions.assertEquals(kafkaLogConfig.getBootstrapServer(), "test");
}
@Test
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/handler/LoggingKafkaPluginDataHandlerTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/handler/LoggingKafkaPluginDataHandlerTest.java
index 1a27744a5b..ea2ea421d3 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/handler/LoggingKafkaPluginDataHandlerTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/handler/LoggingKafkaPluginDataHandlerTest.java
@@ -60,7 +60,7 @@ public class LoggingKafkaPluginDataHandlerTest {
selectorData.setConditionList(list);
pluginData.setEnabled(false);
pluginData.setId(UUID.randomUUID().toString().replace("-", ""));
- pluginData.setConfig("{\"topic\":\"test\",
\"namesrvAddr\":\"localhost:8082\"}");
+ pluginData.setConfig("{\"topic\":\"test\",
\"bootstrapServer\":\"localhost:8082\"}");
}
@Test
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/kafka/KafkaLogCollectClientTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/kafka/KafkaLogCollectClientTest.java
index 49a7cef3c4..e0b5cd6b83 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/kafka/KafkaLogCollectClientTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/test/java/org/apache/shenyu/plugin/logging/kafka/kafka/KafkaLogCollectClientTest.java
@@ -34,7 +34,7 @@ import java.lang.reflect.Field;
import static org.mockito.Mockito.mockConstruction;
/**
- * The Test Case For RocketMQLogCollectClient.
+ * The Test Case For KafkaLogCollectClient.
*/
public class KafkaLogCollectClientTest {
@@ -50,7 +50,7 @@ public class KafkaLogCollectClientTest {
public void setUp() {
this.kafkaLogCollectClient = new KafkaLogCollectClient();
pluginData.setEnabled(true);
- pluginData.setConfig("{\"topic\":\"shenyu-access-logging\",
\"namesrvAddr\":\"localhost:8082\"}");
+ pluginData.setConfig("{\"topic\":\"shenyu-access-logging\",
\"bootstrapServer\":\"localhost:8082\"}");
globalLogConfig =
GsonUtils.getInstance().fromJson(pluginData.getConfig(),
KafkaLogCollectConfig.KafkaLogConfig.class);
globalLogConfig.setCompressAlg("LZ4");
shenyuRequestLog.setClientIp("0.0.0.0");
