From c1cf416a44e01b5e1384c2780a9a3c43521a1c9d Mon Sep 17 00:00:00 2001 From: youyong205 Date: Mon, 23 Mar 2015 17:25:36 +0800 Subject: [PATCH] modify the package --- .../cat/broker/api/page/MonitorManager.java | 4 +- .../cat/broker/api/page/batch/Handler.java | 4 +- .../broker/api/page/connection/Handler.java | 4 +- .../cat/broker/api/page/speed/Handler.java | 4 +- .../broker/build/ComponentsConfigurator.java | 2 +- .../resources/META-INF/plexus/components.xml | 12 +- .../dianping/cat/broker/IpServiceTest.java | 4 +- .../build/ComponentsConfigurator.java | 2 +- .../resources/META-INF/plexus/components.xml | 4 +- .../cat/consumer/dependency/Configurator.java | 2 +- .../cat/analysis/TcpSocketReceiver.java | 24 +- .../cat/build/ComponentsConfigurator.java | 4 +- .../dianping/cat/mvc/AbstractReportModel.java | 6 +- .../cat/mvc/AbstractReportPayload.java | 2 +- .../java/com/dianping/cat/mvc/ApiPayload.java | 36 +-- .../cat/report/DefaultReportManager.java | 2 +- .../service/AbstractReportService.java | 2 +- .../service/BaseCompositeModelService.java | 2 +- .../service/BaseHistoricalModelService.java | 2 +- .../service/BaseRemoteModelService.java | 2 +- .../service/LocalModelService.java | 6 +- .../cat/{ => report}/service/ModelPeriod.java | 2 +- .../{ => report}/service/ModelRequest.java | 2 +- .../{ => report}/service/ModelResponse.java | 2 +- .../{ => report}/service/ModelService.java | 2 +- .../service/ModelServiceWithCalSupport.java | 2 +- .../{ => report}/service/ReportService.java | 2 +- .../cat/{dal => service}/HostinfoService.java | 2 +- .../cat/{dal => service}/IpService.java | 2 +- .../cat/{dal => service}/ProjectService.java | 20 +- .../resources/META-INF/plexus/components.xml | 8 +- .../dianping/cat/service/IpServiceTest.java | 3 +- .../dianping/cat/service/ModelPeriodTest.java | 2 + .../cat/service/ModelRequestTest.java | 3 + .../cat/service/ModelResponseTest.java | 2 + .../cat/build/AlarmComponentConfigurator.java | 4 +- .../cat/build/ComponentsConfigurator.java | 8 +- .../build/ServiceComponentConfigurator.java | 6 +- .../cat/build/TaskComponentConfigurator.java | 4 +- .../alert/MetricReportGroupService.java | 8 +- .../alert/exception/ExceptionAlert.java | 6 +- .../alert/heartbeat/HeartbeatAlert.java | 6 +- .../sender/decorator/ProjectDecorator.java | 2 +- .../sender/receiver/ProjectContactor.java | 2 +- .../alert/storage/AbstractStorageAlert.java | 8 +- .../summary/build/FailureSummaryBuilder.java | 6 +- .../alert/transaction/TransactionAlert.java | 8 +- .../cat/report/alert/web/WebAlert.java | 4 +- .../impl/CachedMetricReportServiceImpl.java | 10 +- .../cat/report/page/activity/Handler.java | 8 +- .../page/app/processor/CrashLogProcessor.java | 6 +- .../page/app/service/AppReportService.java | 2 +- .../cat/report/page/cache/Handler.java | 6 +- .../page/cdn/graph/CdnReportConvertor.java | 4 +- .../cat/report/page/cross/Handler.java | 8 +- .../report/page/cross/display/HostInfo.java | 2 +- .../report/page/cross/display/MethodInfo.java | 2 +- .../cross/service/CompositeCrossService.java | 8 +- .../cross/service/CrossReportService.java | 2 +- .../cross/service/HistoricalCrossService.java | 4 +- .../page/cross/service/LocalCrossService.java | 6 +- .../cross/service/RemoteCrossService.java | 2 +- .../cat/report/page/dashboard/Handler.java | 8 +- .../page/dependency/ExternalInfoBuilder.java | 6 +- .../cat/report/page/dependency/Handler.java | 6 +- .../graph/TopologyGraphManager.java | 8 +- .../service/CompositeDependencyService.java | 8 +- .../service/DependencyReportService.java | 2 +- .../service/HistoricalDependencyService.java | 4 +- .../service/LocalDependencyService.java | 6 +- .../service/RemoteDependencyService.java | 2 +- .../cat/report/page/event/Handler.java | 6 +- .../event/service/CompositeEventService.java | 8 +- .../event/service/EventReportService.java | 2 +- .../event/service/HistoricalEventService.java | 4 +- .../page/event/service/LocalEventService.java | 6 +- .../event/service/RemoteEventService.java | 2 +- .../cat/report/page/heartbeat/Handler.java | 8 +- .../service/CompositeHeartbeatService.java | 8 +- .../service/HeartbeatReportService.java | 2 +- .../service/HistoricalHeartbeatService.java | 4 +- .../service/LocalHeartbeatService.java | 6 +- .../service/RemoteHeartbeatService.java | 2 +- .../cat/report/page/logview/Handler.java | 6 +- .../service/CompositeLogViewService.java | 8 +- .../service/HistoricalMessageService.java | 4 +- .../logview/service/LocalMessageService.java | 10 +- .../logview/service/RemoteLogViewService.java | 8 +- .../cat/report/page/matrix/Handler.java | 6 +- .../service/CompositeMatrixService.java | 8 +- .../service/HistoricalMatrixService.java | 4 +- .../matrix/service/LocalMatrixService.java | 6 +- .../matrix/service/MatrixReportService.java | 2 +- .../matrix/service/RemoteMatrixService.java | 2 +- .../cat/report/page/metric/GraphCreator.java | 2 +- .../service/CompositeMetricService.java | 8 +- .../service/DefaultBaselineService.java | 2 +- .../service/HistoricalMetricService.java | 4 +- .../metric/service/LocalMetricService.java | 8 +- .../metric/service/MetricReportService.java | 2 +- .../metric/service/RemoteMetricService.java | 2 +- .../cat/report/page/model/Handler.java | 6 +- .../cat/report/page/model/Payload.java | 2 +- .../cat/report/page/network/Handler.java | 2 +- .../network/nettopology/NetGraphManager.java | 8 +- .../service/NetTopologyReportService.java | 2 +- .../cat/report/page/problem/Handler.java | 8 +- .../service/CompositeProblemService.java | 8 +- .../service/HistoricalProblemService.java | 4 +- .../problem/service/LocalProblemService.java | 6 +- .../problem/service/ProblemReportService.java | 2 +- .../problem/service/RemoteProblemService.java | 2 +- .../cat/report/page/state/Handler.java | 6 +- .../cat/report/page/state/StateBuilder.java | 6 +- .../state/service/CompositeStateService.java | 8 +- .../state/service/HistoricalStateService.java | 4 +- .../page/state/service/LocalStateService.java | 6 +- .../state/service/RemoteStateService.java | 2 +- .../state/service/StateReportService.java | 2 +- .../page/state/task/StateReportBuilder.java | 4 +- .../cat/report/page/statistics/Handler.java | 2 +- .../statistics/service/BugReportService.java | 2 +- .../service/HeavyReportService.java | 2 +- .../statistics/service/JarReportService.java | 2 +- .../service/ServiceReportService.java | 2 +- .../service/SystemReportService.java | 2 +- .../service/UtilizationReportService.java | 2 +- .../cat/report/page/storage/Handler.java | 6 +- .../service/CompositeStorageService.java | 8 +- .../service/HistoricalStorageService.java | 4 +- .../storage/service/LocalStorageService.java | 6 +- .../storage/service/RemoteStorageService.java | 2 +- .../storage/task/StorageReportService.java | 2 +- .../dianping/cat/report/page/top/Handler.java | 6 +- .../page/top/service/CompositeTopService.java | 8 +- .../top/service/HistoricalTopService.java | 4 +- .../page/top/service/LocalTopService.java | 6 +- .../page/top/service/RemoteTopService.java | 2 +- .../page/top/service/TopReportService.java | 2 +- .../cat/report/page/transaction/Handler.java | 6 +- .../service/CompositeTransactionService.java | 8 +- .../service/HistoricalTransactionService.java | 4 +- .../service/LocalTransactionService.java | 6 +- .../service/RemoteTransactionService.java | 2 +- .../service/TransactionReportService.java | 2 +- .../dianping/cat/report/page/web/Handler.java | 6 +- .../report/task/cmdb/ProjectUpdateTask.java | 4 +- .../report/task/notify/NotifyTaskBuilder.java | 2 +- .../processor/GlobalConfigProcessor.java | 2 +- .../router/service/RouterConfigService.java | 2 +- .../resources/META-INF/plexus/components.xml | 220 +++++++++--------- .../report/page/transaction/PayloadTest.java | 2 +- .../task/service/ServiceBuilderTest.java | 2 +- .../utilization/UtilizationBuilderTest.java | 2 +- 154 files changed, 480 insertions(+), 474 deletions(-) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/AbstractReportService.java (99%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/BaseCompositeModelService.java (99%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/BaseHistoricalModelService.java (97%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/BaseRemoteModelService.java (98%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/LocalModelService.java (98%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ModelPeriod.java (96%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ModelRequest.java (96%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ModelResponse.java (91%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ModelService.java (80%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ModelServiceWithCalSupport.java (97%) rename cat-core/src/main/java/com/dianping/cat/{ => report}/service/ReportService.java (95%) rename cat-core/src/main/java/com/dianping/cat/{dal => service}/HostinfoService.java (99%) rename cat-core/src/main/java/com/dianping/cat/{dal => service}/IpService.java (99%) rename cat-core/src/main/java/com/dianping/cat/{dal => service}/ProjectService.java (99%) diff --git a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java index 4bc8301db..2d5967249 100644 --- a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java +++ b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java @@ -18,12 +18,12 @@ import com.dianping.cat.Cat; import com.dianping.cat.CatConstants; import com.dianping.cat.Constants; import com.dianping.cat.config.url.UrlPatternConfigManager; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; import com.dianping.cat.message.Event; import com.dianping.cat.message.Metric; import com.dianping.cat.message.Transaction; import com.dianping.cat.message.internal.DefaultMetric; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; import org.unidal.lookup.util.StringUtils; diff --git a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java index 3c257e952..ab81b7b09 100644 --- a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java +++ b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java @@ -23,9 +23,9 @@ import com.dianping.cat.broker.api.app.proto.AppDataProto; import com.dianping.cat.broker.api.app.proto.ProtoData; import com.dianping.cat.broker.api.page.RequestUtils; import com.dianping.cat.config.app.AppConfigManager; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; import com.dianping.cat.message.Event; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; public class Handler implements PageHandler, LogEnabled { diff --git a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/connection/Handler.java b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/connection/Handler.java index 62494b893..26579f05a 100644 --- a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/connection/Handler.java +++ b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/connection/Handler.java @@ -26,9 +26,9 @@ import com.dianping.cat.broker.api.page.batch.Context; import com.dianping.cat.broker.api.page.batch.Payload; import com.dianping.cat.broker.api.page.batch.UrlParser; import com.dianping.cat.config.app.AppConfigManager; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; import com.dianping.cat.message.Event; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; public class Handler implements PageHandler, LogEnabled { @Inject diff --git a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/speed/Handler.java b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/speed/Handler.java index dd1084b6d..3804ae7d5 100644 --- a/cat-broker/src/main/java/com/dianping/cat/broker/api/page/speed/Handler.java +++ b/cat-broker/src/main/java/com/dianping/cat/broker/api/page/speed/Handler.java @@ -24,9 +24,9 @@ import com.dianping.cat.broker.api.app.proto.ProtoData; import com.dianping.cat.broker.api.page.RequestUtils; import com.dianping.cat.config.app.AppConfigManager; import com.dianping.cat.config.app.AppSpeedConfigManager; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; import com.dianping.cat.message.Event; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; import org.unidal.helper.Splitters; import org.unidal.lookup.util.StringUtils; diff --git a/cat-broker/src/main/java/com/dianping/cat/broker/build/ComponentsConfigurator.java b/cat-broker/src/main/java/com/dianping/cat/broker/build/ComponentsConfigurator.java index 1aa65fc5c..f2430d459 100644 --- a/cat-broker/src/main/java/com/dianping/cat/broker/build/ComponentsConfigurator.java +++ b/cat-broker/src/main/java/com/dianping/cat/broker/build/ComponentsConfigurator.java @@ -22,7 +22,7 @@ import com.dianping.cat.config.app.AppCommandDataTableProvider; import com.dianping.cat.config.app.AppConnectionTableProvider; import com.dianping.cat.config.app.AppSpeedTableProvider; import com.dianping.cat.config.url.UrlPatternConfigManager; -import com.dianping.cat.dal.IpService; +import com.dianping.cat.service.IpService; public class ComponentsConfigurator extends AbstractResourceConfigurator { public static void main(String[] args) { diff --git a/cat-broker/src/main/resources/META-INF/plexus/components.xml b/cat-broker/src/main/resources/META-INF/plexus/components.xml index ee01d9607..d3e31e575 100644 --- a/cat-broker/src/main/resources/META-INF/plexus/components.xml +++ b/cat-broker/src/main/resources/META-INF/plexus/components.xml @@ -12,7 +12,7 @@ com.dianping.cat.config.url.UrlPatternConfigManager - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService @@ -154,7 +154,7 @@ com.dianping.cat.broker.api.page.MonitorManager - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService com.dianping.cat.config.url.UrlPatternConfigManager @@ -162,8 +162,8 @@ - com.dianping.cat.dal.IpService - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService + com.dianping.cat.service.IpService com.dianping.cat.config.url.UrlPatternConfigManager @@ -201,7 +201,7 @@ com.dianping.cat.broker.api.app.AppConsumer - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService com.dianping.cat.config.app.AppConfigManager @@ -299,7 +299,7 @@ com.dianping.cat.broker.api.app.AppConsumer - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService com.dianping.cat.config.app.AppConfigManager diff --git a/cat-broker/src/test/java/com/dianping/cat/broker/IpServiceTest.java b/cat-broker/src/test/java/com/dianping/cat/broker/IpServiceTest.java index 2ef93db73..c9e2b2581 100644 --- a/cat-broker/src/test/java/com/dianping/cat/broker/IpServiceTest.java +++ b/cat-broker/src/test/java/com/dianping/cat/broker/IpServiceTest.java @@ -3,8 +3,8 @@ package com.dianping.cat.broker; import org.junit.Test; import org.unidal.lookup.ComponentTestCase; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; public class IpServiceTest extends ComponentTestCase { @Test diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java index 77a4c3e09..8ef11b710 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java @@ -49,7 +49,6 @@ import com.dianping.cat.core.config.ConfigDao; import com.dianping.cat.core.dal.HourlyReportContentDao; import com.dianping.cat.core.dal.HourlyReportDao; import com.dianping.cat.core.dal.ProjectDao; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.hadoop.hdfs.HdfsUploader; import com.dianping.cat.message.PathBuilder; import com.dianping.cat.message.storage.MessageBucketManager; @@ -58,6 +57,7 @@ import com.dianping.cat.report.DomainValidator; import com.dianping.cat.report.ReportBucketManager; import com.dianping.cat.report.ReportDelegate; import com.dianping.cat.report.ReportManager; +import com.dianping.cat.service.ProjectService; import com.dianping.cat.statistic.ServerStatisticManager; import com.dianping.cat.task.TaskManager; diff --git a/cat-consumer/src/main/resources/META-INF/plexus/components.xml b/cat-consumer/src/main/resources/META-INF/plexus/components.xml index 39825c785..937225882 100644 --- a/cat-consumer/src/main/resources/META-INF/plexus/components.xml +++ b/cat-consumer/src/main/resources/META-INF/plexus/components.xml @@ -338,8 +338,8 @@ - com.dianping.cat.dal.ProjectService - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.core.dal.ProjectDao diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/dependency/Configurator.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/dependency/Configurator.java index 78a91b7fe..4c5781aee 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/dependency/Configurator.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/dependency/Configurator.java @@ -13,9 +13,9 @@ import org.unidal.lookup.configuration.Component; import com.dianping.cat.Constants; import com.dianping.cat.consumer.MockReportManager; import com.dianping.cat.consumer.dependency.model.entity.DependencyReport; -import com.dianping.cat.dal.HostinfoService; import com.dianping.cat.report.ReportDelegate; import com.dianping.cat.report.ReportManager; +import com.dianping.cat.service.HostinfoService; public class Configurator extends AbstractResourceConfigurator { diff --git a/cat-core/src/main/java/com/dianping/cat/analysis/TcpSocketReceiver.java b/cat-core/src/main/java/com/dianping/cat/analysis/TcpSocketReceiver.java index 3bfba1550..a3a72bc4e 100644 --- a/cat-core/src/main/java/com/dianping/cat/analysis/TcpSocketReceiver.java +++ b/cat-core/src/main/java/com/dianping/cat/analysis/TcpSocketReceiver.java @@ -59,6 +59,18 @@ public final class TcpSocketReceiver implements LogEnabled { private volatile long m_processCount; + public synchronized void destory() { + try { + m_logger.info("start shutdown socket, port " + m_port); + m_future.channel().closeFuture(); + m_bossGroup.shutdownGracefully(); + m_workerGroup.shutdownGracefully(); + m_logger.info("shutdown socket success"); + } catch (Exception e) { + m_logger.warn(e.getMessage(), e); + } + } + @Override public void enableLogging(Logger logger) { m_logger = logger; @@ -81,18 +93,6 @@ public final class TcpSocketReceiver implements LogEnabled { } } - public synchronized void destory() { - try { - m_logger.info("start shutdown socket, port " + m_port); - m_future.channel().closeFuture(); - m_bossGroup.shutdownGracefully(); - m_workerGroup.shutdownGracefully(); - m_logger.info("shutdown socket success"); - } catch (Exception e) { - m_logger.warn(e.getMessage(), e); - } - } - public synchronized void startServer(int port) throws InterruptedException { boolean linux = getOSMatches("Linux") || getOSMatches("LINUX"); int threads = 24; diff --git a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index e12f3ffaa..ea8d989b0 100644 --- a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -31,13 +31,13 @@ import com.dianping.cat.config.url.UrlPatternHandler; import com.dianping.cat.core.config.ConfigDao; import com.dianping.cat.core.dal.HostinfoDao; import com.dianping.cat.core.dal.TaskDao; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.IpService; import com.dianping.cat.message.DefaultPathBuilder; import com.dianping.cat.message.PathBuilder; import com.dianping.cat.message.spi.MessageCodec; import com.dianping.cat.message.spi.codec.PlainTextMessageCodec; import com.dianping.cat.report.DomainValidator; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.IpService; import com.dianping.cat.statistic.ServerStatisticManager; import com.dianping.cat.task.TaskManager; diff --git a/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportModel.java b/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportModel.java index fbfc8f1fa..e47535cfe 100755 --- a/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportModel.java +++ b/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportModel.java @@ -16,10 +16,10 @@ import org.unidal.web.mvc.Page; import org.unidal.web.mvc.ViewModel; import com.dianping.cat.Cat; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.ProjectService; -import com.dianping.cat.dal.ProjectService.Department; import com.dianping.cat.helper.JsonBuilder; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.ProjectService; +import com.dianping.cat.service.ProjectService.Department; public abstract class AbstractReportModel> extends ViewModel { diff --git a/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportPayload.java b/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportPayload.java index bb510444b..7040a09cd 100755 --- a/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportPayload.java +++ b/cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportPayload.java @@ -13,7 +13,7 @@ import org.unidal.web.mvc.payload.annotation.FieldMeta; import com.dianping.cat.Constants; import com.dianping.cat.helper.TimeHelper; -import com.dianping.cat.service.ModelPeriod; +import com.dianping.cat.report.service.ModelPeriod; public abstract class AbstractReportPayload implements ActionPayload { diff --git a/cat-core/src/main/java/com/dianping/cat/mvc/ApiPayload.java b/cat-core/src/main/java/com/dianping/cat/mvc/ApiPayload.java index c1de600e4..13a76828e 100644 --- a/cat-core/src/main/java/com/dianping/cat/mvc/ApiPayload.java +++ b/cat-core/src/main/java/com/dianping/cat/mvc/ApiPayload.java @@ -36,7 +36,7 @@ public class ApiPayload { @FieldMeta("province") private String m_province; - + @FieldMeta("queryType") private String m_queryType; @@ -48,17 +48,17 @@ public class ApiPayload { } public String getChannel() { - return m_channel; - } - + return m_channel; + } + public String getCity() { - return m_city; - } - + return m_city; + } + public String getDatabase() { return m_database; } - + public String getIpAddress() { return m_ipAddress; } @@ -80,8 +80,8 @@ public class ApiPayload { } public String getQueryType() { - return m_queryType; - } + return m_queryType; + } public String getThreadId() { return m_threadId; @@ -90,7 +90,7 @@ public class ApiPayload { public String getType() { return m_type; } - + public boolean isWaterfall() { return m_waterfall; } @@ -100,12 +100,12 @@ public class ApiPayload { } public void setChannel(String channel) { - m_channel = channel; - } + m_channel = channel; + } public void setCity(String city) { - m_city = city; - } + m_city = city; + } public void setDatabase(String database) { m_database = database; @@ -126,14 +126,14 @@ public class ApiPayload { public void setName(String name) { m_name = name; } - + public void setProvince(String province) { m_province = province; } public void setQueryType(String queryType) { - m_queryType = queryType; - } + m_queryType = queryType; + } public void setThreadId(String threadId) { m_threadId = threadId; diff --git a/cat-core/src/main/java/com/dianping/cat/report/DefaultReportManager.java b/cat-core/src/main/java/com/dianping/cat/report/DefaultReportManager.java index 5860df523..6ac69ec55 100644 --- a/cat-core/src/main/java/com/dianping/cat/report/DefaultReportManager.java +++ b/cat-core/src/main/java/com/dianping/cat/report/DefaultReportManager.java @@ -25,7 +25,7 @@ import com.dianping.cat.core.dal.HourlyReportContentDao; import com.dianping.cat.core.dal.HourlyReportDao; import com.dianping.cat.message.Message; import com.dianping.cat.message.Transaction; -import com.dianping.cat.service.ModelPeriod; +import com.dianping.cat.report.service.ModelPeriod; /** * Hourly report manager by domain of one report type(such as Transaction, Event, Problem, Heartbeat etc.) produced in diff --git a/cat-core/src/main/java/com/dianping/cat/service/AbstractReportService.java b/cat-core/src/main/java/com/dianping/cat/report/service/AbstractReportService.java similarity index 99% rename from cat-core/src/main/java/com/dianping/cat/service/AbstractReportService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/AbstractReportService.java index a3303d82e..a37bd9c69 100644 --- a/cat-core/src/main/java/com/dianping/cat/service/AbstractReportService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/AbstractReportService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/cat-core/src/main/java/com/dianping/cat/service/BaseCompositeModelService.java b/cat-core/src/main/java/com/dianping/cat/report/service/BaseCompositeModelService.java similarity index 99% rename from cat-core/src/main/java/com/dianping/cat/service/BaseCompositeModelService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/BaseCompositeModelService.java index 5a8ff56f3..a9860b0b5 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/BaseCompositeModelService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/BaseCompositeModelService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.util.ArrayList; import java.util.Collections; diff --git a/cat-core/src/main/java/com/dianping/cat/service/BaseHistoricalModelService.java b/cat-core/src/main/java/com/dianping/cat/report/service/BaseHistoricalModelService.java similarity index 97% rename from cat-core/src/main/java/com/dianping/cat/service/BaseHistoricalModelService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/BaseHistoricalModelService.java index a21224103..155f63265 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/BaseHistoricalModelService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/BaseHistoricalModelService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; diff --git a/cat-core/src/main/java/com/dianping/cat/service/BaseRemoteModelService.java b/cat-core/src/main/java/com/dianping/cat/report/service/BaseRemoteModelService.java similarity index 98% rename from cat-core/src/main/java/com/dianping/cat/service/BaseRemoteModelService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/BaseRemoteModelService.java index 18abcb409..31a30e0b7 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/BaseRemoteModelService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/BaseRemoteModelService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.io.IOException; import java.io.InputStream; diff --git a/cat-core/src/main/java/com/dianping/cat/service/LocalModelService.java b/cat-core/src/main/java/com/dianping/cat/report/service/LocalModelService.java similarity index 98% rename from cat-core/src/main/java/com/dianping/cat/service/LocalModelService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/LocalModelService.java index 1f7f2c644..f57175296 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/LocalModelService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/LocalModelService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; @@ -25,8 +25,6 @@ public abstract class LocalModelService implements Initializable { private String m_name; - public abstract String getReport(ModelRequest request, ModelPeriod period, String domain, ApiPayload payload) throws Exception; - public LocalModelService(String name) { m_name = name; } @@ -60,6 +58,8 @@ public abstract class LocalModelService implements Initializable { throw new RuntimeException("Internal error: this should not be reached!"); } + public abstract String getReport(ModelRequest request, ModelPeriod period, String domain, ApiPayload payload) throws Exception; + @Override public void initialize() throws InitializationException { m_defaultDomain = m_manager.getConsoleDefaultDomain(); diff --git a/cat-core/src/main/java/com/dianping/cat/service/ModelPeriod.java b/cat-core/src/main/java/com/dianping/cat/report/service/ModelPeriod.java similarity index 96% rename from cat-core/src/main/java/com/dianping/cat/service/ModelPeriod.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ModelPeriod.java index b43a1b120..95bf65020 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/ModelPeriod.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ModelPeriod.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import com.dianping.cat.Constants; diff --git a/cat-core/src/main/java/com/dianping/cat/service/ModelRequest.java b/cat-core/src/main/java/com/dianping/cat/report/service/ModelRequest.java similarity index 96% rename from cat-core/src/main/java/com/dianping/cat/service/ModelRequest.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ModelRequest.java index acb4c5be5..001c0d4f8 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/ModelRequest.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ModelRequest.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.util.LinkedHashMap; import java.util.Map; diff --git a/cat-core/src/main/java/com/dianping/cat/service/ModelResponse.java b/cat-core/src/main/java/com/dianping/cat/report/service/ModelResponse.java similarity index 91% rename from cat-core/src/main/java/com/dianping/cat/service/ModelResponse.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ModelResponse.java index edd10955c..46c31cfae 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/ModelResponse.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ModelResponse.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; public class ModelResponse { diff --git a/cat-core/src/main/java/com/dianping/cat/service/ModelService.java b/cat-core/src/main/java/com/dianping/cat/report/service/ModelService.java similarity index 80% rename from cat-core/src/main/java/com/dianping/cat/service/ModelService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ModelService.java index 13aa16254..dac4d83db 100755 --- a/cat-core/src/main/java/com/dianping/cat/service/ModelService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ModelService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; public interface ModelService { diff --git a/cat-core/src/main/java/com/dianping/cat/service/ModelServiceWithCalSupport.java b/cat-core/src/main/java/com/dianping/cat/report/service/ModelServiceWithCalSupport.java similarity index 97% rename from cat-core/src/main/java/com/dianping/cat/service/ModelServiceWithCalSupport.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ModelServiceWithCalSupport.java index dac57e847..5949370ae 100644 --- a/cat-core/src/main/java/com/dianping/cat/service/ModelServiceWithCalSupport.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ModelServiceWithCalSupport.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/cat-core/src/main/java/com/dianping/cat/service/ReportService.java b/cat-core/src/main/java/com/dianping/cat/report/service/ReportService.java similarity index 95% rename from cat-core/src/main/java/com/dianping/cat/service/ReportService.java rename to cat-core/src/main/java/com/dianping/cat/report/service/ReportService.java index 5032dafc0..948a0cc75 100644 --- a/cat-core/src/main/java/com/dianping/cat/service/ReportService.java +++ b/cat-core/src/main/java/com/dianping/cat/report/service/ReportService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.service; +package com.dianping.cat.report.service; import java.util.Date; import java.util.Set; diff --git a/cat-core/src/main/java/com/dianping/cat/dal/HostinfoService.java b/cat-core/src/main/java/com/dianping/cat/service/HostinfoService.java similarity index 99% rename from cat-core/src/main/java/com/dianping/cat/dal/HostinfoService.java rename to cat-core/src/main/java/com/dianping/cat/service/HostinfoService.java index 6a455909d..de5b96879 100644 --- a/cat-core/src/main/java/com/dianping/cat/dal/HostinfoService.java +++ b/cat-core/src/main/java/com/dianping/cat/service/HostinfoService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.dal; +package com.dianping.cat.service; import java.util.ArrayList; import java.util.Date; diff --git a/cat-core/src/main/java/com/dianping/cat/dal/IpService.java b/cat-core/src/main/java/com/dianping/cat/service/IpService.java similarity index 99% rename from cat-core/src/main/java/com/dianping/cat/dal/IpService.java rename to cat-core/src/main/java/com/dianping/cat/service/IpService.java index b27f4dfd7..2a0496066 100644 --- a/cat-core/src/main/java/com/dianping/cat/dal/IpService.java +++ b/cat-core/src/main/java/com/dianping/cat/service/IpService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.dal; +package com.dianping.cat.service; import java.io.BufferedReader; import java.io.IOException; diff --git a/cat-core/src/main/java/com/dianping/cat/dal/ProjectService.java b/cat-core/src/main/java/com/dianping/cat/service/ProjectService.java similarity index 99% rename from cat-core/src/main/java/com/dianping/cat/dal/ProjectService.java rename to cat-core/src/main/java/com/dianping/cat/service/ProjectService.java index 2a514df07..bab75699b 100644 --- a/cat-core/src/main/java/com/dianping/cat/dal/ProjectService.java +++ b/cat-core/src/main/java/com/dianping/cat/service/ProjectService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.dal; +package com.dianping.cat.service; import java.util.ArrayList; import java.util.Collection; @@ -95,15 +95,6 @@ public class ProjectService implements Initializable { } } - public Project findProject(String domain) { - Project project = m_domainToProjects.get(domain); - - if (project == null) { - project = m_cmdbToProjects.get(domain); - } - return project; - } - public Map findDepartments(Collection domains) { Map departments = new TreeMap(); @@ -131,6 +122,15 @@ public class ProjectService implements Initializable { return departments; } + public Project findProject(String domain) { + Project project = m_domainToProjects.get(domain); + + if (project == null) { + project = m_cmdbToProjects.get(domain); + } + return project; + } + @Override public void initialize() throws InitializationException { if (!m_manager.isLocalMode()) { diff --git a/cat-core/src/main/resources/META-INF/plexus/components.xml b/cat-core/src/main/resources/META-INF/plexus/components.xml index 58666e84c..018c4145d 100644 --- a/cat-core/src/main/resources/META-INF/plexus/components.xml +++ b/cat-core/src/main/resources/META-INF/plexus/components.xml @@ -16,8 +16,8 @@ - com.dianping.cat.dal.HostinfoService - com.dianping.cat.dal.HostinfoService + com.dianping.cat.service.HostinfoService + com.dianping.cat.service.HostinfoService com.dianping.cat.core.dal.HostinfoDao @@ -28,8 +28,8 @@ - com.dianping.cat.dal.IpService - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService + com.dianping.cat.service.IpService com.dianping.cat.task.TaskManager diff --git a/cat-core/src/test/java/com/dianping/cat/service/IpServiceTest.java b/cat-core/src/test/java/com/dianping/cat/service/IpServiceTest.java index 8ee7a4f48..098120aed 100644 --- a/cat-core/src/test/java/com/dianping/cat/service/IpServiceTest.java +++ b/cat-core/src/test/java/com/dianping/cat/service/IpServiceTest.java @@ -3,8 +3,7 @@ package com.dianping.cat.service; import org.junit.Test; import org.unidal.lookup.ComponentTestCase; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; +import com.dianping.cat.service.IpService.IpInfo; public class IpServiceTest extends ComponentTestCase { @Test diff --git a/cat-core/src/test/java/com/dianping/cat/service/ModelPeriodTest.java b/cat-core/src/test/java/com/dianping/cat/service/ModelPeriodTest.java index a122bbc36..9a383c034 100644 --- a/cat-core/src/test/java/com/dianping/cat/service/ModelPeriodTest.java +++ b/cat-core/src/test/java/com/dianping/cat/service/ModelPeriodTest.java @@ -2,6 +2,8 @@ package com.dianping.cat.service; import org.junit.Test; +import com.dianping.cat.report.service.ModelPeriod; + import junit.framework.Assert; public class ModelPeriodTest { diff --git a/cat-core/src/test/java/com/dianping/cat/service/ModelRequestTest.java b/cat-core/src/test/java/com/dianping/cat/service/ModelRequestTest.java index d4c6ef8cd..26c815c69 100644 --- a/cat-core/src/test/java/com/dianping/cat/service/ModelRequestTest.java +++ b/cat-core/src/test/java/com/dianping/cat/service/ModelRequestTest.java @@ -4,6 +4,9 @@ import junit.framework.Assert; import org.junit.Test; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; + public class ModelRequestTest { @Test diff --git a/cat-core/src/test/java/com/dianping/cat/service/ModelResponseTest.java b/cat-core/src/test/java/com/dianping/cat/service/ModelResponseTest.java index dac1d9546..43ab61c8d 100644 --- a/cat-core/src/test/java/com/dianping/cat/service/ModelResponseTest.java +++ b/cat-core/src/test/java/com/dianping/cat/service/ModelResponseTest.java @@ -2,6 +2,8 @@ package com.dianping.cat.service; import org.junit.Test; +import com.dianping.cat.report.service.ModelResponse; + import junit.framework.Assert; public class ModelResponseTest { diff --git a/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java index b6cca8751..f4cd596bb 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java @@ -20,7 +20,6 @@ import com.dianping.cat.consumer.storage.StorageAnalyzer; import com.dianping.cat.consumer.top.TopAnalyzer; import com.dianping.cat.consumer.transaction.TransactionAnalyzer; import com.dianping.cat.core.config.ConfigDao; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.home.dal.report.AlertDao; import com.dianping.cat.home.dal.report.AlertSummaryDao; import com.dianping.cat.home.dal.report.AlterationDao; @@ -113,7 +112,8 @@ import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder; import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelService; +import com.dianping.cat.service.ProjectService; public class AlarmComponentConfigurator extends AbstractResourceConfigurator { @Override diff --git a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index a46d1e528..434854a84 100755 --- a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -28,9 +28,6 @@ import com.dianping.cat.consumer.dependency.DependencyAnalyzer; import com.dianping.cat.consumer.metric.MetricAnalyzer; import com.dianping.cat.consumer.metric.MetricConfigManager; import com.dianping.cat.core.config.ConfigDao; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.JsonBuilder; import com.dianping.cat.home.dal.report.AlertDao; import com.dianping.cat.home.dal.report.TopologyGraphDao; @@ -82,8 +79,11 @@ import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer; import com.dianping.cat.report.page.transaction.service.TransactionReportService; +import com.dianping.cat.report.service.ModelService; import com.dianping.cat.report.task.cmdb.ProjectUpdateTask; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.ProjectService; import com.dianping.cat.system.page.router.config.RouterConfigManager; public class ComponentsConfigurator extends AbstractResourceConfigurator { diff --git a/cat-home/src/main/java/com/dianping/cat/build/ServiceComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ServiceComponentConfigurator.java index 99dc62107..e52a9af91 100755 --- a/cat-home/src/main/java/com/dianping/cat/build/ServiceComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ServiceComponentConfigurator.java @@ -20,7 +20,6 @@ import com.dianping.cat.consumer.state.StateAnalyzer; import com.dianping.cat.consumer.storage.StorageAnalyzer; import com.dianping.cat.consumer.top.TopAnalyzer; import com.dianping.cat.consumer.transaction.TransactionAnalyzer; -import com.dianping.cat.dal.IpService; import com.dianping.cat.hadoop.hdfs.HdfsMessageBucketManager; import com.dianping.cat.message.codec.HtmlMessageCodec; import com.dianping.cat.message.codec.WaterfallMessageCodec; @@ -74,8 +73,9 @@ import com.dianping.cat.report.page.transaction.service.CompositeTransactionServ import com.dianping.cat.report.page.transaction.service.HistoricalTransactionService; import com.dianping.cat.report.page.transaction.service.LocalTransactionService; import com.dianping.cat.report.page.transaction.service.TransactionReportService; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelService; +import com.dianping.cat.service.IpService; class ServiceComponentConfigurator extends AbstractResourceConfigurator { @Override diff --git a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java index c5deec45b..508ca0d4d 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java @@ -23,8 +23,6 @@ import com.dianping.cat.core.dal.HourlyReportDao; import com.dianping.cat.core.dal.MonthlyReportDao; import com.dianping.cat.core.dal.TaskDao; import com.dianping.cat.core.dal.WeeklyReportDao; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.home.dal.report.BaselineDao; import com.dianping.cat.core.dal.DailyReportContentDao; import com.dianping.cat.core.dal.MonthlyReportContentDao; @@ -108,6 +106,8 @@ import com.dianping.cat.report.task.notify.NotifyTaskBuilder; import com.dianping.cat.report.task.notify.ReportRender; import com.dianping.cat.report.task.notify.ReportRenderImpl; import com.dianping.cat.report.task.notify.render.AppDataComparisonRender; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.ProjectService; import com.dianping.cat.system.page.router.config.RouterConfigManager; import com.dianping.cat.system.page.router.service.RouterConfigService; import com.dianping.cat.system.page.router.task.RouterConfigBuilder; diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/MetricReportGroupService.java b/cat-home/src/main/java/com/dianping/cat/report/alert/MetricReportGroupService.java index d4e76df1d..a30dc602c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/MetricReportGroupService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/MetricReportGroupService.java @@ -4,10 +4,10 @@ import org.unidal.lookup.annotation.Inject; import com.dianping.cat.consumer.metric.model.entity.MetricReport; import com.dianping.cat.report.alert.MetricReportGroup.State; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class MetricReportGroupService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/exception/ExceptionAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/exception/ExceptionAlert.java index db6c4a17c..3ca8ff236 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/exception/ExceptionAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/exception/ExceptionAlert.java @@ -19,13 +19,13 @@ import com.dianping.cat.message.Transaction; import com.dianping.cat.report.page.dependency.TopExceptionExclude; import com.dianping.cat.report.page.dependency.TopMetric; import com.dianping.cat.report.page.dependency.TopMetric.Item; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; import com.dianping.cat.report.alert.AlertType; import com.dianping.cat.report.alert.exception.AlertExceptionBuilder.AlertException; import com.dianping.cat.report.alert.sender.AlertEntity; import com.dianping.cat.report.alert.sender.AlertManager; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; public class ExceptionAlert implements Task { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/heartbeat/HeartbeatAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/heartbeat/HeartbeatAlert.java index 86395020d..b7078a230 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/heartbeat/HeartbeatAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/heartbeat/HeartbeatAlert.java @@ -29,14 +29,14 @@ import com.dianping.cat.home.rule.entity.Condition; import com.dianping.cat.home.rule.entity.Config; import com.dianping.cat.message.Transaction; import com.dianping.cat.report.page.heartbeat.config.HeartbeatDisplayPolicyManager; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; import com.dianping.cat.report.alert.AlertResultEntity; import com.dianping.cat.report.alert.AlertType; import com.dianping.cat.report.alert.BaseAlert; import com.dianping.cat.report.alert.config.BaseRuleConfigManager; import com.dianping.cat.report.alert.sender.AlertEntity; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; public class HeartbeatAlert extends BaseAlert { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ProjectDecorator.java b/cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ProjectDecorator.java index 6cbbe6916..ab282ec77 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ProjectDecorator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ProjectDecorator.java @@ -4,7 +4,7 @@ import org.unidal.lookup.annotation.Inject; import com.dianping.cat.Cat; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.ProjectService; +import com.dianping.cat.service.ProjectService; import org.unidal.lookup.util.StringUtils; diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ProjectContactor.java b/cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ProjectContactor.java index 66a213282..33ffe651d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ProjectContactor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ProjectContactor.java @@ -6,9 +6,9 @@ import java.util.List; import org.unidal.lookup.annotation.Inject; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.home.alert.config.entity.Receiver; import com.dianping.cat.report.alert.sender.config.AlertConfigManager; +import com.dianping.cat.service.ProjectService; import org.unidal.lookup.util.StringUtils; diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java index f071cf6bd..be87d1d16 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java @@ -33,10 +33,10 @@ import com.dianping.cat.report.page.storage.StorageConstants; import com.dianping.cat.report.page.storage.config.StorageGroupConfigManager; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder; import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public abstract class AbstractStorageAlert implements Task, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java index 1dfefe7e6..3a9471b0f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java @@ -15,9 +15,9 @@ 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.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class FailureSummaryBuilder extends SummaryBuilder { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java index 09c52261d..5bfb57496 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java @@ -32,10 +32,10 @@ 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.transform.TransactionMergeHelper; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class TransactionAlert implements Task, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/web/WebAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/web/WebAlert.java index fe3b2d47a..2d7ecbf37 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/web/WebAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/web/WebAlert.java @@ -28,13 +28,13 @@ import com.dianping.cat.home.rule.entity.Config; import com.dianping.cat.home.rule.entity.Rule; import com.dianping.cat.message.Transaction; import com.dianping.cat.report.page.app.service.AppDataService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; import com.dianping.cat.report.alert.AlertResultEntity; import com.dianping.cat.report.alert.AlertType; import com.dianping.cat.report.alert.BaseAlert; import com.dianping.cat.report.alert.config.BaseRuleConfigManager; import com.dianping.cat.report.alert.sender.AlertEntity; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; public class WebAlert extends BaseAlert { diff --git a/cat-home/src/main/java/com/dianping/cat/report/graph/metric/impl/CachedMetricReportServiceImpl.java b/cat-home/src/main/java/com/dianping/cat/report/graph/metric/impl/CachedMetricReportServiceImpl.java index 102be8e8f..19add8d51 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/graph/metric/impl/CachedMetricReportServiceImpl.java +++ b/cat-home/src/main/java/com/dianping/cat/report/graph/metric/impl/CachedMetricReportServiceImpl.java @@ -13,17 +13,17 @@ import org.unidal.lookup.annotation.Inject; import com.dianping.cat.Cat; import com.dianping.cat.Constants; import com.dianping.cat.consumer.metric.model.entity.MetricReport; -import com.dianping.cat.dal.IpService; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.graph.metric.CachedMetricReportService; import com.dianping.cat.report.page.cdn.graph.CdnReportConvertor; import com.dianping.cat.report.page.metric.service.MetricReportService; import com.dianping.cat.report.page.system.graph.SystemReportConvertor; import com.dianping.cat.report.page.web.graph.WebReportConvertor; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; +import com.dianping.cat.service.IpService; public class CachedMetricReportServiceImpl implements CachedMetricReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/activity/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/activity/Handler.java index c6a7d2a4f..9c4a28d0c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/activity/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/activity/Handler.java @@ -31,10 +31,10 @@ import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.graph.LineChart; import com.dianping.cat.report.page.activity.config.ActivityConfigManager; import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/app/processor/CrashLogProcessor.java b/cat-home/src/main/java/com/dianping/cat/report/page/app/processor/CrashLogProcessor.java index 71539fa90..b9e18ca58 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/app/processor/CrashLogProcessor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/app/processor/CrashLogProcessor.java @@ -23,9 +23,9 @@ import com.dianping.cat.report.page.app.Model; import com.dianping.cat.report.page.app.Payload; import com.dianping.cat.report.page.app.ProblemStatistics; import com.dianping.cat.report.page.problem.service.ProblemReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class CrashLogProcessor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/app/service/AppReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/app/service/AppReportService.java index 8cd6b97dd..c3c65172d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/app/service/AppReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/app/service/AppReportService.java @@ -13,7 +13,7 @@ import com.dianping.cat.home.app.entity.AppReport; import com.dianping.cat.home.app.transform.DefaultNativeParser; import com.dianping.cat.core.dal.DailyReportContent; import com.dianping.cat.core.dal.DailyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class AppReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java index e1cb8fb15..5d878bb0d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java @@ -28,9 +28,9 @@ import com.dianping.cat.report.page.event.service.EventReportService; 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.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cdn/graph/CdnReportConvertor.java b/cat-home/src/main/java/com/dianping/cat/report/page/cdn/graph/CdnReportConvertor.java index fa897ecae..4c7e2f0d7 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cdn/graph/CdnReportConvertor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cdn/graph/CdnReportConvertor.java @@ -4,8 +4,8 @@ import com.dianping.cat.consumer.metric.model.entity.MetricItem; import com.dianping.cat.consumer.metric.model.entity.MetricReport; import com.dianping.cat.consumer.metric.model.entity.Segment; import com.dianping.cat.consumer.metric.model.transform.BaseVisitor; -import com.dianping.cat.dal.IpService; -import com.dianping.cat.dal.IpService.IpInfo; +import com.dianping.cat.service.IpService; +import com.dianping.cat.service.IpService.IpInfo; public class CdnReportConvertor extends BaseVisitor { private IpService m_ipService; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java index fb2c7240e..d4831bd26 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java @@ -14,16 +14,16 @@ import org.unidal.web.mvc.annotation.PayloadMeta; import com.dianping.cat.consumer.cross.CrossAnalyzer; import com.dianping.cat.consumer.cross.model.entity.CrossReport; -import com.dianping.cat.dal.HostinfoService; import com.dianping.cat.mvc.PayloadNormalizer; import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.page.cross.display.HostInfo; import com.dianping.cat.report.page.cross.display.MethodInfo; import com.dianping.cat.report.page.cross.display.ProjectInfo; import com.dianping.cat.report.page.cross.service.CrossReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; +import com.dianping.cat.service.HostinfoService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/HostInfo.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/HostInfo.java index c13807ae1..6edaa26d2 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/HostInfo.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/HostInfo.java @@ -12,7 +12,7 @@ import com.dianping.cat.consumer.cross.model.entity.Local; import com.dianping.cat.consumer.cross.model.entity.Remote; import com.dianping.cat.consumer.cross.model.entity.Type; import com.dianping.cat.consumer.cross.model.transform.BaseVisitor; -import com.dianping.cat.dal.HostinfoService; +import com.dianping.cat.service.HostinfoService; import org.unidal.lookup.util.StringUtils; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/MethodInfo.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/MethodInfo.java index 018d13859..8e6a39d6d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/MethodInfo.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/display/MethodInfo.java @@ -14,7 +14,7 @@ import com.dianping.cat.consumer.cross.model.entity.Name; import com.dianping.cat.consumer.cross.model.entity.Remote; import com.dianping.cat.consumer.cross.model.entity.Type; import com.dianping.cat.consumer.cross.model.transform.BaseVisitor; -import com.dianping.cat.dal.HostinfoService; +import com.dianping.cat.service.HostinfoService; public class MethodInfo extends BaseVisitor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CompositeCrossService.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CompositeCrossService.java index 814ca5731..bcf9440f4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CompositeCrossService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CompositeCrossService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.cross.CrossAnalyzer; import com.dianping.cat.consumer.cross.CrossReportMerger; import com.dianping.cat.consumer.cross.model.entity.CrossReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeCrossService extends BaseCompositeModelService { public CompositeCrossService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CrossReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CrossReportService.java index 5b6d3b97c..e137ee771 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CrossReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/CrossReportService.java @@ -29,7 +29,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class CrossReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/HistoricalCrossService.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/HistoricalCrossService.java index de3df7393..ca73cbf17 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/HistoricalCrossService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/HistoricalCrossService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalCrossService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/LocalCrossService.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/LocalCrossService.java index 569764131..2c00b884c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/LocalCrossService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/LocalCrossService.java @@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalCrossService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/RemoteCrossService.java b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/RemoteCrossService.java index ce72b8e7c..ef65e618c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/RemoteCrossService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/cross/service/RemoteCrossService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.cross.CrossAnalyzer; import com.dianping.cat.consumer.cross.model.entity.CrossReport; import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteCrossService extends BaseRemoteModelService { public RemoteCrossService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dashboard/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/dashboard/Handler.java index a0182ba49..ab8c1cd5c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dashboard/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dashboard/Handler.java @@ -36,10 +36,10 @@ 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.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/ExternalInfoBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/ExternalInfoBuilder.java index 801022725..4ffcc1491 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/ExternalInfoBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/ExternalInfoBuilder.java @@ -12,9 +12,9 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph; import com.dianping.cat.home.dependency.graph.entity.TopologyNode; import com.dianping.cat.report.page.dependency.graph.GraphConstrant; import com.dianping.cat.report.page.dependency.service.DependencyReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class ExternalInfoBuilder { 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 079923cb0..39e95737d 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 @@ -36,9 +36,9 @@ import com.dianping.cat.report.page.dependency.config.TopoGraphFormatConfigManag import com.dianping.cat.report.page.dependency.graph.LineGraphBuilder; import com.dianping.cat.report.page.dependency.graph.ProductLinesDashboard; import com.dianping.cat.report.page.dependency.graph.TopologyGraphManager; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java index 78d0bf6be..e73711248 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphManager.java @@ -33,10 +33,10 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph; import com.dianping.cat.home.dependency.graph.entity.TopologyNode; import com.dianping.cat.home.dependency.graph.transform.DefaultNativeParser; import com.dianping.cat.message.Transaction; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class TopologyGraphManager implements Initializable, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/CompositeDependencyService.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/CompositeDependencyService.java index d046747fc..af7ebeeb2 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/CompositeDependencyService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/CompositeDependencyService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.dependency.DependencyAnalyzer; import com.dianping.cat.consumer.dependency.DependencyReportMerger; import com.dianping.cat.consumer.dependency.model.entity.DependencyReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeDependencyService extends BaseCompositeModelService { public CompositeDependencyService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/DependencyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/DependencyReportService.java index b7d2f020d..0219f685a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/DependencyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/DependencyReportService.java @@ -17,7 +17,7 @@ import com.dianping.cat.core.dal.HourlyReportContent; import com.dianping.cat.core.dal.HourlyReportContentEntity; import com.dianping.cat.core.dal.HourlyReportEntity; import com.dianping.cat.helper.TimeHelper; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class DependencyReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/HistoricalDependencyService.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/HistoricalDependencyService.java index e9bda5b6a..5865c7c47 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/HistoricalDependencyService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/HistoricalDependencyService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalDependencyService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/LocalDependencyService.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/LocalDependencyService.java index efe6da938..8cc051cd8 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/LocalDependencyService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/LocalDependencyService.java @@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalDependencyService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/RemoteDependencyService.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/RemoteDependencyService.java index 5eb41eccf..d7c028734 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/RemoteDependencyService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/service/RemoteDependencyService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.dependency.DependencyAnalyzer; import com.dianping.cat.consumer.dependency.model.entity.DependencyReport; import com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteDependencyService extends BaseRemoteModelService { public RemoteDependencyService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java index 12cdf6adf..92871dcfa 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java @@ -31,9 +31,9 @@ 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.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/CompositeEventService.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/CompositeEventService.java index 4098c182f..727475351 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/CompositeEventService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/CompositeEventService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.event.EventAnalyzer; import com.dianping.cat.consumer.event.EventReportMerger; import com.dianping.cat.consumer.event.model.entity.EventReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeEventService extends BaseCompositeModelService { public CompositeEventService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/EventReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/EventReportService.java index b76a13614..3e1a3f3af 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/EventReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/EventReportService.java @@ -33,7 +33,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class EventReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/HistoricalEventService.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/HistoricalEventService.java index 860a25434..aaf118989 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/HistoricalEventService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/HistoricalEventService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalEventService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/LocalEventService.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/LocalEventService.java index 911a13bd8..37f1cd894 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/LocalEventService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/LocalEventService.java @@ -14,9 +14,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalEventService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/RemoteEventService.java b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/RemoteEventService.java index aaf526f59..8a5fde5bf 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/event/service/RemoteEventService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/event/service/RemoteEventService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.event.EventAnalyzer; import com.dianping.cat.consumer.event.model.entity.EventReport; import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteEventService extends BaseRemoteModelService { public RemoteEventService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java index 45c4f6966..424bb43bf 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java @@ -28,10 +28,10 @@ import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.graph.svg.GraphBuilder; import com.dianping.cat.report.page.heartbeat.config.HeartbeatDisplayPolicyManager; import com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/CompositeHeartbeatService.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/CompositeHeartbeatService.java index 1d80ae50c..1ffe730a6 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/CompositeHeartbeatService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/CompositeHeartbeatService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer; import com.dianping.cat.consumer.heartbeat.HeartbeatReportMerger; import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeHeartbeatService extends BaseCompositeModelService { public CompositeHeartbeatService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HeartbeatReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HeartbeatReportService.java index 44d7ef7df..677484f92 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HeartbeatReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HeartbeatReportService.java @@ -25,7 +25,7 @@ import com.dianping.cat.core.dal.HourlyReportEntity; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.core.dal.DailyReportContent; import com.dianping.cat.core.dal.DailyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class HeartbeatReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HistoricalHeartbeatService.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HistoricalHeartbeatService.java index 04f10e375..901018a7a 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HistoricalHeartbeatService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/HistoricalHeartbeatService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalHeartbeatService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/LocalHeartbeatService.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/LocalHeartbeatService.java index 42e830479..232f0a447 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/LocalHeartbeatService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/LocalHeartbeatService.java @@ -15,9 +15,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalHeartbeatService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/RemoteHeartbeatService.java b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/RemoteHeartbeatService.java index 566420d77..fdc441a2a 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/RemoteHeartbeatService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/service/RemoteHeartbeatService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer; import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport; import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteHeartbeatService extends BaseRemoteModelService { public RemoteHeartbeatService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java index 63e68850e..d39477cf0 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java @@ -16,9 +16,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.message.Event; import com.dianping.cat.message.internal.MessageId; import com.dianping.cat.report.ReportPage; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/CompositeLogViewService.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/CompositeLogViewService.java index e1b2e6dce..08e071011 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/CompositeLogViewService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/CompositeLogViewService.java @@ -2,10 +2,10 @@ package com.dianping.cat.report.page.logview.service; import java.util.List; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeLogViewService extends BaseCompositeModelService { public CompositeLogViewService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/HistoricalMessageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/HistoricalMessageService.java index 890ed1aaa..d6b19c90e 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/HistoricalMessageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/HistoricalMessageService.java @@ -17,8 +17,8 @@ import com.dianping.cat.message.internal.MessageId; import com.dianping.cat.message.spi.MessageCodec; import com.dianping.cat.message.spi.MessageTree; import com.dianping.cat.message.storage.MessageBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalMessageService extends BaseHistoricalModelService { @Inject(HdfsMessageBucketManager.ID) diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/LocalMessageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/LocalMessageService.java index b1a1efa52..b3ffddd0a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/LocalMessageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/LocalMessageService.java @@ -19,11 +19,11 @@ import com.dianping.cat.message.spi.MessageCodec; import com.dianping.cat.message.spi.MessageTree; import com.dianping.cat.message.storage.MessageBucketManager; import com.dianping.cat.mvc.ApiPayload; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class LocalMessageService extends LocalModelService implements ModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/RemoteLogViewService.java b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/RemoteLogViewService.java index 2bf6f74cf..d973f5bd0 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/RemoteLogViewService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/service/RemoteLogViewService.java @@ -13,10 +13,10 @@ import com.dianping.cat.config.server.ServerConfigManager; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.message.Message; import com.dianping.cat.message.Transaction; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class RemoteLogViewService extends BaseRemoteModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Handler.java index 73799edad..d31b4f755 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/Handler.java @@ -16,9 +16,9 @@ import com.dianping.cat.consumer.matrix.model.entity.MatrixReport; import com.dianping.cat.mvc.PayloadNormalizer; import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.page.matrix.service.MatrixReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/CompositeMatrixService.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/CompositeMatrixService.java index 2520bc8c0..f8e727f12 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/CompositeMatrixService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/CompositeMatrixService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.matrix.MatrixAnalyzer; import com.dianping.cat.consumer.matrix.MatrixReportMerger; import com.dianping.cat.consumer.matrix.model.entity.MatrixReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeMatrixService extends BaseCompositeModelService { public CompositeMatrixService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/HistoricalMatrixService.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/HistoricalMatrixService.java index 2571f8c91..a7522aeb3 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/HistoricalMatrixService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/HistoricalMatrixService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalMatrixService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/LocalMatrixService.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/LocalMatrixService.java index 6375b1cad..9e11d11c5 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/LocalMatrixService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/LocalMatrixService.java @@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalMatrixService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/MatrixReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/MatrixReportService.java index 971cd23ac..ff0e49fa3 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/MatrixReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/MatrixReportService.java @@ -29,7 +29,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class MatrixReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/RemoteMatrixService.java b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/RemoteMatrixService.java index a30b1e9f1..cddf9d2b4 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/RemoteMatrixService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/RemoteMatrixService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.matrix.MatrixAnalyzer; import com.dianping.cat.consumer.matrix.model.entity.MatrixReport; import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteMatrixService extends BaseRemoteModelService { public RemoteMatrixService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/GraphCreator.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/GraphCreator.java index e1e0957ef..2b4573abc 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/GraphCreator.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/GraphCreator.java @@ -19,13 +19,13 @@ import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig; import com.dianping.cat.consumer.metric.config.entity.Tag; import com.dianping.cat.consumer.metric.model.entity.MetricReport; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.Chinese; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.alert.AlertInfo.AlertMetric; import com.dianping.cat.report.alert.MetricType; import com.dianping.cat.report.graph.LineChart; import com.dianping.cat.report.graph.metric.AbstractGraphCreator; +import com.dianping.cat.service.ProjectService; public class GraphCreator extends AbstractGraphCreator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/CompositeMetricService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/CompositeMetricService.java index cbe7cf30a..0e4770cd7 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/CompositeMetricService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/CompositeMetricService.java @@ -4,10 +4,10 @@ import java.util.List; import com.dianping.cat.consumer.metric.MetricAnalyzer; import com.dianping.cat.consumer.metric.model.entity.MetricReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeMetricService extends BaseCompositeModelService { public CompositeMetricService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/DefaultBaselineService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/DefaultBaselineService.java index 370d70436..fe79c2041 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/DefaultBaselineService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/DefaultBaselineService.java @@ -19,9 +19,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.home.dal.report.Baseline; import com.dianping.cat.home.dal.report.BaselineDao; import com.dianping.cat.home.dal.report.BaselineEntity; +import com.dianping.cat.report.service.ModelPeriod; import com.dianping.cat.report.task.TaskHelper; import com.dianping.cat.report.alert.MetricType; -import com.dianping.cat.service.ModelPeriod; public class DefaultBaselineService implements BaselineService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/HistoricalMetricService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/HistoricalMetricService.java index 5e6b11163..ad148ff55 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/HistoricalMetricService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/HistoricalMetricService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalMetricService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/LocalMetricService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/LocalMetricService.java index bcf0c497f..25d2b5cf6 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/LocalMetricService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/LocalMetricService.java @@ -11,7 +11,6 @@ import com.dianping.cat.Constants; import com.dianping.cat.consumer.metric.MetricAnalyzer; import com.dianping.cat.consumer.metric.model.entity.MetricReport; import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser; -import com.dianping.cat.dal.IpService; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; @@ -19,9 +18,10 @@ import com.dianping.cat.report.ReportBucketManager; import com.dianping.cat.report.page.cdn.graph.CdnReportConvertor; import com.dianping.cat.report.page.system.graph.SystemReportConvertor; import com.dianping.cat.report.page.web.graph.WebReportConvertor; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.service.IpService; public class LocalMetricService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/MetricReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/MetricReportService.java index 03480f382..c82b16930 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/MetricReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/MetricReportService.java @@ -19,7 +19,7 @@ import com.dianping.cat.consumer.metric.model.entity.Point; import com.dianping.cat.consumer.metric.model.entity.Segment; import com.dianping.cat.consumer.metric.model.transform.DefaultNativeParser; import com.dianping.cat.message.Event; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class MetricReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/RemoteMetricService.java b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/RemoteMetricService.java index 222587aa0..43f30bea9 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/RemoteMetricService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/metric/service/RemoteMetricService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.metric.MetricAnalyzer; import com.dianping.cat.consumer.metric.model.entity.MetricReport; import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteMetricService extends BaseRemoteModelService { public RemoteMetricService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java index f6bf4b005..472133801 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java @@ -20,9 +20,9 @@ import org.unidal.web.mvc.annotation.PayloadMeta; import com.dianping.cat.Cat; import com.dianping.cat.message.internal.MessageId; import com.dianping.cat.report.ReportPage; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; @SuppressWarnings("rawtypes") public class Handler extends ContainerHolder implements Initializable, PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java index e2396b3d9..a268a334a 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java @@ -9,7 +9,7 @@ import org.unidal.web.mvc.payload.annotation.PathMeta; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportPage; -import com.dianping.cat.service.ModelPeriod; +import com.dianping.cat.report.service.ModelPeriod; public class Payload extends ApiPayload implements ActionPayload { @FieldMeta("op") diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/network/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/Handler.java index efc78464e..a0d378bb4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/network/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/Handler.java @@ -23,7 +23,7 @@ import com.dianping.cat.mvc.PayloadNormalizer; import com.dianping.cat.report.ReportPage; import com.dianping.cat.report.graph.LineChart; import com.dianping.cat.report.page.network.nettopology.NetGraphManager; -import com.dianping.cat.service.ModelPeriod; +import com.dianping.cat.report.service.ModelPeriod; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java index 714ecf609..117b92c84 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java @@ -34,10 +34,10 @@ import com.dianping.cat.report.alert.AlertInfo; import com.dianping.cat.report.alert.AlertInfo.AlertMetric; import com.dianping.cat.report.page.network.config.NetGraphConfigManager; import com.dianping.cat.report.page.network.service.NetTopologyReportService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class NetGraphManager implements Initializable, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java index 7d9df7248..35ba38ec4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java @@ -13,7 +13,7 @@ import com.dianping.cat.core.dal.HourlyReportContentEntity; import com.dianping.cat.core.dal.HourlyReportEntity; import com.dianping.cat.home.network.entity.NetGraphSet; import com.dianping.cat.home.network.transform.DefaultNativeParser; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class NetTopologyReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java index 223b7bf29..eae88151e 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java @@ -33,10 +33,10 @@ 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.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/CompositeProblemService.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/CompositeProblemService.java index 58155f261..b94f7ba2c 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/CompositeProblemService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/CompositeProblemService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.problem.ProblemAnalyzer; import com.dianping.cat.consumer.problem.ProblemReportMerger; import com.dianping.cat.consumer.problem.model.entity.ProblemReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeProblemService extends BaseCompositeModelService { public CompositeProblemService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/HistoricalProblemService.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/HistoricalProblemService.java index e63f0441d..4d70177c2 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/HistoricalProblemService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/HistoricalProblemService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalProblemService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/LocalProblemService.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/LocalProblemService.java index 97980458a..7aeb4fa92 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/LocalProblemService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/LocalProblemService.java @@ -15,9 +15,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalProblemService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/ProblemReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/ProblemReportService.java index a6b2ee72a..12965969a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/ProblemReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/ProblemReportService.java @@ -30,7 +30,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class ProblemReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/RemoteProblemService.java b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/RemoteProblemService.java index 9ae4ca10d..a90f56e5f 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/RemoteProblemService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/service/RemoteProblemService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.problem.ProblemAnalyzer; import com.dianping.cat.consumer.problem.model.entity.ProblemReport; import com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteProblemService extends BaseRemoteModelService { public RemoteProblemService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java index a43f7404a..ecffd3227 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java @@ -23,9 +23,9 @@ 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.state.service.StateReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/StateBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/StateBuilder.java index 4d4c1b835..bba616c61 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/StateBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/StateBuilder.java @@ -12,9 +12,9 @@ import com.dianping.cat.consumer.state.StateAnalyzer; import com.dianping.cat.consumer.state.model.entity.Machine; import com.dianping.cat.consumer.state.model.entity.StateReport; import com.dianping.cat.home.router.entity.DefaultServer; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; import com.dianping.cat.system.page.router.config.RouterConfigManager; public class StateBuilder { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/CompositeStateService.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/CompositeStateService.java index 34a32ce5c..3aa9535e4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/CompositeStateService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/CompositeStateService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.state.StateAnalyzer; import com.dianping.cat.consumer.state.StateReportMerger; import com.dianping.cat.consumer.state.model.entity.StateReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeStateService extends BaseCompositeModelService { public CompositeStateService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/HistoricalStateService.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/HistoricalStateService.java index 6f3b834be..dc7c74fec 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/HistoricalStateService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/HistoricalStateService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.state.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalStateService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/LocalStateService.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/LocalStateService.java index 0237a89b4..6ecba80e6 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/LocalStateService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/LocalStateService.java @@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalStateService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/RemoteStateService.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/RemoteStateService.java index 551f8eefb..f50c60818 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/RemoteStateService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/RemoteStateService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.state.StateAnalyzer; import com.dianping.cat.consumer.state.model.entity.StateReport; import com.dianping.cat.consumer.state.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteStateService extends BaseRemoteModelService { public RemoteStateService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/StateReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/StateReportService.java index 2e8ce8b5e..ace8dd650 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/service/StateReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/service/StateReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class StateReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/state/task/StateReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/page/state/task/StateReportBuilder.java index e9e6e0d99..ad5429715 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/state/task/StateReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/state/task/StateReportBuilder.java @@ -18,12 +18,12 @@ import com.dianping.cat.core.dal.DailyReport; import com.dianping.cat.core.dal.Hostinfo; import com.dianping.cat.core.dal.MonthlyReport; import com.dianping.cat.core.dal.WeeklyReport; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.page.state.service.StateReportService; import com.dianping.cat.report.task.TaskBuilder; import com.dianping.cat.report.task.TaskHelper; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.ProjectService; public class StateReportBuilder implements TaskBuilder { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java index e9d560d14..fe2f094a6 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java @@ -25,7 +25,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta; import com.dianping.cat.Constants; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.SortHelper; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.home.bug.entity.BugReport; @@ -56,6 +55,7 @@ import com.dianping.cat.report.page.statistics.task.heavy.HeavyReportMerger.Serv import com.dianping.cat.report.page.statistics.task.heavy.HeavyReportMerger.UrlComparator; import com.dianping.cat.report.page.statistics.task.jar.JarReportBuilder; import com.dianping.cat.report.page.statistics.task.system.SystemReportBuilder; +import com.dianping.cat.service.ProjectService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/BugReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/BugReportService.java index d7a06b2b0..8f78dd0d8 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/BugReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/BugReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; import com.dianping.cat.report.page.statistics.task.bug.BugReportMerger; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class BugReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/HeavyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/HeavyReportService.java index b769df931..42e9ca0ee 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/HeavyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/HeavyReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.WeeklyReportContentEntity; import com.dianping.cat.home.heavy.entity.HeavyReport; import com.dianping.cat.home.heavy.transform.DefaultNativeParser; import com.dianping.cat.report.page.statistics.task.heavy.HeavyReportMerger; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class HeavyReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/JarReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/JarReportService.java index 3de0b8bce..37a66f575 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/JarReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/JarReportService.java @@ -14,7 +14,7 @@ import com.dianping.cat.core.dal.HourlyReportEntity; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.home.jar.entity.JarReport; import com.dianping.cat.home.jar.transform.DefaultNativeParser; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class JarReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/ServiceReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/ServiceReportService.java index f92391dfd..178d3acbf 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/ServiceReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/ServiceReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.WeeklyReportContentEntity; import com.dianping.cat.home.service.entity.ServiceReport; import com.dianping.cat.home.service.transform.DefaultNativeParser; import com.dianping.cat.report.page.statistics.task.service.ServiceReportMerger; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class ServiceReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/SystemReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/SystemReportService.java index a986621d6..83c59b4bf 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/SystemReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/SystemReportService.java @@ -11,7 +11,7 @@ import com.dianping.cat.core.dal.DailyReportContent; import com.dianping.cat.core.dal.DailyReportContentEntity; import com.dianping.cat.home.system.entity.SystemReport; import com.dianping.cat.home.system.transform.DefaultNativeParser; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class SystemReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/UtilizationReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/UtilizationReportService.java index cde85ebf8..c7dc70cd7 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/UtilizationReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/UtilizationReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.WeeklyReportContentEntity; import com.dianping.cat.home.utilization.entity.UtilizationReport; import com.dianping.cat.home.utilization.transform.DefaultNativeParser; import com.dianping.cat.report.page.statistics.task.utilization.UtilizationReportMerger; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class UtilizationReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java index 946608038..8f86145b5 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java @@ -38,9 +38,9 @@ import com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager; import com.dianping.cat.report.page.storage.transform.HourlyLineChartVisitor; import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.page.storage.transform.StorageOperationFilter; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/CompositeStorageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/CompositeStorageService.java index db32aba78..2b8f68fde 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/CompositeStorageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/CompositeStorageService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.storage.StorageAnalyzer; import com.dianping.cat.consumer.storage.StorageReportMerger; import com.dianping.cat.consumer.storage.model.entity.StorageReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeStorageService extends BaseCompositeModelService { public CompositeStorageService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/HistoricalStorageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/HistoricalStorageService.java index 5ab0557b8..8c7b3fd7f 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/HistoricalStorageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/HistoricalStorageService.java @@ -11,8 +11,8 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; import com.dianping.cat.report.page.storage.task.StorageReportService; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalStorageService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/LocalStorageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/LocalStorageService.java index 03b238e9b..be5d10e93 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/LocalStorageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/LocalStorageService.java @@ -13,9 +13,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalStorageService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/RemoteStorageService.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/RemoteStorageService.java index 58ad0ac32..8214fbdc4 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/RemoteStorageService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/service/RemoteStorageService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.storage.StorageAnalyzer; import com.dianping.cat.consumer.storage.model.entity.StorageReport; import com.dianping.cat.consumer.storage.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteStorageService extends BaseRemoteModelService { public RemoteStorageService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportService.java index 912119df5..90bcfc284 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportService.java @@ -28,7 +28,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class StorageReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java index ae3526779..65656a111 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java @@ -28,9 +28,9 @@ import com.dianping.cat.report.page.dependency.TopExceptionExclude; import com.dianping.cat.report.page.dependency.TopMetric; import com.dianping.cat.report.page.state.StateBuilder; import com.dianping.cat.report.page.top.service.TopReportService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/CompositeTopService.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/CompositeTopService.java index 005a8a89a..9e6b97b8c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/CompositeTopService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/CompositeTopService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.top.TopAnalyzer; import com.dianping.cat.consumer.top.TopReportMerger; import com.dianping.cat.consumer.top.model.entity.TopReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeTopService extends BaseCompositeModelService { public CompositeTopService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/HistoricalTopService.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/HistoricalTopService.java index fc560e67e..58301f21b 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/HistoricalTopService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/HistoricalTopService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.top.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalTopService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/LocalTopService.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/LocalTopService.java index be50a37d1..11173f779 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/LocalTopService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/LocalTopService.java @@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalTopService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/RemoteTopService.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/RemoteTopService.java index d071200cb..be0e7a9b9 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/RemoteTopService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/RemoteTopService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.top.TopAnalyzer; import com.dianping.cat.consumer.top.model.entity.TopReport; import com.dianping.cat.consumer.top.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteTopService extends BaseRemoteModelService { public RemoteTopService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/TopReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/TopReportService.java index d1022cf28..2280858e8 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/top/service/TopReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/top/service/TopReportService.java @@ -16,7 +16,7 @@ import com.dianping.cat.core.dal.HourlyReportContent; import com.dianping.cat.core.dal.HourlyReportContentEntity; import com.dianping.cat.core.dal.HourlyReportEntity; import com.dianping.cat.helper.TimeHelper; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class TopReportService extends AbstractReportService { 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 7891c03f3..cdca0e790 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 @@ -35,9 +35,9 @@ 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.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/CompositeTransactionService.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/CompositeTransactionService.java index d2b1b9c82..8cf2af32b 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/CompositeTransactionService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/CompositeTransactionService.java @@ -5,10 +5,10 @@ import java.util.List; import com.dianping.cat.consumer.transaction.TransactionAnalyzer; import com.dianping.cat.consumer.transaction.TransactionReportMerger; import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; -import com.dianping.cat.service.BaseCompositeModelService; -import com.dianping.cat.service.BaseRemoteModelService; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; +import com.dianping.cat.report.service.BaseCompositeModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; public class CompositeTransactionService extends BaseCompositeModelService { public CompositeTransactionService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/HistoricalTransactionService.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/HistoricalTransactionService.java index 02cb28c1b..304262b42 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/HistoricalTransactionService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/HistoricalTransactionService.java @@ -10,8 +10,8 @@ import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.BaseHistoricalModelService; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.BaseHistoricalModelService; +import com.dianping.cat.report.service.ModelRequest; public class HistoricalTransactionService extends BaseHistoricalModelService { @Inject diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/LocalTransactionService.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/LocalTransactionService.java index b0305aa1c..1e91d6fef 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/LocalTransactionService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/LocalTransactionService.java @@ -17,9 +17,9 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.mvc.ApiPayload; import com.dianping.cat.report.ReportBucket; import com.dianping.cat.report.ReportBucketManager; -import com.dianping.cat.service.LocalModelService; -import com.dianping.cat.service.ModelPeriod; -import com.dianping.cat.service.ModelRequest; +import com.dianping.cat.report.service.LocalModelService; +import com.dianping.cat.report.service.ModelPeriod; +import com.dianping.cat.report.service.ModelRequest; public class LocalTransactionService extends LocalModelService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/RemoteTransactionService.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/RemoteTransactionService.java index 3271f1415..1e74830ef 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/RemoteTransactionService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/RemoteTransactionService.java @@ -7,7 +7,7 @@ import org.xml.sax.SAXException; import com.dianping.cat.consumer.transaction.TransactionAnalyzer; import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser; -import com.dianping.cat.service.BaseRemoteModelService; +import com.dianping.cat.report.service.BaseRemoteModelService; public class RemoteTransactionService extends BaseRemoteModelService { public RemoteTransactionService() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/TransactionReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/TransactionReportService.java index 1d28cf920..20102fb95 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/TransactionReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/service/TransactionReportService.java @@ -33,7 +33,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent; import com.dianping.cat.core.dal.MonthlyReportContentEntity; import com.dianping.cat.core.dal.WeeklyReportContent; import com.dianping.cat.core.dal.WeeklyReportContentEntity; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class TransactionReportService extends AbstractReportService { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/web/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/web/Handler.java index fb50926ee..63f24a7c6 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/web/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/web/Handler.java @@ -36,9 +36,9 @@ import com.dianping.cat.report.graph.LineChart; import com.dianping.cat.report.graph.PieChart; import com.dianping.cat.report.page.problem.transform.ProblemStatistics; import com.dianping.cat.report.page.web.graph.WebGraphCreator; -import com.dianping.cat.service.ModelRequest; -import com.dianping.cat.service.ModelResponse; -import com.dianping.cat.service.ModelService; +import com.dianping.cat.report.service.ModelRequest; +import com.dianping.cat.report.service.ModelResponse; +import com.dianping.cat.report.service.ModelService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/cmdb/ProjectUpdateTask.java b/cat-home/src/main/java/com/dianping/cat/report/task/cmdb/ProjectUpdateTask.java index 2933c718b..92b57e095 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/cmdb/ProjectUpdateTask.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/cmdb/ProjectUpdateTask.java @@ -23,11 +23,11 @@ import com.dianping.cat.Cat; import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; import com.dianping.cat.core.dal.Hostinfo; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.HostinfoService; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.message.Transaction; import com.dianping.cat.report.page.transaction.service.TransactionReportService; +import com.dianping.cat.service.HostinfoService; +import com.dianping.cat.service.ProjectService; public class ProjectUpdateTask implements Task, LogEnabled { diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/notify/NotifyTaskBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/notify/NotifyTaskBuilder.java index 638a34232..5c1d2bea0 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/notify/NotifyTaskBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/notify/NotifyTaskBuilder.java @@ -15,7 +15,6 @@ import com.dianping.cat.consumer.event.model.entity.EventReport; import com.dianping.cat.consumer.problem.model.entity.ProblemReport; import com.dianping.cat.consumer.transaction.TransactionAnalyzer; import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.message.Transaction; import com.dianping.cat.report.alert.sender.AlertChannel; @@ -25,6 +24,7 @@ import com.dianping.cat.report.page.event.service.EventReportService; import com.dianping.cat.report.page.problem.service.ProblemReportService; import com.dianping.cat.report.page.transaction.service.TransactionReportService; import com.dianping.cat.report.task.TaskBuilder; +import com.dianping.cat.service.ProjectService; public class NotifyTaskBuilder implements TaskBuilder { diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/processor/GlobalConfigProcessor.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/processor/GlobalConfigProcessor.java index 023847f4c..d632e5a8f 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/config/processor/GlobalConfigProcessor.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/processor/GlobalConfigProcessor.java @@ -12,12 +12,12 @@ import com.dianping.cat.Cat; import com.dianping.cat.Constants; import com.dianping.cat.config.black.BlackListManager; import com.dianping.cat.core.dal.Project; -import com.dianping.cat.dal.ProjectService; import com.dianping.cat.home.group.entity.Domain; import com.dianping.cat.report.alert.sender.config.SenderConfigManager; import com.dianping.cat.report.page.DomainGroupConfigManager; import com.dianping.cat.report.page.statistics.config.BugConfigManager; import com.dianping.cat.report.page.storage.config.StorageGroupConfigManager; +import com.dianping.cat.service.ProjectService; import com.dianping.cat.system.page.config.Action; import com.dianping.cat.system.page.config.Model; import com.dianping.cat.system.page.config.Payload; diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java b/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java index 0c9361619..5aaa239d9 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java @@ -15,7 +15,7 @@ import com.dianping.cat.core.dal.DailyReportContent; import com.dianping.cat.core.dal.DailyReportContentEntity; import com.dianping.cat.home.router.entity.RouterConfig; import com.dianping.cat.home.router.transform.DefaultNativeParser; -import com.dianping.cat.service.AbstractReportService; +import com.dianping.cat.report.service.AbstractReportService; public class RouterConfigService extends AbstractReportService { diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index 6bebef73e..2eb85027a 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -80,7 +80,7 @@ com.dianping.cat.home.dal.report.TopologyGraphDao - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency @@ -90,10 +90,10 @@ com.dianping.cat.report.task.cmdb.ProjectUpdateTask - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService - com.dianping.cat.dal.HostinfoService + com.dianping.cat.service.HostinfoService com.dianping.cat.report.page.transaction.service.TransactionReportService @@ -445,14 +445,14 @@ com.dianping.cat.report.graph.metric.impl.CachedMetricReportServiceImpl - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric com.dianping.cat.report.page.metric.service.MetricReportService - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService @@ -1280,10 +1280,10 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.dal.HostinfoService + com.dianping.cat.service.HostinfoService - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.page.state.service.StateReportService @@ -1636,7 +1636,7 @@ com.dianping.cat.report.alert.sender.sender.SenderManager - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.page.transaction.service.TransactionReportService @@ -1747,7 +1747,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService transaction com.dianping.cat.report.page.transaction.service.LocalTransactionService @@ -1763,7 +1763,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction-historical com.dianping.cat.report.page.transaction.service.HistoricalTransactionService @@ -1779,7 +1779,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction com.dianping.cat.report.page.transaction.service.CompositeTransactionService @@ -1787,7 +1787,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction-historical @@ -1796,7 +1796,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService event com.dianping.cat.report.page.event.service.LocalEventService @@ -1812,7 +1812,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event-historical com.dianping.cat.report.page.event.service.HistoricalEventService @@ -1828,7 +1828,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event com.dianping.cat.report.page.event.service.CompositeEventService @@ -1836,7 +1836,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event-historical @@ -1845,7 +1845,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService problem com.dianping.cat.report.page.problem.service.LocalProblemService @@ -1861,7 +1861,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem-historical com.dianping.cat.report.page.problem.service.HistoricalProblemService @@ -1877,7 +1877,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem com.dianping.cat.report.page.problem.service.CompositeProblemService @@ -1885,7 +1885,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem-historical @@ -1894,7 +1894,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService heartbeat com.dianping.cat.report.page.heartbeat.service.LocalHeartbeatService @@ -1910,7 +1910,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService heartbeat-historical com.dianping.cat.report.page.heartbeat.service.HistoricalHeartbeatService @@ -1926,7 +1926,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService heartbeat com.dianping.cat.report.page.heartbeat.service.CompositeHeartbeatService @@ -1934,7 +1934,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService heartbeat-historical @@ -1943,7 +1943,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService matrix com.dianping.cat.report.page.matrix.service.LocalMatrixService @@ -1959,7 +1959,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService matrix-historical com.dianping.cat.report.page.matrix.service.HistoricalMatrixService @@ -1975,7 +1975,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService matrix com.dianping.cat.report.page.matrix.service.CompositeMatrixService @@ -1983,7 +1983,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService matrix-historical @@ -1992,7 +1992,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService state com.dianping.cat.report.page.state.service.LocalStateService @@ -2008,7 +2008,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService state-historical com.dianping.cat.report.page.state.service.HistoricalStateService @@ -2024,7 +2024,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService state com.dianping.cat.report.page.state.service.CompositeStateService @@ -2032,7 +2032,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService state-historical @@ -2041,7 +2041,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService cross com.dianping.cat.report.page.cross.service.LocalCrossService @@ -2057,7 +2057,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService cross-historical com.dianping.cat.report.page.cross.service.HistoricalCrossService @@ -2073,7 +2073,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService cross com.dianping.cat.report.page.cross.service.CompositeCrossService @@ -2081,7 +2081,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService cross-historical @@ -2090,7 +2090,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService top com.dianping.cat.report.page.top.service.LocalTopService @@ -2106,7 +2106,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top-historical com.dianping.cat.report.page.top.service.HistoricalTopService @@ -2122,7 +2122,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top com.dianping.cat.report.page.top.service.CompositeTopService @@ -2130,7 +2130,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top-historical @@ -2139,7 +2139,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService dependency com.dianping.cat.report.page.dependency.service.LocalDependencyService @@ -2155,7 +2155,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency-historical com.dianping.cat.report.page.dependency.service.HistoricalDependencyService @@ -2171,7 +2171,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency com.dianping.cat.report.page.dependency.service.CompositeDependencyService @@ -2179,7 +2179,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency-historical @@ -2188,7 +2188,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService storage com.dianping.cat.report.page.storage.service.LocalStorageService @@ -2204,7 +2204,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService storage-historical com.dianping.cat.report.page.storage.service.HistoricalStorageService @@ -2220,7 +2220,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService storage com.dianping.cat.report.page.storage.service.CompositeStorageService @@ -2228,7 +2228,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService storage-historical @@ -2237,7 +2237,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService metric com.dianping.cat.report.page.metric.service.LocalMetricService @@ -2251,12 +2251,12 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.dal.IpService + com.dianping.cat.service.IpService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric-historical com.dianping.cat.report.page.metric.service.HistoricalMetricService @@ -2272,7 +2272,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric com.dianping.cat.report.page.metric.service.CompositeMetricService @@ -2280,7 +2280,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric-historical @@ -2289,7 +2289,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService logview com.dianping.cat.report.page.logview.service.CompositeLogViewService @@ -2297,7 +2297,7 @@ com.dianping.cat.config.server.ServerConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService logview-historical logview-local @@ -2307,7 +2307,7 @@ - com.dianping.cat.service.LocalModelService + com.dianping.cat.report.service.LocalModelService logview com.dianping.cat.report.page.logview.service.LocalMessageService @@ -2334,7 +2334,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService logview-local com.dianping.cat.report.page.logview.service.LocalMessageService @@ -2361,7 +2361,7 @@ - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService logview-historical com.dianping.cat.report.page.logview.service.HistoricalMessageService @@ -2628,7 +2628,7 @@ com.dianping.cat.report.alert.MetricReportGroupService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric @@ -2639,7 +2639,7 @@ com.dianping.cat.report.alert.sender.receiver.BusinessContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2652,7 +2652,7 @@ com.dianping.cat.report.alert.sender.receiver.NetworkContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2665,7 +2665,7 @@ com.dianping.cat.report.alert.sender.receiver.DatabaseContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2678,7 +2678,7 @@ com.dianping.cat.report.alert.sender.receiver.SystemContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2691,7 +2691,7 @@ com.dianping.cat.report.alert.sender.receiver.ExceptionContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2704,7 +2704,7 @@ com.dianping.cat.report.alert.sender.receiver.HeartbeatContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2717,7 +2717,7 @@ com.dianping.cat.report.alert.sender.receiver.ThirdpartyContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2749,7 +2749,7 @@ com.dianping.cat.config.app.AppConfigManager - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService @@ -2762,7 +2762,7 @@ com.dianping.cat.report.alert.sender.config.AlertConfigManager - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.config.url.UrlPatternConfigManager @@ -2775,7 +2775,7 @@ com.dianping.cat.report.alert.sender.receiver.TransactionContactor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.sender.config.AlertConfigManager @@ -2808,7 +2808,7 @@ com.dianping.cat.report.alert.summary.AlertSummaryExecutor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService @@ -2833,7 +2833,7 @@ com.dianping.cat.report.alert.sender.decorator.ExceptionDecorator - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.alert.summary.AlertSummaryExecutor @@ -2851,7 +2851,7 @@ com.dianping.cat.report.alert.sender.decorator.ThirdpartyDecorator - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService @@ -3096,12 +3096,12 @@ com.dianping.cat.report.alert.AlertInfo - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService heartbeat m_heartbeatService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction m_transactionService @@ -3193,7 +3193,7 @@ com.dianping.cat.report.alert.sender.AlertManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction @@ -3215,7 +3215,7 @@ com.dianping.cat.report.alert.sender.AlertManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService storage @@ -3255,7 +3255,7 @@ com.dianping.cat.report.alert.sender.AlertManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top @@ -3274,7 +3274,7 @@ com.dianping.cat.report.alert.sender.AlertManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top @@ -3356,7 +3356,7 @@ com.dianping.cat.report.alert.summary.build.FailureSummaryBuilder - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem @@ -3519,7 +3519,7 @@ com.dianping.cat.report.page.problem.service.ProblemReportService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem m_service @@ -3729,7 +3729,7 @@ com.dianping.cat.report.page.DomainGroupConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction m_service @@ -3814,7 +3814,7 @@ com.dianping.cat.report.page.event.transform.EventMergeHelper - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event m_service @@ -3898,7 +3898,7 @@ com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService heartbeat m_service @@ -3981,7 +3981,7 @@ com.dianping.cat.report.page.logview.JspViewer - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService logview m_service @@ -4017,17 +4017,17 @@ com.dianping.cat.report.page.event.transform.EventMergeHelper - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event m_eventService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction m_transactionService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem m_problemService @@ -4059,7 +4059,7 @@ com.dianping.cat.mvc.PayloadNormalizer - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService matrix m_service @@ -4118,10 +4118,10 @@ com.dianping.cat.mvc.PayloadNormalizer - com.dianping.cat.dal.HostinfoService + com.dianping.cat.service.HostinfoService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService cross m_service @@ -4167,8 +4167,8 @@ - com.dianping.cat.dal.HostinfoService - com.dianping.cat.dal.HostinfoService + com.dianping.cat.service.HostinfoService + com.dianping.cat.service.HostinfoService com.dianping.cat.core.dal.HostinfoDao @@ -4192,7 +4192,7 @@ com.dianping.cat.report.page.cache.Handler - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService event m_eventService @@ -4209,7 +4209,7 @@ com.dianping.cat.mvc.PayloadNormalizer - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction m_transactionService @@ -4241,7 +4241,7 @@ com.dianping.cat.report.page.state.StateBuilder - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService state m_service @@ -4312,7 +4312,7 @@ com.dianping.cat.system.page.router.config.RouterConfigManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService state m_stateService @@ -4377,7 +4377,7 @@ com.dianping.cat.report.page.metric.GraphCreator - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.page.metric.service.BaselineService @@ -4403,8 +4403,8 @@ - com.dianping.cat.dal.ProjectService - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.core.dal.ProjectDao @@ -4452,7 +4452,7 @@ com.dianping.cat.report.page.dependency.Handler - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency m_dependencyService @@ -4478,7 +4478,7 @@ com.dianping.cat.report.page.dependency.graph.TopologyGraphManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService dependency m_service @@ -4543,7 +4543,7 @@ com.dianping.cat.report.page.dependency.ExternalInfoBuilder - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem m_problemservice @@ -4620,7 +4620,7 @@ com.dianping.cat.report.page.statistics.service.JarReportService - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.page.statistics.config.BugConfigManager @@ -4968,7 +4968,7 @@ com.dianping.cat.report.page.network.nettopology.NetGraphManager - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService metric m_service @@ -5055,7 +5055,7 @@ com.dianping.cat.report.page.web.graph.WebGraphCreator - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem m_service @@ -5421,7 +5421,7 @@ com.dianping.cat.report.page.problem.service.ProblemReportService - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService problem m_service @@ -5612,7 +5612,7 @@ com.dianping.cat.mvc.PayloadNormalizer - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService storage m_service @@ -5730,7 +5730,7 @@ com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService transaction m_service @@ -5774,7 +5774,7 @@ com.dianping.cat.report.page.state.StateBuilder - com.dianping.cat.service.ModelService + com.dianping.cat.report.service.ModelService top m_topService @@ -5984,7 +5984,7 @@ com.dianping.cat.system.page.config.processor.GlobalConfigProcessor - com.dianping.cat.dal.ProjectService + com.dianping.cat.service.ProjectService com.dianping.cat.report.page.statistics.config.BugConfigManager diff --git a/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java b/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java index 600c4b9d4..dd83392ff 100755 --- a/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java +++ b/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java @@ -8,7 +8,7 @@ import junit.framework.Assert; import org.junit.Test; -import com.dianping.cat.service.ModelPeriod; +import com.dianping.cat.report.service.ModelPeriod; public class PayloadTest { private static final long ONE_HOUR = 3600 * 1000L; diff --git a/cat-home/src/test/java/com/dianping/cat/report/task/service/ServiceBuilderTest.java b/cat-home/src/test/java/com/dianping/cat/report/task/service/ServiceBuilderTest.java index c05374ab0..e4da546e3 100644 --- a/cat-home/src/test/java/com/dianping/cat/report/task/service/ServiceBuilderTest.java +++ b/cat-home/src/test/java/com/dianping/cat/report/task/service/ServiceBuilderTest.java @@ -7,8 +7,8 @@ import org.unidal.lookup.ComponentTestCase; import com.dianping.cat.Cat; import com.dianping.cat.Constants; -import com.dianping.cat.dal.HostinfoService; import com.dianping.cat.report.page.statistics.task.service.ServiceReportBuilder; +import com.dianping.cat.service.HostinfoService; public class ServiceBuilderTest extends ComponentTestCase{ diff --git a/cat-home/src/test/java/com/dianping/cat/report/task/utilization/UtilizationBuilderTest.java b/cat-home/src/test/java/com/dianping/cat/report/task/utilization/UtilizationBuilderTest.java index b4ee8039c..55552efb2 100644 --- a/cat-home/src/test/java/com/dianping/cat/report/task/utilization/UtilizationBuilderTest.java +++ b/cat-home/src/test/java/com/dianping/cat/report/task/utilization/UtilizationBuilderTest.java @@ -6,8 +6,8 @@ import org.junit.Test; import org.unidal.lookup.ComponentTestCase; import com.dianping.cat.Constants; -import com.dianping.cat.dal.HostinfoService; import com.dianping.cat.report.page.statistics.task.utilization.UtilizationReportBuilder; +import com.dianping.cat.service.HostinfoService; public class UtilizationBuilderTest extends ComponentTestCase{ -- GitLab