Avoid overloading confusion

Author: mst-appear

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/encoder/PreparedStatementExecuteEncoder.scala

@@ -36,12 +36,12 @@ class PreparedStatementExecuteEncoder( rowEncoder : BinaryRowEncoder ) extends M
  if ( m.parameters.isEmpty ) {
  buffer
  } else {
- Unpooled.wrappedBuffer(buffer, encode(m.values))
+ Unpooled.wrappedBuffer(buffer, encodeValues(m.values))
  }
 
  }
 
- private[encoder] def encode( values : Seq[Any] ) : ByteBuf = {
+ private[encoder] def encodeValues( values : Seq[Any] ) : ByteBuf = {
  val nullBitsCount = (values.size + 7) / 8
  val nullBits = new Array[Byte](nullBitsCount)
  val bitMapBuffer = ByteBufferUtils.mysqlBuffer(1 + nullBitsCount)
@@ -57,8 +57,8 @@ class PreparedStatementExecuteEncoder( rowEncoder : BinaryRowEncoder ) extends M
  parameterTypesBuffer.writeShort(ColumnTypes.FIELD_TYPE_NULL)
  } else {
  value match {
- case Some(v) => encode(parameterTypesBuffer, parameterValuesBuffer, v)
- case _ => encode(parameterTypesBuffer, parameterValuesBuffer, value)
+ case Some(v) => encodeValue(parameterTypesBuffer, parameterValuesBuffer, v)
+ case _ => encodeValue(parameterTypesBuffer, parameterValuesBuffer, value)
  }
  }
  index += 1
@@ -74,7 +74,7 @@ class PreparedStatementExecuteEncoder( rowEncoder : BinaryRowEncoder ) extends M
  Unpooled.wrappedBuffer( bitMapBuffer, parameterTypesBuffer, parameterValuesBuffer )
  }
 
- private def encode(parameterTypesBuffer: ByteBuf, parameterValuesBuffer: ByteBuf, value: Any): Unit = {
+ private def encodeValue(parameterTypesBuffer: ByteBuf, parameterValuesBuffer: ByteBuf, value: Any): Unit = {
  val encoder = rowEncoder.encoderFor(value)
  parameterTypesBuffer.writeShort(encoder.encodesTo)
  if (!encoder.isLong(value))

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/encoder/SendLongDataEncoder.scala

@@ -15,10 +15,10 @@ class SendLongDataEncoder( rowEncoder : BinaryRowEncoder ) extends MessageEncode
  buffer.writeBytes(m.statementId)
  buffer.writeShort(m.paramId)
 
- Unpooled.wrappedBuffer(buffer, encodeLong(m.value))
+ Unpooled.wrappedBuffer(buffer, encodeValue(m.value))
  }
 
- private def encodeLong( maybeValue: Any ) : ByteBuf = {
+ private def encodeValue( maybeValue: Any ) : ByteBuf = {
  if ( maybeValue == null || maybeValue == None ) {
  throw new UnsupportedOperationException("Cannot encode NULL as long value")
  } else {

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/encoder/PreparedStatementExecuteEncoderSpec.scala

@@ -27,16 +27,16 @@ class PreparedStatementExecuteEncoderSpec extends Specification {
  "binary row encoder" should {
 
  "encode Some(value) like value" in {
- val actual = encoder.encode(List(Some(1l), Some("foo")))
- val expected = encoder.encode(List(1l, "foo"))
+ val actual = encoder.encodeValues(List(Some(1l), Some("foo")))
+ val expected = encoder.encodeValues(List(1l, "foo"))
 
  actual mustEqual expected
 
  }
 
  "encode None as null" in {
- val actual = encoder.encode(List(None))
- val expected = encoder.encode(List(null))
+ val actual = encoder.encodeValues(List(None))
+ val expected = encoder.encodeValues(List(null))
 
  actual mustEqual expected
  }