You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/11/09 02:59:15 UTC
[incubator-inlong] branch master updated:
[INLONG-1772][Improve]Adjust the ProcessResult class implementation (#1773)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new e25a9c7 [INLONG-1772][Improve]Adjust the ProcessResult class implementation (#1773)
e25a9c7 is described below
commit e25a9c70825ffcacc28bab4d4dc0f6e4eb79e27a
Author: gosonzhang <46...@qq.com>
AuthorDate: Tue Nov 9 10:59:07 2021 +0800
[INLONG-1772][Improve]Adjust the ProcessResult class implementation (#1773)
---
.../org/apache/flink/connectors/tubemq/Tubemq.java | 3 -
.../connectors/tubemq/TubemqSinkFunction.java | 2 -
.../connectors/tubemq/TubemqSourceFunction.java | 2 -
.../flink/connectors/tubemq/TubemqTableSink.java | 2 -
.../flink/connectors/tubemq/TubemqTableSource.java | 3 -
.../tubemq/TubemqTableSourceSinkFactory.java | 2 -
.../apache/flink/connectors/tubemq/TubemqTest.java | 1 -
.../inlong/tubemq/corebase/rv}/ProcessResult.java | 55 ++-----
.../inlong/tubemq/corebase/rv/RetValue.java} | 63 ++++----
.../inlong/tubemq/corebase/utils/AddressUtils.java | 1 -
.../tubemq/corebase/utils/DataConverterUtil.java | 1 -
.../inlong/tubemq/corebase/utils/MixedUtils.java | 1 -
.../corebase/policies/TestFlowCtrlRuleHandler.java | 1 -
.../corerpc/codec/DataConverterUtilTest.java | 1 -
.../tubemq/corerpc/codec/PbEnDecoderTest.java | 1 -
.../tubemq/example/MessagePullConsumerExample.java | 1 -
.../tubemq/server/broker/BrokerServiceServer.java | 82 +++++-----
.../server/broker/web/BrokerAdminServlet.java | 168 ++++++++++-----------
.../server/common/heartbeat/HeartbeatManager.java | 2 +-
.../server/common/paramcheck/PBParameterUtils.java | 2 +-
.../server/common/utils/WebParameterUtils.java | 27 ++--
.../inlong/tubemq/server/master/TMaster.java | 10 +-
.../server/master/metamanage/MetaDataManager.java | 2 +-
.../metastore/BdbMetaStoreServiceImpl.java | 42 +++---
.../metamanage/metastore/MetaStoreService.java | 3 +-
.../metastore/dao/mapper/BrokerConfigMapper.java | 3 +-
.../metastore/dao/mapper/ClusterConfigMapper.java | 2 +-
.../dao/mapper/GroupConsumeCtrlMapper.java | 2 +-
.../metastore/dao/mapper/GroupResCtrlMapper.java | 3 +-
.../metastore/dao/mapper/TopicCtrlMapper.java | 3 +-
.../metastore/dao/mapper/TopicDeployMapper.java | 3 +-
.../impl/bdbimpl/BdbBrokerConfigMapperImpl.java | 2 +-
.../impl/bdbimpl/BdbClusterConfigMapperImpl.java | 2 +-
.../bdbimpl/BdbGroupConsumeCtrlMapperImpl.java | 2 +-
.../impl/bdbimpl/BdbGroupResCtrlMapperImpl.java | 2 +-
.../impl/bdbimpl/BdbTopicCtrlMapperImpl.java | 2 +-
.../impl/bdbimpl/BdbTopicDeployMapperImpl.java | 2 +-
.../nodemanage/nodebroker/BrokerAbnHolder.java | 2 +-
.../nodemanage/nodebroker/BrokerRunManager.java | 2 +-
.../nodemanage/nodebroker/DefBrokerRunManager.java | 4 +-
.../inlong/tubemq/server/master/web/WebServer.java | 1 -
.../server/master/web/action/screen/Webapi.java | 5 +-
.../master/web/handler/BrokerProcessResult.java | 2 +-
.../master/web/handler/GroupProcessResult.java | 2 +-
.../master/web/handler/TopicProcessResult.java | 2 +-
.../web/handler/WebAdminFlowRuleHandler.java | 28 ++--
.../web/handler/WebAdminGroupCtrlHandler.java | 108 ++++++-------
.../web/handler/WebAdminTopicAuthHandler.java | 26 ++--
.../master/web/handler/WebBrokerConfHandler.java | 106 ++++++-------
.../web/handler/WebGroupConsumeCtrlHandler.java | 49 +++---
.../master/web/handler/WebGroupResCtrlHandler.java | 42 +++---
.../master/web/handler/WebMasterInfoHandler.java | 34 ++---
.../master/web/handler/WebOtherInfoHandler.java | 10 +-
.../master/web/handler/WebTopicCtrlHandler.java | 30 ++--
.../master/web/handler/WebTopicDeployHandler.java | 52 +++----
.../inlong/tubemq/server/tools/BrokerStartup.java | 6 +-
.../inlong/tubemq/server/tools/CliUtils.java | 11 +-
.../inlong/tubemq/server/tools/MasterStartup.java | 6 +-
.../server/common/WebParameterUtilsTest.java | 2 +-
.../tubemq/server/master/MasterConfigTest.java | 1 -
.../dao/entity/TopicDeployEntityTest.java | 1 -
61 files changed, 488 insertions(+), 550 deletions(-)
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/Tubemq.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/Tubemq.java
index dc265b1..383d945 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/Tubemq.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/Tubemq.java
@@ -25,13 +25,10 @@ import static org.apache.flink.connectors.tubemq.TubemqValidator.CONNECTOR_TIDS;
import static org.apache.flink.connectors.tubemq.TubemqValidator.CONNECTOR_TOPIC;
import static org.apache.flink.connectors.tubemq.TubemqValidator.CONNECTOR_TYPE_VALUE_TUBEMQ;
import static org.apache.flink.util.Preconditions.checkNotNull;
-
import java.util.HashMap;
import java.util.Map;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-
import org.apache.flink.table.descriptors.ConnectorDescriptor;
import org.apache.flink.table.descriptors.DescriptorProperties;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSinkFunction.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSinkFunction.java
index 8fb18a1..66e0423 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSinkFunction.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSinkFunction.java
@@ -19,12 +19,10 @@
package org.apache.flink.connectors.tubemq;
import static org.apache.flink.connectors.tubemq.TubemqOptions.MAX_RETRIES;
-
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashSet;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.configuration.Configuration;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSourceFunction.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSourceFunction.java
index 2965a73..f64e581 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSourceFunction.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqSourceFunction.java
@@ -23,7 +23,6 @@ import static org.apache.flink.api.common.typeinfo.BasicTypeInfo.STRING_TYPE_INF
import static org.apache.flink.runtime.net.ConnectionUtils.findConnectingAddress;
import static org.apache.flink.util.Preconditions.checkNotNull;
import static org.apache.flink.util.TimeUtils.parseDuration;
-
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.time.Duration;
@@ -33,7 +32,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-
import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.ListStateDescriptor;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
index 6fb7c39..e504dab 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
@@ -19,9 +19,7 @@
package org.apache.flink.connectors.tubemq;
import static org.apache.flink.util.Preconditions.checkNotNull;
-
import java.util.Arrays;
-
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSource.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSource.java
index 743c692..8ba4b2d 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSource.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSource.java
@@ -19,14 +19,11 @@
package org.apache.flink.connectors.tubemq;
import static org.apache.flink.util.Preconditions.checkNotNull;
-
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TreeSet;
-
import javax.annotation.Nullable;
-
import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSourceSinkFactory.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSourceSinkFactory.java
index 4b581d6..f32e594 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSourceSinkFactory.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSourceSinkFactory.java
@@ -36,7 +36,6 @@ import static org.apache.flink.table.descriptors.Schema.SCHEMA_PROCTIME;
import static org.apache.flink.table.descriptors.Schema.SCHEMA_TYPE;
import static org.apache.flink.table.descriptors.StreamTableDescriptorValidator.UPDATE_MODE;
import static org.apache.flink.table.descriptors.StreamTableDescriptorValidator.UPDATE_MODE_VALUE_APPEND;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -44,7 +43,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TreeSet;
-
import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.configuration.Configuration;
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/test/java/org/apache/flink/connectors/tubemq/TubemqTest.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/test/java/org/apache/flink/connectors/tubemq/TubemqTest.java
index eebd45d..340b4ee 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/test/java/org/apache/flink/connectors/tubemq/TubemqTest.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/test/java/org/apache/flink/connectors/tubemq/TubemqTest.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.flink.table.descriptors.Descriptor;
import org.apache.flink.table.descriptors.DescriptorProperties;
import org.apache.flink.table.descriptors.DescriptorTestBase;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/ProcessResult.java
similarity index 56%
copy from inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java
copy to inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/ProcessResult.java
index 55a630e..35c7f04 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java
+++ b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/ProcessResult.java
@@ -15,69 +15,48 @@
* limitations under the License.
*/
-package org.apache.inlong.tubemq.server.common.utils;
+package org.apache.inlong.tubemq.corebase.rv;
-import org.apache.inlong.tubemq.corebase.TErrCodeConstants;
+public class ProcessResult extends RetValue {
-public class ProcessResult {
- public boolean success = true;
- public int errCode = TErrCodeConstants.SUCCESS;
- public String errInfo = "";
- public Object retData1 = null;
+ private Object retData1 = null;
public ProcessResult() {
-
+ super();
}
public ProcessResult(ProcessResult other) {
- this.success = other.success;
- this.errCode = other.errCode;
- this.errInfo = other.errInfo;
+ super(other);
this.retData1 = other.retData1;
}
public ProcessResult(Object retData) {
- this.success = true;
+ super();
this.retData1 = retData;
}
public ProcessResult(int errCode, String errInfo) {
- this.success = false;
- this.errCode = errCode;
- this.errInfo = errInfo;
+ super(errCode, errInfo);
}
public void setFailResult(int errCode, final String errMsg) {
- this.success = false;
- this.errCode = errCode;
- this.errInfo = errMsg;
+ super.setFailResult(errCode, errMsg);
this.retData1 = null;
}
public void setFailResult(final String errMsg) {
- this.success = false;
- this.errCode = TErrCodeConstants.BAD_REQUEST;
- this.errInfo = errMsg;
+ super.setFailResult(errMsg);
this.retData1 = null;
}
- public void setSuccResult(Object retData) {
- this.success = true;
- this.errInfo = "Ok!";
- this.errCode = TErrCodeConstants.SUCCESS;
- this.retData1 = retData;
- }
-
- public boolean isSuccess() {
- return success;
- }
-
- public int getErrCode() {
- return errCode;
+ public void setSuccResult() {
+ super.setSuccResult();
+ this.retData1 = null;
}
- public String getErrInfo() {
- return errInfo;
+ public void setSuccResult(Object retData) {
+ super.setSuccResult();
+ this.retData1 = retData;
}
public Object getRetData() {
@@ -89,9 +68,7 @@ public class ProcessResult {
}
public void clear() {
- this.success = true;
- this.errCode = TErrCodeConstants.SUCCESS;
- this.errInfo = "";
+ super.clear();
this.retData1 = null;
}
}
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/RetValue.java
similarity index 58%
rename from inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java
rename to inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/RetValue.java
index 55a630e..f99fb00 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/ProcessResult.java
+++ b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/rv/RetValue.java
@@ -15,57 +15,59 @@
* limitations under the License.
*/
-package org.apache.inlong.tubemq.server.common.utils;
+package org.apache.inlong.tubemq.corebase.rv;
import org.apache.inlong.tubemq.corebase.TErrCodeConstants;
-public class ProcessResult {
- public boolean success = true;
- public int errCode = TErrCodeConstants.SUCCESS;
- public String errInfo = "";
- public Object retData1 = null;
+public class RetValue {
+ private boolean success = true;
+ private int errCode = TErrCodeConstants.SUCCESS;
+ private String errMsg = "";
- public ProcessResult() {
+ public RetValue() {
}
- public ProcessResult(ProcessResult other) {
+ public RetValue(RetValue other) {
this.success = other.success;
this.errCode = other.errCode;
- this.errInfo = other.errInfo;
- this.retData1 = other.retData1;
+ this.errMsg = other.errMsg;
}
- public ProcessResult(Object retData) {
- this.success = true;
- this.retData1 = retData;
+ public RetValue(int errCode, String errMsg) {
+ this.success = false;
+ this.errCode = errCode;
+ this.errMsg = errMsg;
}
- public ProcessResult(int errCode, String errInfo) {
- this.success = false;
+ public RetValue(boolean isSuccess, int errCode, String errMsg) {
+ this.success = isSuccess;
this.errCode = errCode;
- this.errInfo = errInfo;
+ this.errMsg = errMsg;
+ }
+
+ public void setFullInfo(boolean isSuccess, int errCode, String errMsg) {
+ this.success = isSuccess;
+ this.errCode = errCode;
+ this.errMsg = errMsg;
}
public void setFailResult(int errCode, final String errMsg) {
this.success = false;
this.errCode = errCode;
- this.errInfo = errMsg;
- this.retData1 = null;
+ this.errMsg = errMsg;
}
public void setFailResult(final String errMsg) {
this.success = false;
this.errCode = TErrCodeConstants.BAD_REQUEST;
- this.errInfo = errMsg;
- this.retData1 = null;
+ this.errMsg = errMsg;
}
- public void setSuccResult(Object retData) {
+ public void setSuccResult() {
this.success = true;
- this.errInfo = "Ok!";
+ this.errMsg = "Ok!";
this.errCode = TErrCodeConstants.SUCCESS;
- this.retData1 = retData;
}
public boolean isSuccess() {
@@ -76,22 +78,13 @@ public class ProcessResult {
return errCode;
}
- public String getErrInfo() {
- return errInfo;
- }
-
- public Object getRetData() {
- return retData1;
- }
-
- public void setRetData(Object retData) {
- this.retData1 = retData;
+ public String getErrMsg() {
+ return errMsg;
}
public void clear() {
this.success = true;
this.errCode = TErrCodeConstants.SUCCESS;
- this.errInfo = "";
- this.retData1 = null;
+ this.errMsg = "";
}
}
diff --git a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/AddressUtils.java b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/AddressUtils.java
index 42b1250..b846f95 100644
--- a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/AddressUtils.java
+++ b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/AddressUtils.java
@@ -24,7 +24,6 @@ import java.net.SocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Enumeration;
-
import org.apache.inlong.tubemq.corebase.exception.AddressException;
import org.jboss.netty.channel.Channel;
diff --git a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/DataConverterUtil.java b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/DataConverterUtil.java
index bd5f785..aaf5a8d 100644
--- a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/DataConverterUtil.java
+++ b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/DataConverterUtil.java
@@ -38,7 +38,6 @@ import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientBroker;
/**
* Tube meta info converter tools
*/
-
public class DataConverterUtil {
/**
diff --git a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/MixedUtils.java b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/MixedUtils.java
index e4629b2..4a90bd1 100644
--- a/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/MixedUtils.java
+++ b/inlong-tubemq/tubemq-core/src/main/java/org/apache/inlong/tubemq/corebase/utils/MixedUtils.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-
import org.apache.commons.codec.binary.StringUtils;
import org.apache.inlong.tubemq.corebase.Message;
import org.apache.inlong.tubemq.corebase.TokenConstants;
diff --git a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
index d501c46..09fc784 100644
--- a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
+++ b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corebase/policies/TestFlowCtrlRuleHandler.java
@@ -19,7 +19,6 @@ package org.apache.inlong.tubemq.corebase.policies;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-
import java.util.Calendar;
import java.util.TimeZone;
import org.junit.Test;
diff --git a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/DataConverterUtilTest.java b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/DataConverterUtilTest.java
index ac6d4e1..bc5e26d 100644
--- a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/DataConverterUtilTest.java
+++ b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/DataConverterUtilTest.java
@@ -19,7 +19,6 @@ package org.apache.inlong.tubemq.corerpc.codec;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/PbEnDecoderTest.java b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/PbEnDecoderTest.java
index 4ccef6a..aaf46cc 100644
--- a/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/PbEnDecoderTest.java
+++ b/inlong-tubemq/tubemq-core/src/test/java/org/apache/inlong/tubemq/corerpc/codec/PbEnDecoderTest.java
@@ -18,7 +18,6 @@
package org.apache.inlong.tubemq.corerpc.codec;
import static org.junit.Assert.assertEquals;
-
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster;
import org.apache.inlong.tubemq.corerpc.RpcConstants;
import org.junit.Test;
diff --git a/inlong-tubemq/tubemq-example/src/main/java/org/apache/inlong/tubemq/example/MessagePullConsumerExample.java b/inlong-tubemq/tubemq-example/src/main/java/org/apache/inlong/tubemq/example/MessagePullConsumerExample.java
index bf51d9e..393b3c4 100644
--- a/inlong-tubemq/tubemq-example/src/main/java/org/apache/inlong/tubemq/example/MessagePullConsumerExample.java
+++ b/inlong-tubemq/tubemq-example/src/main/java/org/apache/inlong/tubemq/example/MessagePullConsumerExample.java
@@ -18,7 +18,6 @@
package org.apache.inlong.tubemq.example;
import static org.apache.inlong.tubemq.corebase.TErrCodeConstants.IGNORE_ERROR_SET;
-
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
index 92b3869..beca6c2 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
@@ -45,6 +45,7 @@ import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientBroker.Registe
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientBroker.SendMessageRequestP2B;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientBroker.SendMessageResponseB2P;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientBroker.TransferedMessage;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.AddressUtils;
import org.apache.inlong.tubemq.corebase.utils.CheckSum;
import org.apache.inlong.tubemq.corebase.utils.DataConverterUtil;
@@ -76,7 +77,6 @@ import org.apache.inlong.tubemq.server.common.heartbeat.TimeoutListener;
import org.apache.inlong.tubemq.server.common.offsetstorage.OffsetStorageInfo;
import org.apache.inlong.tubemq.server.common.paramcheck.PBParameterUtils;
import org.apache.inlong.tubemq.server.common.utils.AppendResult;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.RowLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -289,28 +289,28 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
// get and check clientId field
if (!PBParameterUtils.getStringParameter(WebFieldDef.CLIENTID,
request.getClientId(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String clientId = (String) result.retData1;
+ final String clientId = (String) result.getRetData();
// get and check groupName field
if (!PBParameterUtils.getStringParameter(WebFieldDef.GROUPNAME,
request.getGroupName(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
// get and check topicName field
if (!PBParameterUtils.getTopicNameParameter(request.getTopicName(),
this.metadataManager, strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
// get consumer info
- final String topicName = (String) result.retData1;
+ final String topicName = (String) result.getRetData();
final int partitionId = request.getPartitionId();
boolean isEscFlowCtrl = request.hasEscFlowCtrl() && request.getEscFlowCtrl();
String partStr = getPartStr(groupName, topicName, partitionId);
@@ -388,7 +388,7 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
return builder.build();
} else {
builder.setErrCode(msgResult.getRetCode());
- builder.setErrMsg(msgResult.errInfo);
+ builder.setErrMsg(msgResult.getErrInfo());
builder.setMinLimitTime((int) msgResult.waitTime);
return builder.build();
}
@@ -607,20 +607,20 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
// get and check clientId field
if (!PBParameterUtils.getStringParameter(WebFieldDef.CLIENTID,
request.getClientId(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String producerId = (String) result.retData1;
+ final String producerId = (String) result.getRetData();
// get and check topicName and partitionId field
final int partitionId = request.getPartitionId();
if (!PBParameterUtils.getTopicNamePartIdInfo(request.getTopicName(),
partitionId, this.metadataManager, strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final TopicMetadata topicMetadata = (TopicMetadata) result.retData1;
+ final TopicMetadata topicMetadata = (TopicMetadata) result.getRetData();
final String topicName = topicMetadata.getTopic();
String msgType = null;
int msgTypeCode = -1;
@@ -732,28 +732,28 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
// get and check clientId field
if (!PBParameterUtils.getStringParameter(WebFieldDef.CLIENTID,
request.getClientId(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String clientId = (String) result.retData1;
+ final String clientId = (String) result.getRetData();
// get and check topicName field
if (!PBParameterUtils.getTopicNameParameter(request.getTopicName(),
this.metadataManager, strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
// get consumer info
- final String topicName = (String) result.retData1;
+ final String topicName = (String) result.getRetData();
// get and check groupName field
if (!PBParameterUtils.getStringParameter(WebFieldDef.GROUPNAME,
request.getGroupName(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
boolean isRegister = (request.getOpType() == RpcConstants.MSG_OPTYPE_REGISTER);
Set<String> filterCondSet = new HashSet<>();
if (request.getFilterCondStrList() != null && !request.getFilterCondStrList().isEmpty()) {
@@ -1001,19 +1001,19 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
// get and check clientId field
if (!PBParameterUtils.getStringParameter(WebFieldDef.CLIENTID,
request.getClientId(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String clientId = (String) result.retData1;
+ final String clientId = (String) result.getRetData();
// get and check groupName field
if (!PBParameterUtils.getStringParameter(WebFieldDef.GROUPNAME,
request.getGroupName(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
int reqQryPriorityId = request.hasQryPriorityId()
? request.getQryPriorityId() : TBaseConstants.META_VALUE_UNDEFINED;
List<Partition> partitions =
@@ -1116,28 +1116,28 @@ public class BrokerServiceServer implements BrokerReadService, BrokerWriteServic
// get and check clientId field
if (!PBParameterUtils.getStringParameter(WebFieldDef.CLIENTID,
request.getClientId(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String clientId = (String) result.retData1;
+ final String clientId = (String) result.getRetData();
// get and check groupName field
if (!PBParameterUtils.getStringParameter(WebFieldDef.GROUPNAME,
request.getGroupName(), strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
int partitionId = request.getPartitionId();
// get and check topicName and partitionId field
if (!PBParameterUtils.getTopicNamePartIdInfo(request.getTopicName(),
partitionId, this.metadataManager, strBuffer, result)) {
- builder.setErrCode(result.errCode);
- builder.setErrMsg(result.errInfo);
+ builder.setErrCode(result.getErrCode());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
- final TopicMetadata topicMetadata = (TopicMetadata) result.retData1;
+ final TopicMetadata topicMetadata = (TopicMetadata) result.getRetData();
final String topicName = topicMetadata.getTopic();
String partStr = getPartStr(groupName, topicName, partitionId);
ConsumerNodeInfo consumerNodeInfo = consumerRegisterMap.get(partStr);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java
index 1774aed..2a0d5e1 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java
@@ -27,6 +27,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TokenConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.MixedUtils;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
@@ -40,7 +41,6 @@ import org.apache.inlong.tubemq.server.broker.offset.OffsetService;
import org.apache.inlong.tubemq.server.broker.utils.GroupOffsetInfo;
import org.apache.inlong.tubemq.server.broker.utils.TopicPubStoreInfo;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
/***
@@ -127,10 +127,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuilder, result)) {
- WebParameterUtils.buildFailResult(sBuilder, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuilder, result.getErrMsg());
return;
}
- Set<String> groupNameSet = (Set<String>) result.retData1;
+ Set<String> groupNameSet = (Set<String>) result.getRetData();
sBuilder.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"Success!\",\"dataSet\":[");
Map<String, ConsumerNodeInfo> map =
broker.getBrokerServiceServer().getConsumerRegisterMap();
@@ -215,10 +215,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuilder, result)) {
- WebParameterUtils.buildFailResult(sBuilder, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuilder, result.getErrMsg());
return;
}
- Set<String> topicNameSet = (Set<String>) result.retData1;
+ Set<String> topicNameSet = (Set<String>) result.getRetData();
sBuilder.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"Success!\",\"dataSet\":[");
Map<String, ConcurrentHashMap<Integer, MessageStore>> messageTopicStores =
broker.getStoreManager().getMessageStores();
@@ -282,16 +282,16 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> topicNameSet = (Set<String>) result.retData1;
+ Set<String> topicNameSet = (Set<String>) result.getRetData();
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.NEEDREFRESH, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- boolean requireRefresh = (boolean) result.retData1;
+ boolean requireRefresh = (boolean) result.getRetData();
sBuffer.append("{\"result\":true,\"errCode\":0,\"errMsg\":\"Success!\",\"detail\":[");
Map<String, ConcurrentHashMap<Integer, MessageStore>> messageTopicStores =
broker.getStoreManager().getMessageStores();
@@ -341,34 +341,34 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.TOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String topicName = (String) result.retData1;
+ final String topicName = (String) result.getRetData();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.GROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.MODIFYUSER, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String modifyUser = (String) result.retData1;
+ final String modifyUser = (String) result.getRetData();
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.PARTITIONID, true, -1, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- int partitionId = (Integer) result.retData1;
+ int partitionId = (Integer) result.getRetData();
if (!WebParameterUtils.getLongParamValue(req,
WebFieldDef.MANUALOFFSET, true, -1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final long manualOffset = (Long) result.retData1;
+ final long manualOffset = (Long) result.getRetData();
List<String> topicList = broker.getMetadataManager().getTopics();
if (!topicList.contains(topicName)) {
sBuffer.append("{\"result\":false,\"errCode\":400,\"errMsg\":\"")
@@ -430,22 +430,22 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.TOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String topicName = (String) result.retData1;
+ final String topicName = (String) result.getRetData();
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.PARTITIONID, false, -1, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final int partitionId = (Integer) result.retData1;
+ final int partitionId = (Integer) result.getRetData();
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.MSGCOUNT, false, 3, 3, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- int msgCount = (Integer) result.retData1;
+ int msgCount = (Integer) result.getRetData();
msgCount = Math.max(msgCount, 1);
if (msgCount > 50) {
sBuffer.append("{\"result\":false,\"errCode\":400,\"errMsg\":\"")
@@ -455,10 +455,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
}
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.FILTERCONDS, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> filterCondStrSet = (Set<String>) result.retData1;
+ Set<String> filterCondStrSet = (Set<String>) result.getRetData();
broker.getBrokerServiceServer()
.getMessageSnapshot(topicName, partitionId, msgCount, filterCondStrSet, sBuffer);
}
@@ -475,28 +475,28 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.TOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String topicName = (String) result.retData1;
+ final String topicName = (String) result.getRetData();
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.GROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String groupName = (String) result.retData1;
+ final String groupName = (String) result.getRetData();
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.PARTITIONID, true, -1, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- int partitionId = (Integer) result.retData1;
+ int partitionId = (Integer) result.getRetData();
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.REQUIREREALOFFSET, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final boolean requireRealOffset = (Boolean) result.retData1;
+ final boolean requireRealOffset = (Boolean) result.getRetData();
List<String> topicList = broker.getMetadataManager().getTopics();
if (!topicList.contains(topicName)) {
sBuffer.append("{\"result\":false,\"errCode\":400,\"errMsg\":\"")
@@ -586,11 +586,11 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// get the topic set to be queried
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
// get target consume group name
- Set<String> topicSet = (Set<String>) result.retData1;
+ Set<String> topicSet = (Set<String>) result.getRetData();
// get topic's publish info
Map<String, Map<Integer, TopicPubStoreInfo>> topicStorePubInfoMap =
broker.getStoreManager().getTopicPublishInfos(topicSet);
@@ -630,10 +630,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
ProcessResult result = new ProcessResult();
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.WITHDIVIDE, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- boolean withDivide = (boolean) result.retData1;
+ boolean withDivide = (boolean) result.getRetData();
// get offset service
int itemCnt = 0;
int totalCnt = 0;
@@ -691,18 +691,18 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> inGroupNameSet = (Set<String>) result.retData1;
+ Set<String> inGroupNameSet = (Set<String>) result.getRetData();
// get the topic set to be queried
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
// get target consume group name
- Set<String> topicSet = (Set<String>) result.retData1;
+ Set<String> topicSet = (Set<String>) result.getRetData();
// filter invalid groups
Set<String> qryGroupNameSet = new HashSet<>();
Set<String> bookedGroupSet = broker.getOffsetManager().getBookedGroups();
@@ -765,49 +765,49 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final Set<String> groupNameSet = (Set<String>) result.retData1;
+ final Set<String> groupNameSet = (Set<String>) result.getRetData();
// get set mode
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.MANUALSET, true, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- boolean manualSet = (Boolean) result.retData1;
+ boolean manualSet = (Boolean) result.getRetData();
// get modify user
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.MODIFYUSER, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
List<Tuple3<String, Integer, Long>> resetOffsets;
- final String modifier = (String) result.retData1;
+ final String modifier = (String) result.getRetData();
if (manualSet) {
// get offset json info
if (!WebParameterUtils.getJsonDictParamValue(req,
WebFieldDef.OFFSETJSON, true, null, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
Map<String, Long> manOffsets =
- (Map<String, Long>) result.retData1;
+ (Map<String, Long>) result.getRetData();
// valid and transfer offset format
if (!validManOffsetResetInfo(WebFieldDef.OFFSETJSON, manOffsets, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
resetOffsets =
- (List<Tuple3<String, Integer, Long>>) result.retData1;
+ (List<Tuple3<String, Integer, Long>>) result.getRetData();
} else {
// get the topic set to be set
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> topicSet = (Set<String>) result.retData1;
+ Set<String> topicSet = (Set<String>) result.getRetData();
// transfer offset format
resetOffsets = buildOffsetResetInfo(topicSet);
}
@@ -827,39 +827,39 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// get source consume group name
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.SRCGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String srcGroupName = (String) result.retData1;
+ final String srcGroupName = (String) result.getRetData();
// get source consume group's topic set cloned to target group
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> srcTopicNameSet = (Set<String>) result.retData1;
+ Set<String> srcTopicNameSet = (Set<String>) result.getRetData();
// valid topic and get topic's partitionIds
if (!validAndGetTopicPartInfo(srcGroupName,
WebFieldDef.SRCGROUPNAME, srcTopicNameSet, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
final Map<String, Set<Integer>> topicPartMap =
- (Map<String, Set<Integer>>) result.retData1;
+ (Map<String, Set<Integer>>) result.getRetData();
// get target consume group name
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.TGTCOMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- Set<String> tgtGroupNameSet = (Set<String>) result.retData1;
+ Set<String> tgtGroupNameSet = (Set<String>) result.getRetData();
// get modify user
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.MODIFYUSER, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String modifier = (String) result.retData1;
+ final String modifier = (String) result.getRetData();
// check sourceGroup if existed
Set<String> bookedGroups = broker.getOffsetManager().getBookedGroups();
if (!bookedGroups.contains(srcGroupName)) {
@@ -892,38 +892,38 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// get consume group name
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final Set<String> groupNameSet = (Set<String>) result.retData1;
+ final Set<String> groupNameSet = (Set<String>) result.getRetData();
// get modify user
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.MODIFYUSER, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- final String modifier = (String) result.retData1;
+ final String modifier = (String) result.getRetData();
// get need removed offset's topic
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
// get target consume group name
- Set<String> topicNameSet = (Set<String>) result.retData1;
+ Set<String> topicNameSet = (Set<String>) result.getRetData();
// get set mode
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ONLYMEM, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
- boolean onlyMemory = (Boolean) result.retData1;
+ boolean onlyMemory = (Boolean) result.getRetData();
if (!validAndGetGroupTopicInfo(groupNameSet, topicNameSet, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return;
}
Map<String, Map<String, Set<Integer>>> groupTopicPartMap =
- (Map<String, Map<String, Set<Integer>>>) result.retData1;
+ (Map<String, Map<String, Set<Integer>>>) result.getRetData();
broker.getOffsetManager().deleteGroupOffset(
onlyMemory, groupTopicPartMap, modifier);
// builder return result
@@ -1029,7 +1029,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
.append(fieldDef.name).append("'s key invalid:")
.append(entry.getKey())
.append(" must be brokerId:topicName:partitionId !").toString());
- return result.success;
+ return result.isSuccess();
}
brokerId = keyItems[0].trim();
topicName = keyItems[1].trim();
@@ -1046,7 +1046,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
.append(fieldDef.name).append("'s key invalid:")
.append(entry.getKey())
.append("'s partitionId value not number!").toString());
- return result.success;
+ return result.isSuccess();
}
// check and adjust offset value
try {
@@ -1068,7 +1068,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
} else {
result.setSuccResult(offsetVals);
}
- return result.success;
+ return result.isSuccess();
}
// builder group's offset info
@@ -1081,7 +1081,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
// valid and get topic's partitionIds
if (validAndGetTopicPartInfo(group, groupFldDef, topicSet, result)) {
Map<String, Set<Integer>> topicPartMap =
- (Map<String, Set<Integer>>) result.retData1;
+ (Map<String, Set<Integer>>) result.getRetData();
// get topic's publish info
Map<String, Map<Integer, TopicPubStoreInfo>> topicStorePubInfoMap =
broker.getStoreManager().getTopicPublishInfos(topicPartMap.keySet());
@@ -1133,7 +1133,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
for (String group : targetGroupSet) {
if (validAndGetTopicPartInfo(group, WebFieldDef.GROUPNAME, topicSet, result)) {
Map<String, Set<Integer>> topicPartMap =
- (Map<String, Set<Integer>>) result.retData1;
+ (Map<String, Set<Integer>>) result.getRetData();
groupTopicPartMap.put(group, topicPartMap);
}
}
@@ -1152,7 +1152,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
.append("Parameter ").append(groupFldDef.name)
.append(": subscribed topic set of ").append(groupName)
.append(" query result is null!").toString());
- return result.success;
+ return result.isSuccess();
}
// filter valid topic set
Set<String> tgtTopicSet = new HashSet<>();
@@ -1169,7 +1169,7 @@ public class BrokerAdminServlet extends AbstractWebHandler {
.append("Parameter ").append(groupFldDef.name)
.append(": ").append(groupName)
.append(" unsubscribed to the specified topic set!").toString());
- return result.success;
+ return result.isSuccess();
}
}
Map<String, Set<Integer>> topicPartMap = getTopicPartitions(tgtTopicSet);
@@ -1177,10 +1177,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
result.setFailResult(400, new StringBuilder(512)
.append("Parameter ").append(groupFldDef.name)
.append(": all topics subscribed by the group have been deleted!").toString());
- return result.success;
+ return result.isSuccess();
}
result.setSuccResult(topicPartMap);
- return result.success;
+ return result.isSuccess();
}
private Map<String, Set<Integer>> getTopicPartitions(Set<String> topicSet) {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/heartbeat/HeartbeatManager.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/heartbeat/HeartbeatManager.java
index b28b188..44fcb56 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/heartbeat/HeartbeatManager.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/heartbeat/HeartbeatManager.java
@@ -25,9 +25,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.inlong.tubemq.corebase.TErrCodeConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.common.exception.HeartbeatException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/paramcheck/PBParameterUtils.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/paramcheck/PBParameterUtils.java
index 4c507a9..0ae10a5 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/paramcheck/PBParameterUtils.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/paramcheck/PBParameterUtils.java
@@ -27,11 +27,11 @@ import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.TErrCodeConstants;
import org.apache.inlong.tubemq.corebase.TokenConstants;
import org.apache.inlong.tubemq.corebase.cluster.ConsumerInfo;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.broker.metadata.MetadataManager;
import org.apache.inlong.tubemq.server.broker.metadata.TopicMetadata;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.MasterConfig;
import org.apache.inlong.tubemq.server.master.metamanage.MetaDataManager;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.GroupResCtrlEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
index 28f85f1..3fa17ac 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
@@ -35,6 +35,7 @@ import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.TokenConstants;
import org.apache.inlong.tubemq.corebase.policies.FlowCtrlItem;
import org.apache.inlong.tubemq.corebase.policies.FlowCtrlRuleHandler;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.broker.utils.DataStoreUtils;
@@ -414,35 +415,35 @@ public class WebParameterUtils {
TServerConstants.TOPIC_STOREBLOCK_NUM_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setNumTopicStores((int) result.retData1);
+ newConf.setNumTopicStores((int) result.getRetData());
// get numPartitions parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.NUMPARTITIONS, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getNumPartitions()),
TServerConstants.TOPIC_PARTITION_NUM_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setNumPartitions((int) result.retData1);
+ newConf.setNumPartitions((int) result.getRetData());
// get unflushThreshold parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.UNFLUSHTHRESHOLD, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getUnflushThreshold()),
TServerConstants.TOPIC_DSK_UNFLUSHTHRESHOLD_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setUnflushThreshold((int) result.retData1);
+ newConf.setUnflushThreshold((int) result.getRetData());
// get unflushInterval parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.UNFLUSHINTERVAL, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getUnflushInterval()),
TServerConstants.TOPIC_DSK_UNFLUSHINTERVAL_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setUnflushInterval((int) result.retData1);
+ newConf.setUnflushInterval((int) result.getRetData());
// get unflushDataHold parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.UNFLUSHDATAHOLD, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getUnflushDataHold()),
TServerConstants.TOPIC_DSK_UNFLUSHDATAHOLD_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setUnflushDataHold((int) result.retData1);
+ newConf.setUnflushDataHold((int) result.getRetData());
// get memCacheMsgSizeInMB parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.MCACHESIZEINMB, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getMemCacheMsgSizeInMB()),
@@ -450,39 +451,39 @@ public class WebParameterUtils {
TServerConstants.TOPIC_CACHESIZE_MB_MAX, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setMemCacheMsgSizeInMB((int) result.retData1);
+ newConf.setMemCacheMsgSizeInMB((int) result.getRetData());
// get memCacheFlushIntvl parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.UNFMCACHEINTERVAL, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getMemCacheFlushIntvl()),
TServerConstants.TOPIC_CACHEINTVL_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setMemCacheFlushIntvl((int) result.retData1);
+ newConf.setMemCacheFlushIntvl((int) result.getRetData());
// get memCacheMsgCntInK parameter value
if (!WebParameterUtils.getIntParamValue(paramCntr, WebFieldDef.UNFMCACHECNTINK, false,
(defVal == null ? TBaseConstants.META_VALUE_UNDEFINED : defVal.getMemCacheMsgCntInK()),
TServerConstants.TOPIC_CACHECNT_INK_MIN, sBuffer, result)) {
return result.isSuccess();
}
- newConf.setMemCacheMsgCntInK((int) result.retData1);
+ newConf.setMemCacheMsgCntInK((int) result.getRetData());
// get deletePolicy parameter value
if (!WebParameterUtils.getDeletePolicyParameter(paramCntr, false,
(defVal == null ? null : defVal.getDeletePolicy()), sBuffer, result)) {
return result.isSuccess();
}
- newConf.setDeletePolicy((String) result.retData1);
+ newConf.setDeletePolicy((String) result.getRetData());
// get acceptPublish parameter value
if (!WebParameterUtils.getBooleanParamValue(paramCntr, WebFieldDef.ACCEPTPUBLISH, false,
(defVal == null ? null : defVal.getAcceptPublish()), sBuffer, result)) {
return result.isSuccess();
}
- newConf.setAcceptPublish((Boolean) result.retData1);
+ newConf.setAcceptPublish((Boolean) result.getRetData());
// get acceptSubscribe parameter value
if (!WebParameterUtils.getBooleanParamValue(paramCntr, WebFieldDef.ACCEPTSUBSCRIBE, false,
(defVal == null ? null : defVal.getAcceptSubscribe()), sBuffer, result)) {
return result.isSuccess();
}
- newConf.setAcceptSubscribe((Boolean) result.retData1);
+ newConf.setAcceptSubscribe((Boolean) result.getRetData());
result.setSuccResult(newConf);
return result.isSuccess();
}
@@ -641,7 +642,7 @@ public class WebParameterUtils {
hasMinVal, minValue, hasMaxVal, maxValue, sBuffer, result)) {
return result.isSuccess();
}
- tgtValueSet.add((Integer) result.retData1);
+ tgtValueSet.add((Integer) result.getRetData());
}
result.setSuccResult(tgtValueSet);
} else {
@@ -772,7 +773,7 @@ public class WebParameterUtils {
if (!checkStrValueNorms(fieldDef, strParamValueItem, sBuffer, result)) {
return result.isSuccess();
}
- valItemSet.add((String) result.retData1);
+ valItemSet.add((String) result.getRetData());
}
// check if is empty result
if (valItemSet.isEmpty()) {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/TMaster.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/TMaster.java
index e263061..08bef9d 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/TMaster.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/TMaster.java
@@ -70,6 +70,7 @@ import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.Registe
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.RegisterResponseM2B;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.RegisterResponseM2C;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.RegisterResponseM2P;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.ConcurrentHashSet;
import org.apache.inlong.tubemq.corebase.utils.DataConverterUtil;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
@@ -93,7 +94,6 @@ import org.apache.inlong.tubemq.server.common.offsetstorage.ZkOffsetStorage;
import org.apache.inlong.tubemq.server.common.paramcheck.PBParameterUtils;
import org.apache.inlong.tubemq.server.common.paramcheck.ParamCheckResult;
import org.apache.inlong.tubemq.server.common.utils.HasThread;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.RowLock;
import org.apache.inlong.tubemq.server.common.utils.Sleeper;
import org.apache.inlong.tubemq.server.master.balance.DefaultLoadBalancer;
@@ -595,7 +595,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
logger.warn(strBuffer.toString());
}
builder.setErrCode(result.getErrCode());
- builder.setErrMsg(result.getErrInfo());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
// need removed for authorize center end
@@ -978,7 +978,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
request.getBrokerTopicSetConfInfoList(), request.getBrokerOnline(),
overtls, strBuffer, result)) {
builder.setErrCode(result.getErrCode());
- builder.setErrMsg(result.getErrInfo());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
// print broker register log
@@ -1087,7 +1087,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
request.getWriteStatusRpt(), request.getBrokerOnline(),
strBuffer, result)) {
builder.setErrCode(result.getErrCode());
- builder.setErrMsg(result.getErrInfo());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
if (request.getTakeConfInfo()) {
@@ -1176,7 +1176,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
checkNodeStatus(String.valueOf(brokerId), strBuffer);
if (!brokerRunManager.brokerClose2M(brokerId, strBuffer, result)) {
builder.setErrCode(result.getErrCode());
- builder.setErrMsg(result.getErrInfo());
+ builder.setErrMsg(result.getErrMsg());
return builder.build();
}
builder.setSuccess(true);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
index 719c916..b68cd99 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataManager.java
@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.TErrCodeConstants;
import org.apache.inlong.tubemq.corebase.TokenConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.KeyBuilderUtils;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
@@ -42,7 +43,6 @@ import org.apache.inlong.tubemq.server.common.fileconfig.MasterReplicationConfig
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStsChgType;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.MasterConfig;
import org.apache.inlong.tubemq.server.master.TMaster;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
index 9147cd5..f38e35f 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/BdbMetaStoreServiceImpl.java
@@ -54,10 +54,10 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.TokenConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.fileconfig.MasterReplicationConfig;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.MasterGroupStatus;
import org.apache.inlong.tubemq.server.master.bdbstore.MasterNodeInfo;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
@@ -232,7 +232,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[addClusterConfig], ")
.append("failure to add cluster setting record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -260,7 +260,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[updClusterConfig], ")
.append("failure to update record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -290,7 +290,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delClusterConfig], ")
.append("failure to delete cluster setting record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -315,7 +315,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[addBrokerConf], ")
.append("failure to add broker configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -344,7 +344,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[updBrokerConf], ")
.append("failure to update broker configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -368,7 +368,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delBrokerConf], ")
.append("failure to delete broker configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -415,7 +415,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[addTopicConf], ")
.append("failure to add topic configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -444,7 +444,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[updTopicConf], ")
.append("failure to update topic configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -472,7 +472,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delTopicConf], ")
.append("failure to delete topic configure record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -497,7 +497,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delTopicConfByBrokerId], ")
.append("failure to delete topic deploy record : ")
- .append(brokerId).append(result.getErrInfo());
+ .append(brokerId).append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -585,7 +585,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
sBuffer.append("[addTopicCtrlConf], ")
.append("failure to add topic control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(sBuffer.toString());
}
sBuffer.delete(0, sBuffer.length());
@@ -613,7 +613,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
sBuffer.append("[updTopicCtrlConf], ")
.append("failure to update topic control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(sBuffer.toString());
}
sBuffer.delete(0, sBuffer.length());
@@ -640,7 +640,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
sBuffer.append("[delTopicCtrlConf], ")
.append("failure to delete topic control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(sBuffer.toString());
}
sBuffer.delete(0, sBuffer.length());
@@ -681,7 +681,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[addGroupResCtrlConf], ")
.append("failure to add group resource control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -710,7 +710,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[updGroupResCtrlConf], ")
.append("failure to update group resource control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -738,7 +738,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delGroupResCtrlConf], ")
.append("failure to delete group resource control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -773,7 +773,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[addGroupConsumeCtrlConf], ")
.append("failure to add group consume control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -801,7 +801,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[updGroupConsumeCtrlConf], ")
.append("failure to update group consume control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
@@ -831,7 +831,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
sBuffer.append("[delGroupConsumeCtrlConf], ")
.append("failure to delete group consume control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(sBuffer.toString());
}
sBuffer.delete(0, sBuffer.length());
@@ -859,7 +859,7 @@ public class BdbMetaStoreServiceImpl implements MetaStoreService {
} else {
strBuffer.append("[delGroupConsumeCtrlConf], ")
.append("failure to delete group consume control record : ")
- .append(result.getErrInfo());
+ .append(result.getErrMsg());
logger.warn(strBuffer.toString());
}
strBuffer.delete(0, strBuffer.length());
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/MetaStoreService.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/MetaStoreService.java
index b62f0f1..82d5eb2 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/MetaStoreService.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/MetaStoreService.java
@@ -20,9 +20,8 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.Server;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.keepalive.AliveObserver;
import org.apache.inlong.tubemq.server.master.metamanage.keepalive.KeepAlive;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BrokerConfEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/BrokerConfigMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/BrokerConfigMapper.java
index 3eb480e..8e7c513 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/BrokerConfigMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/BrokerConfigMapper.java
@@ -19,8 +19,7 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
import java.util.Map;
import java.util.Set;
-
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BrokerConfEntity;
public interface BrokerConfigMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/ClusterConfigMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/ClusterConfigMapper.java
index 16abf38..b647944 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/ClusterConfigMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/ClusterConfigMapper.java
@@ -17,7 +17,7 @@
package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.ClusterSettingEntity;
public interface ClusterConfigMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupConsumeCtrlMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupConsumeCtrlMapper.java
index ea56960..f015421 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupConsumeCtrlMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupConsumeCtrlMapper.java
@@ -20,7 +20,7 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.GroupConsumeCtrlEntity;
public interface GroupConsumeCtrlMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupResCtrlMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupResCtrlMapper.java
index e0a6de7..e72b3d2 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupResCtrlMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/GroupResCtrlMapper.java
@@ -19,8 +19,7 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
import java.util.Map;
import java.util.Set;
-
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.GroupResCtrlEntity;
public interface GroupResCtrlMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicCtrlMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicCtrlMapper.java
index 728ab51..82a5c6f 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicCtrlMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicCtrlMapper.java
@@ -20,8 +20,7 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.TopicCtrlEntity;
public interface TopicCtrlMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicDeployMapper.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicDeployMapper.java
index 69c1917..cc1d510 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicDeployMapper.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/TopicDeployMapper.java
@@ -20,8 +20,7 @@ package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.mapper;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.TopicDeployEntity;
public interface TopicDeployMapper extends AbstractMapper {
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbBrokerConfigMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbBrokerConfigMapperImpl.java
index 0e516ef..571aaa3 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbBrokerConfigMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbBrokerConfigMapperImpl.java
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.ConcurrentHashSet;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbBrokerConfEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BrokerConfEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbClusterConfigMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbClusterConfigMapperImpl.java
index f0fb961..84b72c8 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbClusterConfigMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbClusterConfigMapperImpl.java
@@ -25,8 +25,8 @@ import com.sleepycat.persist.StoreConfig;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbClusterSettingEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.TStoreConstants;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupConsumeCtrlMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupConsumeCtrlMapperImpl.java
index cbc153f..8c2410c 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupConsumeCtrlMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupConsumeCtrlMapperImpl.java
@@ -31,10 +31,10 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.ConcurrentHashSet;
import org.apache.inlong.tubemq.corebase.utils.KeyBuilderUtils;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbGroupFilterCondEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.GroupConsumeCtrlEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupResCtrlMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupResCtrlMapperImpl.java
index 08602eb..e59b67e 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupResCtrlMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbGroupResCtrlMapperImpl.java
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbGroupFlowCtrlEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.GroupResCtrlEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicCtrlMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicCtrlMapperImpl.java
index d14761e..47c8394 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicCtrlMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicCtrlMapperImpl.java
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbTopicAuthControlEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.TopicCtrlEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicDeployMapperImpl.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicDeployMapperImpl.java
index b61f80a..c65d7d9 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicDeployMapperImpl.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/bdbimpl/BdbTopicDeployMapperImpl.java
@@ -31,10 +31,10 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.ConcurrentHashSet;
import org.apache.inlong.tubemq.corebase.utils.KeyBuilderUtils;
import org.apache.inlong.tubemq.server.common.exception.LoadMetaException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbTopicConfEntity;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.TopicDeployEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerAbnHolder.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerAbnHolder.java
index 7843d8a..666f840 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerAbnHolder.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerAbnHolder.java
@@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.MetaDataManager;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BrokerConfEntity;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunManager.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunManager.java
index 5be31bc..79c4686 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunManager.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/BrokerRunManager.java
@@ -26,10 +26,10 @@ import org.apache.inlong.tubemq.corebase.cluster.Partition;
import org.apache.inlong.tubemq.corebase.cluster.TopicInfo;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.HeartResponseM2B;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.RegisterResponseM2B;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.corebase.utils.Tuple3;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BrokerConfEntity;
/*
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/DefBrokerRunManager.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/DefBrokerRunManager.java
index 6caf91d..5775029 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/DefBrokerRunManager.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/nodemanage/nodebroker/DefBrokerRunManager.java
@@ -31,6 +31,7 @@ import org.apache.inlong.tubemq.corebase.cluster.Partition;
import org.apache.inlong.tubemq.corebase.cluster.TopicInfo;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.HeartResponseM2B;
import org.apache.inlong.tubemq.corebase.protobuf.generated.ClientMaster.RegisterResponseM2B;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.corebase.utils.Tuple3;
import org.apache.inlong.tubemq.corebase.utils.Tuple4;
@@ -38,7 +39,6 @@ import org.apache.inlong.tubemq.server.common.heartbeat.HeartbeatManager;
import org.apache.inlong.tubemq.server.common.heartbeat.TimeoutInfo;
import org.apache.inlong.tubemq.server.common.heartbeat.TimeoutListener;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.SerialIdUtils;
import org.apache.inlong.tubemq.server.master.MasterConfig;
import org.apache.inlong.tubemq.server.master.TMaster;
@@ -285,7 +285,7 @@ public class DefBrokerRunManager implements BrokerRunManager, AliveObserver {
removedTopics, sBuffer, result);
logger.info(sBuffer.append("[Broker Report] receive broker removed topics = ")
.append(removedTopics.toString()).append(", removed result is ")
- .append(result.getErrInfo()).toString());
+ .append(result.getErrMsg()).toString());
sBuffer.delete(0, sBuffer.length());
}
brokerAbnHolder.updateBrokerReportStatus(brokerId, rptReadStatus, rptWriteStatus);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/WebServer.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/WebServer.java
index 63b9d3f..9ac8bac 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/WebServer.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/WebServer.java
@@ -19,7 +19,6 @@ package org.apache.inlong.tubemq.server.master.web;
import static javax.servlet.DispatcherType.ASYNC;
import static javax.servlet.DispatcherType.REQUEST;
-
import java.util.EnumSet;
import org.apache.inlong.tubemq.server.Server;
import org.apache.inlong.tubemq.server.master.MasterConfig;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/Webapi.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/Webapi.java
index 719d996..57e8788 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/Webapi.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/Webapi.java
@@ -18,12 +18,11 @@
package org.apache.inlong.tubemq.server.master.web.action.screen;
import static org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper.getWebApiRegInfo;
-
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corerpc.exception.StandbyException;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.common.webbase.WebMethodMapper;
import org.apache.inlong.tubemq.server.master.TMaster;
@@ -102,7 +101,7 @@ public class Webapi implements Action {
// valid operation authorize info
if (!WebParameterUtils.validReqAuthorizeInfo(req,
webApiRegInfo.needAuthToken, master, sBuffer, result)) {
- throw new Exception(result.errInfo);
+ throw new Exception(result.getErrMsg());
}
sBuffer = (StringBuilder) webApiRegInfo.method.invoke(
webApiRegInfo.webHandler, req, sBuffer, result);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/BrokerProcessResult.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/BrokerProcessResult.java
index f339087..bbd8626 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/BrokerProcessResult.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/BrokerProcessResult.java
@@ -18,7 +18,7 @@
package org.apache.inlong.tubemq.server.master.web.handler;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
public class BrokerProcessResult extends ProcessResult {
private int brokerId = TBaseConstants.META_VALUE_UNDEFINED;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/GroupProcessResult.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/GroupProcessResult.java
index 7cbad42..c149bb6 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/GroupProcessResult.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/GroupProcessResult.java
@@ -17,7 +17,7 @@
package org.apache.inlong.tubemq.server.master.web.handler;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
public class GroupProcessResult extends ProcessResult {
private String groupName = "";
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/TopicProcessResult.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/TopicProcessResult.java
index 822d27a..36238ae 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/TopicProcessResult.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/TopicProcessResult.java
@@ -18,7 +18,7 @@
package org.apache.inlong.tubemq.server.master.web.handler;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
public class TopicProcessResult extends ProcessResult {
private int brokerId = TBaseConstants.META_VALUE_UNDEFINED;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
index 48ab9f0..4a06c30 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminFlowRuleHandler.java
@@ -25,9 +25,9 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -74,13 +74,13 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
GroupResCtrlEntity qryEntity = new GroupResCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -88,13 +88,13 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
if (!WebParameterUtils.getQryPriorityIdParameter(req,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.QRY_PRIORITY_MIN_VALUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int inQryPriorityId = (int) result.getRetData();
// get flowCtrlEnable's statusId info
if (!WebParameterUtils.getFlowCtrlStatusParamValue(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean flowCtrlEnable = (Boolean) result.getRetData();
@@ -160,14 +160,14 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -195,14 +195,14 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -210,22 +210,22 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
if (!WebParameterUtils.getQryPriorityIdParameter(req,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.QRY_PRIORITY_MIN_VALUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int qryPriorityId = (int) result.getRetData();
// get flowCtrlEnable's statusId info
if (!WebParameterUtils.getFlowCtrlStatusParamValue(req,
false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean flowCtrlEnable = (Boolean) result.getRetData();
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null), sBuffer, result);
- if (!result.success) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ if (!result.isSuccess()) {
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String flowCtrlInfo = (String) result.getRetData();
@@ -249,7 +249,7 @@ public class WebAdminFlowRuleHandler extends AbstractWebHandler {
sBuffer.append("{\"groupName\":\"").append(entry.getGroupName()).append("\"")
.append(",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
index a83ee19..7d628cd 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -109,20 +109,20 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
GroupConsumeCtrlEntity entity = new GroupConsumeCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, entity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -165,20 +165,20 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
GroupConsumeCtrlEntity qryEntity = new GroupConsumeCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -226,32 +226,32 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
GroupConsumeCtrlEntity qryEntity = new GroupConsumeCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get condStatus field
if (!getCondStatusParamValue(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean filterEnable = (Boolean) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondSet(req, false, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> filterCondSet = (Set<String>) result.getRetData();
@@ -310,13 +310,13 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
GroupResCtrlEntity entity = new GroupResCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, entity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -324,7 +324,7 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.OLDALWDBCRATE, false,
TBaseConstants.META_VALUE_UNDEFINED, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int allowedBClientRate = (int) result.getRetData();
@@ -371,21 +371,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getAndValidTopicNameInfo(req,
metaDataManager, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -413,13 +413,13 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
if (!getGroupCsmJsonSetInfo(req, opEntity, Boolean.FALSE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupConsumeCtrlEntity> addRecordMap =
@@ -445,21 +445,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -488,21 +488,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getAndValidTopicNameInfo(req,
metaDataManager, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -530,13 +530,13 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
if (!getGroupCsmJsonSetInfo(req, opEntity, Boolean.TRUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupConsumeCtrlEntity> addRecordMap =
@@ -562,21 +562,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -655,21 +655,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -697,28 +697,28 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group configure info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.GROUPNAME, true, "", sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String groupName = (String) result.getRetData();
// get reJoinWait info
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.REJOINWAIT, false, 0, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int reJoinWait = (int) result.getRetData();
// get consumerId list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSCONSUMERID, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.getErrInfo());
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> consumerIdSet = (Set<String>) result.getRetData();
@@ -796,13 +796,13 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
if (!getGroupCtrlJsonSetInfo(req, opEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupResCtrlEntity> addRecordMap =
@@ -829,14 +829,14 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -862,7 +862,7 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
sBuffer.append("{\"groupName\":\"").append(entry.getGroupName())
.append("\",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
@@ -883,21 +883,21 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// get resCheckStatus info
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.RESCHECKENABLE,
false, (isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean resChkEnable = (Boolean) result.getRetData();
@@ -906,7 +906,7 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
false, (isAddOp ? TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN
: TBaseConstants.META_VALUE_UNDEFINED),
TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int allowedBClientRate = (int) result.getRetData();
@@ -941,33 +941,33 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getAndValidTopicNameInfo(req,
metaDataManager, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get condStatus field
if (!getCondStatusParamValue(req, false, (isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean filterEnable = (Boolean) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(req, false, isAddOp, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String filterCondStr = (String) result.getRetData();
@@ -1004,13 +1004,13 @@ public class WebAdminGroupCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get filterCondJsonSet info
if (!getFilterJsonSetInfo(req, isAddOp, opEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupConsumeCtrlEntity> addRecordMap =
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
index 8591767..728bbdd 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -67,13 +67,13 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
TopicCtrlEntity qryEntity = new TopicCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -150,21 +150,21 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// get authCtrlStatus info
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.ISENABLE,
false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean enableTopicAuth = (Boolean) result.getRetData();
@@ -190,13 +190,13 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicJsonSet record map
if (!getTopicCtrlJsonSetInfo(req, opEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, TopicCtrlEntity> addRecordMap =
@@ -221,14 +221,14 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -247,7 +247,7 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
StringBuilder sBuffer, ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.TOPICJSONSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> deployJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -264,7 +264,7 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
// get topicName configure info
if (!WebParameterUtils.getStringParamValue(confMap,
WebFieldDef.TOPICNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
String topicName = (String) result.getRetData();
// get authCtrlStatus info
@@ -306,7 +306,7 @@ public class WebAdminTopicAuthHandler extends AbstractWebHandler {
sBuffer.append("{\"topicName\":\"").append(entry.getTopicName()).append("\"")
.append(",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
index 79cf88c..daa9376 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebBrokerConfHandler.java
@@ -26,6 +26,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.cluster.BrokerInfo;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.AddressUtils;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
@@ -34,7 +35,6 @@ import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
import org.apache.inlong.tubemq.server.common.statusdef.StepStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
@@ -119,41 +119,41 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
BrokerConfEntity qryEntity = new BrokerConfEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
// get brokerIp info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPBROKERIP, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> brokerIpSet = (Set<String>) result.getRetData();
// get brokerPort field
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int brokerPort = (int) result.getRetData();
// get brokerTlsPort field
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERTLSPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int brokerTlsPort = (int) result.getRetData();
// get brokerWebPort field
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERWEBPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int brokerWebPort = (int) result.getRetData();
@@ -161,7 +161,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.REGIONID,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.BROKER_REGION_ID_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int regionId = (int) result.getRetData();
@@ -169,48 +169,48 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.GROUPID,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.BROKER_GROUP_ID_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int groupId = (int) result.getRetData();
// get and valid TopicPropGroup info
if (!WebParameterUtils.getTopicPropInfo(req,
null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final TopicPropGroup brokerProps = (TopicPropGroup) result.getRetData();
// get and valid TopicStatusId info
if (!WebParameterUtils.getTopicStatusParamValue(req,
false, TopicStatus.STATUS_TOPIC_UNDEFINED, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
TopicStatus topicStatus = (TopicStatus) result.getRetData();
// get and valid broker manage status info
if (!getManageStatusParamValue(req, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final ManageStatus mngStatus = (ManageStatus) result.getRetData();
// get topic info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// get isInclude info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ISINCLUDE, false, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean isInclude = (Boolean) result.getRetData();
// get withTopic info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.WITHTOPIC, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean withTopic = (Boolean) result.getRetData();
@@ -321,21 +321,21 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get isReservedData info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ISRESERVEDDATA, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean isReservedData = (Boolean) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
@@ -358,14 +358,14 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
@@ -388,14 +388,14 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
@@ -420,20 +420,20 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
// get and valid broker read or write status info
if (!getAcceptReadAndWriteParamValue(req, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Tuple2<Boolean, Boolean> rdWtTpl =
@@ -458,14 +458,14 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
@@ -488,21 +488,21 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
// check and get relReason field
if (!WebParameterUtils.getStringParamValue(req, WebFieldDef.RELREASON,
false, "Web API call", sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String relReason = (String) result.getRetData();
@@ -526,48 +526,48 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
BrokerConfEntity qryEntity = new BrokerConfEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
// get brokerIp info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPBROKERIP, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> brokerIpSet = (Set<String>) result.getRetData();
// get withDetail info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.WITHDETAIL, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
boolean withDetail = (Boolean) result.getRetData();
// get onlyAbnormal info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ONLYABNORMAL, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
boolean onlyAbnormal = (Boolean) result.getRetData();
// get onlyAutoForbidden info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ONLYAUTOFBD, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
boolean onlyAutoForbidden = (Boolean) result.getRetData();
// get onlyEnableTLS info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.ONLYENABLETLS, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
boolean onlyEnableTLS = (Boolean) result.getRetData();
@@ -680,7 +680,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
@@ -691,7 +691,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERPORT,
false, (isAddOp ? defClusterSetting.getBrokerPort()
: TBaseConstants.META_VALUE_UNDEFINED), 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int brokerPort = (int) result.getRetData();
@@ -699,7 +699,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERTLSPORT,
false, (isAddOp ? defClusterSetting.getBrokerTLSPort()
: TBaseConstants.META_VALUE_UNDEFINED), 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int brokerTlsPort = (int) result.getRetData();
@@ -707,7 +707,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERWEBPORT,
false, (isAddOp ? defClusterSetting.getBrokerWebPort()
: TBaseConstants.META_VALUE_UNDEFINED), 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int brokerWebPort = (int) result.getRetData();
@@ -716,7 +716,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
false, (isAddOp ? TServerConstants.BROKER_REGION_ID_DEF
: TBaseConstants.META_VALUE_UNDEFINED),
TServerConstants.BROKER_REGION_ID_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int regionId = (int) result.getRetData();
@@ -725,14 +725,14 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
false, (isAddOp ? TServerConstants.BROKER_GROUP_ID_DEF
: TBaseConstants.META_VALUE_UNDEFINED),
TServerConstants.BROKER_GROUP_ID_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int groupId = (int) result.getRetData();
// get and valid TopicPropGroup info
if (!WebParameterUtils.getTopicPropInfo(req,
(isAddOp ? defClusterSetting.getClsDefTopicProps() : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
TopicPropGroup brokerProps = (TopicPropGroup) result.getRetData();
@@ -741,7 +741,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
if (isAddOp) {
// get brokerIp and brokerId field
if (!getBrokerIpAndIdParamValue(req, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Tuple2<Integer, String> brokerIdAndIpTuple =
@@ -753,14 +753,14 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
} else {
// get and valid broker manage status info
if (!getManageStatusParamValue(req, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
ManageStatus mngStatus = (ManageStatus) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIdSet = (Set<Integer>) result.getRetData();
@@ -785,13 +785,13 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity defOpEntity = (BaseEntity) result.getRetData();
// check and get brokerJsonSet info
if (!getBrokerJsonSetInfo(req, isAddOp, defOpEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<Integer, BrokerConfEntity> addedRecordMap =
@@ -888,7 +888,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.BROKERJSONSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> brokerJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -1005,7 +1005,7 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
.append(",\"brokerIp\":\"").append(entry.getBrokerIp())
.append("\",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
@@ -1017,13 +1017,13 @@ public class WebBrokerConfHandler extends AbstractWebHandler {
// get brokerIp
if (!WebParameterUtils.getStringParamValue(paramCntr,
WebFieldDef.BROKERIP, true, null, sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
String brokerIp = (String) result.getRetData();
// get brokerId
if (!WebParameterUtils.getIntParamValue(paramCntr,
WebFieldDef.BROKERID, false, 0, 0, sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
int brokerId = (int) result.getRetData();
// valid brokerIp and brokerId
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupConsumeCtrlHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupConsumeCtrlHandler.java
index 32c4c74..3de7d13 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupConsumeCtrlHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupConsumeCtrlHandler.java
@@ -23,9 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -70,40 +69,40 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
GroupConsumeCtrlEntity qryEntity = new GroupConsumeCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// get consumeEnable info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.CONSUMEENABLE, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean consumeEnable = (Boolean) result.getRetData();
// get filterEnable info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.FILTERENABLE, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean filterEnable = (Boolean) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondSet(req, false, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> filterCondSet = (Set<String>) result.getRetData();
@@ -203,21 +202,21 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get groupName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -235,21 +234,21 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opInfoEntity = (BaseEntity) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getAndValidTopicNameInfo(req,
metaDataManager, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// get groupName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
@@ -257,7 +256,7 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.CONSUMEENABLE, false,
(isAddOp ? true : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean consumeEnable = (Boolean) result.getRetData();
@@ -265,7 +264,7 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.DSBCSMREASON, false,
(isAddOp ? "" : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String disableRsn = (String) result.getRetData();
@@ -273,13 +272,13 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.FILTERENABLE, false,
(isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean filterEnable = (Boolean) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(req, false, isAddOp, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String filterCondStr = (String) result.getRetData();
@@ -301,13 +300,13 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity defOpEntity = (BaseEntity) result.getRetData();
// check and get groupCsmJsonSet data
if (!getGroupConsumeJsonSetInfo(req, isAddOp, defOpEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupConsumeCtrlEntity> batchAddInfoMap =
@@ -335,7 +334,7 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
.append(",\"topicName\":\"").append(result.getTopicName()).append("\"")
.append(",\"success\":").append(result.isSuccess())
.append(",\"errCode\":").append(result.getErrCode())
- .append(",\"errInfo\":\"").append(result.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(result.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
@@ -347,7 +346,7 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
// get groupCsmJsonSet field info
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.GROUPCSMJSONSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> filterJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -359,12 +358,12 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
for (Map<String, String> itemsMap : filterJsonArray) {
if (!WebParameterUtils.getStringParamValue(itemsMap,
WebFieldDef.GROUPNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
final String groupName = (String) result.getRetData();
if (!WebParameterUtils.getStringParamValue(itemsMap,
WebFieldDef.TOPICNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
String topicName = (String) result.getRetData();
if (!configuredTopicSet.contains(topicName)) {
@@ -373,7 +372,7 @@ public class WebGroupConsumeCtrlHandler extends AbstractWebHandler {
.append(" ").append(topicName)
.append(" is not configure, please configure first!").toString());
sBuffer.delete(0, sBuffer.length());
- return result.success;
+ return result.isSuccess();
}
// get consumeEnable info
if (!WebParameterUtils.getBooleanParamValue(itemsMap,
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupResCtrlHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupResCtrlHandler.java
index 5705d79..6fea768 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupResCtrlHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebGroupResCtrlHandler.java
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -72,20 +72,20 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
GroupResCtrlEntity qryEntity = new GroupResCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> inGroupSet = (Set<String>) result.getRetData();
// get resCheckStatus info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.RESCHECKENABLE, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean resCheckEnable = (Boolean) result.getRetData();
@@ -93,14 +93,14 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
if (!WebParameterUtils.getQryPriorityIdParameter(req,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.QRY_PRIORITY_MIN_VALUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int inQryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.FLOWCTRLENABLE, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean flowCtrlEnable = (Boolean) result.getRetData();
@@ -194,14 +194,14 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> batchGroupNames = (Set<String>) result.getRetData();
@@ -218,21 +218,21 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> batchGroupNames = (Set<String>) result.getRetData();
// get resCheckStatus info
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.RESCHECKENABLE,
false, (isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean resCheckEnable = (Boolean) result.getRetData();
@@ -241,7 +241,7 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
false, (isAddOp ? TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN
: TBaseConstants.META_VALUE_UNDEFINED),
TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int allowedBClientRate = (int) result.getRetData();
@@ -253,22 +253,22 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
false, (isAddOp ? defClusterSetting.getQryPriorityId()
: TBaseConstants.META_VALUE_UNDEFINED),
TServerConstants.QRY_PRIORITY_MIN_VALUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int qryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.FLOWCTRLENABLE,
false, (isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean flowCtrlEnable = (Boolean) result.getRetData();
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null), sBuffer, result);
- if (!result.success) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ if (!result.isSuccess()) {
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String flowCtrlInfo = (String) result.getRetData();
@@ -288,13 +288,13 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity defOpEntity = (BaseEntity) result.getRetData();
// get group resource control json record
if (!getGroupResCtrlJsonSetInfo(req, isAddOp, defOpEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, GroupResCtrlEntity> addRecordMap =
@@ -313,7 +313,7 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.GROUPRESCTRLSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> ctrlJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -334,7 +334,7 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
// get group configure info
if (!WebParameterUtils.getStringParamValue(itemValueMap,
WebFieldDef.GROUPNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
final String groupName = (String) result.getRetData();
// get resCheckStatus info
@@ -405,7 +405,7 @@ public class WebGroupResCtrlHandler extends AbstractWebHandler {
sBuffer.append("{\"groupName\":\"").append(entry.getGroupName()).append("\"")
.append(",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebMasterInfoHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebMasterInfoHandler.java
index 62d6343..1bcbae1 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebMasterInfoHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebMasterInfoHandler.java
@@ -23,10 +23,10 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.cluster.TopicInfo;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -246,14 +246,14 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -341,7 +341,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
@@ -351,7 +351,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
TBaseConstants.META_VALUE_UNDEFINED, TBaseConstants.META_VALUE_UNDEFINED,
TBaseConstants.META_VALUE_UNDEFINED, Boolean.FALSE, 0,
TServerConstants.BLANK_FLOWCTRL_RULES, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
return buildRetInfo(sBuffer, false);
@@ -374,7 +374,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
boolean isNewVer) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final BaseEntity opEntity = (BaseEntity) result.getRetData();
@@ -384,28 +384,28 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
TBaseConstants.META_VALUE_UNDEFINED,
TBaseConstants.META_MIN_ALLOWED_MESSAGE_SIZE_MB,
TBaseConstants.META_MAX_ALLOWED_MESSAGE_SIZE_MB, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int maxMsgSizeMB = (int) result.getRetData();
// get broker port info
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int inBrokerPort = (int) result.getRetData();
// get broker tls port info
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERTLSPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int inBrokerTlsPort = (int) result.getRetData();
// get broker web port info
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERWEBPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int inBrokerWebPort = (int) result.getRetData();
@@ -416,7 +416,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
defProps.fillDefaultValue();
}
if (!WebParameterUtils.getTopicPropInfo(req, defProps, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final TopicPropGroup inTopicProps = (TopicPropGroup) result.getRetData();
@@ -424,7 +424,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
if (!WebParameterUtils.getQryPriorityIdParameter(req,
false, TBaseConstants.META_VALUE_UNDEFINED,
TServerConstants.QRY_PRIORITY_MIN_VALUE, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
int inQryPriorityId = (int) result.getRetData();
@@ -432,13 +432,13 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
if (isNewVer) {
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.FLOWCTRLENABLE, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
} else {
if (!WebParameterUtils.getFlowCtrlStatusParamValue(req,
false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
}
@@ -446,8 +446,8 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null), sBuffer, result);
- if (!result.success) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ if (!result.isSuccess()) {
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
String flowCtrlInfo = (String) result.getRetData();
@@ -455,7 +455,7 @@ public class WebMasterInfoHandler extends AbstractWebHandler {
if (!metaDataManager.addOrUpdClusterDefSetting(opEntity, inBrokerPort,
inBrokerTlsPort, inBrokerWebPort, maxMsgSizeMB, inQryPriorityId,
flowCtrlEnable, flowRuleCnt, flowCtrlInfo, inTopicProps, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
return buildRetInfo(sBuffer, isNewVer);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java
index 8ce72de..bf7a3cb 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java
@@ -29,9 +29,9 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.cluster.ConsumerInfo;
import org.apache.inlong.tubemq.corebase.cluster.Partition;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.nodemanage.nodebroker.TopicPSInfoManager;
@@ -73,21 +73,21 @@ public class WebOtherInfoHandler extends AbstractWebHandler {
// get group list
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSGROUPNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> inGroupNameSet = (Set<String>) result.getRetData();
if (inGroupNameSet.isEmpty()) {
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSCONSUMEGROUP, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
inGroupNameSet = (Set<String>) result.getRetData();
}
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -137,7 +137,7 @@ public class WebOtherInfoHandler extends AbstractWebHandler {
WebFieldDef.GROUPNAME, true, null, sBuffer, result)) {
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.CONSUMEGROUP, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
}
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
index 6c60f88..2fb76d9 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicCtrlHandler.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
@@ -76,13 +76,13 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
TopicCtrlEntity qryEntity = new TopicCtrlEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -175,14 +175,14 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -202,14 +202,14 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
@@ -218,7 +218,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
if (topicNameSet.size() == 1) {
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.TOPICNAMEID,
false, TBaseConstants.META_VALUE_UNDEFINED, 0, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
topicNameId = (int) result.getRetData();
@@ -226,7 +226,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
// get authCtrlStatus info
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.AUTHCTRLENABLE,
false, (isAddOp ? false : null), sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean enableTopicAuth = (Boolean) result.getRetData();
@@ -240,7 +240,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
(isAddOp ? maxMsgSizeMB : TBaseConstants.META_VALUE_UNDEFINED),
TBaseConstants.META_MIN_ALLOWED_MESSAGE_SIZE_MB,
maxMsgSizeMB, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
maxMsgSizeMB = (int) result.getRetData();
@@ -259,13 +259,13 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity defOpEntity = (BaseEntity) result.getRetData();
// check and get add record map
if (!getTopicCtrlJsonSetInfo(req, isAddOp, defOpEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, TopicCtrlEntity> addRecordMap =
@@ -283,7 +283,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.TOPICCTRLSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> ctrlJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -304,7 +304,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
// get topicName configure info
if (!WebParameterUtils.getStringParamValue(itemConfMap,
WebFieldDef.TOPICNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
final String topicName = (String) result.getRetData();
// check max message size
@@ -360,7 +360,7 @@ public class WebTopicCtrlHandler extends AbstractWebHandler {
sBuffer.append("{\"topicName\":\"").append(entry.getTopicName()).append("\"")
.append(",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicDeployHandler.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicDeployHandler.java
index b5354ce..52ddf50 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicDeployHandler.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebTopicDeployHandler.java
@@ -26,12 +26,12 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.cluster.TopicInfo;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.Tuple2;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStsChgType;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.apache.inlong.tubemq.server.master.metamanage.DataOpErrCode;
@@ -246,14 +246,14 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIdSet = (Set<Integer>) result.getRetData();
@@ -345,7 +345,7 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIds = (Set<Integer>) result.getRetData();
@@ -386,13 +386,13 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.WITHIP, false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
boolean withIp = (Boolean) result.getRetData();
@@ -445,47 +445,47 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
TopicDeployEntity qryEntity = new TopicDeployEntity();
// get queried operation info, for createUser, modifyUser, dataVersionId
if (!WebParameterUtils.getQueriedOperateInfo(req, qryEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
// check and get topicName field
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get brokerId field
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<Integer> brokerIdSet = (Set<Integer>) result.getRetData();
// get brokerPort field
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.BROKERPORT,
false, TBaseConstants.META_VALUE_UNDEFINED, 1, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final int brokerPort = (int) result.getRetData();
// get and valid topicProps info
if (!WebParameterUtils.getTopicPropInfo(req, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
TopicPropGroup topicProps = (TopicPropGroup) result.getRetData();
// get withGroupAuthInfo field
if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.WITHGROUPAUTHINFO,
false, false, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Boolean withGroupAuthInfo = (Boolean) result.getRetData();
// get and valid TopicStatusId info
if (!WebParameterUtils.getTopicStatusParamValue(req,
false, TopicStatus.STATUS_TOPIC_UNDEFINED, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
TopicStatus topicStatus = (TopicStatus) result.getRetData();
@@ -757,27 +757,27 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get brokerId info
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
final Set<Integer> brokerIdSet = (Set<Integer>) result.getRetData();
// get and valid TopicPropGroup info
if (!WebParameterUtils.getTopicPropInfo(req, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
TopicPropGroup topicPropInfo = (TopicPropGroup) result.getRetData();
@@ -804,13 +804,13 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
boolean isAddOp) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, isAddOp, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity defOpEntity = (BaseEntity) result.getRetData();
// check and get add record map
if (!getTopicDeployJsonSetInfo(req, isAddOp, defOpEntity, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Map<String, TopicDeployEntity> addRecordMap =
@@ -828,7 +828,7 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.TOPICJSONSET, true, null, result)) {
- return result.success;
+ return result.isSuccess();
}
List<Map<String, String>> deployJsonArray =
(List<Map<String, String>>) result.getRetData();
@@ -845,7 +845,7 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
// get topicName configure info
if (!WebParameterUtils.getStringParamValue(confMap,
WebFieldDef.TOPICNAME, true, "", sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
String topicName = (String) result.getRetData();
// get broker configure info
@@ -897,7 +897,7 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
// get brokerId
if (!WebParameterUtils.getIntParamValue(keyValueMap,
WebFieldDef.BROKERID, true, 0, 0, sBuffer, result)) {
- return result.success;
+ return result.isSuccess();
}
int brokerId = (int) result.getRetData();
BrokerConfEntity curEntity =
@@ -925,7 +925,7 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
.append(",\"topicName\":\"").append(entry.getTopicName()).append("\"")
.append(",\"success\":").append(entry.isSuccess())
.append(",\"errCode\":").append(entry.getErrCode())
- .append(",\"errInfo\":\"").append(entry.getErrInfo()).append("\"}");
+ .append(",\"errInfo\":\"").append(entry.getErrMsg()).append("\"}");
}
WebParameterUtils.buildSuccessWithDataRetEnd(sBuffer, totalCnt);
return sBuffer;
@@ -944,21 +944,21 @@ public class WebTopicDeployHandler extends AbstractWebHandler {
TopicStsChgType chgType) {
// check and get operation info
if (!WebParameterUtils.getAUDBaseInfo(req, false, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get topicName info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.COMPSTOPICNAME, true, null, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get brokerId info
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.COMPSBROKERID, true, sBuffer, result)) {
- WebParameterUtils.buildFailResult(sBuffer, result.errInfo);
+ WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
Set<Integer> brokerIdSet = (Set<Integer>) result.getRetData();
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/BrokerStartup.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/BrokerStartup.java
index e5e012d..942af61 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/BrokerStartup.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/BrokerStartup.java
@@ -17,9 +17,9 @@
package org.apache.inlong.tubemq.server.tools;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.broker.BrokerConfig;
import org.apache.inlong.tubemq.server.broker.TubeBroker;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,10 +32,10 @@ public class BrokerStartup {
// get configure file path
ProcessResult result = new ProcessResult();
if (!CliUtils.getConfigFilePath(args, result)) {
- System.err.println(result.errInfo);
+ System.err.println(result.getErrMsg());
System.exit(1);
}
- String configFilePath = (String) result.retData1;
+ String configFilePath = (String) result.getRetData();
// read configure file
BrokerConfig brokerConfig = new BrokerConfig();
brokerConfig.loadFromFile(configFilePath);
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/CliUtils.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/CliUtils.java
index cecf6c2..9398c8a 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/CliUtils.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/CliUtils.java
@@ -18,14 +18,13 @@
package org.apache.inlong.tubemq.server.tools;
import static org.apache.inlong.tubemq.server.common.fielddef.CliArgDef.FILEPATH;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
public class CliUtils {
@@ -44,20 +43,20 @@ public class CliUtils {
CommandLine cli = parser.parse(options, args);
if (cli == null) {
result.setFailResult("Parse args failure");
- return result.success;
+ return result.isSuccess();
}
if (!cli.hasOption(FILEPATH.longOpt)) {
result.setFailResult(new StringBuilder(512)
.append("Please input the configuration file path by ")
.append("-").append(FILEPATH.opt).append(" or ")
.append("-").append(FILEPATH.longOpt).append(" option").toString());
- return result.success;
+ return result.isSuccess();
}
String configFilePath = cli.getOptionValue(FILEPATH.longOpt);
if (TStringUtils.isBlank(configFilePath)) {
result.setFailResult(new StringBuilder(512)
.append(FILEPATH.longOpt).append(" is required!").toString());
- return result.success;
+ return result.isSuccess();
}
result.setSuccResult(configFilePath);
} catch (Throwable e) {
@@ -65,6 +64,6 @@ public class CliUtils {
.append("Parse configuration file path failure: ")
.append(e.toString()).toString());
}
- return result.success;
+ return result.isSuccess();
}
}
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/MasterStartup.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/MasterStartup.java
index eabe4d4..51be2cf 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/MasterStartup.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/MasterStartup.java
@@ -17,7 +17,7 @@
package org.apache.inlong.tubemq.server.tools;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.master.MasterConfig;
import org.apache.inlong.tubemq.server.master.TMaster;
import org.slf4j.Logger;
@@ -32,10 +32,10 @@ public class MasterStartup {
// get configure file path
ProcessResult result = new ProcessResult();
if (!CliUtils.getConfigFilePath(args, result)) {
- System.err.println(result.errInfo);
+ System.err.println(result.getErrMsg());
System.exit(1);
}
- String configFilePath = (String) result.retData1;
+ String configFilePath = (String) result.getRetData();
// read configure file
final MasterConfig masterConfig = new MasterConfig();
masterConfig.loadFromFile(configFilePath);
diff --git a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/common/WebParameterUtilsTest.java b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/common/WebParameterUtilsTest.java
index ce95a4e..43d43bc 100644
--- a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/common/WebParameterUtilsTest.java
+++ b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/common/WebParameterUtilsTest.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
-import org.apache.inlong.tubemq.server.common.utils.ProcessResult;
import org.apache.inlong.tubemq.server.common.utils.WebParameterUtils;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.BaseEntity;
import org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity.TopicPropGroup;
diff --git a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/MasterConfigTest.java b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/MasterConfigTest.java
index 01949a1..57e321a 100644
--- a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/MasterConfigTest.java
+++ b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/MasterConfigTest.java
@@ -18,7 +18,6 @@
package org.apache.inlong.tubemq.server.master;
import com.sleepycat.je.Durability;
-
import org.apache.inlong.tubemq.server.common.fileconfig.MasterReplicationConfig;
import org.apache.inlong.tubemq.server.common.fileconfig.ZKConfig;
import org.junit.Assert;
diff --git a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicDeployEntityTest.java b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicDeployEntityTest.java
index 7d26c35..4935abd 100644
--- a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicDeployEntityTest.java
+++ b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicDeployEntityTest.java
@@ -18,7 +18,6 @@
package org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity;
import java.util.Date;
-
import org.apache.inlong.tubemq.corebase.utils.KeyBuilderUtils;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
import org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbTopicConfEntity;