Skip to content

Commit 4abce12

Browse files
xuwei-kxuwei-k
committed
Update scalafmt setting. prepare Scala 3.4
1 parent 4c44d8e commit 4abce12

13 files changed

+62
-74
lines changed

‎.scalafmt.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ indent.extendSite = 2
77
spaces.inImportCurlyBraces = true
88
runner.dialect = scala3
99
align.tokens = []
10+
rewrite.scala3.convertToNewSyntax = true
11+
runner.dialectOverride.allowSignificantIndentation = false
12+
runner.dialectOverride.allowAsForImportRename = false
13+
runner.dialectOverride.allowStarWildcardImport = false

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

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
3636
val _parameters = ensureAndNormalizeParameters(parameters)
3737
withListeners(statement, _parameters) {
3838
queryLogging(statement, _parameters)
39-
connection.sendPreparedStatement(statement, _parameters: _*).map {
40-
result =>
41-
result.rowsAffected.exists(_ > 0)
39+
connection.sendPreparedStatement(statement, _parameters*).map { result =>
40+
result.rowsAffected.exists(_ > 0)
4241
}
4342
}
4443
}
@@ -56,12 +55,12 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
5655
AsyncTx.inTransaction(
5756
TxAsyncDBSession(conn),
5857
{ (tx: TxAsyncDBSession) =>
59-
tx.connection.sendPreparedStatement(statement, _parameters: _*)
58+
tx.connection.sendPreparedStatement(statement, _parameters*)
6059
}
6160
)
6261
}
6362
} else {
64-
connection.sendPreparedStatement(statement, _parameters: _*)
63+
connection.sendPreparedStatement(statement, _parameters*)
6564
}
6665
// Process statement result
6766
statementResultF.map { result =>
@@ -90,14 +89,14 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
9089
TxAsyncDBSession(conn),
9190
{ (tx: TxAsyncDBSession) =>
9291
tx.connection
93-
.sendPreparedStatement(statement, _parameters: _*)
92+
.sendPreparedStatement(statement, _parameters*)
9493
.flatMap(readGeneratedKey)
9594
}
9695
)
9796
}
9897
} else {
9998
connection
100-
.sendPreparedStatement(statement, _parameters: _*)
99+
.sendPreparedStatement(statement, _parameters*)
101100
.flatMap(readGeneratedKey)
102101
}
103102
}
@@ -107,21 +106,20 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
107106
def traversable[A](statement: String, parameters: Any*)(
108107
extractor: WrappedResultSet => A
109108
)(implicit cxt: EC = ECGlobal): Future[Iterable[A]] =
110-
iterable[A](statement, parameters: _*)(extractor)
109+
iterable[A](statement, parameters*)(extractor)
111110

112111
def iterable[A](statement: String, parameters: Any*)(
113112
extractor: WrappedResultSet => A
114113
)(implicit cxt: EC = ECGlobal): Future[Iterable[A]] = {
115114
val _parameters = ensureAndNormalizeParameters(parameters)
116115
withListeners(statement, _parameters) {
117116
queryLogging(statement, _parameters)
118-
connection.sendPreparedStatement(statement, _parameters: _*).map {
119-
result =>
120-
result.rows
121-
.map { ars =>
122-
new AsyncResultSetIterator(ars).map(extractor).toList
123-
}
124-
.getOrElse(Nil)
117+
connection.sendPreparedStatement(statement, _parameters*).map { result =>
118+
result.rows
119+
.map { ars =>
120+
new AsyncResultSetIterator(ars).map(extractor).toList
121+
}
122+
.getOrElse(Nil)
125123
}
126124
}
127125
}
@@ -130,7 +128,7 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
130128
extractor: WrappedResultSet => A
131129
)(implicit cxt: EC = ECGlobal): Future[Option[A]] = {
132130
val _parameters = ensureAndNormalizeParameters(parameters)
133-
iterable(statement, _parameters: _*)(extractor).map {
131+
iterable(statement, _parameters*)(extractor).map {
134132
case Nil => None
135133
case one :: Nil => Option(one)
136134
case results => throw TooManyRowsException(1, results.size)
@@ -141,7 +139,7 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
141139
extractor: WrappedResultSet => A
142140
)(implicit cxt: EC = ECGlobal): Future[List[A]] = {
143141
val _parameters = ensureAndNormalizeParameters(parameters)
144-
iterable[A](statement, _parameters: _*)(extractor).map(_.toList)
142+
iterable[A](statement, _parameters*)(extractor).map(_.toList)
145143
}
146144

147145
@deprecated("will be removed. use oneToOneIterable", "0.12.0")
@@ -150,7 +148,7 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
150148
)(
151149
extractTo: WrappedResultSet => Option[B]
152150
)(transform: (A, B) => Z)(implicit cxt: EC = ECGlobal): Future[Iterable[Z]] =
153-
oneToOneIterable[A, B, Z](statement, parameters: _*)(extractOne)(extractTo)(
151+
oneToOneIterable[A, B, Z](statement, parameters*)(extractOne)(extractTo)(
154152
transform
155153
)
156154

@@ -176,18 +174,17 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
176174
case _ => oneToOne += (o -> extractTo(rs))
177175
}
178176
}
179-
connection.sendPreparedStatement(statement, _parameters: _*).map {
180-
result =>
181-
result.rows
182-
.map { ars =>
183-
new AsyncResultSetIterator(ars)
184-
.foldLeft(LinkedHashMap[A, Option[B]]())(processResultSet)
185-
.map {
186-
case (one, Some(to)) => transform(one, to)
187-
case (one, None) => one.asInstanceOf[Z]
188-
}
189-
}
190-
.getOrElse(Nil)
177+
connection.sendPreparedStatement(statement, _parameters*).map { result =>
178+
result.rows
179+
.map { ars =>
180+
new AsyncResultSetIterator(ars)
181+
.foldLeft(LinkedHashMap[A, Option[B]]())(processResultSet)
182+
.map {
183+
case (one, Some(to)) => transform(one, to)
184+
case (one, None) => one.asInstanceOf[Z]
185+
}
186+
}
187+
.getOrElse(Nil)
191188
}
192189
}
193190
}
@@ -198,7 +195,7 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
198195
)(extractTo: WrappedResultSet => Option[B])(
199196
transform: (A, Seq[B]) => Z
200197
)(implicit cxt: EC = ECGlobal): Future[Iterable[Z]] =
201-
oneToManyIterable[A, B, Z](statement, parameters: _*)(extractOne)(
198+
oneToManyIterable[A, B, Z](statement, parameters*)(extractOne)(
202199
extractTo
203200
)(transform)
204201

@@ -229,17 +226,16 @@ trait AsyncDBSession extends AsyncDBSessionBoilerplate with LogSupport {
229226
.getOrElse(Nil))
230227
}
231228
}
232-
connection.sendPreparedStatement(statement, _parameters: _*).map {
233-
result =>
234-
result.rows
235-
.map { ars =>
236-
new AsyncResultSetIterator(ars)
237-
.foldLeft(LinkedHashMap[A, Seq[B]]())(processResultSet)
238-
.map { case (one, to) =>
239-
transform(one, to)
240-
}
241-
}
242-
.getOrElse(Nil)
229+
connection.sendPreparedStatement(statement, _parameters*).map { result =>
230+
result.rows
231+
.map { ars =>
232+
new AsyncResultSetIterator(ars)
233+
.foldLeft(LinkedHashMap[A, Seq[B]]())(processResultSet)
234+
.map { case (one, to) =>
235+
transform(one, to)
236+
}
237+
}
238+
.getOrElse(Nil)
243239
}
244240
}
245241
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AsyncOneToOneSQLToOption[A, B, Z](
3434
session
3535
.oneToOneIterable(
3636
underlying.statement,
37-
underlying.rawParameters.toSeq: _*
37+
underlying.rawParameters.toSeq*
3838
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
3939
.map {
4040
case Nil => None
@@ -54,7 +54,7 @@ class AsyncOneToOneSQLToIterable[A, B, Z](
5454
): Future[Iterable[Z]] = {
5555
session.oneToOneIterable(
5656
underlying.statement,
57-
underlying.rawParameters.toSeq: _*
57+
underlying.rawParameters.toSeq*
5858
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
5959
}
6060
}
@@ -69,7 +69,7 @@ class AsyncOneToOneSQLToList[A, B, Z](
6969
): Future[List[Z]] = {
7070
val iterable = session.oneToOneIterable(
7171
underlying.statement,
72-
underlying.rawParameters.toSeq: _*
72+
underlying.rawParameters.toSeq*
7373
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
7474
iterable.map(_.toList)
7575
}
@@ -89,7 +89,7 @@ class AsyncOneToManySQLToOption[A, B, Z](
8989
session
9090
.oneToManyIterable(
9191
underlying.statement,
92-
underlying.rawParameters.toSeq: _*
92+
underlying.rawParameters.toSeq*
9393
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
9494
.map {
9595
case Nil => None
@@ -109,7 +109,7 @@ class AsyncOneToManySQLToIterable[A, B, Z](
109109
): Future[Iterable[Z]] = {
110110
session.oneToManyIterable(
111111
underlying.statement,
112-
underlying.rawParameters.toSeq: _*
112+
underlying.rawParameters.toSeq*
113113
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
114114
}
115115
}
@@ -124,7 +124,7 @@ class AsyncOneToManySQLToList[A, B, Z](
124124
): Future[List[Z]] = {
125125
val iterable = session.oneToManyIterable(
126126
underlying.statement,
127-
underlying.rawParameters.toSeq: _*
127+
underlying.rawParameters.toSeq*
128128
)(underlying.extractOne)(underlying.extractTo)(underlying.transform)
129129
iterable.map(_.toList)
130130
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ trait AsyncSQLExecution extends Any {
2525
session: AsyncDBSession,
2626
cxt: EC = ECGlobal
2727
): Future[Boolean] = {
28-
session.execute(underlying.statement, underlying.parameters.toSeq: _*)
28+
session.execute(underlying.statement, underlying.parameters.toSeq*)
2929
}
3030
}
3131
class AsyncSQLExecutionImpl(val underlying: SQLExecution)
@@ -38,7 +38,7 @@ trait AsyncSQLUpdate extends Any {
3838
session: AsyncDBSession,
3939
cxt: EC = ECGlobal
4040
): Future[Int] = {
41-
session.update(underlying.statement, underlying.parameters.toSeq: _*)
41+
session.update(underlying.statement, underlying.parameters.toSeq*)
4242
}
4343
}
4444
class AsyncSQLUpdateImpl(val underlying: SQLUpdate)
@@ -53,7 +53,7 @@ trait AsyncSQLUpdateAndReturnGeneratedKey extends Any {
5353
): Future[Long] = {
5454
session.updateAndReturnGeneratedKey(
5555
underlying.statement,
56-
underlying.parameters.toSeq: _*
56+
underlying.parameters.toSeq*
5757
)
5858
}
5959
}
@@ -68,7 +68,7 @@ trait AsyncSQLToOption[A] extends Any {
6868
session: AsyncDBSession,
6969
cxt: EC = ECGlobal
7070
): Future[Option[A]] = {
71-
session.single(underlying.statement, underlying.rawParameters.toSeq: _*)(
71+
session.single(underlying.statement, underlying.rawParameters.toSeq*)(
7272
underlying.extractor
7373
)
7474
}
@@ -83,7 +83,7 @@ trait AsyncSQLToIterable[A] extends Any {
8383
session: AsyncDBSession,
8484
cxt: EC = ECGlobal
8585
): Future[Iterable[A]] = {
86-
session.iterable(underlying.statement, underlying.rawParameters.toSeq: _*)(
86+
session.iterable(underlying.statement, underlying.rawParameters.toSeq*)(
8787
underlying.extractor
8888
)
8989
}
@@ -98,7 +98,7 @@ trait AsyncSQLToList[A] extends Any {
9898
session: AsyncDBSession,
9999
cxt: EC = ECGlobal
100100
): Future[List[A]] = {
101-
session.list(underlying.statement, underlying.rawParameters.toSeq: _*)(
101+
session.list(underlying.statement, underlying.rawParameters.toSeq*)(
102102
underlying.extractor
103103
)
104104
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ object AsyncTx {
3737
* @param cxt execution context
3838
* @return async tx query
3939
*/
40-
def withSQLBuilders(builders: SQLBuilder[_]*)(implicit
40+
def withSQLBuilders(builders: SQLBuilder[?]*)(implicit
4141
session: SharedAsyncDBSession,
4242
cxt: EC = ECGlobal
4343
): AsyncTxQuery = {
44-
withSQLs(builders.map(_.toSQL): _*)
44+
withSQLs(builders.map(_.toSQL)*)
4545
}
4646

4747
/**
@@ -52,7 +52,7 @@ object AsyncTx {
5252
* @param cxt execution context
5353
* @return async tx query
5454
*/
55-
def withSQLs(sqlObjects: SQL[_, _]*)(implicit
55+
def withSQLs(sqlObjects: SQL[?, ?]*)(implicit
5656
session: SharedAsyncDBSession,
5757
cxt: EC = ECGlobal
5858
): AsyncTxQuery = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AsyncTxQuery(sqls: Seq[SQL[_, _]]) {
3535
results <- resultsFuture
3636
current <- tx.connection.sendPreparedStatement(
3737
sql.statement,
38-
sql.parameters.toSeq: _*
38+
sql.parameters.toSeq*
3939
)
4040
} yield results :+ current
4141
}

‎core/src/main/scala/scalikejdbc/async/internal/MockPreparedStatement.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class MockPreparedStatement extends PreparedStatement {
160160
def setQueryTimeout(index: Int): Unit = notSupported
161161

162162
// Members declared in java.sql.Wrapper
163-
def isWrapperFor(index: Class[_]): Boolean = notSupported
163+
def isWrapperFor(index: Class[?]): Boolean = notSupported
164164
def unwrap[T](index: Class[T]): T = notSupported
165165

166166
private def notSupported = throw new RuntimeException("Not supported")

‎core/src/main/scala/scalikejdbc/async/internal/RowDataResultSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ private[scalikejdbc] class RowDataResultSet(
616616

617617
override def unwrap[T](iface: Class[T]): T = notvalid
618618

619-
override def isWrapperFor(iface: Class[_]): Boolean = notvalid
619+
override def isWrapperFor(iface: Class[?]): Boolean = notvalid
620620

621621
private def any(columnIndex: Int): Any = {
622622
// To be compatible with JDBC, index should be 1-origin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ package object async extends PackageBoilerplate {
111111

112112
object updateFuture {
113113
def apply(
114-
sql: => SQLBuilder[_]
114+
sql: => SQLBuilder[?]
115115
)(implicit session: AsyncDBSession, cxt: EC = ECGlobal): Future[Int] = {
116116
withSQL(sql).update.future()
117117
}
118118
}
119119

120120
object executeFuture {
121121
def apply(
122-
sql: => SQLBuilder[_]
122+
sql: => SQLBuilder[?]
123123
)(implicit session: AsyncDBSession, cxt: EC = ECGlobal): Future[Boolean] = {
124124
withSQL(sql).execute.future()
125125
}

‎core/src/test/scala/programmerlist/ExampleSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class ExampleSpec
4444

4545
Await.result(created, 5.seconds)
4646
created.foreach { newCompany =>
47-
4847
// delete a record and rollback
4948
val withinTx: Future[Unit] = AsyncDB.localTx { implicit tx =>
5049
for {

‎core/src/test/scala/sample/MySQLSampleSpec.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ class MySQLSampleSpec
268268

269269
it should "update in a local transaction" in {
270270
(1 to 10).foreach { _ =>
271-
272271
val generatedIdFuture: Future[Long] = NamedAsyncDB("mysql").localTx {
273272
implicit tx =>
274273
withSQL(
@@ -299,7 +298,6 @@ class MySQLSampleSpec
299298

300299
it should "rollback in a local transaction" in {
301300
(1 to 10).foreach { _ =>
302-
303301
NamedDB("mysql").autoCommit { implicit s =>
304302
withSQL { delete.from(AsyncLover).where.eq(column.id, 1003) }.update
305303
.apply()
@@ -342,7 +340,6 @@ class MySQLSampleSpec
342340

343341
it should "provide transaction by AsyncTx.withSQLBuilders" in {
344342
(1 to 10).foreach { _ =>
345-
346343
val deletionAndCreation: Future[Seq[AsyncQueryResult]] =
347344
NamedAsyncDB("mysql").withPool { implicit s =>
348345
AsyncTx
@@ -381,7 +378,6 @@ class MySQLSampleSpec
381378

382379
it should "provide transactional deletion by AsyncTx.withSQLBuilders" in {
383380
(1 to 10).foreach { _ =>
384-
385381
NamedDB("mysql").autoCommit { implicit s =>
386382
withSQL { delete.from(AsyncLover).where.eq(column.id, 998) }.update
387383
.apply()
@@ -420,7 +416,6 @@ class MySQLSampleSpec
420416

421417
it should "rollback in a transaction when using AsyncTx.withSQLs" in {
422418
(1 to 10).foreach { _ =>
423-
424419
val failure: Future[Seq[AsyncQueryResult]] =
425420
NamedAsyncDB("mysql").withPool { implicit s =>
426421
AsyncTx

0 commit comments

Comments
 (0)