refator payload normalize

cat-home/src/main/java/com/dianping/cat/report/page/NormalizePayload.java

@@ -14,19 +14,18 @@ public class NormalizePayload {
 		if (StringUtils.isEmpty(payload.getDomain())) {
 			payload.setDomain(m_manager.getConsoleDefaultDomain());
 		}
-
-		String ip = payload.getIpAddress();
-		if (StringUtils.isEmpty(ip)) {
+		if (StringUtils.isEmpty(payload.getIpAddress())) {
 			payload.setIpAddress(CatString.ALL_IP);
 		}
-		model.setIpAddress(payload.getIpAddress());
-		model.setAction(payload.getAction());
-		model.setDisplayDomain(payload.getDomain());
 		if (payload.getPeriod().isFuture()) {
 			model.setLongDate(payload.getCurrentDate());
 		} else {
 			model.setLongDate(payload.getDate());
 		}
+		model.setIpAddress(payload.getIpAddress());
+		model.setAction(payload.getAction());
+		model.setDisplayDomain(payload.getDomain());
+
 		if (payload.getAction().getName().startsWith("history")) {
 			String type = payload.getReportType();
 			if (type == null || type.length() == 0) {
@@ -41,5 +40,5 @@ public class NormalizePayload {
 			model.setCustomDate(payload.getHistoryStartDate(), payload.getHistoryEndDate());
 		}
 	}
-	
+
 }

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

@@ -13,6 +13,7 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.report.ReportPage;
+import com.dianping.cat.report.page.NormalizePayload;
 import com.dianping.cat.report.page.metric.MetricConfig.MetricFlag;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -25,6 +26,9 @@ public class Handler implements PageHandler<Context> {
 	@Inject(type = ModelService.class, value = "metric")
 	private ModelService<MetricReport> m_service;
 
+	@Inject
+	private NormalizePayload m_normalizePayload;
+
 	private static final String TUAN = "TuanGou";
 
 	private MetricReport getReport(Payload payload) {
@@ -98,14 +102,10 @@ public class Handler implements PageHandler<Context> {
 
 	private void normalize(Model model, Payload payload) {
 		payload.setGroup(TUAN);
-		model.setIpAddress(payload.getIpAddress());
-		model.setAction(Action.VIEW);
-		model.setPage(ReportPage.METRIC);
-		model.setLongDate(payload.getDate());
-		model.setDisplayDomain(payload.getDomain());
-		model.setDomain(payload.getDomain());
 		model.setGroup(payload.getGroup());
 		model.setChannel(payload.getChannel());
+		model.setPage(ReportPage.METRIC);
+		m_normalizePayload.normalize(model, payload);
 	}
 
 	public class MetricTitle {

cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java

@@ -11,10 +11,10 @@ import org.unidal.web.mvc.annotation.InboundActionMeta;
 import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
-import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.top.model.entity.TopReport;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
+import com.dianping.cat.report.page.NormalizePayload;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -32,7 +32,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<TopReport> m_service;
 
 	@Inject
-	private ServerConfigManager m_manager;
+	private NormalizePayload m_normalizePayload;
 
 	private TopReport getReport(Payload payload) {
 		String domain = payload.getDomain();
@@ -88,12 +88,9 @@ public class Handler implements PageHandler<Context> {
 	}
 
 	private void normalize(Model model, Payload payload) {
-		payload.setDomain(m_manager.getConsoleDefaultDomain());
-		model.setIpAddress(payload.getIpAddress());
-		model.setAction(Action.VIEW);
 		model.setPage(ReportPage.TOP);
-		model.setLongDate(payload.getDate());
-		model.setDisplayDomain(payload.getDomain());
+		model.setAction(Action.VIEW);
+		m_normalizePayload.normalize(model, payload);
 	}
 
 }

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

@@ -2330,7 +2330,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.configuration.ServerConfigManager</role>
+					<role>com.dianping.cat.report.page.NormalizePayload</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -2355,6 +2355,9 @@
 					<role-hint>metric</role-hint>
 					<field-name>m_service</field-name>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.report.page.NormalizePayload</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>