Upgrade to scalafmt-core 3.0.2 (#1822)

* Update scalafmt-core to 3.0.2 * Reformat with scalafmt 3.0.2 * Reformat * Upgrade setup-scala to 11 Co-authored-by: Scala Steward <[email protected]>
wvlet · Sep 5, 2021 · 18bd9c5 · 18bd9c5
1 parent bbca62f
commit 18bd9c5
Show file tree

Hide file tree

Showing 132 changed files with 1,192 additions and 1,347 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Scala 2.13 test with coverage report

diff --git a/.github/workflows/package-test.yml b/.github/workflows/package-test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Packaging test

diff --git a/.github/workflows/release-js.yml b/.github/workflows/release-js.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 10000
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags -f
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Setup GPG

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags -f
       # Install OpenJDK 11
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Setup GPG

diff --git a/.github/workflows/sbt-integration.yml b/.github/workflows/sbt-integration.yml
@@ -28,7 +28,7 @@ jobs:
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags -f
         working-directory: ./airframe
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Get Airframe version

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 10000
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Publish snapshots

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Scala 2.12 test
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Scala 2.13 test
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Scala 2.13 + JDK16 test
@@ -60,7 +60,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - name: Scala 3.x test
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - uses: actions/setup-node@v2
@@ -86,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v11
         with:
           java-version: [email protected]
       - uses: actions/setup-node@v2

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.7.5
+version = 3.0.2
 maxColumn = 120
 style = defaultWithAlign
 optIn.breaksInsideChains = true

diff --git a/airframe-canvas/src/main/scala/wvlet/airframe/canvas/UnsafeCanvas.scala b/airframe-canvas/src/main/scala/wvlet/airframe/canvas/UnsafeCanvas.scala
@@ -15,8 +15,7 @@ package wvlet.airframe.canvas
 import java.nio.ByteBuffer
 
 /**
-  * Canvas implementation with Unsafe memory access.
-  * This provides native C-code level access performance.
+  * Canvas implementation with Unsafe memory access. This provides native C-code level access performance.
   */
 final class UnsafeCanvas(
     // Base object for resolving the relative address of the raw byte array.

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/DataType.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/DataType.scala
@@ -65,8 +65,8 @@ object DataType {
   }
 
   /**
-    * Union type represents a type whose data can be one of the specified types.
-    * The members of a union type need to be record types.
+    * Union type represents a type whose data can be one of the specified types. The members of a union type need to be
+    * record types.
     * @param types
     */
   case class UNION(types: Seq[RecordType]) extends StructuredType {
@@ -94,7 +94,8 @@ object DataType {
     @transient private lazy val columnIdx: Map[String, Int] = column.map(_.name).zipWithIndex.toMap[String, Int]
 
     /**
-      * @param index 0-origin index
+      * @param index
+      *   0-origin index
       * @return
       */
     def columnType(index: Int): Column = column(index)

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/MessageCodec.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/MessageCodec.scala
@@ -31,8 +31,7 @@ trait MessageCodec[A] extends LogSupport {
   def pack(v: A): MsgPack = toMsgPack(v)
 
   /**
-    * Converting the input MessagePack into an object. If the conversion fails,
-    * throw an IllegalArgumentException
+    * Converting the input MessagePack into an object. If the conversion fails, throw an IllegalArgumentException
     */
   def unpack(msgpack: MsgPack): A = {
     val unpacker = am.MessagePack.newUnpacker(msgpack)

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/MessageContext.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/MessageContext.scala
@@ -16,11 +16,9 @@ package wvlet.airframe.codec
 import wvlet.airframe.codec.DataType._
 
 /**
-  * MessageContext is used for passing the parsing configuration and
-  * the last value read by codec.
+  * MessageContext is used for passing the parsing configuration and the last value read by codec.
   *
-  * For efficiency, it holds several primitive type values as
-  * local variables to avoid the boxing overhead.
+  * For efficiency, it holds several primitive type values as local variables to avoid the boxing overhead.
   */
 case class MessageContext(
     // For now, we have no specific configuration to add

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/ObjectCodec.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/ObjectCodec.scala
@@ -25,8 +25,8 @@ trait PackAsMapSupport[A] { self: MessageCodec[A] =>
 
 /**
   * A generic codec for parameter lists:
-  * - array form: [v1, v2, ...]
-  * - map form: {k1:v1, k2:v2, ..}
+  *   - array form: [v1, v2, ...]
+  *   - map form: {k1:v1, k2:v2, ..}
   *
   * @param name
   * @param params

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/PrimitiveCodec.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/PrimitiveCodec.scala
@@ -910,12 +910,11 @@ object PrimitiveCodec {
   }
 
   /**
-    * Codec for Any values. This only supports very basic types to enable
-    * packing/unpacking collections like Seq[Any], Map[Any, Any] at ease.
+    * Codec for Any values. This only supports very basic types to enable packing/unpacking collections like Seq[Any],
+    * Map[Any, Any] at ease.
     *
-    * Another option to implement AnyCodec is packing pairs of (type, value), but
-    * we will not take this approach as this will require many bytes to fully encode
-    * type names.
+    * Another option to implement AnyCodec is packing pairs of (type, value), but we will not take this approach as this
+    * will require many bytes to fully encode type names.
     */
   object AnyCodec extends MessageCodec[Any] {
     override def pack(p: Packer, v: Any): Unit = {

diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/UnionCodec.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/UnionCodec.scala
@@ -17,8 +17,7 @@ import wvlet.airframe.msgpack.spi.{Packer, Unpacker}
 import wvlet.airframe.surface.{Surface, Union}
 
 /**
-  * Codec for union classes (e.g., A or B)
-  * This codec is necessary for defining OpenAPI's model classes
+  * Codec for union classes (e.g., A or B) This codec is necessary for defining OpenAPI's model classes
   */
 case class UnionCodec(codecs: Seq[MessageCodec[_]]) extends MessageCodec[Union] {
   override def pack(p: Packer, v: Union): Unit = {

diff --git a/airframe-config/src/main/scala/wvlet/airframe/config/Config.scala b/airframe-config/src/main/scala/wvlet/airframe/config/Config.scala
@@ -95,8 +95,7 @@ case class Config private[config] (env: ConfigEnv, holder: Map[Surface, ConfigHo
   import wvlet.airframe.surface.reflect._
 
   /**
-    * Create a map representation of this config for display purpose.
-    * Parameters with @secret annotation will be hidden.
+    * Create a map representation of this config for display purpose. Parameters with @secret annotation will be hidden.
     */
   def toPrintableMap: Map[String, Any] = {
     def traverse(s: Surface, v: Any, secret: Option[wvlet.airframe.surface.secret]): Any = {

diff --git a/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/OSType.scala b/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/OSType.scala
@@ -25,7 +25,8 @@ import scala.sys.process.Process
 /**
   * OS type resolver
   *
-  * @author leo
+  * @author
+  *   leo
   */
 object OS {
   def isWindows: Boolean = getType == OSType.Windows

diff --git a/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/Parallel.scala b/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/Parallel.scala
@@ -58,10 +58,14 @@ object Parallel extends LogSupport {
   /**
     * Process all elements of the source by the given function then wait for the completion.
     *
-    * @param source      Source collection
-    * @param parallelism Parallelism, the default value is a number of available processors
-    * @param f           Function which processes each element of the source collection
-    * @return Collection of the results
+    * @param source
+    *   Source collection
+    * @param parallelism
+    *   Parallelism, the default value is a number of available processors
+    * @param f
+    *   Function which processes each element of the source collection
+    * @return
+    *   Collection of the results
     */
   def run[T, R: ClassTag](source: Seq[T], parallelism: Int = Runtime.getRuntime.availableProcessors())(
       f: T => R
@@ -115,13 +119,17 @@ object Parallel extends LogSupport {
   }
 
   /**
-    * Process all elements of the source by the given function then don't wait completion.
-    * The result is an iterator which is likely a stream which elements are pushed continuously.
+    * Process all elements of the source by the given function then don't wait completion. The result is an iterator
+    * which is likely a stream which elements are pushed continuously.
     *
-    * @param source      the source iterator
-    * @param parallelism Parallelism, the default value is a number of available processors
-    * @param f           Function which processes each element of the source collection
-    * @return Iterator of the results
+    * @param source
+    *   the source iterator
+    * @param parallelism
+    *   Parallelism, the default value is a number of available processors
+    * @param f
+    *   Function which processes each element of the source collection
+    * @return
+    *   Iterator of the results
     */
   def iterate[T, R](
       source: Iterator[T],

diff --git a/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/Shell.scala b/airframe-control/.jvm/src/main/scala/wvlet/airframe/control/Shell.scala
@@ -56,7 +56,8 @@ object Shell extends LogSupport {
   /**
     * Kill the process tree rooted from pid
     * @param pid
-    * @return exit code
+    * @return
+    *   exit code
     */
   def killTree(pid: Int, signal: String = "TERM"): Int = {
     // stop the parent process first to keep it from forking another child process
@@ -103,8 +104,7 @@ object Shell extends LogSupport {
   }
 
   /**
-    * launch a command in the remote host. The target host needs to be accessed
-    * via ssh command without password.
+    * launch a command in the remote host. The target host needs to be accessed via ssh command without password.
     * @param host
     * @param cmdLine
     */
@@ -115,7 +115,8 @@ object Shell extends LogSupport {
   /**
     * Return the process ID of the current JVM.
     *
-    * @return process id or -1 when process ID is not found.
+    * @return
+    *   process id or -1 when process ID is not found.
     */
   def getProcessIDOfCurrentJVM: Int = {
     val r = ManagementFactory.getRuntimeMXBean
@@ -127,7 +128,8 @@ object Shell extends LogSupport {
   /**
     * Returns process id
     * @param p
-    * @return process id or -1 if pid cannot be detected
+    * @return
+    *   process id or -1 if pid cannot be detected
     */
   def getProcessID(p: java.lang.Process): Option[Int] = {
     Try(p.pid().toInt).toOption.orElse {

diff --git a/airframe-control/.jvm/src/test/scala/wvlet/airframe/control/ShellTest.scala b/airframe-control/.jvm/src/test/scala/wvlet/airframe/control/ShellTest.scala
@@ -24,7 +24,8 @@ import wvlet.airspec.AirSpec
 //--------------------------------------
 
 /**
-  * @author leo
+  * @author
+  *   leo
   */
 class ShellTest extends AirSpec {