Skip to content

Commit 9b88c8a

Browse files
author
MongoCamp CI
committed
ci: update version after release
1 parent bc1638e commit 9b88c8a

10 files changed

Lines changed: 211 additions & 204 deletions

File tree

‎package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"name": "mongodb-driver",
3-
"organization": "dev.mongocamp",
4-
"version": "3.1.0",
5-
"author": "info@mongocamp.dev",
6-
"license": "Apache-2.0",
7-
"type": "module",
8-
"repository": {
9-
"type": "git",
10-
"url": "git+https://github.com/MongoCamp/mongodb-driver.git"
2+
"name" : "mongodb-driver",
3+
"organization" : "dev.mongocamp",
4+
"version" : "3.1.1.snapshot",
5+
"author" : "info@mongocamp.dev",
6+
"license" : "Apache-2.0",
7+
"type" : "module",
8+
"repository" : {
9+
"type" : "git",
10+
"url" : "git+https://github.com/MongoCamp/mongodb-driver.git"
1111
},
12-
"bugs": {
13-
"url": "https://github.com/MongoCamp/mongodb-driver/issues"
12+
"bugs" : {
13+
"url" : "https://github.com/MongoCamp/mongodb-driver/issues"
1414
},
15-
"homepage": "https://mongodb-driver.mongocamp.dev/",
16-
"scripts": {
17-
"docs:serve": "vitepress serve docs --port 5555",
18-
"docs:build": "pnpm docs:external; vitepress build docs",
19-
"docs:external": "sh docs/external/fileloader.sh",
20-
"docs:dev": "pnpm docs:external; vitepress dev docs"
15+
"homepage" : "https://mongodb-driver.mongocamp.dev/",
16+
"scripts" : {
17+
"docs:serve" : "vitepress serve docs --port 5555",
18+
"docs:build" : "pnpm docs:external; vitepress build docs",
19+
"docs:external" : "sh docs/external/fileloader.sh",
20+
"docs:dev" : "pnpm docs:external; vitepress dev docs"
2121
},
22-
"devDependencies": {
23-
"@iconify-json/fluent-emoji": "^1.2.7",
24-
"@unocss/preset-icons": "^66.6.8",
25-
"unocss": "^66.6.8",
26-
"vitepress": "1.6.4"
22+
"devDependencies" : {
23+
"@iconify-json/fluent-emoji" : "^1.2.7",
24+
"@unocss/preset-icons" : "^66.6.8",
25+
"unocss" : "^66.6.8",
26+
"vitepress" : "1.6.4"
2727
}
2828
}

‎src/main/scala/dev/mongocamp/driver/mongodb/MongoDAO.scala‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import dev.mongocamp.driver.mongodb.operation.Crud
1212
import io.circe.Decoder
1313
import java.nio.charset.Charset
1414
import java.util.Date
15-
import org.bson.BsonDocument
16-
import org.mongodb.scala.bsonDocumentToDocument
1715
import org.bson.json.JsonParseException
16+
import org.bson.BsonDocument
1817
import org.mongodb.scala.bson.conversions.Bson
18+
import org.mongodb.scala.bsonDocumentToDocument
19+
import org.mongodb.scala.model.changestream.FullDocument
1920
import org.mongodb.scala.model.Accumulators._
2021
import org.mongodb.scala.model.Aggregates._
2122
import org.mongodb.scala.model.Filters._
2223
import org.mongodb.scala.model.Projections
23-
import org.mongodb.scala.model.changestream.FullDocument
2424
import org.mongodb.scala.BulkWriteResult
2525
import org.mongodb.scala.Document
2626
import org.mongodb.scala.MongoCollection
@@ -41,13 +41,15 @@ abstract class MongoDAO[A](provider: DatabaseProvider, collectionName: String)(i
4141
import org.mongodb.scala.Observer
4242
import org.mongodb.scala.Subscription
4343
import org.mongodb.scala.model.changestream.ChangeStreamDocument
44-
coll.watch[Document]().subscribe(new Observer[ChangeStreamDocument[Document]] {
45-
override def onSubscribe(s: Subscription): Unit = observer.onSubscribe(s)
46-
override def onError(e: Throwable): Unit = observer.onError(e)
47-
override def onComplete(): Unit = observer.onComplete()
48-
override def onNext(event: ChangeStreamDocument[Document]): Unit =
49-
observer.onNext(event.asInstanceOf[ChangeStreamDocument[A]])
50-
})
44+
coll
45+
.watch[Document]()
46+
.subscribe(new Observer[ChangeStreamDocument[Document]] {
47+
override def onSubscribe(s: Subscription): Unit = observer.onSubscribe(s)
48+
override def onError(e: Throwable): Unit = observer.onError(e)
49+
override def onComplete(): Unit = observer.onComplete()
50+
override def onNext(event: ChangeStreamDocument[Document]): Unit =
51+
observer.onNext(event.asInstanceOf[ChangeStreamDocument[A]])
52+
})
5153
observer
5254
}
5355

@@ -57,22 +59,19 @@ abstract class MongoDAO[A](provider: DatabaseProvider, collectionName: String)(i
5759
def addChangeObserver(observer: ChangeObserver[A], fullDocument: FullDocument, pipeline: Seq[Bson]): ChangeObserver[A] =
5860
addChangeObserver(observer, fullDocument, pipeline, None)
5961

60-
def addChangeObserver(
61-
observer: ChangeObserver[A],
62-
fullDocument: FullDocument,
63-
pipeline: Seq[Bson],
64-
resumeAfter: Option[BsonDocument]
65-
): ChangeObserver[A] = {
62+
def addChangeObserver(observer: ChangeObserver[A], fullDocument: FullDocument, pipeline: Seq[Bson], resumeAfter: Option[BsonDocument]): ChangeObserver[A] = {
6663
import org.mongodb.scala.Observer
6764
import org.mongodb.scala.Subscription
6865
import org.mongodb.scala.model.changestream.ChangeStreamDocument
6966
val baseStream = if (pipeline.nonEmpty) coll.watch[Document](pipeline) else coll.watch[Document]()
7067
val withFullDoc = baseStream.fullDocument(fullDocument)
71-
val finalStream = resumeAfter.fold(withFullDoc)(token => withFullDoc.resumeAfter(token))
68+
val finalStream = resumeAfter.fold(withFullDoc)(
69+
token => withFullDoc.resumeAfter(token)
70+
)
7271
finalStream.subscribe(new Observer[ChangeStreamDocument[Document]] {
73-
override def onSubscribe(s: Subscription): Unit = observer.onSubscribe(s)
74-
override def onError(e: Throwable): Unit = observer.onError(e)
75-
override def onComplete(): Unit = observer.onComplete()
72+
override def onSubscribe(s: Subscription): Unit = observer.onSubscribe(s)
73+
override def onError(e: Throwable): Unit = observer.onError(e)
74+
override def onComplete(): Unit = observer.onComplete()
7675
override def onNext(event: ChangeStreamDocument[Document]): Unit =
7776
observer.onNext(event.asInstanceOf[ChangeStreamDocument[A]])
7877
})

‎src/main/scala/dev/mongocamp/driver/mongodb/bson/BsonConverter.scala‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,8 @@ object BsonConverter {
131131
case bd: BigDecimal => BsonDecimal128(bd)
132132
case bd: java.math.BigDecimal => BsonDecimal128(bd)
133133
case doc: Document => BsonDocument(doc)
134-
case e: java.lang.Enum[_] => BsonString(e.name())
135-
case v: AnyRef
136-
if Option(v.getClass.getSuperclass).map(_.getName).contains("scala.Enumeration$Value") =>
134+
case e: java.lang.Enum[_] => BsonString(e.name())
135+
case v: AnyRef if Option(v.getClass.getSuperclass).map(_.getName).contains("scala.Enumeration$Value") =>
137136
BsonString(v.toString)
138137
case map: scala.collection.Map[_, _] =>
139138
var doc = Document()

‎src/main/scala/dev/mongocamp/driver/mongodb/operation/Crud.scala‎

Lines changed: 79 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -146,75 +146,84 @@ abstract class Crud[A]()(implicit ct: ClassTag[A], decoder: Decoder[A]) extends
146146
deleteMany(Map(), options)
147147
}
148148

149-
def findOneAndUpdate(filter: Bson, update: Bson): SingleObservable[A] =
150-
{
151-
coll.findOneAndUpdate(filter, update).map(doc => documentToObject[A](doc, decoder))
152-
}
153-
154-
def findOneAndUpdate(filter: Bson, update: Bson, options: FindOneAndUpdateOptions): SingleObservable[A] =
155-
{
156-
coll.findOneAndUpdate(filter, update, options).map(doc => documentToObject[A](doc, decoder))
157-
}
158-
159-
def findOneAndDelete(filter: Bson): SingleObservable[A] =
160-
{
161-
coll.findOneAndDelete(filter).map(doc => documentToObject[A](doc, decoder))
162-
}
163-
164-
def findOneAndDelete(filter: Bson, options: FindOneAndDeleteOptions): SingleObservable[A] =
165-
{
166-
coll.findOneAndDelete(filter, options).map(doc => documentToObject[A](doc, decoder))
167-
}
168-
169-
def findOneAndReplace(filter: Bson, replacement: A): SingleObservable[A] =
170-
{
171-
coll.findOneAndReplace(filter, Converter.toDocument(replacement)).map(doc => documentToObject[A](doc, decoder))
172-
}
173-
174-
def findOneAndReplace(filter: Bson, replacement: A, options: FindOneAndReplaceOptions): SingleObservable[A] =
175-
176-
{
177-
coll.findOneAndReplace(filter, Converter.toDocument(replacement), options).map(doc => documentToObject[A](doc, decoder))
178-
}
179-
180-
def upsertOne(filter: Bson, value: A): Observable[UpdateResult] =
181-
{
182-
replaceOne(filter, value, ReplaceOptions().upsert(true))
183-
}
184-
185-
def insertOne(value: A, session: ClientSession): Observable[InsertOneResult] =
186-
{
187-
coll.insertOne(session, Converter.toDocument(value))
188-
}
189-
190-
def insertMany(values: Seq[A], session: ClientSession): Observable[InsertManyResult] =
191-
{
192-
coll.insertMany(session, values.map(Converter.toDocument))
193-
}
194-
195-
def replaceOne(filter: Bson, value: A, session: ClientSession): Observable[UpdateResult] =
196-
{
197-
coll.replaceOne(session, filter, Converter.toDocument(value))
198-
}
199-
200-
def updateOne(filter: Bson, update: Bson, session: ClientSession): Observable[UpdateResult] =
201-
{
202-
coll.updateOne(session, filter, update)
203-
}
204-
205-
def updateMany(filter: Bson, update: Bson, session: ClientSession): Observable[UpdateResult] =
206-
{
207-
coll.updateMany(session, filter, update)
208-
}
209-
210-
def deleteOne(filter: Bson, session: ClientSession): Observable[DeleteResult] =
211-
{
212-
coll.deleteOne(session, filter)
213-
}
214-
215-
def deleteMany(filter: Bson, session: ClientSession): Observable[DeleteResult] =
216-
{
217-
coll.deleteMany(session, filter)
218-
}
149+
def findOneAndUpdate(filter: Bson, update: Bson): SingleObservable[A] = {
150+
coll
151+
.findOneAndUpdate(filter, update)
152+
.map(
153+
doc => documentToObject[A](doc, decoder)
154+
)
155+
}
156+
157+
def findOneAndUpdate(filter: Bson, update: Bson, options: FindOneAndUpdateOptions): SingleObservable[A] = {
158+
coll
159+
.findOneAndUpdate(filter, update, options)
160+
.map(
161+
doc => documentToObject[A](doc, decoder)
162+
)
163+
}
164+
165+
def findOneAndDelete(filter: Bson): SingleObservable[A] = {
166+
coll
167+
.findOneAndDelete(filter)
168+
.map(
169+
doc => documentToObject[A](doc, decoder)
170+
)
171+
}
172+
173+
def findOneAndDelete(filter: Bson, options: FindOneAndDeleteOptions): SingleObservable[A] = {
174+
coll
175+
.findOneAndDelete(filter, options)
176+
.map(
177+
doc => documentToObject[A](doc, decoder)
178+
)
179+
}
180+
181+
def findOneAndReplace(filter: Bson, replacement: A): SingleObservable[A] = {
182+
coll
183+
.findOneAndReplace(filter, Converter.toDocument(replacement))
184+
.map(
185+
doc => documentToObject[A](doc, decoder)
186+
)
187+
}
188+
189+
def findOneAndReplace(filter: Bson, replacement: A, options: FindOneAndReplaceOptions): SingleObservable[A] = {
190+
coll
191+
.findOneAndReplace(filter, Converter.toDocument(replacement), options)
192+
.map(
193+
doc => documentToObject[A](doc, decoder)
194+
)
195+
}
196+
197+
def upsertOne(filter: Bson, value: A): Observable[UpdateResult] = {
198+
replaceOne(filter, value, ReplaceOptions().upsert(true))
199+
}
200+
201+
def insertOne(value: A, session: ClientSession): Observable[InsertOneResult] = {
202+
coll.insertOne(session, Converter.toDocument(value))
203+
}
204+
205+
def insertMany(values: Seq[A], session: ClientSession): Observable[InsertManyResult] = {
206+
coll.insertMany(session, values.map(Converter.toDocument))
207+
}
208+
209+
def replaceOne(filter: Bson, value: A, session: ClientSession): Observable[UpdateResult] = {
210+
coll.replaceOne(session, filter, Converter.toDocument(value))
211+
}
212+
213+
def updateOne(filter: Bson, update: Bson, session: ClientSession): Observable[UpdateResult] = {
214+
coll.updateOne(session, filter, update)
215+
}
216+
217+
def updateMany(filter: Bson, update: Bson, session: ClientSession): Observable[UpdateResult] = {
218+
coll.updateMany(session, filter, update)
219+
}
220+
221+
def deleteOne(filter: Bson, session: ClientSession): Observable[DeleteResult] = {
222+
coll.deleteOne(session, filter)
223+
}
224+
225+
def deleteMany(filter: Bson, session: ClientSession): Observable[DeleteResult] = {
226+
coll.deleteMany(session, filter)
227+
}
219228

220229
}

‎src/main/scala/dev/mongocamp/driver/mongodb/operation/Search.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ abstract class Search[A]()(implicit ct: ClassTag[A], decoder: Decoder[A]) extend
7272
coll.find(session, filter).sort(sort).projection(projection).skip(skip)
7373
}
7474
}
75-
findObservable.map(doc => documentToObject[A](doc, decoder))
75+
findObservable.map(
76+
doc => documentToObject[A](doc, decoder)
77+
)
7678
}
7779

7880
def find(session: ClientSession, filter: Bson): Observable[A] =

‎src/test/scala/dev/mongocamp/driver/mongodb/DocumentIncludesSuite.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DocumentIncludesSuite extends FunSuite with DocumentIncludes {
3535

3636
test("documentFromMutableMap should convert mutable.Map to Document") {
3737
val mutableMap: scala.collection.mutable.Map[String, Any] = scala.collection.mutable.Map("key" -> "value")
38-
val document = documentFromMutableMap(mutableMap)
38+
val document = documentFromMutableMap(mutableMap)
3939
assert(document.isInstanceOf[Document])
4040
assertEquals(document.toBsonDocument.toJson(), "{\"key\": \"value\"}")
4141
assertEquals(document.getString("key"), "value")

0 commit comments

Comments
 (0)