Skip to content

Commit 4b09684

Browse files
xuwei-kxuwei-k
committed
remove unnecessary parentheses
1 parent fa233bd commit 4b09684

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎core/src/main/scala/scalikejdbc/async/AsyncDBSession.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ trait AsyncDBSession extends LogSupport {
114114

115115
def list[A](statement: String, parameters: Any*)(extractor: WrappedResultSet => A)(implicit cxt: EC = ECGlobal): Future[List[A]] = {
116116
val _parameters = ensureAndNormalizeParameters(parameters)
117-
(iterable[A](statement, _parameters: _*)(extractor)).map(_.toList)
117+
iterable[A](statement, _parameters: _*)(extractor).map(_.toList)
118118
}
119119

120120
@deprecated("will be removed. use oneToOneIterable", "0.12.0")
@@ -130,7 +130,7 @@ trait AsyncDBSession extends LogSupport {
130130
withListeners(statement, _parameters) {
131131
queryLogging(statement, _parameters)
132132

133-
def processResultSet(oneToOne: (LinkedHashMap[A, Option[B]]), rs: WrappedResultSet): LinkedHashMap[A, Option[B]] = {
133+
def processResultSet(oneToOne: LinkedHashMap[A, Option[B]], rs: WrappedResultSet): LinkedHashMap[A, Option[B]] = {
134134
val o = extractOne(rs)
135135
oneToOne.keys.find(_ == o) match {
136136
case Some(_) => throw IllegalRelationshipException(ErrorMessage.INVALID_ONE_TO_ONE_RELATION)
@@ -167,7 +167,7 @@ trait AsyncDBSession extends LogSupport {
167167
withListeners(statement, _parameters) {
168168
queryLogging(statement, _parameters)
169169

170-
def processResultSet(oneToMany: (LinkedHashMap[A, Seq[B]]), rs: WrappedResultSet): LinkedHashMap[A, Seq[B]] = {
170+
def processResultSet(oneToMany: LinkedHashMap[A, Seq[B]], rs: WrappedResultSet): LinkedHashMap[A, Seq[B]] = {
171171
val o = extractOne(rs)
172172
oneToMany.keys.find(_ == o).map { _ =>
173173
extractTo(rs).map(many => oneToMany += (o -> (oneToMany.apply(o) :+ many))).getOrElse(oneToMany)
@@ -206,7 +206,7 @@ trait AsyncDBSession extends LogSupport {
206206
withListeners(statement, _parameters) {
207207
queryLogging(statement, _parameters)
208208

209-
def processResultSet(result: (LinkedHashMap[A, (Seq[B1], Seq[B2])]), rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2])] = {
209+
def processResultSet(result: LinkedHashMap[A, (Seq[B1], Seq[B2])], rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2])] = {
210210
val o = extractOne(rs)
211211
val (to1, to2) = (extractTo1(rs), extractTo2(rs))
212212
result.keys.find(_ == o).map { _ =>
@@ -253,7 +253,7 @@ trait AsyncDBSession extends LogSupport {
253253
withListeners(statement, _parameters) {
254254
queryLogging(statement, _parameters)
255255

256-
def processResultSet(result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3])]), rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3])] = {
256+
def processResultSet(result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3])], rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3])] = {
257257
val o = extractOne(rs)
258258
val (to1, to2, to3) = (extractTo1(rs), extractTo2(rs), extractTo3(rs))
259259
result.keys.find(_ == o).map { _ =>
@@ -307,7 +307,7 @@ trait AsyncDBSession extends LogSupport {
307307
withListeners(statement, _parameters) {
308308
queryLogging(statement, _parameters)
309309

310-
def processResultSet(result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])]), rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])] = {
310+
def processResultSet(result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])], rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4])] = {
311311
val o = extractOne(rs)
312312
val (to1, to2, to3, to4) = (extractTo1(rs), extractTo2(rs), extractTo3(rs), extractTo4(rs))
313313
result.keys.find(_ == o).map { _ =>
@@ -376,7 +376,7 @@ trait AsyncDBSession extends LogSupport {
376376
queryLogging(statement, _parameters)
377377

378378
def processResultSet(
379-
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])]),
379+
result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])],
380380
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5])] = {
381381
val o = extractOne(rs)
382382
val (to1, to2, to3, to4, to5) = (extractTo1(rs), extractTo2(rs), extractTo3(rs), extractTo4(rs), extractTo5(rs))
@@ -451,7 +451,7 @@ trait AsyncDBSession extends LogSupport {
451451
queryLogging(statement, _parameters)
452452

453453
def processResultSet(
454-
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6])]),
454+
result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6])],
455455
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6])] = {
456456
val o = extractOne(rs)
457457
val (to1, to2, to3, to4, to5, to6) = (extractTo1(rs), extractTo2(rs), extractTo3(rs), extractTo4(rs), extractTo5(rs), extractTo6(rs))
@@ -531,7 +531,7 @@ trait AsyncDBSession extends LogSupport {
531531
queryLogging(statement, _parameters)
532532

533533
def processResultSet(
534-
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7])]),
534+
result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7])],
535535
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7])] = {
536536
val o = extractOne(rs)
537537
val (to1, to2, to3, to4, to5, to6, to7) = (
@@ -623,7 +623,7 @@ trait AsyncDBSession extends LogSupport {
623623
queryLogging(statement, _parameters)
624624

625625
def processResultSet(
626-
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8])]),
626+
result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8])],
627627
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8])] = {
628628
val o = extractOne(rs)
629629
val (to1, to2, to3, to4, to5, to6, to7, to8) = (
@@ -721,7 +721,7 @@ trait AsyncDBSession extends LogSupport {
721721
queryLogging(statement, _parameters)
722722

723723
def processResultSet(
724-
result: (LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8], Seq[B9])]),
724+
result: LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8], Seq[B9])],
725725
rs: WrappedResultSet): LinkedHashMap[A, (Seq[B1], Seq[B2], Seq[B3], Seq[B4], Seq[B5], Seq[B6], Seq[B7], Seq[B8], Seq[B9])] = {
726726
val o = extractOne(rs)
727727
val (to1, to2, to3, to4, to5, to6, to7, to8, to9) = (

‎core/src/main/scala/scalikejdbc/async/AsyncResultSetTraversable.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import scalikejdbc._
2323
@deprecated("will be removed. use AsyncResultSetIterator", "0.12.0")
2424
class AsyncResultSetTraversable(var rs: AsyncResultSet) extends Traversable[WrappedResultSet] {
2525

26-
def foreach[U](f: (WrappedResultSet) => U): Unit = while (rs.next()) {
26+
def foreach[U](f: WrappedResultSet => U): Unit = while (rs.next()) {
2727
f.apply(rs)
2828
rs = rs.tail()
2929
}

‎core/src/main/scala/scalikejdbc/async/AsyncTx.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object AsyncTx {
5151
new AsyncTxQuery(sqlObjects)
5252
}
5353

54-
def inTransaction[A](tx: TxAsyncDBSession, op: (TxAsyncDBSession) => Future[A])(implicit cxt: EC = ECGlobal): Future[A] = {
54+
def inTransaction[A](tx: TxAsyncDBSession, op: TxAsyncDBSession => Future[A])(implicit cxt: EC = ECGlobal): Future[A] = {
5555
val p = Promise[A]()
5656
val connection = tx.connection.asInstanceOf[AsyncConnectionCommonImpl].underlying
5757
connection.inTransaction(_ => op.apply(tx)).onComplete {

‎core/src/main/scala/scalikejdbc/async/NamedAsyncDB.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ case class NamedAsyncDB(name: Any = AsyncConnectionPool.DEFAULT_NAME) {
3030
* @tparam A return type
3131
* @return a Future value
3232
*/
33-
def withPool[A](op: (SharedAsyncDBSession) => Future[A]): Future[A] = {
33+
def withPool[A](op: SharedAsyncDBSession => Future[A]): Future[A] = {
3434
op.apply(sharedSession)
3535
}
3636

@@ -49,7 +49,7 @@ case class NamedAsyncDB(name: Any = AsyncConnectionPool.DEFAULT_NAME) {
4949
* @tparam A return type
5050
* @return a future value
5151
*/
52-
def localTx[A](op: (TxAsyncDBSession) => Future[A])(implicit cxt: EC = ECGlobal): Future[A] = {
52+
def localTx[A](op: TxAsyncDBSession => Future[A])(implicit cxt: EC = ECGlobal): Future[A] = {
5353
AsyncConnectionPool(name).borrow().toNonSharedConnection()
5454
.flatMap(conn => AsyncTx.inTransaction[A](TxAsyncDBSession(conn), op))
5555
}

0 commit comments

Comments
 (0)