refactor code

cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java

@@ -95,7 +95,7 @@ import com.dianping.cat.report.page.metric.service.BaselineService;
 import com.dianping.cat.report.page.storage.StorageMergeHelper;
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer;
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ProjectService;
 import com.dianping.cat.system.config.AlertConfigManager;

cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java

@@ -89,11 +89,11 @@ import com.dianping.cat.report.page.statistics.task.utilization.UtilizationRepor
 import com.dianping.cat.report.page.storage.StorageMergeHelper;
 import com.dianping.cat.report.page.storage.task.StorageReportBuilder;
 import com.dianping.cat.report.page.storage.task.StorageReportService;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
 import com.dianping.cat.report.page.transaction.task.TransactionGraphCreator;
 import com.dianping.cat.report.page.transaction.task.TransactionMerger;
 import com.dianping.cat.report.page.transaction.task.TransactionReportBuilder;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.task.DefaultTaskConsumer;
 import com.dianping.cat.report.task.ReportFacade;
 import com.dianping.cat.report.task.TaskBuilder;

cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java

@@ -11,10 +11,10 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.report.graph.PieChart.Item;
-import com.dianping.cat.report.page.problem.PieGraphChartVisitor;
-import com.dianping.cat.report.page.problem.ProblemStatistics;
-import com.dianping.cat.report.page.problem.ProblemStatistics.StatusStatistics;
-import com.dianping.cat.report.page.problem.ProblemStatistics.TypeStatistics;
+import com.dianping.cat.report.page.problem.transform.PieGraphChartVisitor;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics.StatusStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics.TypeStatistics;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;

cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java

@@ -31,7 +31,7 @@ import com.dianping.cat.report.alert.AlertType;
 import com.dianping.cat.report.alert.DataChecker;
 import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.report.alert.sender.AlertManager;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;

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

@@ -29,7 +29,7 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.activity.entity.Activity;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;

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

@@ -25,9 +25,9 @@ import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.cache.CacheReport.CacheNameItem;
 import com.dianping.cat.report.page.event.service.EventReportService;
-import com.dianping.cat.report.page.transaction.AllMachineMerger;
-import com.dianping.cat.report.page.transaction.AllNameMerger;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
+import com.dianping.cat.report.page.transaction.transform.AllMachineMerger;
+import com.dianping.cat.report.page.transaction.transform.AllNameMerger;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
@@ -116,13 +116,13 @@ public class Handler implements PageHandler<Context> {
 			eventReport = response.getModel();
 		}
 		if (Constants.ALL.equalsIgnoreCase(ipAddress)) {
-			com.dianping.cat.report.page.event.AllMachineMerger allEvent = new com.dianping.cat.report.page.event.AllMachineMerger();
+			com.dianping.cat.report.page.event.transform.AllMachineMerger allEvent = new com.dianping.cat.report.page.event.transform.AllMachineMerger();
 
 			allEvent.visitEventReport(eventReport);
 			eventReport = allEvent.getReport();
 		}
 		if (Constants.ALL.equalsIgnoreCase(type)) {
-			com.dianping.cat.report.page.event.AllNameMerger allEvent = new com.dianping.cat.report.page.event.AllNameMerger();
+			com.dianping.cat.report.page.event.transform.AllNameMerger allEvent = new com.dianping.cat.report.page.event.transform.AllNameMerger();
 
 			allEvent.visitEventReport(eventReport);
 			eventReport = allEvent.getReport();

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

@@ -31,11 +31,11 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.event.EventMergeHelper;
-import com.dianping.cat.report.page.problem.ProblemStatistics;
-import com.dianping.cat.report.page.problem.ProblemStatistics.StatusStatistics;
-import com.dianping.cat.report.page.problem.ProblemStatistics.TypeStatistics;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
+import com.dianping.cat.report.page.event.transform.EventMergeHelper;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics.StatusStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics.TypeStatistics;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;

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

@@ -27,6 +27,9 @@ import com.dianping.cat.report.graph.svg.GraphBuilder;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.event.DisplayNames.EventNameModel;
 import com.dianping.cat.report.page.event.service.EventReportService;
+import com.dianping.cat.report.page.event.transform.DistributionDetailVisitor;
+import com.dianping.cat.report.page.event.transform.EventMergeHelper;
+import com.dianping.cat.report.page.event.transform.PieGraphChartVisitor;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;

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

@@ -11,7 +11,7 @@ import com.dianping.cat.consumer.event.EventAnalyzer;
 import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.helper.SortHelper;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.event.DistributionDetailVisitor.DistributionDetail;
+import com.dianping.cat.report.page.event.transform.DistributionDetailVisitor.DistributionDetail;
 
 @ModelMeta(EventAnalyzer.ID)
 public class Model extends AbstractReportModel<Action, Context> {

cat-home/src/main/java/com/dianping/cat/report/page/event/AllMachineMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/event/transform/AllMachineMerger.java

-package com.dianping.cat.report.page.event;
+package com.dianping.cat.report.page.event.transform;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.event.EventReportMerger;

cat-home/src/main/java/com/dianping/cat/report/page/event/AllNameMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/event/transform/AllNameMerger.java

-package com.dianping.cat.report.page.event;
+package com.dianping.cat.report.page.event.transform;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.event.EventReportMerger;

cat-home/src/main/java/com/dianping/cat/report/page/event/DistributionDetailVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/event/transform/DistributionDetailVisitor.java

-package com.dianping.cat.report.page.event;
+package com.dianping.cat.report.page.event.transform;
 
 import java.util.ArrayList;
 import java.util.Collections;

cat-home/src/main/java/com/dianping/cat/report/page/event/EventMergeHelper.java → cat-home/src/main/java/com/dianping/cat/report/page/event/transform/EventMergeHelper.java

-package com.dianping.cat.report.page.event;
+package com.dianping.cat.report.page.event.transform;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.event.model.entity.EventReport;

cat-home/src/main/java/com/dianping/cat/report/page/event/PieGraphChartVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/event/transform/PieGraphChartVisitor.java

-package com.dianping.cat.report.page.event;
+package com.dianping.cat.report.page.event.transform;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -28,6 +28,10 @@ import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.problem.service.ProblemReportService;
+import com.dianping.cat.report.page.problem.transform.DetailStatistics;
+import com.dianping.cat.report.page.problem.transform.HourlyLineChartVisitor;
+import com.dianping.cat.report.page.problem.transform.PieGraphChartVisitor;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;

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

@@ -11,6 +11,8 @@ import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.helper.SortHelper;
 import com.dianping.cat.report.page.AbstractReportModel;
+import com.dianping.cat.report.page.problem.transform.DetailStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 
 @ModelMeta(ProblemAnalyzer.ID)
 public class Model extends AbstractReportModel<Action, Context> {

cat-home/src/main/java/com/dianping/cat/report/page/problem/DetailStatistics.java → cat-home/src/main/java/com/dianping/cat/report/page/problem/transform/DetailStatistics.java

-package com.dianping.cat.report.page.problem;
+package com.dianping.cat.report.page.problem.transform;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;

cat-home/src/main/java/com/dianping/cat/report/page/problem/HourlyLineChartVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/problem/transform/HourlyLineChartVisitor.java

-package com.dianping.cat.report.page.problem;
+package com.dianping.cat.report.page.problem.transform;
 
 import java.util.Date;
 import java.util.LinkedHashMap;

cat-home/src/main/java/com/dianping/cat/report/page/problem/PieGraphChartVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/problem/transform/PieGraphChartVisitor.java

-package com.dianping.cat.report.page.problem;
+package com.dianping.cat.report.page.problem.transform;
 
 import java.util.ArrayList;
 import java.util.HashMap;

cat-home/src/main/java/com/dianping/cat/report/page/problem/ProblemStatistics.java → cat-home/src/main/java/com/dianping/cat/report/page/problem/transform/ProblemStatistics.java

-package com.dianping.cat.report.page.problem;
+package com.dianping.cat.report.page.problem.transform;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -15,6 +15,7 @@ import com.dianping.cat.consumer.problem.model.entity.Entity;
 import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.transform.BaseVisitor;
 import com.dianping.cat.helper.SortHelper;
+import com.dianping.cat.report.page.problem.LongConfig;
 
 public class ProblemStatistics extends BaseVisitor {
 

cat-home/src/main/java/com/dianping/cat/report/page/statistics/task/utilization/UtilizationReportBuilder.java

@@ -28,8 +28,8 @@ import com.dianping.cat.report.page.cross.display.TypeDetailInfo;
 import com.dianping.cat.report.page.cross.service.CrossReportService;
 import com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService;
 import com.dianping.cat.report.page.statistics.service.UtilizationReportService;
-import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
 

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

@@ -31,6 +31,9 @@ import com.dianping.cat.report.page.transaction.GraphPayload.DurationPayload;
 import com.dianping.cat.report.page.transaction.GraphPayload.FailurePayload;
 import com.dianping.cat.report.page.transaction.GraphPayload.HitPayload;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
+import com.dianping.cat.report.page.transaction.transform.DistributionDetailVisitor;
+import com.dianping.cat.report.page.transaction.transform.PieGraphChartVisitor;
+import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;

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

@@ -11,7 +11,7 @@ import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.helper.SortHelper;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.transaction.DistributionDetailVisitor.DistributionDetail;
+import com.dianping.cat.report.page.transaction.transform.DistributionDetailVisitor.DistributionDetail;
 
 @ModelMeta(TransactionAnalyzer.ID)
 public class Model extends AbstractReportModel<Action, Context> {

cat-home/src/main/java/com/dianping/cat/report/page/transaction/AllMachineMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/transform/AllMachineMerger.java

-package com.dianping.cat.report.page.transaction;
+package com.dianping.cat.report.page.transaction.transform;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.transaction.TransactionReportMerger;

cat-home/src/main/java/com/dianping/cat/report/page/transaction/AllNameMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/transform/AllNameMerger.java

-package com.dianping.cat.report.page.transaction;
+package com.dianping.cat.report.page.transaction.transform;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.transaction.TransactionReportMerger;

cat-home/src/main/java/com/dianping/cat/report/page/transaction/DistributionDetailVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/transform/DistributionDetailVisitor.java

-package com.dianping.cat.report.page.transaction;
+package com.dianping.cat.report.page.transaction.transform;
 
 import java.util.ArrayList;
 import java.util.Collections;

cat-home/src/main/java/com/dianping/cat/report/page/transaction/PieGraphChartVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/transform/PieGraphChartVisitor.java

-package com.dianping.cat.report.page.transaction;
+package com.dianping.cat.report.page.transaction.transform;
 
 import java.util.ArrayList;
 import java.util.HashMap;

cat-home/src/main/java/com/dianping/cat/report/page/transaction/TransactionMergeHelper.java → cat-home/src/main/java/com/dianping/cat/report/page/transaction/transform/TransactionMergeHelper.java

-package com.dianping.cat.report.page.transaction;
+package com.dianping.cat.report.page.transaction.transform;
 
 import org.unidal.lookup.util.StringUtils;
 

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

@@ -34,7 +34,7 @@ import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.problem.ProblemStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 import com.dianping.cat.report.page.web.graph.WebGraphCreator;
 import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.service.ModelRequest;

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

@@ -16,7 +16,7 @@ import com.dianping.cat.helper.SortHelper;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.problem.ProblemStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 
 public class Model extends AbstractReportModel<Action, Context> {
 

cat-home/src/main/java/com/dianping/cat/report/task/notify/render/ProblemRender.java

@@ -10,8 +10,8 @@ import java.util.Map;
 
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.problem.ProblemStatistics;
-import com.dianping.cat.report.page.problem.ProblemStatistics.TypeStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
+import com.dianping.cat.report.page.problem.transform.ProblemStatistics.TypeStatistics;
 
 public class ProblemRender {