#274 follow up

Author: Stanley Shyiko

src/main/java/com/github/shyiko/mysql/binlog/BinaryLogClient.java

@@ -646,7 +646,7 @@ private GreetingPacket receiveGreeting() throws IOException {
     }
 
     private void enableHeartbeat() throws IOException {
-        channel.writeBuffered(new QueryCommand("set @master_heartbeat_period=" + heartbeatInterval * 1000000));
+        channel.write(new QueryCommand("set @master_heartbeat_period=" + heartbeatInterval * 1000000));
         byte[] statementResult = channel.read();
         if (statementResult[0] == (byte) 0xFF /* error */) {
             byte[] bytes = Arrays.copyOfRange(statementResult, 1, statementResult.length);
@@ -669,7 +669,7 @@ private void requestBinaryLogStream() throws IOException {
                 dumpBinaryLogCommand = new DumpBinaryLogCommand(serverId, binlogFilename, binlogPosition);
             }
         }
-        channel.writeBuffered(dumpBinaryLogCommand);
+        channel.write(dumpBinaryLogCommand);
     }
 
     private void ensureEventDataDeserializer(EventType eventType,
@@ -703,7 +703,7 @@ private void authenticate(GreetingPacket greetingPacket) throws IOException {
             if (serverSupportsSSL) {
                 SSLRequestCommand sslRequestCommand = new SSLRequestCommand();
                 sslRequestCommand.setCollation(collation);
-                channel.writeBuffered(sslRequestCommand, packetNumber++);
+                channel.write(sslRequestCommand, packetNumber++);
                 SSLSocketFactory sslSocketFactory =
                     this.sslSocketFactory != null ?
                         this.sslSocketFactory :
@@ -718,7 +718,7 @@ private void authenticate(GreetingPacket greetingPacket) throws IOException {
         AuthenticateCommand authenticateCommand = new AuthenticateCommand(schema, username, password,
             greetingPacket.getScramble());
         authenticateCommand.setCollation(collation);
-        channel.writeBuffered(authenticateCommand, packetNumber);
+        channel.write(authenticateCommand, packetNumber);
         byte[] authenticationResult = channel.read();
         if (authenticationResult[0] != (byte) 0x00 /* ok */) {
             if (authenticationResult[0] == (byte) 0xFF /* error */) {
@@ -748,7 +748,7 @@ private void switchAuthentication(byte[] authenticationResult, boolean usingSSLS
             String scramble = buffer.readZeroTerminatedString();
 
             Command switchCommand = new AuthenticateNativePasswordCommand(scramble, password);
-            channel.writeBuffered(switchCommand, (usingSSLSocket ? 4 : 3));
+            channel.write(switchCommand, (usingSSLSocket ? 4 : 3));
             byte[] authResult = channel.read();
 
             if (authResult[0] != (byte) 0x00) {
@@ -790,7 +790,7 @@ public void run() {
                             connectionLost = System.currentTimeMillis() - eventLastSeen > keepAliveInterval;
                         } else {
                             try {
-                                channel.writeBuffered(new PingCommand());
+                                channel.write(new PingCommand());
                             } catch (IOException e) {
                                 connectionLost = true;
                             }
@@ -894,7 +894,7 @@ public boolean isConnected() {
     }
 
     private String fetchGtidPurged() throws IOException {
-        channel.writeBuffered(new QueryCommand("show global variables like 'gtid_purged'"));
+        channel.write(new QueryCommand("show global variables like 'gtid_purged'"));
         ResultSetRowPacket[] resultSet = readResultSet();
         if (resultSet.length != 0) {
             return resultSet[0].getValue(1).toUpperCase();
@@ -904,7 +904,7 @@ private String fetchGtidPurged() throws IOException {
 
     private void fetchBinlogFilenameAndPosition() throws IOException {
         ResultSetRowPacket[] resultSet;
-        channel.writeBuffered(new QueryCommand("show master status"));
+        channel.write(new QueryCommand("show master status"));
         resultSet = readResultSet();
         if (resultSet.length == 0) {
             throw new IOException("Failed to determine binlog filename/position");
@@ -915,7 +915,7 @@ private void fetchBinlogFilenameAndPosition() throws IOException {
     }
 
     private ChecksumType fetchBinlogChecksum() throws IOException {
-        channel.writeBuffered(new QueryCommand("show global variables like 'binlog_checksum'"));
+        channel.write(new QueryCommand("show global variables like 'binlog_checksum'"));
         ResultSetRowPacket[] resultSet = readResultSet();
         if (resultSet.length == 0) {
             return ChecksumType.NONE;
@@ -924,7 +924,7 @@ private ChecksumType fetchBinlogChecksum() throws IOException {
     }
 
     private void confirmSupportOfChecksum(ChecksumType checksumType) throws IOException {
-        channel.writeBuffered(new QueryCommand("set @master_binlog_checksum= @@global.binlog_checksum"));
+        channel.write(new QueryCommand("set @master_binlog_checksum= @@global.binlog_checksum"));
         byte[] statementResult = channel.read();
         if (statementResult[0] == (byte) 0xFF /* error */) {
             byte[] bytes = Arrays.copyOfRange(statementResult, 1, statementResult.length);

src/main/java/com/github/shyiko/mysql/binlog/network/protocol/PacketChannel.java

@@ -61,23 +61,28 @@ public byte[] read() throws IOException {
         return inputStream.read(length);
     }
 
-    /*
-       Azure's MySQL has bizarre network properties that force us to write an
-       auth-response challenge in one shot, lest their hair catch on fire and
-       forcibly disconnect us.
-     */
-    public void writeBuffered(Command command, int packetNumber) throws IOException {
+    public void write(Command command, int packetNumber) throws IOException {
         byte[] body = command.toByteArray();
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         buffer.writeInteger(body.length, 3); // packet length
         buffer.writeInteger(packetNumber, 1);
         buffer.write(body, 0, body.length);
-        buffer.flush();
-        socket.getOutputStream().write(buffer.toByteArray());
+        outputStream.write(buffer.toByteArray());
+        // though it has no effect in case of default (underlying) output stream (SocketOutputStream),
+        // it may be necessary in case of non-default one
+        outputStream.flush();
+    }
+
+    /**
+     * @deprecated use {@link #write(Command, int)} instead
+     */
+    @Deprecated
+    public void writeBuffered(Command command, int packetNumber) throws IOException {
+        write(command, packetNumber);
     }
 
-    public void writeBuffered(Command command) throws IOException {
-        writeBuffered(command, 0);
+    public void write(Command command) throws IOException {
+        write(command, 0);
     }
 
     public void upgradeToSSL(SSLSocketFactory sslSocketFactory, HostnameVerifier hostnameVerifier) throws IOException {