From bf10b16138e66765a75df02b4edc95acb20b1b6f Mon Sep 17 00:00:00 2001
From: agapple <jianghang.loujh@alibaba-inc.com>
Date: Thu, 4 Feb 2016 11:22:36 +0800
Subject: [PATCH] migrate

---
 .../parse/inbound/mysql/MysqlEventParser.java   | 17 -----------------
 .../embedded/CanalServerWithEmbedded.java       |  8 ++++----
 .../server/netty/CanalServerWithNetty.java      |  2 +-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
index d9377005..99fce6c3 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
@@ -700,23 +700,6 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
         }
     }
 
-//    protected Entry parseAndProfilingIfNecessary(LogEvent bod) throws Exception {
-//        long startTs = -1;
-//        boolean enabled = getProfilingEnabled();
-//        if (enabled) {
-//            startTs = System.currentTimeMillis();
-//        }
-//        CanalEntry.Entry event = binlogParser.parse(bod);
-//        if (enabled) {
-//            this.parsingInterval = System.currentTimeMillis() - startTs;
-//        }
-//
-//        if (parsedEventCount.incrementAndGet() < 0) {
-//            parsedEventCount.set(0);
-//        }
-//        return event;
-//    }
-
     public void setSupportBinlogFormats(String formatStrs) {
         String[] formats = StringUtils.split(formatStrs, ',');
         if (formats != null) {
diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java
index ab6e9734..d8488668 100644
--- a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java
+++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java
@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.alibaba.otter.canal.server.CanalService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -22,6 +21,7 @@ import com.alibaba.otter.canal.protocol.position.LogPosition;
 import com.alibaba.otter.canal.protocol.position.Position;
 import com.alibaba.otter.canal.protocol.position.PositionRange;
 import com.alibaba.otter.canal.server.CanalServer;
+import com.alibaba.otter.canal.server.CanalService;
 import com.alibaba.otter.canal.server.exception.CanalServerException;
 import com.alibaba.otter.canal.store.CanalEventStore;
 import com.alibaba.otter.canal.store.model.Event;
@@ -45,13 +45,13 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C
     // private Map<ClientIdentity, Position> lastRollbackPostions;
     private CanalInstanceGenerator     canalInstanceGenerator;
 
-
     private static class SingletonHolder {
+
         private static final CanalServerWithEmbedded CANAL_SERVER_WITH_EMBEDDED = new CanalServerWithEmbedded();
     }
 
-    private CanalServerWithEmbedded() {
-
+    public CanalServerWithEmbedded(){
+        // 希望也保留用户new单独实例的需求,兼容历史
     }
 
     public static CanalServerWithEmbedded instance() {
diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
index 8876e6b1..39546467 100644
--- a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
+++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
@@ -3,7 +3,6 @@ package com.alibaba.otter.canal.server.netty;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import com.alibaba.otter.canal.instance.core.CanalInstance;
 import org.apache.commons.lang.StringUtils;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.Channel;
@@ -35,6 +34,7 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana
     private ServerBootstrap         bootstrap     = null;
 
     private static class SingletonHolder {
+
         private static final CanalServerWithNetty CANAL_SERVER_WITH_NETTY = new CanalServerWithNetty();
     }