prepare next version

Author: sfxcode

CHANGES.md

@@ -9,6 +9,7 @@
   - **Breaking Change** : dropped => headResult (use now result)
   - **Breaking Change** :  changed => result (old Option[A], new A) => use resultOption instead
 * Add Bulkwrite to Crud Operations
+* MongoDAO supports Json Import from File
 
 ### 1.8.2
 

build.sbt

@@ -10,6 +10,8 @@ scalaVersion := crossScalaVersions.value.head
 
 scalacOptions += "-deprecation"
 
+parallelExecution in Test := false
+
 lazy val root = (project in file("."))
   .enablePlugins(BuildInfoPlugin)
   .settings(

docs/src/main/paradox/database_provider.md

@@ -17,6 +17,7 @@ It is used for DatabaseProvider creation.
 | userName             | used for Authentification |                    |
 | password             | used for Authentification |                    |
 | poolOptions          |                           | MongoPoolOptions() |
+| compressors          | List: zlib, snappy, zstd  | List()             |
 | customClientSettings |                           | None               |
 
 
@@ -27,7 +28,6 @@ It is used for DatabaseProvider creation.
 | maxConnectionIdleTime          | 60            |
 | maxSize                        | 50            |
 | minSize                        | 0             |
-| maxWaitQueueSize               | 500           |
 | DefaultMaintenanceInitialDelay | 0             |
 
 

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

@@ -1,9 +1,15 @@
 package com.sfxcode.nosql.mongo
 
+import java.nio.charset.Charset
+
+import better.files.{ File, Scanner }
+import com.sfxcode.nosql.mongo.bson.DocumentHelper
 import com.sfxcode.nosql.mongo.database.DatabaseProvider
 import com.sfxcode.nosql.mongo.operation.Crud
-import org.mongodb.scala.{ Document, MongoCollection }
+import org.bson.json.JsonParseException
+import org.mongodb.scala.{ BulkWriteResult, Document, MongoCollection, SingleObservable }
 
+import scala.collection.mutable.ArrayBuffer
 import scala.reflect.ClassTag
 
 /**
@@ -27,4 +33,18 @@ abstract class MongoDAO[A](provider: DatabaseProvider, collectionName: String)(i
   // internal object for raw document access
   object Raw extends MongoDAO[Document](provider, collectionName)
 
+  def importJsonFile(file: File): SingleObservable[BulkWriteResult] = {
+    val docs = new ArrayBuffer[Document]()
+    try {
+      if (file.exists) {
+        val iterator = file.lineIterator(Charset.forName("UTF-8"))
+        iterator.foreach(line => docs.+=(DocumentHelper.documentFromJsonString(line).get))
+      }
+    } catch {
+      case e: JsonParseException =>
+        logger.error(e.getMessage, e)
+    }
+    Raw.bulkWriteMany(docs.toSeq)
+  }
+
 }

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

@@ -0,0 +1,48 @@
+package com.sfxcode.nosql.mongo.bson
+
+import better.files.{ Scanner, StringSplitter }
+import com.typesafe.scalalogging.LazyLogging
+import org.mongodb.scala.Document
+
+object DocumentHelper extends LazyLogging {
+  val SplitterDelimeter = ' '
+  /*
+   iso date bugffix
+   */
+  def documentFromJsonString(json: String): Option[Document] = {
+    var result: Option[Document] = None
+
+    try {
+      result = Some(Document(json))
+    } catch {
+      case e: Exception if e.getMessage.contains("parse string as a date") => {
+        logger.debug("parse error - try to replace iso date")
+        val scanner = Scanner(json, splitter = StringSplitter.on(SplitterDelimeter))
+        var i = 0
+        var datePosition = 0
+        val resultBuffer = new StringBuffer()
+
+        scanner.foreach(s => {
+          i = i + 1
+          if ("\"$date\"".equals(s)) {
+            datePosition = i + 2
+          }
+          if (i == datePosition) {
+            if (s.length == 30 && (s.charAt(24) == '+' || s.charAt(24) == '-')) {
+              resultBuffer.append(s.substring(0, 27))
+              resultBuffer.append(":")
+              resultBuffer.append(s.substring(27))
+            } else {
+              resultBuffer.append(s)
+            }
+          } else {
+            resultBuffer.append(s)
+          }
+          resultBuffer.append(SplitterDelimeter)
+        })
+        result = Some(Document(resultBuffer.toString))
+      }
+    }
+    result
+  }
+}

src/main/scala/com/sfxcode/nosql/mongo/operation/Crud.scala

@@ -1,5 +1,6 @@
 package com.sfxcode.nosql.mongo.operation
 
+import better.files.File
 import com.sfxcode.nosql.mongo.{ Converter, _ }
 import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.model.Filters._

src/test/resources/application.conf

@@ -1,7 +1,7 @@
 test.mongo.database = "test"
 
 unit.test.mongo {
-  database = "config_path_test"
+  database = "simple-mongo-unit-test"
   host = "localhost"
   port = 27017
   applicationName = "simple-mongo-config-test"
@@ -13,7 +13,7 @@ unit.test.mongo {
 }
 
 config.test.mongo {
-  database = "config_path_test"
+  database = "simple-mongo-unit-test"
   host = "localhost"
   port = 270007
   applicationName = "simple-mongo-config-test"
@@ -25,7 +25,7 @@ config.test.mongo {
 }
 
 config.test.auth.mongo {
-  database = "config_path_test"
+  database = "simple-mongo-unit-test"
   host = "localhost"
   port = 270007
   applicationName = "simple-mongo-config-test-with-auth"