Skip to content

Commit d2760e2

Browse files
committed
refactor: collection only can use document
1 parent 7107c59 commit d2760e2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ developers := List(
4040

4141
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
4242

43-
crossScalaVersions := Seq("2.13.16")
44-
//crossScalaVersions := Seq("3.6.0")
43+
//crossScalaVersions := Seq("2.13.16")
44+
crossScalaVersions := Seq("3.6.0")
4545

4646
scalaVersion := crossScalaVersions.value.head
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class MongoDAO[A](provider: DatabaseProvider, collectionName: String)(i
2727

2828
val name: String = provider.guessName(collectionName)
2929

30-
val collection: MongoCollection[Document] = provider.collection[Document](collectionName)
30+
val collection: MongoCollection[Document] = provider.collection(collectionName)
3131

3232
def addChangeObserver(observer: ChangeObserver[A]): ChangeObserver[A] = {
3333
coll.watch[A]().subscribe(observer)

src/main/scala/dev/mongocamp/driver/mongodb/database/DatabaseProvider.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ class DatabaseProvider(val config: MongoConfig) extends Serializable {
9494
runCommand(Map("collStats" -> collectionName), databaseName).map(document => CollectionStatus(document))
9595
}
9696

97-
def collection[A](collectionName: String)(implicit ct: ClassTag[A]): MongoCollection[A] =
97+
def collection(collectionName: String): MongoCollection[Document] =
9898
if (collectionName.contains(DatabaseProvider.CollectionSeparator)) {
9999
val newDatabaseName: String = guessDatabaseName(collectionName)
100100
val newCollectionName: String = guessName(collectionName)
101-
database(newDatabaseName).getCollection[A](newCollectionName)
101+
database(newDatabaseName).getCollection(newCollectionName)
102102
}
103103
else {
104-
database().getCollection[A](collectionName)
104+
database().getCollection(collectionName)
105105
}
106106

107107
def guessDatabaseName(maybeSeparatedName: String): String = {

src/test/scala/dev/mongocamp/driver/mongodb/CompactSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CompactSpec extends Specification with BeforeAll {
2424
"CompactSpec" should {
2525
"compact single collection" in {
2626
val count: Option[CompactResult] = BookDAO.compact.result()
27-
count must beSome()
27+
count.isDefined must beTrue
2828
count.get.bytesFreed must beGreaterThanOrEqualTo(0L)
2929
}
3030
"compact complete database" in {

src/test/scala/dev/mongocamp/driver/mongodb/database/DatabaseProviderSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DatabaseProviderSpec extends PersonSpecification {
4747

4848
"must evaluate collection status" in {
4949
val status: Option[CollectionStatus] = provider.collectionStatus("people").resultOption()
50-
status must beSome()
50+
status.isDefined must beTrue
5151
status.get.ns mustEqual "mongocamp-unit-test.people"
5252
}
5353

0 commit comments

Comments
 (0)