Merge pull request #48 from xuwei-k/refactoring

some refactoring
scalikejdbc · Apr 3, 2017 · c3f5d65 · c3f5d65
2 parents eb464b5 + c50858e
commit c3f5d65
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/scala/scalikejdbc/async/internal/AsyncResultSetImpl.scala b/core/src/main/scala/scalikejdbc/async/internal/AsyncResultSetImpl.scala
@@ -29,7 +29,7 @@ private[scalikejdbc] class AsyncResultSetImpl(rows: IndexedSeq[RowData])
     with AsyncResultSet {
 
   // AsyncResultSet API
-  override def next(): Boolean = rows.headOption.isDefined
+  override def next(): Boolean = rows.nonEmpty
   override def tail(): AsyncResultSet = new AsyncResultSetImpl(rows.tail)
 
 }
diff --git a/core/src/main/scala/scalikejdbc/async/internal/RowDataResultSet.scala b/core/src/main/scala/scalikejdbc/async/internal/RowDataResultSet.scala
@@ -317,7 +317,7 @@ private[scalikejdbc] class RowDataResultSet(var currentRow: Option[RowData], var
     val ref = getObject(columnIndex)
 
     if (ref != null && `type`.isInstance(ref)) {
-      return ref.asInstanceOf[T]
+      ref.asInstanceOf[T]
     } else {
       throw new SQLException(s"Object of class ${ref.getClass} is not an instance of ${`type`}");
     }
@@ -327,7 +327,7 @@ private[scalikejdbc] class RowDataResultSet(var currentRow: Option[RowData], var
     val ref = getObject(columnLabel)
 
     if (ref != null && `type`.isInstance(ref)) {
-      return ref.asInstanceOf[T]
+      ref.asInstanceOf[T]
     } else {
       throw new SQLException(s"Object of class ${ref.getClass} is not an instance of ${`type`}");
     }

diff --git a/core/src/main/scala/scalikejdbc/async/internal/mysql/MySQLConnectionImpl.scala b/core/src/main/scala/scalikejdbc/async/internal/mysql/MySQLConnectionImpl.scala
@@ -37,7 +37,7 @@ trait MySQLConnectionImpl extends AsyncConnectionCommonImpl {
   override protected def extractGeneratedKey(queryResult: QueryResult)(implicit cxt: EC = ECGlobal): Future[Option[Long]] = {
     ensureNonShared()
     underlying.sendQuery("SELECT LAST_INSERT_ID()").map { result =>
-      result.rows.headOption.flatMap { rows =>
+      result.rows.flatMap { rows =>
         rows.headOption.map { row => row(0).asInstanceOf[Long] }
       }
     }

diff --git a/core/src/main/scala/scalikejdbc/async/internal/postgresql/PostgreSQLConnectionImpl.scala b/core/src/main/scala/scalikejdbc/async/internal/postgresql/PostgreSQLConnectionImpl.scala
@@ -38,7 +38,7 @@ trait PostgreSQLConnectionImpl extends AsyncConnectionCommonImpl {
   protected def extractGeneratedKey(queryResult: QueryResult)(implicit cxt: EC = ECGlobal): Future[Option[Long]] = {
     ensureNonShared()
     Future.successful(for {
-      rows <- queryResult.rows.headOption
+      rows <- queryResult.rows
       row <- rows.headOption
       value <- Option(row(0))
       key <- Try(value.toString.toLong).toOption