Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-11656][SDK] DataProxy Java SDK lacks a common-lang dependency #11657

Merged
merged 2 commits into from
Jan 8, 2025
Merged

[INLONG-11656][SDK] DataProxy Java SDK lacks a common-lang dependency #11657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6643d
[INLONG-11656][SDK] DataProxy Java SDK lacks a common-lang dependency
Jan 7, 2025
e71d719
[INLONG-11656][SDK] DataProxy Java SDK lacks a common-lang dependency
Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions ...ataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ private void doEncryptConfigEntryQueryWork() throws Exception {
}
if (result.getF0() == null) {
if (this.userEncryptConfigEntry != null) {
logger.warn("ConfigManager({}) connect manager({}) failure, using the last pubKey, secretId={}",
this.callerId, this.encryptConfigVisitUrl, this.clientConfig.getAuthSecretId());
logger.warn("ConfigManager({}) connect manager({}) failure, using the last pubKey, userName={}",
this.callerId, this.encryptConfigVisitUrl, this.clientConfig.getUserName());
return;
}
throw new Exception("Visit manager error:" + result.getF1());
Expand Down Expand Up @@ -570,8 +570,8 @@ private Tuple2<EncryptConfigEntry, String> requestPubKeyFromManager() {
pubKeyConf = JsonParser.parseString(queryResult.getF1()).getAsJsonObject();
} catch (Throwable ex) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) parse failure, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) parse failure, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
errorMsg = "parse pubkey failure:" + ex.getMessage();
bookManagerQryFailStatus(false, errorMsg);
Expand All @@ -585,23 +585,23 @@ private Tuple2<EncryptConfigEntry, String> requestPubKeyFromManager() {
try {
if (!pubKeyConf.has("resultCode")) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: resultCode field not exist, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: resultCode field not exist, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("resultCode field not exist");
}
int resultCode = pubKeyConf.get("resultCode").getAsInt();
if (resultCode != 0) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: resultCode != 0, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: resultCode != 0, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("resultCode != 0!");
}
if (!pubKeyConf.has("resultData")) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: resultData field not exist, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: resultData field not exist, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("resultData field not exist");
}
Expand All @@ -610,24 +610,24 @@ private Tuple2<EncryptConfigEntry, String> requestPubKeyFromManager() {
String publicKey = resultData.get("publicKey").getAsString();
if (StringUtils.isBlank(publicKey)) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: publicKey is blank, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: publicKey is blank, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("publicKey is blank!");
}
String username = resultData.get("username").getAsString();
if (StringUtils.isBlank(username)) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: username is blank, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: username is blank, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("username is blank!");
}
String versionStr = resultData.get("version").getAsString();
if (StringUtils.isBlank(versionStr)) {
if (parseCounter.shouldPrint()) {
logger.warn("ConfigManager({}) config failure: version is blank, secretId={}, config={}!",
this.callerId, this.clientConfig.getAuthSecretId(), queryResult.getF1());
logger.warn("ConfigManager({}) config failure: version is blank, userName={}, config={}!",
this.callerId, this.clientConfig.getUserName(), queryResult.getF1());
}
throw new Exception("version is blank!");
}
Expand Down Expand Up @@ -670,8 +670,8 @@ private Tuple2<EncryptConfigEntry, String> readCachedPubKeyEntry() {
}
} catch (Throwable ex) {
if (exptCounter.shouldPrint()) {
logger.warn("ConfigManager({}) read({}) file exception, secretId={}",
callerId, encryptConfigCacheFile, clientConfig.getAuthSecretId(), ex);
logger.warn("ConfigManager({}) read({}) file exception, userName={}",
callerId, encryptConfigCacheFile, clientConfig.getUserName(), ex);
}
return new Tuple2<>(null, "read PubKeyEntry file failure:" + ex.getMessage());
} finally {
Expand Down Expand Up @@ -705,8 +705,8 @@ private void writeCachePubKeyEntryFile(EncryptConfigEntry entry) {
// p.close();
} catch (Throwable ex) {
if (exptCounter.shouldPrint()) {
logger.warn("ConfigManager({}) write file({}) exception, secretId={}, content={}",
callerId, encryptConfigCacheFile, clientConfig.getAuthSecretId(), entry.toString(), ex);
logger.warn("ConfigManager({}) write file({}) exception, userName={}, content={}",
callerId, encryptConfigCacheFile, clientConfig.getUserName(), entry.toString(), ex);
}
} finally {
if (fos != null) {
Expand Down Expand Up @@ -836,7 +836,7 @@ private void storeAndBuildMetaConfigure(ProxyClientConfig config) {
this.encryptConfigCacheFile = strBuff
.append(clientConfig.getConfigStoreBasePath())
.append(ConfigConstants.META_STORE_SUB_DIR)
.append(clientConfig.getAuthSecretId())
.append(clientConfig.getUserName())
.append(ConfigConstants.REMOTE_ENCRYPT_CACHE_FILE_SUFFIX)
.toString();
strBuff.delete(0, strBuff.length());
Expand Down
2 changes: 1 addition & 1 deletion ...-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/metric/MetricConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.inlong.sdk.dataproxy.metric;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

public class MetricConfig {

Expand Down
5 changes: 4 additions & 1 deletion ...ng-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/ClientMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.util.concurrent.DefaultThreadFactory;
import org.apache.commons.lang.mutable.MutableBoolean;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -322,6 +322,9 @@ public void updateProxyInfoList(boolean nodeChanged, List<HostInfo> newNodes) {
do {
int selectCnt = 0;
for (HostInfo hostInfo : candidateNodes) {
if (realHosts.contains(hostInfo.getReferenceName())) {
continue;
}
try {
client = new NettyClient(this.sender.getInstanceId(),
this.bootstrap, hostInfo, this.configure);
Expand Down
2 changes: 1 addition & 1 deletion inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/Sender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import org.apache.inlong.sdk.dataproxy.utils.Tuple2;

import io.netty.channel.Channel;
import org.apache.commons.lang.mutable.MutableBoolean;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/apache/inlong/sdk/dataproxy/pb/config/ContextProxyClusterConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.inlong.sdk.dataproxy.pb.config.pojo.ProxyInfo;

import com.alibaba.fastjson.JSON;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.flume.Context;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Loading