refactor logview service inject

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

@@ -165,10 +165,11 @@ class ServiceComponentConfigurator extends AbstractResourceConfigurator {
 		      .req(MessageConsumer.class) //
 		      .req(MessageBucketManager.class, LocalMessageBucketManager.ID) //
 		      .req(MessageCodec.class, HtmlMessageCodec.ID, "m_html") //
-		      .req(MessageCodec.class, WaterfallMessageCodec.ID, "m_waterfull"));
+		      .req(MessageCodec.class, WaterfallMessageCodec.ID, "m_waterfall"));
 		all.add(C(ModelService.class, "message-historical", HistoricalMessageService.class) //
 		      .req(MessageBucketManager.class, HdfsMessageBucketManager.ID) //
-		      .req(MessageCodec.class, "html"));
+		      .req(MessageCodec.class, HtmlMessageCodec.ID, "m_html") //
+		      .req(MessageCodec.class, WaterfallMessageCodec.ID, "m_waterfall"));
 
 		all.add(C(CachedReportTask.class).req(ReportServiceManager.class, ServerConfigManager.class));
 		return all;

cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HistoricalMessageService.java

@@ -14,6 +14,7 @@ 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.spi.core.HtmlMessageCodec;
+import com.dianping.cat.message.spi.core.WaterfallMessageCodec;
 import com.dianping.cat.report.page.model.spi.internal.BaseLocalModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
@@ -24,7 +25,10 @@ public class HistoricalMessageService extends BaseLocalModelService<String> {
 	private MessageBucketManager m_hdfsBucketManager;
 
 	@Inject(HtmlMessageCodec.ID)
-	private MessageCodec m_codec;
+	private MessageCodec m_html;
+
+	@Inject(WaterfallMessageCodec.ID)
+	private MessageCodec m_waterfall;
 
 	public HistoricalMessageService() {
 		super("logview");
@@ -61,12 +65,9 @@ public class HistoricalMessageService extends BaseLocalModelService<String> {
 		ChannelBuffer buf = ChannelBuffers.dynamicBuffer(8192);
 
 		if (tree.getMessage() instanceof Transaction && request.getProperty("waterfall", "false").equals("true")) {
-			// to work around a plexus injection bug
-			MessageCodec codec = lookup(MessageCodec.class, "waterfall");
-
-			codec.encode(tree, buf);
+			m_waterfall.encode(tree, buf);
 		} else {
-			m_codec.encode(tree, buf);
+			m_html.encode(tree, buf);
 		}
 
 		try {

cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalMessageService.java

@@ -12,6 +12,8 @@ import com.dianping.cat.message.Transaction;
 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.spi.core.HtmlMessageCodec;
+import com.dianping.cat.message.spi.core.WaterfallMessageCodec;
 import com.dianping.cat.report.page.model.spi.internal.BaseLocalModelService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
@@ -23,11 +25,11 @@ public class LocalMessageService extends BaseLocalModelService<String> {
 	@Inject(LocalMessageBucketManager.ID)
 	private MessageBucketManager m_bucketManager;
 
-	@Inject("html")
+	@Inject(HtmlMessageCodec.ID)
 	private MessageCodec m_html;
 
-	@Inject("waterfull")
-	private MessageCodec m_waterfull;
+	@Inject(WaterfallMessageCodec.ID)
+	private MessageCodec m_waterfall;
 
 	public LocalMessageService() {
 		super("logview");
@@ -42,7 +44,7 @@ public class LocalMessageService extends BaseLocalModelService<String> {
 			ChannelBuffer buf = ChannelBuffers.dynamicBuffer(8192);
 
 			if (tree.getMessage() instanceof Transaction && request.getProperty("waterfall", "false").equals("true")) {
-				m_waterfull.encode(tree, buf);
+				m_waterfall.encode(tree, buf);
 			} else {
 				m_html.encode(tree, buf);
 			}

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

@@ -2017,7 +2017,7 @@
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessageCodec</role>
 					<role-hint>waterfall</role-hint>
-					<field-name>m_waterfull</field-name>
+					<field-name>m_waterfall</field-name>
 				</requirement>
 			</requirements>
 		</component>
@@ -2033,6 +2033,12 @@
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessageCodec</role>
 					<role-hint>html</role-hint>
+					<field-name>m_html</field-name>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.MessageCodec</role>
+					<role-hint>waterfall</role-hint>
+					<field-name>m_waterfall</field-name>
 				</requirement>
 			</requirements>
 		</component>
@@ -3541,7 +3547,7 @@
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessageCodec</role>
-					<role-hint>waterfull</role-hint>
+					<role-hint>waterfall</role-hint>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.message.spi.core.MessageConsumer</role>