modify the parameter

cat-home/src/main/java/com/dianping/cat/report/page/metric/chart/GraphCreator.java

@@ -44,7 +44,7 @@ public class GraphCreator {
 	private ProductLineConfigManager m_productLineConfigManager;
 
 	public Map<String, LineChart> buildChartsByProductLine(String productLine, Date startDate, Date endDate,
-	      String abtestID) {
+	      String abtestId) {
 		long start = startDate.getTime();
 		long end = endDate.getTime();
 		int totalSize = (int) ((end - start) / TimeUtil.ONE_MINUTE);
@@ -60,11 +60,11 @@ public class GraphCreator {
 			MetricReport oneDayReport = m_metricReportService.query(productLine, new Date(start - TimeUtil.ONE_DAY));
 			MetricReport sevenDayReport = m_metricReportService.query(productLine, new Date(start - TimeUtil.ONE_DAY * 7));
 			Map<String, double[]> currentValues = m_pruductDataFetcher.buildGraphData(metricReport, metricConfigs,
-			      abtestID);
+			      abtestId);
 			Map<String, double[]> oneDayValues = m_pruductDataFetcher
-			      .buildGraphData(oneDayReport, metricConfigs, abtestID);
+			      .buildGraphData(oneDayReport, metricConfigs, abtestId);
 			Map<String, double[]> sevenDayValues = m_pruductDataFetcher.buildGraphData(sevenDayReport, metricConfigs,
-			      abtestID);
+			      abtestId);
 
 			mergeMap(allCurrentValues, currentValues, totalSize, index);
 			mergeMap(allOneDayValues, oneDayValues, totalSize, index);

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -2842,26 +2842,12 @@
 				<requirement>
 					<role>com.dianping.cat.report.page.metric.JspViewer</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.report.page.model.spi.ModelService</role>
-					<role-hint>metric</role-hint>
-					<field-name>m_service</field-name>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.consumer.advanced.MetricConfigManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.consumer.advanced.ProductLineConfigManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.report.service.ReportService</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.report.baseline.BaselineService</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.metric.chart.GraphCreator</role>
 				</requirement>
@@ -2876,15 +2862,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.consumer.advanced.MetricConfigManager</role>
-			<implementation>com.dianping.cat.consumer.advanced.MetricConfigManager</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.core.config.ConfigDao</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.consumer.advanced.ProductLineConfigManager</role>
 			<implementation>com.dianping.cat.consumer.advanced.ProductLineConfigManager</implementation>
@@ -2918,6 +2895,15 @@
 				</requirement>
 			</requirements>
 		</component>
+		<component>
+			<role>com.dianping.cat.consumer.advanced.MetricConfigManager</role>
+			<implementation>com.dianping.cat.consumer.advanced.MetricConfigManager</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.core.config.ConfigDao</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.report.page.jsError.Handler</role>
 			<implementation>com.dianping.cat.report.page.jsError.Handler</implementation>