From 934aa6bb6c5c0c4df9fdabb8c294091fdfd9d7b7 Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Fri, 17 Mar 2017 13:17:50 +0800
Subject: [PATCH] compile error

---
 .../worker/application/ApplicationMain.java   | 20 +++++++++----------
 .../worker/httpserver/Controller.java         | 11 +++-------
 .../httpserver/controller/DagController.java  |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMain.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMain.java
index 64ff24ba0..20da536ba 100644
--- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMain.java
+++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMain.java
@@ -1,9 +1,7 @@
 package com.a.eye.skywalking.collector.worker.application;
 
 import com.a.eye.skywalking.api.util.StringUtil;
-import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorker;
-import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorkerProvider;
-import com.a.eye.skywalking.collector.actor.ClusterWorkerContext;
+import com.a.eye.skywalking.collector.actor.*;
 import com.a.eye.skywalking.collector.actor.selector.RollingSelector;
 import com.a.eye.skywalking.collector.actor.selector.WorkerSelector;
 import com.a.eye.skywalking.collector.worker.application.analysis.DAGNodeAnalysis;
@@ -25,12 +23,12 @@ public class ApplicationMain extends AbstractLocalSyncWorker {
 
     private Logger logger = LogManager.getFormatterLogger(ApplicationMain.class);
 
-    public ApplicationMain(Role role, ClusterWorkerContext clusterContext) throws Exception {
-        super(role, clusterContext);
+    public ApplicationMain(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
+        super(role, clusterContext, selfContext);
     }
 
     @Override
-    public void preStart() throws Exception {
+    public void preStart() throws ProviderNotFountException {
         getClusterContext().findProvider(DAGNodeAnalysis.Role.INSTANCE).create(getClusterContext(), getSelfContext());
         getClusterContext().findProvider(NodeInstanceAnalysis.Role.INSTANCE).create(getClusterContext(), getSelfContext());
         getClusterContext().findProvider(ResponseCostAnalysis.Role.INSTANCE).create(getClusterContext(), getSelfContext());
@@ -62,16 +60,16 @@ public class ApplicationMain extends AbstractLocalSyncWorker {
         }
 
         @Override
-        public Class workerClass() {
-            return ApplicationMain.class;
+        public ApplicationMain workerInstance(ClusterWorkerContext clusterContext) {
+            return new ApplicationMain(role(), clusterContext, new LocalWorkerContext());
         }
     }
 
-    public static class Role extends com.a.eye.skywalking.collector.actor.Role {
-        public static Role INSTANCE = new Role();
+    public enum Role implements com.a.eye.skywalking.collector.actor.Role {
+        INSTANCE;
 
         @Override
-        public String name() {
+        public String roleName() {
             return ApplicationMain.class.getSimpleName();
         }
 
diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/Controller.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/Controller.java
index 31a7eceec..56535702a 100644
--- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/Controller.java
+++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/Controller.java
@@ -1,7 +1,6 @@
 package com.a.eye.skywalking.collector.worker.httpserver;
 
-import com.a.eye.skywalking.collector.actor.AbstractAsyncMember;
-import com.a.eye.skywalking.collector.actor.AbstractSyncMember;
+import com.a.eye.skywalking.collector.actor.Role;
 import com.google.gson.JsonElement;
 import fi.iki.elonen.NanoHTTPD;
 
@@ -18,11 +17,7 @@ public abstract class Controller {
 
     protected abstract JsonElement execute(Map<String, String> parms);
 
-    protected void tell(AbstractAsyncMember targetMember, Object message) throws Exception {
-        targetMember.beTold(message);
-    }
-
-    protected void tell(AbstractSyncMember targetMember, Object message) throws Exception {
-        targetMember.beTold(message);
+    protected void tell(Role role, Object message) throws Exception {
+//        targetMember.beTold(message);
     }
 }
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/controller/DagController.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/controller/DagController.java
index 64096f679..e85c21716 100644
--- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/controller/DagController.java
+++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/controller/DagController.java
@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * @author pengys5
  */
-public class DagController implements Controller {
+public class DagController extends Controller {
 
     @Override
     public NanoHTTPD.Method httpMethod() {