From 91c5aa79af19af37c9574c5f315a30d7a5586643 Mon Sep 17 00:00:00 2001
From: youyong205 <youyong205@126.com>
Date: Mon, 2 Dec 2013 11:26:49 +0800
Subject: [PATCH] fix cat bug

---
 cat-home/pom.xml                              |  2 +-
 .../cat/report/page/dependency/Handler.java   |  4 +++-
 .../cat/report/page/statistics/Model.java     |  2 +-
 .../cat/report/page/transaction/Handler.java  |  3 +--
 .../main/resources/META-INF/app.properties    |  2 ++
 .../dependency/DependencyGraphReport.java     | 20 -------------------
 6 files changed, 8 insertions(+), 25 deletions(-)
 create mode 100644 cat-home/src/main/resources/META-INF/app.properties
 delete mode 100644 cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java

diff --git a/cat-home/pom.xml b/cat-home/pom.xml
index 6efa73564..74354fb00 100755
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
@@ -150,7 +150,7 @@
 			<plugin>
 				<groupId>org.unidal.maven.plugins</groupId>
 				<artifactId>codegen-maven-plugin</artifactId>
-				<version>2.0.8</version>
+				<version>2.0.5</version>
 				<executions>
 					<execution>
 						<id>generate plexus component descriptor</id>
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java
index bbe6fbce7..74948c26b 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java
@@ -174,7 +174,9 @@ public class Handler implements PageHandler<Context> {
 			m_externalInfoBuilder.buildExceptionInfoOnGraph(payload, model, topologyGraph);
 			model.setReportStart(new Date(payload.getDate()));
 			model.setReportEnd(new Date(payload.getDate() + TimeUtil.ONE_HOUR - 1));
-			model.setTopologyGraph(new DefaultJsonBuilder().build(topologyGraph));
+			String build = new DefaultJsonBuilder().buildJson(topologyGraph);
+			
+			model.setTopologyGraph(build);
 			break;
 		case LINE_CHART:
 			DependencyReport dependencyReport = queryDependencyReport(payload);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java
index 1d3adbcce..086806bd6 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java
@@ -69,7 +69,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 	}
 
 	public String getBugs() {
-		return new DefaultJsonBuilder().build(m_bugReport);
+		return new DefaultJsonBuilder().buildJson(m_bugReport);
 	}
 
 	public List<Service> getCacheServices() {
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
index 9835dd69d..e3c4e9d32 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
@@ -85,7 +85,7 @@ public class Handler implements PageHandler<Context> {
 			if (payload != null && report != null) {
 				boolean isCurrent = payload.getPeriod().isCurrent();
 				double seconds;
-				
+
 				if (isCurrent) {
 					seconds = (System.currentTimeMillis() - payload.getCurrentDate()) / (double) 1000;
 				} else {
@@ -175,7 +175,6 @@ public class Handler implements PageHandler<Context> {
 
 		normalize(model, payload);
 		String type = payload.getType();
-
 		switch (payload.getAction()) {
 		case HOURLY_REPORT:
 			showHourlyReport(model, payload);
diff --git a/cat-home/src/main/resources/META-INF/app.properties b/cat-home/src/main/resources/META-INF/app.properties
new file mode 100644
index 000000000..a47ade75d
--- /dev/null
+++ b/cat-home/src/main/resources/META-INF/app.properties
@@ -0,0 +1,2 @@
+app.name=test
+app.swimlane=test
\ No newline at end of file
diff --git a/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java b/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java
deleted file mode 100644
index 518b1ecc5..000000000
--- a/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dianping.cat.report.page.dependency;
-
-import org.junit.Test;
-import org.unidal.helper.Files;
-
-import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
-import com.dianping.cat.home.dependency.graph.transform.DefaultJsonBuilder;
-import com.dianping.cat.home.dependency.graph.transform.DefaultSaxParser;
-
-public class DependencyGraphReport {
-
-	@Test
-	public void test() throws Exception {
-		String oldXml = Files.forIO().readFrom(getClass().getResourceAsStream("graph.xml"), "utf-8");
-		TopologyGraph front = DefaultSaxParser.parse(oldXml);
-		DefaultJsonBuilder build = new DefaultJsonBuilder();
-
-		System.out.println(build.build(front));
-	}
-}
-- 
GitLab