format & import

client/src/main/java/com/alibaba/otter/canal/client/impl/ClusterNodeAccessStrategy.java

@@ -114,5 +114,4 @@ public class ClusterNodeAccessStrategy implements CanalNodeAccessStrategy {
         return zkClient;
     }
 
-
 }

common/pom.xml

@@ -16,9 +16,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.6.Final</version>
 		</dependency>
-
 		<!-- zk -->
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
@@ -36,7 +34,6 @@
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java

@@ -168,8 +168,8 @@ public class LogBuffer {
      * @param newLimit The new limit value; must be non-negative and no larger
      * than this buffer's capacity
      * @return This buffer
-     * @throws IllegalArgumentException If the preconditions on <tt>newLimit</tt>
+     * @throws IllegalArgumentException If the preconditions on
-     * do not hold
+     * <tt>newLimit</tt> do not hold
      */
     public final LogBuffer limit(int newLimit) {
         if (origin + newLimit > buffer.length || newLimit < 0) throw new IllegalArgumentException("capacity excceed: "

driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannel.java

@@ -10,11 +10,10 @@ import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 
 /**
- * @author luoyaogui
+ * @author luoyaogui 封装netty的通信channel和数据接收缓存，实现读、写、连接校验的功能。 2016-12-28
- * 封装netty的通信channel和数据接收缓存，实现读、写、连接校验的功能。
- * 2016-12-28
  */
 public class SocketChannel {
+
     private Channel channel = null;
     private Object  lock    = new Object();
     private ByteBuf cache   = PooledByteBufAllocator.DEFAULT.directBuffer(1024 * 1024 * 5); // 缓存大小
@@ -22,6 +21,7 @@ public class SocketChannel {
     public Channel getChannel() {
         return channel;
     }
+
     public void setChannel(Channel channel, boolean notify) {
         this.channel = channel;
         if (notify) {// 是否需要通知，主要时channel不可用时
@@ -40,18 +40,23 @@ public class SocketChannel {
             notifyAll();
         }
     }
+
     public void writeChannel(byte[]... buf) throws IOException {
-		if(channel != null && channel.isWritable())
+        if (channel != null && channel.isWritable()) {
             channel.writeAndFlush(Unpooled.copiedBuffer(buf));
-		else
+        } else {
             throw new IOException("write  failed  !  please checking !");
         }
+    }
+
     public int read(ByteBuffer buffer) throws IOException {
-		if(null == channel)
+        if (null == channel) throw new IOException("socket has Interrupted !");
-			throw new IOException("socket has Interrupted !");
         if (cache.readableBytes() < buffer.remaining()) {
             synchronized (this) {
-				try {wait();} catch (InterruptedException e) {}
+                try {
+                    wait();
+                } catch (InterruptedException e) {
+                }
             }
         } else {
             synchronized (lock) {
@@ -60,12 +65,15 @@ public class SocketChannel {
         }
         return 0;
     }
+
     public boolean isConnected() {
         return channel != null ? true : false;
     }
+
     public SocketAddress getRemoteSocketAddress() {
         return channel != null ? channel.remoteAddress() : null;
     }
+
     public void close() {
         if (channel != null) {
             channel.close();

driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java

@@ -20,10 +20,9 @@ import java.io.IOException;
 import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 /**
- * @author luoyaogui
+ * @author luoyaogui 实现channel的管理（监听连接、读数据、回收） 2016-12-28
- * 实现channel的管理（监听连接、读数据、回收）
- * 2016-12-28
  */
 @SuppressWarnings("rawtypes")
 public abstract class SocketChannelPool {
@@ -33,14 +32,18 @@ public abstract class SocketChannelPool {
     private static Map<Channel, SocketChannel> chManager = new ConcurrentHashMap<Channel, SocketChannel>();
 
     static {
-		boot.group(group).channel(NioSocketChannel.class)
+        boot.group(group)
+            .channel(NioSocketChannel.class)
             .option(ChannelOption.SO_RCVBUF, 32 * 1024)
             .option(ChannelOption.SO_SNDBUF, 32 * 1024)
-			.option(ChannelOption.TCP_NODELAY, true)//如果是延时敏感型应用，建议关闭Nagle算法
+            .option(ChannelOption.TCP_NODELAY, true)
+            // 如果是延时敏感型应用，建议关闭Nagle算法
             .option(ChannelOption.SO_KEEPALIVE, true)
             .option(ChannelOption.RCVBUF_ALLOCATOR, AdaptiveRecvByteBufAllocator.DEFAULT)
-			.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT) //
+            .option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
+            //
             .handler(new ChannelInitializer() {
+
                 @Override
                 protected void initChannel(Channel arg0) throws Exception {
                     arg0.pipeline().addLast(new BusinessHandler());// 命令过滤和handler添加管理
@@ -51,14 +54,15 @@ public abstract class SocketChannelPool {
     public static SocketChannel open(SocketAddress address) throws Exception {
         final SocketChannel socket = new SocketChannel();
         boot.connect(address).addListener(new ChannelFutureListener() {
+
             @Override
             public void operationComplete(ChannelFuture arg0) throws Exception {
-				if(arg0.isSuccess())
+                if (arg0.isSuccess()) socket.setChannel(arg0.channel(), false);
-					socket.setChannel(arg0.channel(),false);
                 synchronized (socket) {
                     socket.notify();
                 }
-		}});
+            }
+        });
         synchronized (socket) {
             socket.wait();
         }
@@ -70,25 +74,25 @@ public abstract class SocketChannelPool {
     }
 
     public static class BusinessHandler extends ChannelInboundHandlerAdapter {
+
         private SocketChannel socket = null;
-		@Override
+
         public void channelInactive(ChannelHandlerContext ctx) throws Exception {
             socket.setChannel(null, true);
             chManager.remove(ctx.channel());// 移除
         }
-		@Override
+
-		public void channelRead(ChannelHandlerContext ctx, Object msg)
+        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-				throws Exception {
+            if (null == socket) {
-			if(null == socket)
                 socket = chManager.get(ctx.channel());
+            }
             if (socket != null) {
                 socket.writeCache((ByteBuf) msg);
             }
             ReferenceCountUtil.release(msg);// 添加防止内存泄漏的
         }
-		@Override
+
-		public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-				throws Exception {
             ctx.close();
         }
     }

driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;

filter/src/test/java/com/alibaba/otter/canal/filter/AviaterFilterTest.java

@@ -1,7 +1,6 @@
 package com.alibaba.otter.canal.filter;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.filter.aviater.AviaterELFilter;

filter/src/test/java/com/alibaba/otter/canal/filter/MutliAviaterFilterTest.java

@@ -5,9 +5,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Assert;
-
 import org.apache.commons.lang.RandomStringUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter;

instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java

@@ -1,5 +1,11 @@
 package com.alibaba.otter.canal.instance.core;
 
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alibaba.otter.canal.common.AbstractCanalLifeCycle;
 import com.alibaba.otter.canal.common.alarm.CanalAlarmHandler;
 import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter;
@@ -16,17 +22,9 @@ import com.alibaba.otter.canal.protocol.ClientIdentity;
 import com.alibaba.otter.canal.sink.CanalEventSink;
 import com.alibaba.otter.canal.store.CanalEventStore;
 import com.alibaba.otter.canal.store.model.Event;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
 
 /**
- * Created with Intellig IDEA.
+ * Created with Intellig IDEA. Author: yinxiu Date: 2016-01-07 Time: 22:26
- * Author: yinxiu
- * Date: 2016-01-07
- * Time: 22:26
  */
 public class AbstractCanalInstance extends AbstractCanalLifeCycle implements CanalInstance {
 
@@ -121,7 +119,6 @@ public class AbstractCanalInstance extends AbstractCanalLifeCycle implements Can
             alarmHandler.stop();
         }
 
-
         logger.info("stop successful....");
     }
 

instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/CanalInstanceWithSpring.java

@@ -2,11 +2,11 @@ package com.alibaba.otter.canal.instance.spring;
 
 import java.util.List;
 
-import com.alibaba.otter.canal.instance.core.AbstractCanalInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.alibaba.otter.canal.common.alarm.CanalAlarmHandler;
+import com.alibaba.otter.canal.instance.core.AbstractCanalInstance;
 import com.alibaba.otter.canal.meta.CanalMetaManager;
 import com.alibaba.otter.canal.parse.CanalEventParser;
 import com.alibaba.otter.canal.protocol.CanalEntry;

meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java

@@ -5,9 +5,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Assert;
-
 import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

meta/src/test/java/com/alibaba/otter/canal/meta/MemoryMetaManagerTest.java

@@ -3,7 +3,6 @@ package com.alibaba.otter.canal.meta;
 import java.util.Map;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.protocol.position.PositionRange;

meta/src/test/java/com/alibaba/otter/canal/meta/MixedMetaManagerTest.java

@@ -3,9 +3,8 @@ package com.alibaba.otter.canal.meta;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

meta/src/test/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManagerTest.java

@@ -3,9 +3,8 @@ package com.alibaba.otter.canal.meta;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

meta/src/test/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManagerTest.java

@@ -2,9 +2,8 @@ package com.alibaba.otter.canal.meta;
 
 import java.util.Map;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinLogConnection.java

@@ -85,19 +85,16 @@ public class LocalBinLogConnection implements ErosaConnection {
                 boolean needContinue = true;
                 LogEvent event = null;
                 L: while (fetcher.fetch()) {
-                    /*event = decoder.decode(fetcher, context);
+                    /*
-                    if (event == null) {
+                     * event = decoder.decode(fetcher, context); if (event ==
-                        throw new CanalParseException("parse failed");
+                     * null) { throw new CanalParseException("parse failed"); }
-                    }
+                     * if (!func.sink(event)) { needContinue = false; break; }
-
+                     */
-                    if (!func.sink(event)) {
-                        needContinue = false;
-                        break;
-                    }*/
 
                     do {
                         if (event == null) {
-							event = new RotateLogEvent(context.getLogPosition().getFileName(), context.getLogPosition().getPosition());
+                            event = new RotateLogEvent(context.getLogPosition().getFileName(), context.getLogPosition()
+                                .getPosition());
                         } else {
                             event = decoder.decode(fetcher, context);
                         }

parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java

@@ -2,7 +2,6 @@ package com.alibaba.otter.canal.parse.inbound.mysql;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -148,8 +147,7 @@ public class MysqlConnection implements ErosaConnection {
         HeaderPacket binlogDumpHeader = new HeaderPacket();
         binlogDumpHeader.setPacketBodyLength(cmdBody.length);
         binlogDumpHeader.setPacketSequenceNumber((byte) 0x00);
-        PacketManager.write(connector.getChannel(), binlogDumpHeader.toBytes(),
+        PacketManager.write(connector.getChannel(), binlogDumpHeader.toBytes(), cmdBody);
-                cmdBody);
 
         connector.setDumping(true);
     }

parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java

@@ -2,7 +2,6 @@ package com.alibaba.otter.canal.parse;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
 
 import org.junit.Assert;
 import org.junit.Test;

parse/src/test/java/com/alibaba/otter/canal/parse/inbound/EventTransactionBufferTest.java

@@ -6,7 +6,6 @@ import java.util.Date;
 import java.util.List;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.inbound.EventTransactionBuffer.TransactionFlushCallback;

parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java

@@ -5,7 +5,6 @@ import java.nio.charset.Charset;
 import java.util.List;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.stub.AbstractCanalEventSinkTest;

parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java

@@ -5,7 +5,6 @@ import java.nio.charset.Charset;
 import java.util.List;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.stub.AbstractCanalEventSinkTest;

parse/src/test/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManagerTest.java

@@ -3,9 +3,8 @@ package com.alibaba.otter.canal.parse.index;
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Assert;
-
 import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java

@@ -3,9 +3,8 @@ package com.alibaba.otter.canal.parse.index;
 import java.net.InetSocketAddress;
 import java.util.Date;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java

@@ -1,8 +1,7 @@
 package com.alibaba.otter.canal.parse.index;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java

@@ -1,8 +1,7 @@
 package com.alibaba.otter.canal.parse.index;
 
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

pom.xml

@@ -199,6 +199,11 @@
                 <artifactId>netty</artifactId>
                 <version>3.2.5.Final</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>4.1.6.Final</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>

store/src/test/java/com/alibaba/otter/cancel/store/memory/buffer/MemoryEventStoreMultiThreadTest.java

@@ -7,10 +7,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Assert;
-
 import org.apache.commons.lang.math.RandomUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.util.CollectionUtils;