[inlong] branch master updated: [INLONG-6190][SDK] Add protocolType field in DataProxy config (#6191)

[healchow]

This is an automated email from the ASF dual-hosted git repository.

healchow 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 4df49b1fe [INLONG-6190][SDK] Add protocolType field in DataProxy 
config (#6191)
4df49b1fe is described below

commit 4df49b1fe335f79378c72e7b8cef01d4863da445
Author: ganfengtan <ganfeng...@users.noreply.github.com>
AuthorDate: Sat Oct 15 21:32:28 2022 +0800

    [INLONG-6190][SDK] Add protocolType field in DataProxy config (#6191)
---
 .../java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java  | 9 +++++----
 .../apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java   | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
 
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
index 1e0422515..7c6780b0b 100644
--- 
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
+++ 
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
@@ -52,6 +52,7 @@ public class ProxyClientConfig {
     private int maxTimeoutCnt = ConfigConstants.MAX_TIMEOUT_CNT;
     private String authSecretId;
     private String authSecretKey;
+    private String protocolType;
 
     private boolean enableSaveManagerVIps = true;
 
@@ -102,8 +103,8 @@ public class ProxyClientConfig {
 
     /*pay attention to the last url parameter ip*/
     public ProxyClientConfig(String localHost, boolean isLocalVisit, String 
managerIp,
-                             int managerPort, String groupId, String netTag, 
String authSecretId, String authSecretKey,
-                             LoadBalance loadBalance, int virtualNode, int 
maxRetry) throws ProxysdkException {
+            int managerPort, String groupId, String netTag, String 
authSecretId, String authSecretKey,
+            LoadBalance loadBalance, int virtualNode, int maxRetry) throws 
ProxysdkException {
         if (Utils.isBlank(localHost)) {
             throw new ProxysdkException("localHost is blank!");
         }
@@ -137,7 +138,7 @@ public class ProxyClientConfig {
     }
 
     public ProxyClientConfig(String localHost, boolean isLocalVisit, String 
managerIp, int managerPort, String groupId,
-                             String netTag, String authSecretId, String 
authSecretKey) throws ProxysdkException {
+            String netTag, String authSecretId, String authSecretKey) throws 
ProxysdkException {
         this(localHost, isLocalVisit, managerIp, managerPort, groupId, netTag, 
authSecretId, authSecretKey,
                 ConfigConstants.DEFAULT_LOAD_BALANCE, 
ConfigConstants.DEFAULT_VIRTUAL_NODE,
                 ConfigConstants.DEFAULT_RANDOM_MAX_RETRY);
@@ -304,7 +305,7 @@ public class ProxyClientConfig {
     }
 
     public void setAuthenticationInfo(boolean needAuthentication, boolean 
needDataEncry,
-                                      final String userName, final String 
secretKey) {
+            final String userName, final String secretKey) {
         this.needAuthentication = needAuthentication;
         this.isNeedDataEncry = needDataEncry;
         if (this.needAuthentication || this.isNeedDataEncry) {
diff --git 
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
 
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
index 3d20f3286..d679b0d48 100644
--- 
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
+++ 
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
@@ -590,6 +590,7 @@ public class ProxyConfigManager extends Thread {
         ArrayList<BasicNameValuePair> params = new 
ArrayList<BasicNameValuePair>();
         params.add(new BasicNameValuePair("extTag", clientConfig.getNetTag()));
         params.add(new BasicNameValuePair("ip", this.localIP));
+        params.add(new BasicNameValuePair("protocolType", 
clientConfig.getProtocolType()));
         LOGGER.info("Begin to get configure from manager {}, param is {}", 
url, params);
 
         String resultStr = requestConfiguration(url, params);