This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 1071dbb57 [INLONG-6715][DataProxy] Fix json problem in data proxy
(#6716)
1071dbb57 is described below
commit 1071dbb576481cc7798122ba56d4badba3412579
Author: vernedeng <[email protected]>
AuthorDate: Fri Dec 2 23:24:13 2022 +0800
[INLONG-6715][DataProxy] Fix json problem in data proxy (#6716)
---
.../config/holder/IdTopicConfigHolder.java | 4 ---
.../config/loader/ManagerIdTopicConfigLoader.java | 16 +++++-----
.../dataproxy/config/pojo/IdTopicConfig.java | 36 +++++++++++++---------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/IdTopicConfigHolder.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/IdTopicConfigHolder.java
index 5ace034bc..198e97ebb 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/IdTopicConfigHolder.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/IdTopicConfigHolder.java
@@ -38,7 +38,6 @@ import static
org.apache.inlong.dataproxy.config.loader.ConfigLoader.RELOAD_INTE
import static
org.apache.inlong.dataproxy.config.loader.IdTopicConfigLoader.IDTOPIC_CONFIG_TYPE;
/**
- *
* IdTopicConfigHolder
*/
public class IdTopicConfigHolder implements Configurable {
@@ -55,7 +54,6 @@ public class IdTopicConfigHolder implements Configurable {
/**
* configure
- *
* @param context
*/
@Override
@@ -140,7 +138,6 @@ public class IdTopicConfigHolder implements Configurable {
/**
* get configList
- *
* @return the configList
*/
public List<IdTopicConfig> getConfigList() {
@@ -149,7 +146,6 @@ public class IdTopicConfigHolder implements Configurable {
/**
* getTopic
- *
* @param uid
* @return
*/
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
index 8db5ad80a..8231462e1 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
@@ -1,10 +1,10 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -17,10 +17,6 @@
package org.apache.inlong.dataproxy.config.loader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.flume.Context;
import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
import org.apache.inlong.common.pojo.dataproxy.InLongIdObject;
@@ -28,15 +24,17 @@ import
org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.pojo.DataType;
import org.apache.inlong.dataproxy.config.pojo.IdTopicConfig;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
/**
- *
* ManagerIdTopicConfigLoader
*/
public class ManagerIdTopicConfigLoader implements IdTopicConfigLoader {
/**
* load
- *
* @return
*/
@Override
@@ -61,6 +59,7 @@ public class ManagerIdTopicConfigLoader implements
IdTopicConfigLoader {
config.setDataType(DataType.convert(params.getOrDefault("dataType",
DataType.TEXT.value())));
config.setFieldDelimiter(params.getOrDefault("fieldDelimiter",
"|"));
config.setFileDelimiter(params.getOrDefault("fileDelimiter",
"\n"));
+ config.setParams(params);
configList.add(config);
}
return configList;
@@ -68,7 +67,6 @@ public class ManagerIdTopicConfigLoader implements
IdTopicConfigLoader {
/**
* configure
- *
* @param context
*/
@Override
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/IdTopicConfig.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/IdTopicConfig.java
index 39bd52818..c846088b3 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/IdTopicConfig.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/IdTopicConfig.java
@@ -19,8 +19,10 @@ package org.apache.inlong.dataproxy.config.pojo;
import org.apache.commons.lang3.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/**
- *
* IdTopicConfig
*/
public class IdTopicConfig {
@@ -33,9 +35,10 @@ public class IdTopicConfig {
private String fieldDelimiter = "|";
private String fileDelimiter = "\n";
+ private Map<String, String> params = new HashMap<>();
+
/**
* get uid
- *
* @return the uid
*/
public String getUid() {
@@ -44,7 +47,6 @@ public class IdTopicConfig {
/**
* generateUid
- *
* @param inlongGroupId
* @param inlongStreamId
* @return
@@ -67,7 +69,6 @@ public class IdTopicConfig {
/**
* get inlongGroupId
- *
* @return the inlongGroupId
*/
public String getInlongGroupId() {
@@ -76,7 +77,6 @@ public class IdTopicConfig {
/**
* set inlongGroupId
- *
* @param inlongGroupId the inlongGroupId to set
*/
public void setInlongGroupId(String inlongGroupId) {
@@ -86,7 +86,6 @@ public class IdTopicConfig {
/**
* get inlongStreamid
- *
* @return the inlongStreamid
*/
public String getInlongStreamid() {
@@ -95,7 +94,6 @@ public class IdTopicConfig {
/**
* set inlongStreamid
- *
* @param inlongStreamid the inlongStreamid to set
*/
public void setInlongStreamid(String inlongStreamid) {
@@ -105,7 +103,6 @@ public class IdTopicConfig {
/**
* get topicName
- *
* @return the topicName
*/
public String getTopicName() {
@@ -114,7 +111,6 @@ public class IdTopicConfig {
/**
* set topicName
- *
* @param topicName the topicName to set
*/
public void setTopicName(String topicName) {
@@ -123,7 +119,6 @@ public class IdTopicConfig {
/**
* get dataType
- *
* @return the dataType
*/
public DataType getDataType() {
@@ -132,7 +127,6 @@ public class IdTopicConfig {
/**
* set dataType
- *
* @param dataType the dataType to set
*/
public void setDataType(DataType dataType) {
@@ -141,7 +135,6 @@ public class IdTopicConfig {
/**
* get fieldDelimiter
- *
* @return the fieldDelimiter
*/
public String getFieldDelimiter() {
@@ -150,7 +143,6 @@ public class IdTopicConfig {
/**
* set fieldDelimiter
- *
* @param fieldDelimiter the fieldDelimiter to set
*/
public void setFieldDelimiter(String fieldDelimiter) {
@@ -159,7 +151,6 @@ public class IdTopicConfig {
/**
* get fileDelimiter
- *
* @return the fileDelimiter
*/
public String getFileDelimiter() {
@@ -168,13 +159,28 @@ public class IdTopicConfig {
/**
* set fileDelimiter
- *
* @param fileDelimiter the fileDelimiter to set
*/
public void setFileDelimiter(String fileDelimiter) {
this.fileDelimiter = fileDelimiter;
}
+ /**
+ * get params
+ * @return the params
+ */
+ public Map<String, String> getParams() {
+ return params;
+ }
+
+ /**
+ * set params
+ * @param params the params to set
+ */
+ public void setParams(Map<String, String> params) {
+ this.params = params;
+ }
+
/**
* formatTopicName<br>
* change full topic name "pulsar-9xn9wp35pbxb/test/atta_topic_1" to base
topic name "atta_topic_1"<br>
