scala fmt and style

Author: sfxcode

.scalafmt.conf

@@ -0,0 +1,8 @@
+style = defaultWithAlign
+project.git = true
+maxColumn = 120
+unindentTopLevelOperators  = true
+danglingParentheses = true
+spaces.inImportCurlyBraces = true
+
+rewrite.rules = [ RedundantBraces, SortImports ]

scalastyle-config.xml

@@ -68,7 +68,7 @@
  <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"></check>
- <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="true"></check>
+ <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="false"></check>
  <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check>
@@ -85,7 +85,7 @@
  </check>
  <check level="warning" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true">
   <parameters>
-   <parameter name="maximum"><![CDATA[10]]></parameter>
+   <parameter name="maximum"><![CDATA[30]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check>
@@ -98,7 +98,7 @@
  </check>
  <check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="true">
   <parameters>
-   <parameter name="maxLength"><![CDATA[50]]></parameter>
+   <parameter name="maxLength"><![CDATA[70]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true">

src/main/scala/com/sfxcode/nosql/mongo/Field.scala

@@ -20,32 +20,29 @@ object Field {
 
   def groupField(fieldName: String): BsonValue = groupFields(List(fieldName))
 
-  def firstFields(fieldnames: Iterable[String]): Set[BsonField] = {
+  def firstFields(fieldnames: Iterable[String]): Set[BsonField] =
     fieldnames.map(fieldname => firstField(fieldname)).toSet
-  }
 
-  def minFields(fieldnames: Iterable[String]): Set[BsonField] = {
+  def minFields(fieldnames: Iterable[String]): Set[BsonField] =
     fieldnames.map(fieldname => minField(fieldname)).toSet
-  }
 
-  def lastFields(fieldnames: Iterable[String]): Set[BsonField] = {
+  def lastFields(fieldnames: Iterable[String]): Set[BsonField] =
     fieldnames.map(fieldname => lastField(fieldname)).toSet
-  }
 
-  def sumFields(fieldnames: Iterable[String]): Set[BsonField] = {
+  def sumFields(fieldnames: Iterable[String]): Set[BsonField] =
     fieldnames.map(fieldname => sumField(fieldname)).toSet
-  }
 
-  def avgFields(fieldnames: Iterable[String]): Set[BsonField] = {
+  def avgFields(fieldnames: Iterable[String]): Set[BsonField] =
     fieldnames.map(fieldname => avgField(fieldname)).toSet
-  }
 
   def groupFields(fieldnames: Iterable[String]): BsonValue = {
     val list = fieldnames
       .map(name => {
-        if (name.startsWith("$"))
+        if (name.startsWith("$")) {
           name
-        else "$" + name
+        } else {
+          "$" + name
+        }
       })
       .toList
     BsonConverter.toBson(Map("_id" -> list))

src/main/scala/com/sfxcode/nosql/mongo/Filter.scala

@@ -11,34 +11,30 @@ import org.mongodb.scala.model.Filters._
 object Filter extends LazyLogging {
   val DefaultBson: Bson = BsonDocument(Document())
 
-  def valueFilter(key: String, value: Any): Bson = {
-
+  def valueFilter(key: String, value: Any): Bson =
     value match {
       case list: List[_] =>
         in(key, list: _*)
       case set: Set[_] =>
         in(key, set.toSeq: _*)
-      case id: Any =>
+      case _: Any =>
         equal(key, value)
       case _ => DefaultBson
     }
-  }
 
   def nullFilter(fieldName: String): Bson = equal(fieldName, null)
 
   def notNullFilter(fieldName: String): Bson = not(nullFilter(fieldName))
 
-  def dateInRangeFilter(dateFieldKey: String,
-                        dateFrom: Date = null,
-                        dateUntil: Date = null): Bson = {
-    if (dateFrom != null && dateUntil != null)
+  def dateInRangeFilter(dateFieldKey: String, dateFrom: Date = null, dateUntil: Date = null): Bson =
+    if (dateFrom != null && dateUntil != null) {
       and(gte(dateFieldKey, dateFrom), lte(dateFieldKey, dateUntil))
-    else if (dateUntil != null)
+    } else if (dateUntil != null) {
       lte(dateFieldKey, dateUntil)
-    else if (dateFrom != null)
+    } else if (dateFrom != null) {
       gte(dateFieldKey, dateFrom)
-    else
+    } else {
       Map()
-  }
+    }
 
 }

src/main/scala/com/sfxcode/nosql/mongo/GridFSDAO.scala

@@ -3,7 +3,7 @@ package com.sfxcode.nosql.mongo
 import com.sfxcode.nosql.mongo.gridfs.Metadata
 import org.bson.types.ObjectId
 import org.mongodb.scala.bson.conversions.Bson
-import org.mongodb.scala.gridfs.{GridFSBucket, GridFSFile}
+import org.mongodb.scala.gridfs.{ GridFSBucket, GridFSFile }
 import org.mongodb.scala.model.CountOptions
 import org.mongodb.scala.{
   Completed,
@@ -16,20 +16,16 @@ import org.mongodb.scala.{
   WriteConcern
 }
 
-abstract class GridFSDAO(database: MongoDatabase, bucketName: String)
-    extends Metadata(database, bucketName) {
+abstract class GridFSDAO(database: MongoDatabase, bucketName: String) extends Metadata(database, bucketName) {
 
   var bucket = GridFSBucket(database, bucketName)
 
   protected def gridfsBucket: GridFSBucket = bucket
 
-  def count(filter: Bson = Document(),
-            options: CountOptions = CountOptions()): Observable[Long] =
+  def count(filter: Bson = Document(), options: CountOptions = CountOptions()): Observable[Long] =
     Files.count(filter, options)
 
-  def createMetadataIndex(
-      key: String,
-      sortAscending: Boolean = true): SingleObservable[String] =
+  def createMetadataIndex(key: String, sortAscending: Boolean = true): SingleObservable[String] =
     Files.createIndexForField(createMetadataKey(key), sortAscending)
 
   def dropIndexForName(name: String): SingleObservable[Completed] =
@@ -41,26 +37,19 @@ abstract class GridFSDAO(database: MongoDatabase, bucketName: String)
   def renameFile(file: GridFSFile, newFilename: String): Observable[Completed] =
     gridfsBucket.rename(file.getId, newFilename)
 
-  def withReadConcern(readConcern: ReadConcern): Unit = {
+  def withReadConcern(readConcern: ReadConcern): Unit =
     bucket = GridFSBucket(database, bucketName).withReadConcern(readConcern)
-  }
 
-  def withWriteConcern(writeConcern: WriteConcern): Unit = {
+  def withWriteConcern(writeConcern: WriteConcern): Unit =
     bucket = GridFSBucket(database, bucketName).withWriteConcern(writeConcern)
-  }
 
-  def withChunkSizeBytes(chunkSizeBytes: Int): Unit = {
-    bucket =
-      GridFSBucket(database, bucketName).withChunkSizeBytes(chunkSizeBytes)
-  }
+  def withChunkSizeBytes(chunkSizeBytes: Int): Unit =
+    bucket = GridFSBucket(database, bucketName).withChunkSizeBytes(chunkSizeBytes)
 
-  def withReadPreference(readPreference: ReadPreference): Unit = {
-    bucket =
-      GridFSBucket(database, bucketName).withReadPreference(readPreference)
-  }
+  def withReadPreference(readPreference: ReadPreference): Unit =
+    bucket = GridFSBucket(database, bucketName).withReadPreference(readPreference)
 
-  def withDisableMD5(disableMD5: Boolean): Unit = {
+  def withDisableMD5(disableMD5: Boolean): Unit =
     bucket = GridFSBucket(database, bucketName).withDisableMD5(disableMD5)
-  }
 
 }

src/main/scala/com/sfxcode/nosql/mongo/MongoDAO.scala

@@ -1,16 +1,14 @@
 package com.sfxcode.nosql.mongo
 
 import com.sfxcode.nosql.mongo.operation.Crud
-import org.mongodb.scala.{Document, MongoCollection, MongoDatabase}
+import org.mongodb.scala.{ Document, MongoCollection, MongoDatabase }
 
 import scala.reflect.ClassTag
 
 /**
   * Created by tom on 20.01.17.
   */
-abstract class MongoDAO[A](database: MongoDatabase, collectionName: String)(
-    implicit ct: ClassTag[A])
-    extends Crud[A] {
+abstract class MongoDAO[A](database: MongoDatabase, collectionName: String)(implicit ct: ClassTag[A]) extends Crud[A] {
 
   val collection: MongoCollection[A] = database.getCollection[A](collectionName)
 

src/main/scala/com/sfxcode/nosql/mongo/Sort.scala

@@ -1,15 +1,15 @@
 package com.sfxcode.nosql.mongo
 
 import org.bson.conversions.Bson
-import org.mongodb.scala.model.Sorts.{ascending, descending, orderBy}
+import org.mongodb.scala.model.Sorts.{ ascending, descending, orderBy }
 
 object Sort {
 
-  def sortByKey(key: String, sortAscending: Boolean = true): Bson = {
-    if (sortAscending)
+  def sortByKey(key: String, sortAscending: Boolean = true): Bson =
+    if (sortAscending) {
       orderBy(ascending(key))
-    else
+    } else {
       orderBy(descending(key))
-  }
+    }
 
 }

src/main/scala/com/sfxcode/nosql/mongo/bson/BsonConverter.scala

@@ -1,7 +1,7 @@
 package com.sfxcode.nosql.mongo.bson
 
 import java.math.BigInteger
-import java.time.{LocalDate, LocalDateTime, ZoneId}
+import java.time.{ LocalDate, LocalDateTime, ZoneId }
 import java.util.Date
 
 import org.mongodb.scala.Document
@@ -15,15 +15,15 @@ object BsonConverter {
 
   var converterPlugin: AbstractConverterPlugin = new BaseConverterPlugin()
 
-  def toBson(value: Any): BsonValue = {
-
+  def toBson(value: Any): BsonValue =
     value match {
       case bsonValue: BsonValue => bsonValue
       case option: Option[Any] =>
-        if (option.isDefined)
+        if (option.isDefined) {
           toBson(option.get)
-        else
+        } else {
           BsonNull()
+        }
       case v: Any if converterPlugin.hasCustomClass(v) =>
         converterPlugin.toBson(v)
       case b: Boolean         => BsonBoolean(b)
@@ -33,8 +33,7 @@ object BsonConverter {
       case r: Regex           => BsonRegularExpression(r)
       case d: Date            => BsonDateTime(d)
       case ld: LocalDate =>
-        BsonDateTime(
-          Date.from(ld.atStartOfDay(ZoneId.systemDefault()).toInstant))
+        BsonDateTime(Date.from(ld.atStartOfDay(ZoneId.systemDefault()).toInstant))
       case ldt: LocalDateTime =>
         BsonDateTime(Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant))
       case oid: ObjectId            => BsonObjectId(oid)
@@ -72,9 +71,8 @@ object BsonConverter {
       case _ =>
         BsonNull()
     }
-  }
 
-  def fromBson(value: BsonValue): Any = {
+  def fromBson(value: BsonValue): Any =
     value match {
 
       case b: BsonBoolean           => b.getValue
@@ -94,7 +92,6 @@ object BsonConverter {
       case n: BsonNull => null
       case _           => value
     }
-  }
 
   def asMap(document: Document): Map[String, Any] = {
     val result = new mutable.HashMap[String, Any]()

src/main/scala/com/sfxcode/nosql/mongo/bson/ConverterPlugin.scala

@@ -15,8 +15,9 @@ abstract class AbstractConverterPlugin {
 
   def hasCustomClass(v: Any): Boolean = {
     customClassList.foreach(c => {
-      if (c.isAssignableFrom(v.getClass))
+      if (c.isAssignableFrom(v.getClass)) {
         return true
+      }
     })
     false
   }
@@ -26,12 +27,11 @@ abstract class AbstractConverterPlugin {
     BsonConverter.toBson(map)
   }
 
-  def toBson(value: Any): BsonValue = {
+  def toBson(value: Any): BsonValue =
     value match {
       case _ =>
         BsonNull()
     }
-  }
 }
 
 object ClassUtil {

src/main/scala/com/sfxcode/nosql/mongo/bson/codecs/BigDecimalCodec.scala

@@ -1,23 +1,19 @@
 package com.sfxcode.nosql.mongo.bson.codecs
 
-import org.bson.codecs.{Codec, DecoderContext, EncoderContext}
-import org.bson.{BsonReader, BsonWriter}
+import org.bson.codecs.{ Codec, DecoderContext, EncoderContext }
+import org.bson.{ BsonReader, BsonWriter }
 
 /**
   * A Codec for BigDecimal instances.
   *
   */
 class BigDecimalCodec extends Codec[BigDecimal] {
 
-  override def decode(reader: BsonReader,
-                      decoderContext: DecoderContext): BigDecimal =
+  override def decode(reader: BsonReader, decoderContext: DecoderContext): BigDecimal =
     BigDecimal(reader.readDouble())
 
-  override def encode(writer: BsonWriter,
-                      value: BigDecimal,
-                      encoderContext: EncoderContext): Unit = {
+  override def encode(writer: BsonWriter, value: BigDecimal, encoderContext: EncoderContext): Unit =
     writer.writeDouble(value.doubleValue())
-  }
 
   override def getEncoderClass: Class[BigDecimal] = classOf[BigDecimal]
 }