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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 3185684c2 [INLONG-6579][TubeMQ] The updated version causes the
consumer group permissions to be abnormal (#6597)
3185684c2 is described below
commit 3185684c2a2da1363c90ca66d6ac97b824be1790
Author: Goson Zhang <[email protected]>
AuthorDate: Tue Nov 22 10:06:22 2022 +0800
[INLONG-6579][TubeMQ] The updated version causes the consumer group
permissions to be abnormal (#6597)
---
.../server/common/utils/WebParameterUtils.java | 36 +++++++++++-
.../bdbentitys/BdbClusterSettingEntity.java | 8 ++-
.../master/metamanage/DefaultMetaDataService.java | 23 ++++----
.../server/master/metamanage/MetaDataService.java | 25 ++++----
.../metastore/dao/entity/ClusterSettingEntity.java | 20 +++----
.../dao/entity/GroupConsumeCtrlEntity.java | 34 +++++------
.../metastore/dao/entity/GroupResCtrlEntity.java | 32 ++++------
.../metastore/dao/entity/TopicCtrlEntity.java | 20 +++----
.../metastore/dao/mapper/MetaConfigMapper.java | 13 +++--
.../metastore/impl/AbsClusterConfigMapperImpl.java | 2 +-
.../metastore/impl/AbsConsumeCtrlMapperImpl.java | 4 +-
.../metastore/impl/AbsGroupResCtrlMapperImpl.java | 4 +-
.../metastore/impl/AbsMetaConfigMapperImpl.java | 12 ++--
.../metastore/impl/AbsTopicCtrlMapperImpl.java | 2 +-
.../web/handler/WebAdminFlowRuleHandler.java | 6 +-
.../web/handler/WebAdminGroupCtrlHandler.java | 68 +++++++++++-----------
.../web/handler/WebAdminTopicAuthHandler.java | 14 ++---
.../web/handler/WebGroupConsumeCtrlHandler.java | 33 ++++++-----
.../master/web/handler/WebGroupResCtrlHandler.java | 33 ++++++-----
.../master/web/handler/WebMasterInfoHandler.java | 7 ++-
.../master/web/handler/WebTopicCtrlHandler.java | 13 +++--
.../tubemq/server/tools/cli/CliMetaDataBRU.java | 23 ++++++--
.../dao/entity/ClusterSettingEntityTest.java | 12 ++--
.../dao/entity/GroupConsumeCtrlEntityTest.java | 8 +--
.../dao/entity/GroupResCtrlEntityTest.java | 12 ++--
.../metastore/dao/entity/TopicCtrlEntityTest.java | 3 +-
26 files changed, 245 insertions(+), 222 deletions(-)
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 005489780..1cf10e4ef 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
@@ -42,6 +42,7 @@ import
org.apache.inlong.tubemq.server.broker.utils.DataStoreUtils;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.TStatusConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
import org.apache.inlong.tubemq.server.master.TMaster;
import
org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbBrokerConfEntity;
@@ -237,6 +238,35 @@ public class WebParameterUtils {
return result.isSuccess();
}
+ /**
+ * Parse the parameter value from an object value to a EnableStatus value
+ *
+ * @param paramCntr parameter container object
+ * @param required a boolean value represent whether the parameter is
must required
+ * @param defValue a default value returned if failed to parse value
from the given object
+ * @param sBuffer string buffer
+ * @param result process result of parameter value
+ * @return the process result
+ */
+ public static <T> boolean getEnableStatusValue(T paramCntr, WebFieldDef
fieldDef,
+ boolean required,
EnableStatus defValue,
+ StringBuilder sBuffer,
+ ProcessResult result) {
+ if (!WebParameterUtils.getBooleanParamValue(paramCntr, fieldDef,
+ required, null, sBuffer, result)) {
+ return result.isSuccess();
+ }
+ Boolean enableValue = (Boolean) result.getRetData();
+ if (enableValue == null) {
+ result.setSuccResult(defValue);
+ } else if (enableValue) {
+ result.setSuccResult(EnableStatus.STATUS_ENABLE);
+ } else {
+ result.setSuccResult(EnableStatus.STATUS_DISABLE);
+ }
+ return result.isSuccess();
+ }
+
/**
* Decode the deletePolicy parameter value from an object value
* the value must like {method},{digital}[s|m|h]
@@ -534,7 +564,7 @@ public class WebParameterUtils {
* @return process result
*/
public static <T> boolean getFlowCtrlStatusParamValue(T paramCntr, boolean
required,
- Boolean defValue,
StringBuilder sBuffer,
+ EnableStatus
defValue, StringBuilder sBuffer,
ProcessResult
result) {
// check and get statusId field
if (!WebParameterUtils.getIntParamValue(paramCntr,
WebFieldDef.STATUSID, required,
@@ -546,9 +576,9 @@ public class WebParameterUtils {
result.setSuccResult(defValue);
} else {
if (paramValue == 1) {
- result.setSuccResult(Boolean.TRUE);
+ result.setSuccResult(EnableStatus.STATUS_ENABLE);
} else {
- result.setSuccResult(Boolean.FALSE);
+ result.setSuccResult(EnableStatus.STATUS_DISABLE);
}
}
return result.isSuccess();
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/bdbstore/bdbentitys/BdbClusterSettingEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/bdbstore/bdbentitys/BdbClusterSettingEntity.java
index c5a31451f..da4d97fd1 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/bdbstore/bdbentitys/BdbClusterSettingEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/bdbstore/bdbentitys/BdbClusterSettingEntity.java
@@ -25,6 +25,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.inlong.tubemq.corebase.TBaseConstants;
import org.apache.inlong.tubemq.corebase.utils.DateTimeConvertUtils;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
import
org.apache.inlong.tubemq.server.master.metamanage.metastore.TStoreConstants;
/*
@@ -327,14 +328,15 @@ public class BdbClusterSettingEntity implements
Serializable {
String.valueOf(enableGloFlowCtrl));
}
- public Boolean getEnableGloFlowCtrl() {
+ public EnableStatus getEnableGloFlowCtrl() {
String atrVal =
TStringUtils.getAttrValFrmAttributes(this.attributes,
TStoreConstants.TOKEN_ENABLE_FLOW_CTRL);
if (atrVal != null) {
- return Boolean.parseBoolean(atrVal);
+ return Boolean.parseBoolean(atrVal)
+ ? EnableStatus.STATUS_ENABLE : EnableStatus.STATUS_DISABLE;
}
- return null;
+ return EnableStatus.STATUS_UNDEFINE;
}
public void setGloFlowCtrlCnt(int flowCtrlCnt) {
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/DefaultMetaDataService.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/DefaultMetaDataService.java
index 40d83c156..735259cb0 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/DefaultMetaDataService.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/DefaultMetaDataService.java
@@ -36,6 +36,7 @@ import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fileconfig.BdbMetaConfig;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
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;
@@ -319,7 +320,7 @@ public class DefaultMetaDataService implements
MetaDataService {
public boolean addOrUpdClusterDefSetting(BaseEntity opEntity, int
brokerPort,
int brokerTlsPort, int
brokerWebPort,
int maxMsgSizeMB, int
qryPriorityId,
- Boolean flowCtrlEnable, int
flowRuleCnt,
+ EnableStatus flowCtrlEnable, int
flowRuleCnt,
String flowCtrlInfo,
TopicPropGroup topicProps,
StringBuilder strBuff,
ProcessResult result) {
// check current status
@@ -854,7 +855,7 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public List<TopicProcessResult> addOrUpdTopicCtrlConf(boolean isAddOp,
BaseEntity opEntity,
Set<String>
topicNameSet, int topicNameId,
- Boolean
enableTopicAuth, int maxMsgSizeInMB,
+ EnableStatus
enableTopicAuth, int maxMsgSizeInMB,
StringBuilder
strBuff, ProcessResult result) {
TopicCtrlEntity entity;
Map<String, TopicCtrlEntity> topicCtrlEntityMap = new HashMap<>();
@@ -906,7 +907,7 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public TopicProcessResult insertTopicCtrlConf(BaseEntity opEntity, String
topicName,
- Boolean enableTopicAuth,
StringBuilder strBuff,
+ EnableStatus
enableTopicAuth, StringBuilder strBuff,
ProcessResult result) {
// check current status
if (!metaConfigMapper.checkStoreStatus(true, result)) {
@@ -971,9 +972,9 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public GroupProcessResult addOrUpdGroupCtrlConf(boolean isAddOp,
BaseEntity opEntity,
- String groupName, Boolean
resCheckEnable,
+ String groupName,
EnableStatus resCheckEnable,
int allowedBClientRate,
int qryPriorityId,
- Boolean flowCtrlEnable,
int flowRuleCnt,
+ EnableStatus
flowCtrlEnable, int flowRuleCnt,
String flowCtrlInfo,
StringBuilder strBuff,
ProcessResult result) {
GroupResCtrlEntity entity =
@@ -998,7 +999,7 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public GroupProcessResult insertGroupCtrlConf(BaseEntity opEntity, String
groupName,
- int qryPriorityId, Boolean
flowCtrlEnable,
+ int qryPriorityId,
EnableStatus flowCtrlEnable,
int flowRuleCnt, String
flowCtrlRuleInfo,
StringBuilder strBuff,
ProcessResult result) {
// check current status
@@ -1012,7 +1013,7 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public GroupProcessResult insertGroupCtrlConf(BaseEntity opEntity, String
groupName,
- Boolean resChkEnable, int
allowedB2CRate,
+ EnableStatus resChkEnable,
int allowedB2CRate,
StringBuilder strBuff,
ProcessResult result) {
// check current status
if (!metaConfigMapper.checkStoreStatus(true, result)) {
@@ -1077,8 +1078,8 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public GroupProcessResult addOrUpdConsumeCtrlInfo(boolean isAddOp,
BaseEntity opEntity,
String groupName, String
topicName,
- Boolean enableCsm,
String disableRsn,
- Boolean enableFlt,
String fltCondStr,
+ EnableStatus enableCsm,
String disableRsn,
+ EnableStatus enableFlt,
String fltCondStr,
StringBuilder strBuff,
ProcessResult result) {
GroupConsumeCtrlEntity entity =
new GroupConsumeCtrlEntity(opEntity, groupName, topicName);
@@ -1100,8 +1101,8 @@ public class DefaultMetaDataService implements
MetaDataService {
@Override
public GroupProcessResult insertConsumeCtrlInfo(BaseEntity opEntity,
String groupName,
- String topicName, Boolean
enableCsm,
- String disReason, Boolean
enableFlt,
+ String topicName,
EnableStatus enableCsm,
+ String disReason,
EnableStatus enableFlt,
String fltCondStr,
StringBuilder strBuff,
ProcessResult result) {
// check current status
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataService.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataService.java
index 8f26f2507..793a4474b 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataService.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/MetaDataService.java
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.inlong.tubemq.corebase.rv.ProcessResult;
import org.apache.inlong.tubemq.server.Server;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
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;
@@ -123,7 +124,7 @@ public interface MetaDataService extends Server {
boolean addOrUpdClusterDefSetting(BaseEntity opEntity, int brokerPort,
int brokerTlsPort, int brokerWebPort,
int maxMsgSizeMB, int qryPriorityId,
- Boolean flowCtrlEnable, int flowRuleCnt,
+ EnableStatus flowCtrlEnable, int
flowRuleCnt,
String flowCtrlInfo, TopicPropGroup
topicProps,
StringBuilder strBuff, ProcessResult
result);
@@ -414,7 +415,7 @@ public interface MetaDataService extends Server {
*/
List<TopicProcessResult> addOrUpdTopicCtrlConf(boolean isAddOp, BaseEntity
opEntity,
Set<String> topicNameSet,
int topicNameId,
- Boolean enableTopicAuth,
int maxMsgSizeInMB,
+ EnableStatus
enableTopicAuth, int maxMsgSizeInMB,
StringBuilder strBuff,
ProcessResult result);
/**
@@ -435,13 +436,13 @@ public interface MetaDataService extends Server {
*
* @param opEntity operator information
* @param topicName topic info
- * @param enableTopicAuth if authenticate check
+ * @param enableTopicAuth authenticate check status
* @param strBuff the print info string buffer
* @param result the process result return
* @return true if success otherwise false
*/
TopicProcessResult insertTopicCtrlConf(BaseEntity opEntity, String
topicName,
- Boolean enableTopicAuth,
StringBuilder strBuff,
+ EnableStatus enableTopicAuth,
StringBuilder strBuff,
ProcessResult result);
/**
@@ -523,9 +524,9 @@ public interface MetaDataService extends Server {
* @return true if success otherwise false
*/
GroupProcessResult addOrUpdGroupCtrlConf(boolean isAddOp, BaseEntity
opEntity,
- String groupName, Boolean
resCheckEnable,
+ String groupName, EnableStatus
resCheckEnable,
int allowedBClientRate, int
qryPriorityId,
- Boolean flowCtrlEnable, int
flowRuleCnt,
+ EnableStatus flowCtrlEnable, int
flowRuleCnt,
String flowCtrlInfo,
StringBuilder strBuff,
ProcessResult result);
@@ -554,7 +555,7 @@ public interface MetaDataService extends Server {
* @return true if success otherwise false
*/
GroupProcessResult insertGroupCtrlConf(BaseEntity opEntity, String
groupName,
- int qryPriorityId, Boolean
flowCtrlEnable,
+ int qryPriorityId, EnableStatus
flowCtrlEnable,
int flowRuleCnt, String
flowCtrlRuleInfo,
StringBuilder strBuff,
ProcessResult result);
@@ -571,7 +572,7 @@ public interface MetaDataService extends Server {
* @return true if success otherwise false
*/
GroupProcessResult insertGroupCtrlConf(BaseEntity opEntity, String
groupName,
- Boolean resChkEnable, int
allowedB2CRate,
+ EnableStatus resChkEnable, int
allowedB2CRate,
StringBuilder strBuff,
ProcessResult result);
/**
@@ -634,8 +635,8 @@ public interface MetaDataService extends Server {
*/
GroupProcessResult addOrUpdConsumeCtrlInfo(boolean isAddOp, BaseEntity
opEntity,
String groupName, String
topicName,
- Boolean enableCsm, String
disableRsn,
- Boolean enableFlt, String
fltCondStr,
+ EnableStatus enableCsm, String
disableRsn,
+ EnableStatus enableFlt, String
fltCondStr,
StringBuilder strBuff,
ProcessResult result);
/**
@@ -665,8 +666,8 @@ public interface MetaDataService extends Server {
* @return process result
*/
GroupProcessResult insertConsumeCtrlInfo(BaseEntity opEntity, String
groupName,
- String topicName, Boolean
enableCsm,
- String disReason, Boolean
enableFlt,
+ String topicName, EnableStatus
enableCsm,
+ String disReason, EnableStatus
enableFlt,
String fltCondStr, StringBuilder
strBuff,
ProcessResult result);
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntity.java
index 332a96380..be063b283 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntity.java
@@ -142,7 +142,7 @@ public class ClusterSettingEntity extends BaseEntity
implements Cloneable {
*/
public boolean updModifyInfo(long dataVerId, int brokerPort, int
brokerTLSPort,
int brokerWebPort, int maxMsgSizeMB,
- int qryPriorityId, Boolean flowCtrlEnable,
+ int qryPriorityId, EnableStatus
flowCtrlEnable,
int flowRuleCnt, String flowCtrlRuleInfo,
TopicPropGroup defTopicProps) {
boolean changed = false;
@@ -186,10 +186,10 @@ public class ClusterSettingEntity extends BaseEntity
implements Cloneable {
}
// check and set flowCtrl info
if (flowCtrlEnable != null
- && (this.gloFlowCtrlStatus == EnableStatus.STATUS_UNDEFINE
- || this.gloFlowCtrlStatus.isEnable() != flowCtrlEnable)) {
+ && flowCtrlEnable != EnableStatus.STATUS_UNDEFINE
+ && this.gloFlowCtrlStatus != flowCtrlEnable) {
+ this.gloFlowCtrlStatus = flowCtrlEnable;
changed = true;
- setEnableFlowCtrl(flowCtrlEnable);
}
if (TStringUtils.isNotBlank(flowCtrlRuleInfo)
&& !flowCtrlRuleInfo.equals(gloFlowCtrlRuleInfo)) {
@@ -416,7 +416,9 @@ public class ClusterSettingEntity extends BaseEntity
implements Cloneable {
}
private void setGloFlowCtrlStatus(EnableStatus gloFlowCtrlStatus) {
- this.gloFlowCtrlStatus = gloFlowCtrlStatus;
+ if (gloFlowCtrlStatus != null) {
+ this.gloFlowCtrlStatus = gloFlowCtrlStatus;
+ }
}
private void setGloFlowCtrlInfo(int flowCtrlCnt, String flowCtrlInfo) {
@@ -424,14 +426,6 @@ public class ClusterSettingEntity extends BaseEntity
implements Cloneable {
this.gloFlowCtrlRuleInfo = flowCtrlInfo;
}
- private void setEnableFlowCtrl(boolean enableFlowCtrl) {
- if (enableFlowCtrl) {
- this.gloFlowCtrlStatus = EnableStatus.STATUS_ENABLE;
- } else {
- this.gloFlowCtrlStatus = EnableStatus.STATUS_DISABLE;
- }
- }
-
private void setClsDefTopicProps(TopicPropGroup clsDefTopicProps) {
this.clsDefTopicProps = clsDefTopicProps;
}
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntity.java
index 5a73c57ec..1758dc586 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntity.java
@@ -123,11 +123,9 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
return consumeEnable.isEnable();
}
- public void setConsumeEnable(boolean enableConsume) {
- if (enableConsume) {
- this.consumeEnable = EnableStatus.STATUS_ENABLE;
- } else {
- this.consumeEnable = EnableStatus.STATUS_DISABLE;
+ public void setConsumeEnable(EnableStatus consumeEnable) {
+ if (consumeEnable != null) {
+ this.consumeEnable = consumeEnable;
}
}
@@ -143,11 +141,9 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
return filterEnable == EnableStatus.STATUS_ENABLE;
}
- private void setFilterEnable(boolean enableFilter) {
- if (enableFilter) {
- this.filterEnable = EnableStatus.STATUS_ENABLE;
- } else {
- this.filterEnable = EnableStatus.STATUS_DISABLE;
+ public void setFilterEnable(EnableStatus filterEnable) {
+ if (filterEnable != null) {
+ this.filterEnable = filterEnable;
}
}
@@ -174,8 +170,8 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
*
* @return whether data is changed
*/
- public boolean updModifyInfo(long dataVerId, Boolean consumeEnable,
- String disableRsn, Boolean filterEnable,
+ public boolean updModifyInfo(long dataVerId, EnableStatus consumeEnable,
+ String disableRsn, EnableStatus filterEnable,
String filterCondStr) {
boolean changed = false;
// check and set brokerPort info
@@ -186,8 +182,8 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
}
// check and set consumeEnable info
if (consumeEnable != null
- && (this.consumeEnable == EnableStatus.STATUS_UNDEFINE
- || this.consumeEnable.isEnable() != consumeEnable)) {
+ && consumeEnable != EnableStatus.STATUS_UNDEFINE
+ && this.consumeEnable != consumeEnable) {
changed = true;
setConsumeEnable(consumeEnable);
}
@@ -197,10 +193,10 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
changed = true;
disableReason = disableRsn;
}
- // check and set consumeEnable info
+ // check and set filterEnable info
if (filterEnable != null
- && (this.filterEnable == EnableStatus.STATUS_UNDEFINE
- || this.filterEnable.isEnable() != filterEnable)) {
+ && filterEnable != EnableStatus.STATUS_UNDEFINE
+ && this.filterEnable != filterEnable) {
changed = true;
setFilterEnable(filterEnable);
}
@@ -332,8 +328,8 @@ public class GroupConsumeCtrlEntity extends BaseEntity
implements Cloneable {
@Override
public GroupConsumeCtrlEntity clone() {
GroupConsumeCtrlEntity copy = (GroupConsumeCtrlEntity) super.clone();
- copy.setConsumeEnable(getConsumeEnable().isEnable());
- copy.setFilterEnable(getFilterEnable().isEnable());
+ copy.setConsumeEnable(getConsumeEnable());
+ copy.setFilterEnable(getFilterEnable());
return copy;
}
}
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntity.java
index ac2bac075..ec77c9bc9 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntity.java
@@ -179,26 +179,14 @@ public class GroupResCtrlEntity extends BaseEntity
implements Cloneable {
}
public void setResCheckStatus(EnableStatus resCheckStatus) {
- this.resCheckStatus = resCheckStatus;
- }
-
- private void setResCheckStatus(boolean enableResChk) {
- if (enableResChk) {
- this.resCheckStatus = EnableStatus.STATUS_ENABLE;
- } else {
- this.resCheckStatus = EnableStatus.STATUS_DISABLE;
+ if (resCheckStatus != null) {
+ this.resCheckStatus = resCheckStatus;
}
}
public void setFlowCtrlStatus(EnableStatus flowCtrlStatus) {
- this.flowCtrlStatus = flowCtrlStatus;
- }
-
- private void setFlowCtrlStatus(boolean enableFlowCtrl) {
- if (enableFlowCtrl) {
- this.flowCtrlStatus = EnableStatus.STATUS_ENABLE;
- } else {
- this.flowCtrlStatus = EnableStatus.STATUS_DISABLE;
+ if (flowCtrlStatus != null) {
+ this.flowCtrlStatus = flowCtrlStatus;
}
}
@@ -221,8 +209,8 @@ public class GroupResCtrlEntity extends BaseEntity
implements Cloneable {
* @return whether changed
*/
public boolean updModifyInfo(long dataVerId,
- Boolean resChkEnable, int allowedB2CRate,
- int qryPriorityId, Boolean flowCtrlEnable,
+ EnableStatus resChkEnable, int allowedB2CRate,
+ int qryPriorityId, EnableStatus
flowCtrlEnable,
int flowRuleCnt, String flowCtrlRuleInfo) {
boolean changed = false;
// check and set dataVerId info
@@ -233,8 +221,8 @@ public class GroupResCtrlEntity extends BaseEntity
implements Cloneable {
}
// check and set resCheckStatus info
if (resChkEnable != null
- && (this.resCheckStatus == EnableStatus.STATUS_UNDEFINE
- || this.resCheckStatus.isEnable() != resChkEnable)) {
+ && resChkEnable != EnableStatus.STATUS_UNDEFINE
+ && this.resCheckStatus != resChkEnable) {
changed = true;
setResCheckStatus(resChkEnable);
}
@@ -252,8 +240,8 @@ public class GroupResCtrlEntity extends BaseEntity
implements Cloneable {
}
// check and set flowCtrl info
if (flowCtrlEnable != null
- && (this.flowCtrlStatus == EnableStatus.STATUS_UNDEFINE
- || this.flowCtrlStatus.isEnable() != flowCtrlEnable)) {
+ && flowCtrlEnable != EnableStatus.STATUS_UNDEFINE
+ && this.flowCtrlStatus != flowCtrlEnable) {
changed = true;
setFlowCtrlStatus(flowCtrlEnable);
}
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntity.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntity.java
index 2ad57a15b..a9aee44c9 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntity.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntity.java
@@ -105,20 +105,14 @@ public class TopicCtrlEntity extends BaseEntity
implements Cloneable {
return authCtrlStatus == EnableStatus.STATUS_ENABLE;
}
- public void setEnableAuthCtrl(boolean enableAuth) {
- if (enableAuth) {
- this.authCtrlStatus = EnableStatus.STATUS_ENABLE;
- } else {
- this.authCtrlStatus = EnableStatus.STATUS_DISABLE;
- }
- }
-
public EnableStatus getAuthCtrlStatus() {
return authCtrlStatus;
}
public void setAuthCtrlStatus(EnableStatus authCtrlStatus) {
- this.authCtrlStatus = authCtrlStatus;
+ if (authCtrlStatus != null) {
+ this.authCtrlStatus = authCtrlStatus;
+ }
}
public int getMaxMsgSizeInB() {
@@ -147,7 +141,7 @@ public class TopicCtrlEntity extends BaseEntity implements
Cloneable {
* @return whether changed
*/
public boolean updModifyInfo(long dataVerId, int topicNameId,
- int newMaxMsgSizeMB, Boolean enableTopicAuth)
{
+ int newMaxMsgSizeMB, EnableStatus
enableTopicAuth) {
boolean changed = false;
// check and set brokerPort info
if (dataVerId != TBaseConstants.META_VALUE_UNDEFINED
@@ -167,9 +161,9 @@ public class TopicCtrlEntity extends BaseEntity implements
Cloneable {
}
// check and set authCtrlStatus info
if (enableTopicAuth != null
- && (this.authCtrlStatus == EnableStatus.STATUS_UNDEFINE
- || this.authCtrlStatus.isEnable() != enableTopicAuth)) {
- setEnableAuthCtrl(enableTopicAuth);
+ && enableTopicAuth != EnableStatus.STATUS_UNDEFINE
+ && this.authCtrlStatus != enableTopicAuth) {
+ setAuthCtrlStatus(enableTopicAuth);
changed = true;
}
if (changed) {
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/MetaConfigMapper.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/MetaConfigMapper.java
index f3cd23e7c..b52624dd1 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/MetaConfigMapper.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/mapper/MetaConfigMapper.java
@@ -21,6 +21,7 @@ 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.common.statusdef.EnableStatus;
import org.apache.inlong.tubemq.server.common.statusdef.ManageStatus;
import org.apache.inlong.tubemq.server.common.statusdef.TopicStatus;
import
org.apache.inlong.tubemq.server.master.metamanage.metastore.ConfigObserver;
@@ -64,7 +65,7 @@ public interface MetaConfigMapper extends KeepAliveService {
boolean addOrUpdClusterDefSetting(BaseEntity opEntity, int brokerPort,
int brokerTlsPort, int brokerWebPort,
int maxMsgSizeMB, int qryPriorityId,
- Boolean flowCtrlEnable, int flowRuleCnt,
+ EnableStatus flowCtrlEnable, int
flowRuleCnt,
String flowCtrlInfo, TopicPropGroup
topicProps,
StringBuilder strBuff, ProcessResult
result);
@@ -178,7 +179,7 @@ public interface MetaConfigMapper extends KeepAliveService {
* @return true if success otherwise false
*/
boolean insertTopicCtrlConf(BaseEntity opEntity,
- String topicName, Boolean enableTopicAuth,
+ String topicName, EnableStatus enableTopicAuth,
StringBuilder strBuff, ProcessResult result);
/**
@@ -408,7 +409,7 @@ public interface MetaConfigMapper extends KeepAliveService {
* @return true if success otherwise false
*/
boolean insertGroupCtrlConf(BaseEntity opEntity, String groupName,
- int qryPriorityId, Boolean flowCtrlEnable,
+ int qryPriorityId, EnableStatus flowCtrlEnable,
int flowRuleCnt, String flowCtrlRuleInfo,
StringBuilder strBuff, ProcessResult result);
@@ -424,7 +425,7 @@ public interface MetaConfigMapper extends KeepAliveService {
* @return true if success otherwise false
*/
boolean insertGroupCtrlConf(BaseEntity opEntity, String groupName,
- Boolean resChkEnable, int allowedB2CRate,
+ EnableStatus resChkEnable, int allowedB2CRate,
StringBuilder strBuff, ProcessResult result);
/**
@@ -497,8 +498,8 @@ public interface MetaConfigMapper extends KeepAliveService {
* @return process result
*/
boolean insertConsumeCtrlInfo(BaseEntity opEntity, String groupName,
- String topicName, Boolean enableCsm,
- String disReason, Boolean enableFlt,
+ String topicName, EnableStatus enableCsm,
+ String disReason, EnableStatus enableFlt,
String fltCondStr, StringBuilder strBuff,
ProcessResult result);
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsClusterConfigMapperImpl.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsClusterConfigMapperImpl.java
index 16c341193..c22ccd1af 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsClusterConfigMapperImpl.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsClusterConfigMapperImpl.java
@@ -53,7 +53,7 @@ public abstract class AbsClusterConfigMapperImpl implements
ClusterConfigMapper
if (!newEntity.updModifyInfo(entity.getDataVerId(),
entity.getBrokerPort(), entity.getBrokerTLSPort(),
entity.getBrokerWebPort(), entity.getMaxMsgSizeInMB(),
- entity.getQryPriorityId(), entity.enableFlowCtrl(),
+ entity.getQryPriorityId(), entity.getGloFlowCtrlStatus(),
entity.getGloFlowCtrlRuleCnt(),
entity.getGloFlowCtrlRuleInfo(),
entity.getClsDefTopicProps())) {
result.setFailResult(DataOpErrCode.DERR_UNCHANGED.getCode(),
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsConsumeCtrlMapperImpl.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsConsumeCtrlMapperImpl.java
index bcdd5c1bb..9a690f70f 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsConsumeCtrlMapperImpl.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsConsumeCtrlMapperImpl.java
@@ -84,8 +84,8 @@ public abstract class AbsConsumeCtrlMapperImpl implements
ConsumeCtrlMapper {
GroupConsumeCtrlEntity newEntity = curEntity.clone();
newEntity.updBaseModifyInfo(entity);
if (!newEntity.updModifyInfo(entity.getDataVerId(),
- entity.isEnableConsume(), entity.getDisableReason(),
- entity.isEnableFilterConsume(), entity.getFilterCondStr())) {
+ entity.getConsumeEnable(), entity.getDisableReason(),
+ entity.getFilterEnable(), entity.getFilterCondStr())) {
result.setFailResult(DataOpErrCode.DERR_UNCHANGED.getCode(),
"Consume control configure not changed!");
return result.isSuccess();
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsGroupResCtrlMapperImpl.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsGroupResCtrlMapperImpl.java
index dc3edea34..ee7b72a90 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsGroupResCtrlMapperImpl.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsGroupResCtrlMapperImpl.java
@@ -73,8 +73,8 @@ public abstract class AbsGroupResCtrlMapperImpl implements
GroupResCtrlMapper {
GroupResCtrlEntity newEntity = curEntity.clone();
newEntity.updBaseModifyInfo(entity);
if (!newEntity.updModifyInfo(entity.getDataVerId(),
- entity.isEnableResCheck(), entity.getAllowedBrokerClientRate(),
- entity.getQryPriorityId(), entity.isFlowCtrlEnable(),
+ entity.getResCheckStatus(),
entity.getAllowedBrokerClientRate(),
+ entity.getQryPriorityId(), entity.getFlowCtrlStatus(),
entity.getRuleCnt(), entity.getFlowCtrlInfo())) {
result.setFailResult(DataOpErrCode.DERR_UNCHANGED.getCode(),
"Group control configure not changed!");
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsMetaConfigMapperImpl.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsMetaConfigMapperImpl.java
index f54ceebdf..563009f6f 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsMetaConfigMapperImpl.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsMetaConfigMapperImpl.java
@@ -120,7 +120,7 @@ public abstract class AbsMetaConfigMapperImpl implements
MetaConfigMapper {
public boolean addOrUpdClusterDefSetting(BaseEntity opEntity,
int brokerPort, int brokerTlsPort,
int brokerWebPort, int
maxMsgSizeMB,
- int qryPriorityId, Boolean
flowCtrlEnable,
+ int qryPriorityId, EnableStatus
flowCtrlEnable,
int flowRuleCnt, String
flowCtrlInfo,
TopicPropGroup topicProps,
StringBuilder strBuff,
ProcessResult result) {
@@ -372,7 +372,7 @@ public abstract class AbsMetaConfigMapperImpl implements
MetaConfigMapper {
@Override
public boolean insertTopicCtrlConf(BaseEntity opEntity,
- String topicName, Boolean
enableTopicAuth,
+ String topicName, EnableStatus
enableTopicAuth,
StringBuilder strBuff, ProcessResult
result) {
TopicCtrlEntity entity =
new TopicCtrlEntity(opEntity, topicName);
@@ -868,7 +868,7 @@ public abstract class AbsMetaConfigMapperImpl implements
MetaConfigMapper {
@Override
public boolean insertGroupCtrlConf(BaseEntity opEntity, String groupName,
- int qryPriorityId, Boolean
flowCtrlEnable,
+ int qryPriorityId, EnableStatus
flowCtrlEnable,
int flowRuleCnt, String
flowCtrlRuleInfo,
StringBuilder strBuff, ProcessResult
result) {
GroupResCtrlEntity newEntity = new GroupResCtrlEntity(opEntity,
groupName);
@@ -881,7 +881,7 @@ public abstract class AbsMetaConfigMapperImpl implements
MetaConfigMapper {
@Override
public boolean insertGroupCtrlConf(BaseEntity opEntity, String groupName,
- Boolean resChkEnable, int
allowedB2CRate,
+ EnableStatus resChkEnable, int
allowedB2CRate,
StringBuilder strBuff, ProcessResult
result) {
GroupResCtrlEntity newEntity = new GroupResCtrlEntity(opEntity,
groupName);
newEntity.updModifyInfo(opEntity.getDataVerId(), resChkEnable,
allowedB2CRate,
@@ -1059,8 +1059,8 @@ public abstract class AbsMetaConfigMapperImpl implements
MetaConfigMapper {
@Override
public boolean insertConsumeCtrlInfo(BaseEntity opEntity, String groupName,
- String topicName, Boolean enableCsm,
- String disReason, Boolean enableFlt,
+ String topicName, EnableStatus
enableCsm,
+ String disReason, EnableStatus
enableFlt,
String fltCondStr, StringBuilder
strBuff,
ProcessResult result) {
GroupConsumeCtrlEntity entity =
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsTopicCtrlMapperImpl.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsTopicCtrlMapperImpl.java
index 3457ee27d..5a1478730 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsTopicCtrlMapperImpl.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/impl/AbsTopicCtrlMapperImpl.java
@@ -79,7 +79,7 @@ public abstract class AbsTopicCtrlMapperImpl implements
TopicCtrlMapper {
newEntity.updBaseModifyInfo(entity);
if (!newEntity.updModifyInfo(entity.getDataVerId(),
entity.getTopicId(), entity.getMaxMsgSizeInMB(),
- entity.isAuthCtrlEnable())) {
+ entity.getAuthCtrlStatus())) {
result.setFailResult(DataOpErrCode.DERR_UNCHANGED.getCode(),
"Topic control configure not changed!");
return result.isSuccess();
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 141a06cbf..bef467721 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
@@ -99,7 +99,7 @@ public class WebAdminFlowRuleHandler extends
AbstractWebHandler {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
qryEntity.updModifyInfo(qryEntity.getDataVerId(), null,
TBaseConstants.META_VALUE_UNDEFINED, inQryPriorityId,
flowCtrlEnable, TBaseConstants.META_VALUE_UNDEFINED, null);
@@ -181,7 +181,7 @@ public class WebAdminFlowRuleHandler extends
AbstractWebHandler {
if (ctrlEntity != null
&& ctrlEntity.getFlowCtrlStatus() !=
EnableStatus.STATUS_DISABLE) {
retInfoList.add(defMetaDataService.insertGroupCtrlConf(opEntity, groupName,
- TServerConstants.QRY_PRIORITY_DEF_VALUE, Boolean.FALSE,
+ TServerConstants.QRY_PRIORITY_DEF_VALUE,
EnableStatus.STATUS_DISABLE,
0, TServerConstants.BLANK_FLOWCTRL_RULES, sBuffer,
result));
} else {
result.setFullInfo(true, DataOpErrCode.DERR_SUCCESS.getCode(),
"Ok");
@@ -230,7 +230,7 @@ public class WebAdminFlowRuleHandler extends
AbstractWebHandler {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null),
sBuffer, result);
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 5d77c672b..ca0fd9a66 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
@@ -140,7 +140,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// only query disable consume group
- entity.setConsumeEnable(false);
+ entity.setConsumeEnable(EnableStatus.STATUS_DISABLE);
Map<String, List<GroupConsumeCtrlEntity>> qryResult =
defMetaDataService.getGroupConsumeCtrlConf(groupNameSet,
topicNameSet, entity);
int totalCnt = 0;
@@ -197,7 +197,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
return sBuffer;
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
- qryEntity.setConsumeEnable(true);
+ qryEntity.setConsumeEnable(EnableStatus.STATUS_ENABLE);
Map<String, List<GroupConsumeCtrlEntity>> qryResultMap =
defMetaDataService.getGroupConsumeCtrlConf(groupNameSet,
topicNameSet, qryEntity);
int totalCnt = 0;
@@ -263,7 +263,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondSet(req, false, true, sBuffer,
result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
@@ -418,7 +418,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
continue;
}
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity, groupName,
- topicName, Boolean.FALSE, "Old API add blacklist,
disable consume",
+ topicName, EnableStatus.STATUS_DISABLE, "Old API add
blacklist, disable consume",
null, null, sBuffer, result));
}
}
@@ -443,7 +443,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
- if (!getGroupCsmJsonSetInfo(req, opEntity, Boolean.FALSE,
+ if (!getGroupCsmJsonSetInfo(req, opEntity, EnableStatus.STATUS_DISABLE,
"Old API batch set BlackList", sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
@@ -512,7 +512,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
&& ctrlEntity.getConsumeEnable() !=
EnableStatus.STATUS_ENABLE) {
defMetaDataService.insertConsumeCtrlInfo(opEntity,
ctrlEntity.getGroupName(),
ctrlEntity.getTopicName(),
- Boolean.TRUE, "Old API delete blacklist,
enable consume",
+ EnableStatus.STATUS_ENABLE, "Old API
delete blacklist, enable consume",
null, null, sBuffer, result);
}
}
@@ -529,7 +529,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
if (ctrlEntity != null
&& ctrlEntity.getConsumeEnable() !=
EnableStatus.STATUS_ENABLE) {
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity,
- groupName, topicName, Boolean.TRUE,
+ groupName, topicName,
EnableStatus.STATUS_ENABLE,
"Old API delete blacklist, enable consume",
null, null, sBuffer, result));
} else {
@@ -576,7 +576,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
if (ctrlEntity != null
&& ctrlEntity.getConsumeEnable() !=
EnableStatus.STATUS_ENABLE) {
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity,
- entry.getGroupName(), entry.getTopicName(),
Boolean.TRUE,
+ entry.getGroupName(), entry.getTopicName(),
EnableStatus.STATUS_ENABLE,
"Old API delete blacklist, enable consume",
null, null, sBuffer, result));
} else {
@@ -633,7 +633,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
continue;
}
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity, groupName,
- topicName, Boolean.TRUE, "Old API add, enable consume",
+ topicName, EnableStatus.STATUS_ENABLE, "Old API add,
enable consume",
null, null, sBuffer, result));
}
}
@@ -658,7 +658,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
- if (!getGroupCsmJsonSetInfo(req, opEntity, Boolean.TRUE,
+ if (!getGroupCsmJsonSetInfo(req, opEntity, EnableStatus.STATUS_ENABLE,
"Old API batch set Enable Consume", sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
@@ -726,7 +726,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
&& ctrlEntity.getConsumeEnable() !=
EnableStatus.STATUS_DISABLE) {
defMetaDataService.insertConsumeCtrlInfo(opEntity,
ctrlEntity.getGroupName(),
ctrlEntity.getTopicName(),
- Boolean.FALSE, "Old API delete, disable
consume",
+ EnableStatus.STATUS_DISABLE, "Old API
delete, disable consume",
null, null, sBuffer, result);
}
}
@@ -743,7 +743,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
if (ctrlEntity != null
&& ctrlEntity.getConsumeEnable() !=
EnableStatus.STATUS_DISABLE) {
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity,
- groupName, topicName, Boolean.FALSE,
+ groupName, topicName,
EnableStatus.STATUS_DISABLE,
"Old API delete, disable consume",
null, null, sBuffer, result));
} else {
@@ -774,7 +774,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
BaseEntity opEntity = (BaseEntity) result.getRetData();
// check and get groupNameJsonSet info
- if (!getGroupCsmJsonSetInfo(req, opEntity, Boolean.FALSE,
+ if (!getGroupCsmJsonSetInfo(req, opEntity, EnableStatus.STATUS_DISABLE,
"Old API batch delete Authorized Consume", sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
@@ -902,7 +902,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
&& ctrlEntity.getFilterEnable() !=
EnableStatus.STATUS_DISABLE) {
defMetaDataService.insertConsumeCtrlInfo(opEntity,
ctrlEntity.getGroupName(),
ctrlEntity.getTopicName(), null,
- "Old API delete, disable filter", false,
+ "Old API delete, disable filter",
EnableStatus.STATUS_DISABLE,
TServerConstants.BLANK_FILTER_ITEM_STR,
sBuffer, result);
}
}
@@ -919,7 +919,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
&& ctrlEntity.getFilterEnable() !=
EnableStatus.STATUS_DISABLE) {
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity,
groupName, topicName, null,
- "Old API delete, disable filter", false,
+ "Old API delete, disable filter",
EnableStatus.STATUS_DISABLE,
TServerConstants.BLANK_FILTER_ITEM_STR,
sBuffer, result));
} else {
result.setFullInfo(true,
DataOpErrCode.DERR_SUCCESS.getCode(), "Ok");
@@ -1091,7 +1091,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
List<GroupProcessResult> retInfoList = new ArrayList<>();
for (String groupName : groupNameSet) {
retInfoList.add(defMetaDataService.addOrUpdGroupCtrlConf(false,
opEntity,
- groupName, Boolean.FALSE, 0,
+ groupName, EnableStatus.STATUS_DISABLE, 0,
TBaseConstants.META_VALUE_UNDEFINED, null,
TBaseConstants.META_VALUE_UNDEFINED, null, sBuffer,
result));
}
@@ -1142,12 +1142,12 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
Set<String> groupNameSet = (Set<String>) result.getRetData();
// get resCheckStatus info
- if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.RESCHECKENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.RESCHECKENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean resChkEnable = (Boolean) result.getRetData();
+ EnableStatus resChkEnable = (EnableStatus) result.getRetData();
// get and valid allowedBClientRate info
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.OLDALWDBCRATE,
false, (isAddOp ? TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN
@@ -1208,11 +1208,12 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// check and get condStatus field
- if (!getCondStatusParamValue(req, false, (isAddOp ? false : null),
sBuffer, result)) {
+ if (!getCondStatusParamValue(req, false,
+ (isAddOp ? EnableStatus.STATUS_DISABLE : null), sBuffer,
result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(req, false, isAddOp,
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
@@ -1229,7 +1230,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
if (ctrlEntity == null) {
if (isAddOp) {
retInfoList.add(defMetaDataService.insertConsumeCtrlInfo(opEntity, groupName,
- topicName, Boolean.TRUE, "Old API set filter
conditions",
+ topicName, EnableStatus.STATUS_ENABLE, "Old
API set filter conditions",
filterEnable, filterCondStr, sBuffer, result));
} else {
result.setFailResult(DataOpErrCode.DERR_NOT_EXIST.getCode(),
@@ -1280,7 +1281,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
entry.getGroupName(), entry.getTopicName());
if (curEntity == null) {
if (isAddOp) {
- entry.setConsumeEnable(true);
+ entry.setConsumeEnable(EnableStatus.STATUS_ENABLE);
} else {
result.setFailResult(DataOpErrCode.DERR_NOT_EXIST.getCode(),
DataOpErrCode.DERR_NOT_EXIST.getDescription());
@@ -1335,10 +1336,10 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
// check and get condStatus field
if (!getCondStatusParamValue(req, false,
- (isAddOp ? false : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_DISABLE : null), sBuffer,
result)) {
return result.isSuccess();
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(req,
false, isAddOp, sBuffer, result)) {
@@ -1392,11 +1393,11 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
String groupName = (String) result.getRetData();
// get resCheckStatus info
- if (!WebParameterUtils.getBooleanParamValue(itemValueMap,
WebFieldDef.RESCHECKENABLE,
- false, false, sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(itemValueMap,
WebFieldDef.RESCHECKENABLE,
+ false, EnableStatus.STATUS_DISABLE, sBuffer, result)) {
return result.isSuccess();
}
- Boolean resChkEnable = (Boolean) result.getRetData();
+ EnableStatus resChkEnable = (EnableStatus) result.getRetData();
// get and valid allowedBClientRate info
if (!WebParameterUtils.getIntParamValue(req,
WebFieldDef.OLDALWDBCRATE,
false, TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN,
@@ -1425,7 +1426,7 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
}
private boolean getGroupCsmJsonSetInfo(HttpServletRequest req, BaseEntity
defOpEntity,
- Boolean enableCsm, String opReason,
+ EnableStatus enableCsm, String
opReason,
StringBuilder sBuffer,
ProcessResult result) {
if (!WebParameterUtils.getJsonArrayParamValue(req,
WebFieldDef.GROUPJSONSET, true, null, result)) {
@@ -1482,8 +1483,9 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
return result.isSuccess();
}
- private <T> boolean getCondStatusParamValue(T paramCntr, boolean required,
Boolean defValue,
- StringBuilder sBuffer,
ProcessResult result) {
+ private <T> boolean getCondStatusParamValue(T paramCntr, boolean required,
+ EnableStatus defValue,
StringBuilder sBuffer,
+ ProcessResult result) {
// check and get condStatus field
if (!WebParameterUtils.getIntParamValue(paramCntr,
WebFieldDef.CONDSTATUS,
required, TBaseConstants.META_VALUE_UNDEFINED, 0, 2, sBuffer,
result)) {
@@ -1494,9 +1496,9 @@ public class WebAdminGroupCtrlHandler extends
AbstractWebHandler {
result.setSuccResult(defValue);
} else {
if (paramValue == 2) {
- result.setSuccResult(Boolean.TRUE);
+ result.setSuccResult(EnableStatus.STATUS_ENABLE);
} else {
- result.setSuccResult(Boolean.FALSE);
+ result.setSuccResult(EnableStatus.STATUS_DISABLE);
}
}
return result.isSuccess();
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 5caff32b3..8a4bed590 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
@@ -167,12 +167,12 @@ public class WebAdminTopicAuthHandler extends
AbstractWebHandler {
}
Set<String> topicNameSet = (Set<String>) result.getRetData();
// get authCtrlStatus info
- if (!WebParameterUtils.getBooleanParamValue(req, WebFieldDef.ISENABLE,
- false, false, sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(req, WebFieldDef.ISENABLE,
+ false, EnableStatus.STATUS_DISABLE, sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean enableTopicAuth = (Boolean) result.getRetData();
+ EnableStatus enableTopicAuth = (EnableStatus) result.getRetData();
// add or update records
List<TopicProcessResult> retInfo = new ArrayList<>();
for (String topicName : topicNameSet) {
@@ -245,7 +245,7 @@ public class WebAdminTopicAuthHandler extends
AbstractWebHandler {
if (ctrlEntity != null
&& ctrlEntity.getAuthCtrlStatus() !=
EnableStatus.STATUS_DISABLE) {
retInfo.add(defMetaDataService.insertTopicCtrlConf(opEntity,
- topicName, Boolean.FALSE, sBuffer, result));
+ topicName, EnableStatus.STATUS_DISABLE, sBuffer,
result));
} else {
result.setFullInfo(true, DataOpErrCode.DERR_SUCCESS.getCode(),
"Ok");
retInfo.add(new TopicProcessResult(0, topicName, result));
@@ -279,11 +279,11 @@ public class WebAdminTopicAuthHandler extends
AbstractWebHandler {
}
String topicName = (String) result.getRetData();
// get authCtrlStatus info
- if (!WebParameterUtils.getBooleanParamValue(confMap,
WebFieldDef.ISENABLE,
- false, false, sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(confMap,
WebFieldDef.ISENABLE,
+ false, EnableStatus.STATUS_DISABLE, sBuffer, result)) {
return result.isSuccess();
}
- Boolean enableTopicAuth = (Boolean) result.getRetData();
+ EnableStatus enableTopicAuth = (EnableStatus) result.getRetData();
itemConf = new TopicCtrlEntity(itemOpEntity, topicName);
itemConf.updModifyInfo(itemOpEntity.getDataVerId(),
TBaseConstants.META_VALUE_UNDEFINED,
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 a2b60675b..4f6f637d3 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
@@ -25,6 +25,7 @@ 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.statusdef.EnableStatus;
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;
@@ -282,19 +283,19 @@ public class WebGroupConsumeCtrlHandler extends
AbstractWebHandler {
}
final Set<String> topicNameSet = (Set<String>) result.getRetData();
// get consumeEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.CONSUMEENABLE, false, null, strBuff, result)) {
WebParameterUtils.buildFailResult(strBuff, result.getErrMsg());
return strBuff;
}
- final Boolean consumeEnable = (Boolean) result.getRetData();
+ final EnableStatus consumeEnable = (EnableStatus) result.getRetData();
// get filterEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.FILTERENABLE, false, null, strBuff, result)) {
WebParameterUtils.buildFailResult(strBuff, result.getErrMsg());
return strBuff;
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondSet(req, false, true, strBuff,
result)) {
WebParameterUtils.buildFailResult(strBuff, result.getErrMsg());
@@ -366,13 +367,13 @@ public class WebGroupConsumeCtrlHandler extends
AbstractWebHandler {
}
final Set<String> groupNameSet = (Set<String>) result.getRetData();
// get consumeEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.CONSUMEENABLE, false,
- (isAddOp ? true : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_ENABLE : null), sBuffer,
result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean consumeEnable = (Boolean) result.getRetData();
+ EnableStatus consumeEnable = (EnableStatus) result.getRetData();
// get disableCsmRsn info
if (!WebParameterUtils.getStringParamValue(req,
WebFieldDef.DSBCSMREASON, false,
@@ -382,13 +383,13 @@ public class WebGroupConsumeCtrlHandler extends
AbstractWebHandler {
}
String disableRsn = (String) result.getRetData();
// get filterEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.FILTERENABLE, false,
- (isAddOp ? false : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_DISABLE : null), sBuffer,
result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(req, false, isAddOp,
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
@@ -494,12 +495,12 @@ public class WebGroupConsumeCtrlHandler extends
AbstractWebHandler {
return result.isSuccess();
}
// get consumeEnable info
- if (!WebParameterUtils.getBooleanParamValue(itemsMap,
+ if (!WebParameterUtils.getEnableStatusValue(itemsMap,
WebFieldDef.CONSUMEENABLE, false,
- (isAddOp ? true : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_ENABLE : null), sBuffer,
result)) {
return result.isSuccess();
}
- final Boolean consumeEnable = (Boolean) result.getRetData();
+ final EnableStatus consumeEnable = (EnableStatus)
result.getRetData();
// get disableCsmRsn info
if (!WebParameterUtils.getStringParamValue(itemsMap,
WebFieldDef.DSBCSMREASON, false, (isAddOp ? "" : null),
sBuffer, result)) {
@@ -507,12 +508,12 @@ public class WebGroupConsumeCtrlHandler extends
AbstractWebHandler {
}
final String disableRsn = (String) result.getRetData();
// get filterEnable info
- if (!WebParameterUtils.getBooleanParamValue(itemsMap,
+ if (!WebParameterUtils.getEnableStatusValue(itemsMap,
WebFieldDef.FILTERENABLE, false,
- (isAddOp ? false : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_DISABLE : null), sBuffer,
result)) {
return result.isSuccess();
}
- Boolean filterEnable = (Boolean) result.getRetData();
+ EnableStatus filterEnable = (EnableStatus) result.getRetData();
// get filterConds info
if (!WebParameterUtils.getFilterCondString(
itemsMap, false, isAddOp, sBuffer, result)) {
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 6102e93e2..847adc659 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
@@ -27,6 +27,7 @@ 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.statusdef.EnableStatus;
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;
@@ -205,12 +206,12 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
final Set<String> inGroupSet = (Set<String>) result.getRetData();
// get resCheckStatus info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.RESCHECKENABLE, false, null, strBuff, result)) {
WebParameterUtils.buildFailResult(strBuff, result.getErrMsg());
return strBuff;
}
- Boolean resCheckEnable = (Boolean) result.getRetData();
+ EnableStatus resCheckEnable = (EnableStatus) result.getRetData();
// get and valid qryPriorityId info
if (!WebParameterUtils.getQryPriorityIdParameter(req,
false, TBaseConstants.META_VALUE_UNDEFINED,
@@ -220,12 +221,12 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
int inQryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.FLOWCTRLENABLE, false, null, strBuff, result)) {
WebParameterUtils.buildFailResult(strBuff, result.getErrMsg());
return strBuff;
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
// query matched records
qryEntity.updModifyInfo(qryEntity.getDataVerId(),
resCheckEnable, TBaseConstants.META_VALUE_UNDEFINED,
inQryPriorityId,
@@ -278,12 +279,12 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
final Set<String> batchGroupNames = (Set<String>) result.getRetData();
// get resCheckStatus info
- if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.RESCHECKENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.RESCHECKENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean resCheckEnable = (Boolean) result.getRetData();
+ EnableStatus resCheckEnable = (EnableStatus) result.getRetData();
// get and valid allowedBrokerClientRate info
if (!WebParameterUtils.getIntParamValue(req, WebFieldDef.ALWDBCRATE,
false, (isAddOp ? TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN
@@ -306,12 +307,12 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
int qryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
- if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.FLOWCTRLENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.FLOWCTRLENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null),
sBuffer, result);
@@ -386,11 +387,11 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
final String groupName = (String) result.getRetData();
// get resCheckStatus info
- if (!WebParameterUtils.getBooleanParamValue(itemValueMap,
WebFieldDef.RESCHECKENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(itemValueMap,
WebFieldDef.RESCHECKENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
return result.isSuccess();
}
- final Boolean resCheckEnable = (Boolean) result.getRetData();
+ final EnableStatus resCheckEnable = (EnableStatus)
result.getRetData();
// get and valid allowedBrokerClientRate info
if (!WebParameterUtils.getIntParamValue(itemValueMap,
WebFieldDef.ALWDBCRATE,
false, (isAddOp ?
TServerConstants.GROUP_BROKER_CLIENT_RATE_MIN
@@ -409,12 +410,12 @@ public class WebGroupResCtrlHandler extends
AbstractWebHandler {
}
final int qryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
- if (!WebParameterUtils.getBooleanParamValue(itemValueMap,
+ if (!WebParameterUtils.getEnableStatusValue(itemValueMap,
WebFieldDef.FLOWCTRLENABLE, false,
- (isAddOp ? false : null), sBuffer, result)) {
+ (isAddOp ? EnableStatus.STATUS_DISABLE : null), sBuffer,
result)) {
return result.isSuccess();
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
// get and flow control rule info
int flowRuleCnt =
WebParameterUtils.getAndCheckFlowRules(itemValueMap,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null),
sBuffer, result);
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 0dc4dbb97..40a175d2d 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
@@ -30,6 +30,7 @@ import
org.apache.inlong.tubemq.corebase.utils.ConcurrentHashSet;
import org.apache.inlong.tubemq.corebase.utils.Tuple3;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.WebFieldDef;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
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;
@@ -414,7 +415,7 @@ public class WebMasterInfoHandler extends
AbstractWebHandler {
if (!defMetaDataService.addOrUpdClusterDefSetting(opEntity,
TBaseConstants.META_VALUE_UNDEFINED,
TBaseConstants.META_VALUE_UNDEFINED,
TBaseConstants.META_VALUE_UNDEFINED,
TBaseConstants.META_VALUE_UNDEFINED,
- TBaseConstants.META_VALUE_UNDEFINED, Boolean.FALSE, 0,
+ TBaseConstants.META_VALUE_UNDEFINED,
EnableStatus.STATUS_DISABLE, 0,
TServerConstants.BLANK_FLOWCTRL_RULES, null, sBuffer, result))
{
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
@@ -495,7 +496,7 @@ public class WebMasterInfoHandler extends
AbstractWebHandler {
int inQryPriorityId = (int) result.getRetData();
// get flowCtrlEnable info
if (isNewVer) {
- if (!WebParameterUtils.getBooleanParamValue(req,
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.FLOWCTRLENABLE, false, null, sBuffer, result))
{
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
@@ -507,7 +508,7 @@ public class WebMasterInfoHandler extends
AbstractWebHandler {
return sBuffer;
}
}
- Boolean flowCtrlEnable = (Boolean) result.getRetData();
+ EnableStatus flowCtrlEnable = (EnableStatus) result.getRetData();
// get and flow control rule info
int flowRuleCnt = WebParameterUtils.getAndCheckFlowRules(req,
(isAddOp ? TServerConstants.BLANK_FLOWCTRL_RULES : null),
sBuffer, result);
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 f1d9f7f90..868035353 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
@@ -27,6 +27,7 @@ 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.statusdef.EnableStatus;
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;
@@ -227,12 +228,12 @@ public class WebTopicCtrlHandler extends
AbstractWebHandler {
topicNameId = (int) result.getRetData();
}
// get authCtrlStatus info
- if (!WebParameterUtils.getBooleanParamValue(req,
WebFieldDef.AUTHCTRLENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(req,
WebFieldDef.AUTHCTRLENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
WebParameterUtils.buildFailResult(sBuffer, result.getErrMsg());
return sBuffer;
}
- Boolean enableTopicAuth = (Boolean) result.getRetData();
+ EnableStatus enableTopicAuth = (EnableStatus) result.getRetData();
// check and get max message size
ClusterSettingEntity defClusterSetting =
defMetaDataService.getClusterDefSetting(false);
@@ -323,11 +324,11 @@ public class WebTopicCtrlHandler extends
AbstractWebHandler {
}
int itemTopicNameId = (int) result.getRetData();
// get authCtrlStatus info
- if (!WebParameterUtils.getBooleanParamValue(itemConfMap,
WebFieldDef.AUTHCTRLENABLE,
- false, (isAddOp ? false : null), sBuffer, result)) {
+ if (!WebParameterUtils.getEnableStatusValue(itemConfMap,
WebFieldDef.AUTHCTRLENABLE,
+ false, (isAddOp ? EnableStatus.STATUS_DISABLE : null),
sBuffer, result)) {
return result.isSuccess();
}
- Boolean enableTopicAuth = (Boolean) result.getRetData();
+ EnableStatus enableTopicAuth = (EnableStatus) result.getRetData();
itemConf = new TopicCtrlEntity(itemOpEntity, topicName);
itemConf.updModifyInfo(itemOpEntity.getDataVerId(),
itemTopicNameId, itemMaxMsgSizeMB, enableTopicAuth);
diff --git
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliMetaDataBRU.java
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliMetaDataBRU.java
index 8b48461c9..475bb8112 100644
---
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliMetaDataBRU.java
+++
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliMetaDataBRU.java
@@ -40,6 +40,7 @@ import
org.apache.inlong.tubemq.corebase.utils.DateTimeConvertUtils;
import org.apache.inlong.tubemq.corebase.utils.TStringUtils;
import org.apache.inlong.tubemq.server.common.TServerConstants;
import org.apache.inlong.tubemq.server.common.fielddef.CliArgDef;
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
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.utils.HttpUtils;
@@ -407,12 +408,14 @@ public class CliMetaDataBRU extends CliAbstractBase {
int flowRuleCnt = jsonItem.get("flowCtrlRuleCount").getAsInt();
JsonArray flowCtrlInfoArray =
jsonItem.get("flowCtrlInfo").getAsJsonArray();
String flowCtrlInfoStr = flowCtrlInfoArray.toString();
+ EnableStatus flowCtrlStatus =
+ flowCtrlEnable ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
// build cluster setting entity
ClusterSettingEntity settingEntity =
new ClusterSettingEntity(baseEntity);
settingEntity.updModifyInfo(baseEntity.getDataVerId(),
brokerPort, brokerTlsPort, brokerWebPort,
maxMsgSizeInMB,
- qryPriorityId, flowCtrlEnable, flowRuleCnt,
flowCtrlInfoStr, defTopicProps);
+ qryPriorityId, flowCtrlStatus, flowRuleCnt,
flowCtrlInfoStr, defTopicProps);
clusterSettingMap.put(settingEntity.getRecordKey(),
settingEntity);
} catch (Throwable e) {
logger.error(strBuff.append("Parse cluster configurations(")
@@ -801,10 +804,12 @@ public class CliMetaDataBRU extends CliAbstractBase {
int topicNameId = jsonItem.get("topicNameId").getAsInt();
boolean enableAuthCtrl =
jsonItem.get("enableAuthControl").getAsBoolean();
int maxMsgSizeInMB = jsonItem.get("maxMsgSizeInMB").getAsInt();
+ EnableStatus authCtrlStatus =
+ enableAuthCtrl ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
// build topic control entity
TopicCtrlEntity topicCtrlEntity = new
TopicCtrlEntity(baseEntity, topicName);
topicCtrlEntity.updModifyInfo(baseEntity.getDataVerId(),
- topicNameId, maxMsgSizeInMB, enableAuthCtrl);
+ topicNameId, maxMsgSizeInMB, authCtrlStatus);
topicCtrlMap.put(topicCtrlEntity.getTopicName(),
topicCtrlEntity);
} catch (Throwable e) {
logger.error(strBuff.append("Parse topic control
configurations(")
@@ -1284,12 +1289,16 @@ public class CliMetaDataBRU extends CliAbstractBase {
int flowCtrlRuleCount =
jsonItem.get("flowCtrlRuleCount").getAsInt();
JsonArray flowCtrlInfoArray =
jsonItem.get("flowCtrlInfo").getAsJsonArray();
String flowCtrlInfoStr = flowCtrlInfoArray.toString();
+ EnableStatus resChkStatus =
+ resCheckEnable ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
+ EnableStatus flowCtrlStatus =
+ flowCtrlEnable ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
// build group resource control entity
GroupResCtrlEntity groupResCtrlEntity =
new GroupResCtrlEntity(baseEntity, groupName);
groupResCtrlEntity.updModifyInfo(baseEntity.getDataVerId(),
- resCheckEnable, alwdBCRate, qryPriorityId,
- flowCtrlEnable, flowCtrlRuleCount, flowCtrlInfoStr);
+ resChkStatus, alwdBCRate, qryPriorityId,
+ flowCtrlStatus, flowCtrlRuleCount, flowCtrlInfoStr);
groupResCtrlMap.put(groupResCtrlEntity.getGroupName(),
groupResCtrlEntity);
} catch (Throwable e) {
logger.error(strBuff.append("Parse group resource control
configurations(")
@@ -1471,11 +1480,15 @@ public class CliMetaDataBRU extends CliAbstractBase {
String disableCsmRsn =
jsonItem.get("disableCsmRsn").getAsString();
boolean filterEnable =
jsonItem.get("filterEnable").getAsBoolean();
String filterConds = jsonItem.get("filterConds").getAsString();
+ EnableStatus csmStatus =
+ consumeEnable ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
+ EnableStatus filterStatus =
+ filterEnable ? EnableStatus.STATUS_ENABLE :
EnableStatus.STATUS_DISABLE;
// build group consume control entity
GroupConsumeCtrlEntity groupCsmCtrlEntity =
new GroupConsumeCtrlEntity(baseEntity, groupName,
topicName);
groupCsmCtrlEntity.updModifyInfo(baseEntity.getDataVerId(),
- consumeEnable, disableCsmRsn, filterEnable,
filterConds);
+ csmStatus, disableCsmRsn, filterStatus, filterConds);
groupCsmCtrlMap.put(groupCsmCtrlEntity.getRecordKey(),
groupCsmCtrlEntity);
} catch (Throwable e) {
logger.error(strBuff.append("Parse group consume control
configurations(")
diff --git
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntityTest.java
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntityTest.java
index 4b7d123f5..ffb34dd4d 100644
---
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntityTest.java
+++
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/ClusterSettingEntityTest.java
@@ -86,7 +86,7 @@ public class ClusterSettingEntityTest {
Assert.assertEquals(setting2.getMaxMsgSizeInB(),
bdbEntity.getMaxMsgSizeInB());
Assert.assertEquals(setting2.getQryPriorityId(),
bdbEntity.getQryPriorityId());
Assert.assertFalse(setting2.getGloFlowCtrlStatus().isEnable());
- Assert.assertNull(bdbEntity.getEnableGloFlowCtrl());
+ Assert.assertEquals(bdbEntity.getEnableGloFlowCtrl(),
EnableStatus.STATUS_UNDEFINE);
Assert.assertEquals(setting2.getGloFlowCtrlRuleCnt(), 0);
Assert.assertEquals(bdbEntity.getGloFlowCtrlCnt(),
TBaseConstants.META_VALUE_UNDEFINED);
Assert.assertEquals(setting2.getGloFlowCtrlRuleInfo(),
TServerConstants.BLANK_FLOWCTRL_RULES);
@@ -113,7 +113,7 @@ public class ClusterSettingEntityTest {
Assert.assertEquals(setting2.getBrokerWebPort(),
bdbSetting.getBrokerWebPort());
Assert.assertEquals(setting2.getMaxMsgSizeInB(),
bdbSetting.getMaxMsgSizeInB());
Assert.assertEquals(setting2.getQryPriorityId(),
bdbSetting.getQryPriorityId());
- Assert.assertEquals(setting2.getGloFlowCtrlStatus().isEnable(),
bdbSetting.getEnableGloFlowCtrl());
+ Assert.assertEquals(setting2.getGloFlowCtrlStatus(),
bdbSetting.getEnableGloFlowCtrl());
Assert.assertEquals(setting2.getGloFlowCtrlRuleCnt(),
bdbSetting.getGloFlowCtrlCnt());
Assert.assertEquals(setting2.getGloFlowCtrlRuleInfo(),
bdbSetting.getGloFlowCtrlInfo());
TopicPropGroup defProps3 = setting2.getClsDefTopicProps();
@@ -138,7 +138,7 @@ public class ClusterSettingEntityTest {
Assert.assertEquals(setting4.getBrokerWebPort(),
bdbSetting.getBrokerWebPort());
Assert.assertEquals(setting4.getMaxMsgSizeInB(),
bdbSetting.getMaxMsgSizeInB());
Assert.assertEquals(setting4.getQryPriorityId(),
bdbSetting.getQryPriorityId());
- Assert.assertEquals(setting4.getGloFlowCtrlStatus().isEnable(),
bdbSetting.getEnableGloFlowCtrl());
+ Assert.assertEquals(setting4.getGloFlowCtrlStatus(),
bdbSetting.getEnableGloFlowCtrl());
Assert.assertEquals(setting4.getGloFlowCtrlRuleCnt(),
bdbSetting.getGloFlowCtrlCnt());
Assert.assertEquals(setting4.getGloFlowCtrlRuleInfo(),
bdbSetting.getGloFlowCtrlInfo());
TopicPropGroup defProps4 = setting4.getClsDefTopicProps();
@@ -163,7 +163,7 @@ public class ClusterSettingEntityTest {
int newBrokerWebPort = 32;
int newMaxMsgSizeMB = 2;
int newQryPriorityId = 101;
- Boolean newFlowCtrlEnable = true;
+ EnableStatus newFlowCtrlEnable = EnableStatus.STATUS_ENABLE;
int newFlowRuleCnt = 5;
String newFlowCtrlRuleInfo = "[{},{},{},{},{}]";
TopicPropGroup newProps = new TopicPropGroup();
@@ -214,7 +214,7 @@ public class ClusterSettingEntityTest {
paramMap.clear();
// case 3
entity2.updModifyInfo(5, 6, 7,
- 8, 9, 101, false,
+ 8, 9, 101, EnableStatus.STATUS_DISABLE,
0, null, null);
entity2.getConfigureInfo(paramMap, true);
Assert.assertEquals(paramMap.size(), 12);
@@ -235,7 +235,7 @@ public class ClusterSettingEntityTest {
paramMap.clear();
// case 4
entity2.updModifyInfo(9, 10, 11,
- 12, 13, 301, true,
+ 12, 13, 301, EnableStatus.STATUS_ENABLE,
2, "[{\"type\":1},{\"type\":2}]", null);
entity2.getConfigureInfo(paramMap, false);
Assert.assertEquals(paramMap.size(), 14);
diff --git
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntityTest.java
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntityTest.java
index 410e3daa7..8fe7a5b22 100644
---
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntityTest.java
+++
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupConsumeCtrlEntityTest.java
@@ -19,6 +19,8 @@ package
org.apache.inlong.tubemq.server.master.metamanage.metastore.dao.entity;
import java.util.Calendar;
import java.util.Date;
+
+import org.apache.inlong.tubemq.server.common.statusdef.EnableStatus;
import
org.apache.inlong.tubemq.server.master.bdbstore.bdbentitys.BdbGroupFilterCondEntity;
import org.junit.Assert;
import org.junit.Test;
@@ -53,9 +55,9 @@ public class GroupConsumeCtrlEntityTest {
Assert.assertEquals(ctrlEntry1.getRecordKey(),
bdbEntity1.getRecordKey());
// case 2
final long newDataVerId = 5555;
- final boolean consumeEnable = true;
+ final EnableStatus consumeEnable = EnableStatus.STATUS_ENABLE;
final String disableRsn = "disable";
- final boolean filterEnable = true;
+ final EnableStatus filterEnable = EnableStatus.STATUS_ENABLE;
final String newFilterCondStr = "[1,2,4]";
Date newDate = new Date();
Calendar c = Calendar.getInstance();
@@ -84,7 +86,5 @@ public class GroupConsumeCtrlEntityTest {
Assert.assertEquals(ctrlEntry2.getAttributes(),
bdbEntity3.getAttributes());
Assert.assertEquals(ctrlEntry2.getDisableReason(),
bdbEntity3.getDisableConsumeReason());
Assert.assertEquals(ctrlEntry2.getRecordKey(),
bdbEntity3.getRecordKey());
-
}
-
}
diff --git
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntityTest.java
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntityTest.java
index 65c403484..c4381ecca 100644
---
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntityTest.java
+++
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/GroupResCtrlEntityTest.java
@@ -83,10 +83,10 @@ public class GroupResCtrlEntityTest {
Assert.assertEquals(bdbEntity2.getSerialId(),
resEntry3.getDataVerId());
// case 4
long newDataVerId = 99;
- boolean resChkEnable = true;
+ EnableStatus resChkEnable = EnableStatus.STATUS_ENABLE;
int newAllowedB2CRate = 5;
int newQryPriorityId = 2;
- boolean newFlowCtrlEnable = false;
+ EnableStatus newFlowCtrlEnable = EnableStatus.STATUS_DISABLE;
int newFlowRuleCnt = 2;
String newFlowCtrlRuleInfo = "[{},{}]";
GroupResCtrlEntity resEntry4 = resEntry3.clone();
@@ -94,10 +94,10 @@ public class GroupResCtrlEntityTest {
Assert.assertTrue(resEntry4.updModifyInfo(newDataVerId, resChkEnable,
newAllowedB2CRate,
newQryPriorityId, newFlowCtrlEnable, newFlowRuleCnt,
newFlowCtrlRuleInfo));
Assert.assertEquals(resEntry4.getDataVerId(), newDataVerId);
- Assert.assertEquals(resEntry4.getResCheckStatus().isEnable(),
resChkEnable);
+ Assert.assertEquals(resEntry4.getResCheckStatus(), resChkEnable);
Assert.assertEquals(resEntry4.getAllowedBrokerClientRate(),
newAllowedB2CRate);
Assert.assertEquals(resEntry4.getQryPriorityId(), newQryPriorityId);
- Assert.assertEquals(resEntry4.getFlowCtrlStatus().isEnable(),
newFlowCtrlEnable);
+ Assert.assertEquals(resEntry4.getFlowCtrlStatus(), newFlowCtrlEnable);
Assert.assertEquals(resEntry4.getRuleCnt(), newFlowRuleCnt);
Assert.assertEquals(resEntry4.getFlowCtrlInfo(), newFlowCtrlRuleInfo);
Assert.assertEquals(resEntry4.getGroupName(),
resEntry3.getGroupName());
@@ -116,7 +116,7 @@ public class GroupResCtrlEntityTest {
// case 5
BdbGroupFlowCtrlEntity bdbEntity5 =
resEntry4.buildBdbGroupFlowCtrlEntity();
Assert.assertEquals(bdbEntity5.getSerialId(), newDataVerId);
- Assert.assertEquals(bdbEntity5.getResCheckStatus().isEnable(),
resChkEnable);
+ Assert.assertEquals(bdbEntity5.getResCheckStatus(), resChkEnable);
Assert.assertEquals(bdbEntity5.getAllowedBrokerClientRate(),
newAllowedB2CRate);
Assert.assertEquals(bdbEntity5.getQryPriorityId(), newQryPriorityId);
Assert.assertEquals(bdbEntity5.getStatusId(), 0);
@@ -127,7 +127,5 @@ public class GroupResCtrlEntityTest {
Assert.assertEquals(resEntry4.getCreateDateStr(),
bdbEntity5.getStrCreateDate());
Assert.assertEquals(resEntry4.getModifyUser(),
bdbEntity5.getModifyUser());
Assert.assertEquals(resEntry4.getModifyDateStr(),
bdbEntity5.getStrModifyDate());
-
}
-
}
diff --git
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntityTest.java
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntityTest.java
index 37d9a95f5..fc75d5e73 100644
---
a/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntityTest.java
+++
b/inlong-tubemq/tubemq-server/src/test/java/org/apache/inlong/tubemq/server/master/metamanage/metastore/dao/entity/TopicCtrlEntityTest.java
@@ -67,7 +67,7 @@ public class TopicCtrlEntityTest {
long dataVerId2 = 555;
int topicId2 = 222;
String topicName2 = "test_1";
- boolean enableAuthControl2 = true;
+ EnableStatus enableAuthControl2 = EnableStatus.STATUS_ENABLE;
String attributes2 = "";
String createUser2 = "creater2";
Date createDate2 = new Date();
@@ -119,5 +119,4 @@ public class TopicCtrlEntityTest {
Assert.assertEquals(ctrlEntity4.getModifyDateStr(),
ctrlEntity2.getModifyDateStr());
Assert.assertEquals(ctrlEntity4.getDataVerId(),
ctrlEntity2.getDataVerId());
}
-
}
