diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index f318e0b349..282555a8d5 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -186,7 +186,7 @@ public final class DruidStatManagerFacade { for (Object datasource : dataSources) { Map wallStat = DruidDataSourceUtils.getWallStatMap(datasource); - map = mergWallStat(map, wallStat); + map = mergeWallStat(map, wallStat); } return map; @@ -205,7 +205,7 @@ public final class DruidStatManagerFacade { } @SuppressWarnings({ "rawtypes", "unchecked" }) - public static Map mergWallStat(Map mapA, Map mapB) { + public static Map mergeWallStat(Map mapA, Map mapB) { if (mapA == null || mapA.size() == 0) { return mapB; } @@ -236,7 +236,7 @@ public final class DruidStatManagerFacade { String sql = (String) blackItem.get("sql"); Map oldItem = newSet.get(sql); - newSet.put(sql, mergWallStat(oldItem, blackItem)); + newSet.put(sql, mergeWallStat(oldItem, blackItem)); } Collection> collectionB = (Collection>) valueB; @@ -247,12 +247,12 @@ public final class DruidStatManagerFacade { String sql = (String) blackItem.get("sql"); Map oldItem = newSet.get(sql); - newSet.put(sql, mergWallStat(oldItem, blackItem)); + newSet.put(sql, mergeWallStat(oldItem, blackItem)); } newMap.put(key, newSet.values()); } else { if (valueA instanceof Map && valueB instanceof Map) { - Object newValue = mergWallStat((Map) valueA, (Map) valueB); + Object newValue = mergeWallStat((Map) valueA, (Map) valueB); newMap.put(key, newValue); } else if (valueA instanceof Set && valueB instanceof Set) { Set set = new HashSet(); @@ -305,7 +305,7 @@ public final class DruidStatManagerFacade { String name = (String) mapB.get("name"); Map mapA = mapped.get(name); - Map mergedMap = mergWallStat(mapA, mapB); + Map mergedMap = mergeWallStat(mapA, mapB); mergedList.add(mergedMap); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java index f9962f2fe6..f156f98502 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java @@ -55,14 +55,14 @@ public class WallStatTest_statMap extends TestCase { System.out.println(JSONUtils.toJSONString(statMapB)); System.out.println(JSONUtils.toJSONString(statMapC)); - Map statMapMerged = DruidStatManagerFacade.mergWallStat(statMapA, statMapB); + Map statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapA, statMapB); System.out.println(JSONUtils.toJSONString(statMapMerged)); Assert.assertEquals(2L, statMapMerged.get("checkCount")); Assert.assertEquals(21L, statMapMerged.get("violationEffectRowCount")); Assert.assertEquals(2, ((Collection>) statMapMerged.get("blackList")).size()); - statMapMerged = DruidStatManagerFacade.mergWallStat(statMapMerged, statMapC); + statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapMerged, statMapC); System.out.println(JSONUtils.toJSONString(statMapMerged)); Assert.assertEquals(2, ((Collection>) statMapMerged.get("blackList")).size()); Assert.assertEquals(33L, statMapMerged.get("violationEffectRowCount"));