scalafmt pass (FIT)

This change only adds scalafmt to the Scala
FIT performer, and then makes every Scala pass
it.  There are no functional changes.

Change-Id: Ib4ed0b6d2f7fad9264dfb038ca03d336fb918292
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/230728
Tested-by: Graham Pople <[email protected]>
Reviewed-by: Graham Pople <[email protected]>

Author: programmatix

pom.xml

@@ -210,10 +210,10 @@
         <module>columnar-java-client</module>
         <!-- Uncomment next lines to include the FIT performers.  They are not included by default as they require
         a) an externally built lib and b) JDK 17 -->
-<!--         <module>core-fit-performer</module>-->
+         <module>core-fit-performer</module>
 <!--         <module>java-fit-performer</module>-->
 <!--         <module>kotlin-fit-performer</module>-->
-<!--         <module>scala-fit-performer</module>-->
+         <module>scala-fit-performer</module>
 <!--         <module>columnar-fit-performer-shared</module>-->
 <!--         <module>columnar-java-fit-performer</module>-->
     </modules>

scala-fit-performer/pom.xml

@@ -72,6 +72,27 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.antipathy</groupId>
+                <!-- use mvn-scalafmt_2.13 for all scala profiles including 3 -->
+                <artifactId>mvn-scalafmt_2.13</artifactId>
+                <version>${mvn-scalafmt.version}</version>
+                <configuration>
+                    <configLocation>${project.basedir}/../.scalafmt.conf</configLocation>
+                    <sourceDirectories>
+                        <param>${project.basedir}/src/main/scala</param>
+                    </sourceDirectories>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!--  Produces a fatjar  -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ReactiveScalaSdkCommandExecutor.scala

@@ -67,7 +67,7 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       val options    = createOptions(request)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val r = if (options == null) content match {
+      val r     = if (options == null) content match {
         case ContentString(value) => collection.insert(docId, value).block()
         case ContentJson(value)   => collection.insert(docId, value).block()
       }
@@ -86,7 +86,7 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       val options    = createOptions(request)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val r =
+      val r     =
         if (options == null) collection.get(docId).block()
         else collection.get(docId, options).block()
       result.setElapsedNanos(System.nanoTime - start)
@@ -99,7 +99,7 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       val options    = createOptions(request)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val r =
+      val r     =
         if (options == null) collection.remove(docId).block()
         else collection.remove(docId, options).block()
       result.setElapsedNanos(System.nanoTime - start)
@@ -113,7 +113,7 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       val content    = convertContent(request.getContent)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val r = if (options == null) content match {
+      val r     = if (options == null) content match {
         case ContentString(value) => collection.replace(docId, value).block()
         case ContentJson(value)   => collection.replace(docId, value).block()
       }
@@ -133,7 +133,7 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       val content    = convertContent(request.getContent)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val r = if (options == null) content match {
+      val r     = if (options == null) content match {
         case ContentString(value) => collection.upsert(docId, value).block()
         case ContentJson(value)   => collection.upsert(docId, value).block()
       }
@@ -145,15 +145,15 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
       result.setElapsedNanos(System.nanoTime - start)
       if (op.getReturnResult) populateResult(result, r)
       else setSuccess(result)
-    // [start:1.5.0]
+      // [start:1.5.0]
     } else if (op.hasRangeScan) {
       val request    = op.getRangeScan
       val collection = connection.collection(request.getCollection).reactive
       val options    = createOptions(request)
       val scanType   = convertScanType(request)
       result.setInitiated(getTimeNow)
       val start = System.nanoTime
-      val flux =
+      val flux  =
         if (options == null) collection.scan(scanType)
         else collection.scan(scanType, options)
       result.setElapsedNanos(System.nanoTime - start)
@@ -174,76 +174,85 @@ class ReactiveScalaSdkCommandExecutor(val connection: ClusterConnection, val cou
               .setStreamId(streamer.streamId)
           )
       )
-    // [end:1.5.0]
+      // [end:1.5.0]
     } else if (op.hasClusterCommand) {
-        val clc = op.getClusterCommand
-        val cluster = connection.cluster.reactive
-
-        if (clc.hasWaitUntilReady) {
-            val request = clc.getWaitUntilReady
-            logger.info("Calling waitUntilReady with timeout " + request.getTimeoutMillis + " milliseconds.")
-            val timeout = request.getTimeoutMillis.milliseconds
-
-            var response: SMono[Unit] = null
-
-            if (request.hasOptions) {
-                val options = waitUntilReadyOptions(request)
-                response = cluster.waitUntilReady(timeout, options)
-            } else {
-                response = cluster.waitUntilReady(timeout)
-            }
-
-            response.doOnSuccess(_ => {
-                setSuccess(result)
-                result.build()
-            }).block()
-        }
-        // [start:1.4.11]
-        else if (clc.hasBucketManager) {
-            return BucketManagerHelper.handleBucketManagerReactive(cluster, op).block()
+      val clc     = op.getClusterCommand
+      val cluster = connection.cluster.reactive
+
+      if (clc.hasWaitUntilReady) {
+        val request = clc.getWaitUntilReady
+        logger.info(
+          "Calling waitUntilReady with timeout " + request.getTimeoutMillis + " milliseconds."
+        )
+        val timeout = request.getTimeoutMillis.milliseconds
+
+        var response: SMono[Unit] = null
+
+        if (request.hasOptions) {
+          val options = waitUntilReadyOptions(request)
+          response = cluster.waitUntilReady(timeout, options)
+        } else {
+          response = cluster.waitUntilReady(timeout)
         }
-        // [end:1.4.11]
+
+        response
+          .doOnSuccess(_ => {
+            setSuccess(result)
+            result.build()
+          })
+          .block()
+      }
+      // [start:1.4.11]
+      else if (clc.hasBucketManager) {
+        return BucketManagerHelper.handleBucketManagerReactive(cluster, op).block()
+      }
+      // [end:1.4.11]
     } else if (op.hasBucketCommand) {
-        val blc = op.getBucketCommand
-        val bucket = connection.cluster.reactive.bucket(blc.getBucketName)
-
-        if (blc.hasWaitUntilReady) {
-            val request = blc.getWaitUntilReady
-            logger.info("Calling waitUntilReady on bucket " + bucket + " with timeout " + request.getTimeoutMillis + " milliseconds.")
-            val timeout = request.getTimeoutMillis.milliseconds
-
-            var response: SMono[Unit] = null
-
-            if (request.hasOptions) {
-                val options = waitUntilReadyOptions(request)
-                response = bucket.waitUntilReady(timeout, options)
-            } else {
-                response = bucket.waitUntilReady(timeout)
-            }
-
-            response.`then`[Result](SMono.fromCallable[Result](() => {
-                setSuccess(result)
-                result.build()
-            })).block()
-        }
-    }
-    else if (op.hasCollectionCommand) {
-        val clc = op.getCollectionCommand
-        val collection = if (clc.hasCollection) {
-            val coll = clc.getCollection
-            Some(connection.cluster
-                    .bucket(coll.getBucketName)
-                    .scope(coll.getScopeName)
-                    .collection(coll.getCollectionName))
-        }
-        else None
+      val blc    = op.getBucketCommand
+      val bucket = connection.cluster.reactive.bucket(blc.getBucketName)
+
+      if (blc.hasWaitUntilReady) {
+        val request = blc.getWaitUntilReady
+        logger.info(
+          "Calling waitUntilReady on bucket " + bucket + " with timeout " + request.getTimeoutMillis + " milliseconds."
+        )
+        val timeout = request.getTimeoutMillis.milliseconds
+
+        var response: SMono[Unit] = null
 
-        if (clc.hasLookupIn || clc.hasLookupInAllReplicas || clc.hasLookupInAnyReplica) {
-            result = LookupInHelper.handleLookupInReactive(perRun, connection, op, (loc) => getDocId(loc)).block()
+        if (request.hasOptions) {
+          val options = waitUntilReadyOptions(request)
+          response = bucket.waitUntilReady(timeout, options)
+        } else {
+          response = bucket.waitUntilReady(timeout)
         }
-        else throw new UnsupportedOperationException()
-    }
-    else throw new UnsupportedOperationException(new IllegalArgumentException("Unknown operation"))
+
+        response
+          .`then`[Result](SMono.fromCallable[Result](() => {
+            setSuccess(result)
+            result.build()
+          }))
+          .block()
+      }
+    } else if (op.hasCollectionCommand) {
+      val clc        = op.getCollectionCommand
+      val collection = if (clc.hasCollection) {
+        val coll = clc.getCollection
+        Some(
+          connection.cluster
+            .bucket(coll.getBucketName)
+            .scope(coll.getScopeName)
+            .collection(coll.getCollectionName)
+        )
+      } else None
+
+      if (clc.hasLookupIn || clc.hasLookupInAllReplicas || clc.hasLookupInAnyReplica) {
+        result = LookupInHelper
+          .handleLookupInReactive(perRun, connection, op, (loc) => getDocId(loc))
+          .block()
+      } else throw new UnsupportedOperationException()
+    } else
+      throw new UnsupportedOperationException(new IllegalArgumentException("Unknown operation"))
 
     result.build
   }