diff --git a/pom.xml b/pom.xml index f01e87fb..81685224 100644 --- a/pom.xml +++ b/pom.xml @@ -149,11 +149,6 @@ fastjson 1.2.60 - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - commons-lang commons-lang diff --git a/tubemq-server/pom.xml b/tubemq-server/pom.xml index 476d8f73..a333357a 100644 --- a/tubemq-server/pom.xml +++ b/tubemq-server/pom.xml @@ -101,10 +101,6 @@ org.apache.velocity velocity - - org.codehaus.jackson - jackson-mapper-asl - org.mortbay.jetty jetty diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java index cafa34ce..d6c1a87e 100644 --- a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java +++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java @@ -17,6 +17,8 @@ package com.tencent.tubemq.server.common.utils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.tencent.tubemq.corebase.TBaseConstants; import com.tencent.tubemq.corebase.TokenConstants; import com.tencent.tubemq.corebase.utils.TStringUtils; @@ -26,7 +28,6 @@ import com.tencent.tubemq.server.master.bdbstore.bdbentitys.BdbBrokerConfEntity; import com.tencent.tubemq.server.master.nodemanage.nodebroker.BrokerConfManage; import com.tencent.tubemq.server.master.nodemanage.nodebroker.BrokerSyncStatusInfo; -import org.codehaus.jackson.map.ObjectMapper; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -608,7 +609,7 @@ public static Set getBatchBrokerIdSet(String inStrBrokerIds * @return a list of linked hash map represent the json array * @throws Exception */ - public static List> checkAndGetJsonArray(String paramName, + public static List> checkAndGetJsonArray(String paramName, Object paramValue, int paramMaxLen, boolean required) throws Exception { @@ -642,8 +643,7 @@ public static List> checkAndGetJsonArray(String pa .append(" characters").toString()); } } - ObjectMapper objectMapper = new ObjectMapper(); - return objectMapper.readValue(decTmpParamVal, List.class); + return JSON.parseObject(decTmpParamVal, new TypeReference>>() {}); } /** diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java index 7c796f56..aded858a 100644 --- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java +++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java @@ -152,7 +152,7 @@ public StringBuilder adminBathAddGroupFilterCondInfo(HttpServletRequest req) thr req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> filterJsonArray = + List> filterJsonArray = WebParameterUtils.checkAndGetJsonArray("filterCondJsonSet", req.getParameter("filterCondJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); @@ -350,7 +350,7 @@ public StringBuilder adminBathModGroupFilterCondInfo(HttpServletRequest req) thr req.getParameter("modifyDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> jsonArray = + List> jsonArray = WebParameterUtils.checkAndGetJsonArray("filterCondJsonSet", req.getParameter("filterCondJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); @@ -758,7 +758,7 @@ public StringBuilder adminBathAddConsumerGroupInfo(HttpServletRequest req) throw req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> jsonArray = + List> jsonArray = WebParameterUtils.checkAndGetJsonArray("groupNameJsonSet", req.getParameter("groupNameJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); @@ -1026,7 +1026,7 @@ public StringBuilder adminBathAddBlackGroupInfo(HttpServletRequest req) throws E req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> jsonArray = + List> jsonArray = WebParameterUtils.checkAndGetJsonArray("groupNameJsonSet", req.getParameter("groupNameJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); @@ -1273,7 +1273,7 @@ public StringBuilder adminBathAddConsumeGroupSetting(HttpServletRequest req) thr WebParameterUtils.validIntDataParameter("allowedBClientRate", req.getParameter("allowedBClientRate"), false, 0, 0); - List> groupNameJsonArray = + List> groupNameJsonArray = WebParameterUtils.checkAndGetJsonArray("groupNameJsonSet", req.getParameter("groupNameJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java index a4e0dedd..48638e46 100644 --- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java +++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebAdminTopicAuthHandler.java @@ -17,6 +17,8 @@ package com.tencent.tubemq.server.master.web.handler; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.tencent.tubemq.corebase.TBaseConstants; import com.tencent.tubemq.corebase.utils.TStringUtils; import com.tencent.tubemq.server.common.utils.WebParameterUtils; @@ -25,7 +27,6 @@ import com.tencent.tubemq.server.master.bdbstore.bdbentitys.BdbGroupFilterCondEntity; import com.tencent.tubemq.server.master.bdbstore.bdbentitys.BdbTopicAuthControlEntity; import com.tencent.tubemq.server.master.nodemanage.nodebroker.BrokerConfManage; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,7 +111,7 @@ public StringBuilder adminBathAddTopicAuthControl(HttpServletRequest req) throws Date createDate = WebParameterUtils.validDateParameter("createDate", req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> topicJsonArray = + List> topicJsonArray = WebParameterUtils.checkAndGetJsonArray("topicJsonSet", req.getParameter("topicJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); if ((topicJsonArray == null) || (topicJsonArray.isEmpty())) { @@ -351,9 +352,8 @@ private HashMap getAuthConsumeGroupInfo( final StringBuilder sBuilder) throws Exception { String strAuthConsumGroup = (String) jsonObject.get("authConsumeGroup"); if ((strAuthConsumGroup != null) && (!TStringUtils.isBlank(strAuthConsumGroup))) { - ObjectMapper objectMapper2 = new ObjectMapper(); - List> authConsumeGroupSet = - objectMapper2.readValue(strAuthConsumGroup, List.class); + List> authConsumeGroupSet = + JSON.parseObject(strAuthConsumGroup, new TypeReference>>() {}); if ((authConsumeGroupSet != null) && (!authConsumeGroupSet.isEmpty())) { for (int count_j = 0; count_j < authConsumeGroupSet.size(); count_j++) { diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java index dc7e8961..95230871 100644 --- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java +++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java @@ -321,7 +321,7 @@ public StringBuilder adminBathAddBrokerDefConfEntityInfo(HttpServletRequest req) Date createDate = WebParameterUtils.validDateParameter("createDate", req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> brokerJsonArray = + List> brokerJsonArray = WebParameterUtils.checkAndGetJsonArray("brokerJsonSet", req.getParameter("brokerJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); if ((brokerJsonArray == null) || (brokerJsonArray.isEmpty())) { diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java index d080eee8..9e538d02 100644 --- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java +++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java @@ -227,7 +227,7 @@ public StringBuilder adminBathAddTopicEntityInfo(HttpServletRequest req) throws Date createDate = WebParameterUtils.validDateParameter("createDate", req.getParameter("createDate"), TBaseConstants.META_MAX_DATEVALUE_LENGTH, false, new Date()); - List> topicJsonArray = + List> topicJsonArray = WebParameterUtils.checkAndGetJsonArray("topicJsonSet", req.getParameter("topicJsonSet"), TBaseConstants.META_VALUE_UNDEFINED, true); if ((topicJsonArray == null) || (topicJsonArray.isEmpty())) {