scalafmt pass

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

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

Author: programmatix

scala-client/pom.xml

@@ -190,6 +190,31 @@
                 </executions>
             </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>
+                        <param>${project.basedir}/src/main/scala-2</param>
+                        <param>${project.basedir}/src/main/scala-2-13</param>
+                        <param>${project.basedir}/src/main/scala-2-13-</param>
+                        <param>${project.basedir}/src/main/scala-3</param>
+                    </sourceDirectories>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

scala-client/src/main/scala-2/com/couchbase/client/scala/AsyncBinaryCollection.scala

@@ -40,7 +40,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
 
   private[scala] val environment                       = async.environment
   private[scala] val kvTimeout: Durability => Duration = async.kvTimeout
-  private[scala] val kvBinaryOps                       = async.couchbaseOps.kvBinaryOps(async.keyspace)
+  private[scala] val kvBinaryOps = async.couchbaseOps.kvBinaryOps(async.keyspace)
 
   /** Add bytes to the end of a Couchbase binary document.
     *
@@ -86,7 +86,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Add bytes to the beginning of a Couchbase binary document.
     *
     * $Same
-    * */
+    */
   def prepend(
       id: String,
       content: Array[Byte],
@@ -107,7 +107,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Add bytes to the beginning of a Couchbase binary document.
     *
     * $Same
-    * */
+    */
   def prepend(
       id: String,
       content: Array[Byte],
@@ -127,7 +127,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Increment a Couchbase 'counter' document.
     *
     * $Same
-    * */
+    */
   def increment(
       id: String,
       delta: Long,
@@ -145,7 +145,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Increment a Couchbase 'counter' document.
     *
     * $Same
-    * */
+    */
   def increment(
       id: String,
       delta: Long,
@@ -166,7 +166,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Decrement a Couchbase 'counter' document.
     *
     * $Same
-    * */
+    */
   def decrement(
       id: String,
       delta: Long,
@@ -184,7 +184,7 @@ class AsyncBinaryCollection(private[scala] val async: AsyncCollection) {
   /** Decrement a Couchbase 'counter' document.
     *
     * $Same
-    * */
+    */
   def decrement(
       id: String,
       delta: Long,

scala-client/src/main/scala-2/com/couchbase/client/scala/AsyncBucket.scala

@@ -46,11 +46,11 @@ class AsyncBucket private[scala] (
     private[scala] val couchbaseOps: CoreCouchbaseOps,
     private[scala] val environment: ClusterEnvironment
 ) extends AsyncBucketBase {
-  val reactive                                     = new ReactiveBucket(this)
+  val reactive = new ReactiveBucket(this)
 
   lazy val viewIndexes = new AsyncViewIndexManager(reactive.viewIndexes)
 
-    lazy val collections = new AsyncCollectionManager(this)
+  lazy val collections = new AsyncCollectionManager(this)
 
   /** Performs a view query against the cluster.
     *
@@ -104,7 +104,6 @@ class AsyncBucket private[scala] (
     viewQuery(designDoc, viewName, ViewOptions(timeout = Some(timeout)))
   }
 
-
   /** Performs application-level ping requests with custom options against services in the Couchbase cluster.
     *
     * Note that this operation performs active I/O against services and endpoints to assess their health. If you do
@@ -161,7 +160,10 @@ class AsyncBucket private[scala] (
     * @param timeout the maximum time to wait until readiness.
     * @param options options to customize the wait
     */
-  def waitUntilReady(timeout: Duration, options: WaitUntilReadyOptions = WaitUntilReadyOptions.Default): Future[Unit] = {
+  def waitUntilReady(
+      timeout: Duration,
+      options: WaitUntilReadyOptions = WaitUntilReadyOptions.Default
+  ): Future[Unit] = {
     couchbaseOps match {
       case core: Core =>
         FutureConversions
@@ -178,4 +180,4 @@ class AsyncBucket private[scala] (
       case _ => Future.failed(CoreProtostellarUtil.unsupportedCurrentlyInProtostellar())
     }
   }
-} 
+}