Skip to content

Commit 2a16ccb

Browse files
committed
DOCSP-30482: remove wildcard imports (#111)
# Pull Request Info [PR Reviewing Guidelines](https://github.com/mongodb/docs-java/blob/master/REVIEWING.md) JIRA - https://jira.mongodb.org/browse/DOCSP-30482 **[staging](https://docs-mongodbcom-staging.corp.mongodb.com/kotlin/docsworker-xlarge/DOCSP-30482-remove-wildcards/)** ## Self-Review Checklist - [x] Is this free of any warnings or errors in the RST? - [ ] Did you run a spell-check? - [ ] Did you run a grammar-check? - [ ] Are all the links working? (cherry picked from commit 1841195)
1 parent 482991c commit 2a16ccb

File tree

59 files changed

+298
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+298
-213
lines changed

examples/src/test/kotlin/AggExpressionsTest.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import com.mongodb.client.model.Aggregates
33
import com.mongodb.client.model.Field
44
import com.mongodb.client.model.Filters
55
import com.mongodb.client.model.Projections
6-
import com.mongodb.client.model.mql.*
6+
import com.mongodb.client.model.mql.MqlArray
7+
import com.mongodb.client.model.mql.MqlDocument
8+
import com.mongodb.client.model.mql.MqlInteger
9+
import com.mongodb.client.model.mql.MqlNumber
10+
import com.mongodb.client.model.mql.MqlString
711
import com.mongodb.client.model.mql.MqlValues.current
812
import com.mongodb.client.model.mql.MqlValues.of
913
import com.mongodb.kotlin.client.coroutine.MongoClient

examples/src/test/kotlin/AggregatesBuilderTest.kt

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11

22
import com.mongodb.MongoNamespace
3-
import com.mongodb.client.model.*
4-
import com.mongodb.client.model.Accumulators.*
5-
import com.mongodb.client.model.Aggregates.*
6-
import com.mongodb.client.model.Sorts.ascending
3+
import com.mongodb.client.model.Accumulators
4+
import com.mongodb.client.model.Aggregates
5+
import com.mongodb.client.model.BucketAutoOptions
6+
import com.mongodb.client.model.BucketGranularity
7+
import com.mongodb.client.model.BucketOptions
8+
import com.mongodb.client.model.Facet
9+
import com.mongodb.client.model.Field
10+
import com.mongodb.client.model.Filters
11+
import com.mongodb.client.model.GraphLookupOptions
12+
import com.mongodb.client.model.IndexOptions
13+
import com.mongodb.client.model.Indexes
14+
import com.mongodb.client.model.MergeOptions
15+
import com.mongodb.client.model.MongoTimeUnit
16+
import com.mongodb.client.model.Projections
17+
import com.mongodb.client.model.Sorts
18+
import com.mongodb.client.model.UnwindOptions
19+
import com.mongodb.client.model.Variable
20+
import com.mongodb.client.model.WindowOutputFields
21+
import com.mongodb.client.model.Windows
722
import com.mongodb.client.model.densify.DensifyOptions
823
import com.mongodb.client.model.densify.DensifyRange
924
import com.mongodb.client.model.fill.FillOptions
@@ -21,7 +36,10 @@ import kotlinx.coroutines.runBlocking
2136
import org.bson.Document
2237
import org.bson.codecs.pojo.annotations.BsonId
2338
import org.bson.types.ObjectId
24-
import org.junit.jupiter.api.*
39+
import org.junit.jupiter.api.AfterAll
40+
import org.junit.jupiter.api.BeforeAll
41+
import org.junit.jupiter.api.Test
42+
import org.junit.jupiter.api.TestInstance
2543
import java.time.LocalDateTime
2644
import kotlin.test.Ignore
2745
import kotlin.test.assertEquals
@@ -116,8 +134,8 @@ class AggregatesBuilderTest {
116134
val collection = database.getCollection<Document>("someCollection")
117135
collection.insertOne(Document("someField", "someCriteria"))
118136
// :snippet-start: methods-example
119-
val matchStage = match(Filters.eq("someField", "someCriteria"))
120-
val sortByCountStage = sortByCount("\$someField")
137+
val matchStage = Aggregates.match(Filters.eq("someField", "someCriteria"))
138+
val sortByCountStage = Aggregates.sortByCount("\$someField")
121139
val results = collection.aggregate(
122140
listOf(matchStage, sortByCountStage)).toList()
123141
// :snippet-end:
@@ -338,8 +356,8 @@ class AggregatesBuilderTest {
338356
val grouping = orderCollection.aggregate<Results>(listOf(
339357
// :snippet-start: group
340358
Aggregates.group("\$${Order::customerId.name}",
341-
sum("totalQuantity", "\$${Order::ordered.name}"),
342-
avg("averageQuantity", "\$${Order::ordered.name}")
359+
Accumulators.sum("totalQuantity", "\$${Order::ordered.name}"),
360+
Accumulators.avg("averageQuantity", "\$${Order::ordered.name}")
343361
)
344362
// :snippet-end:
345363
))
@@ -673,7 +691,7 @@ class AggregatesBuilderTest {
673691

674692
val resultsFlow = translateCollection.aggregate<Results>(listOf(
675693
// :snippet-start: replace-root
676-
replaceRoot("\$${Book::spanishTranslation.name}")
694+
Aggregates.replaceRoot("\$${Book::spanishTranslation.name}")
677695
// :snippet-end:
678696

679697
))
@@ -686,7 +704,7 @@ class AggregatesBuilderTest {
686704
data class Results (val watched: Boolean, val type: String)
687705
val resultsFlow = movieCollection.aggregate<Results>(listOf(
688706
// :snippet-start: add-fields
689-
addFields(
707+
Aggregates.addFields(
690708
Field("watched", false),
691709
Field("type", "movie")
692710
)
@@ -711,7 +729,7 @@ class AggregatesBuilderTest {
711729
fun bucketTest() = runBlocking {
712730
val resultsFlow = screenCollection.aggregate<Document>(listOf(
713731
// :snippet-start: bucket
714-
bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
732+
Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70, 1000))
715733
// :snippet-end:
716734
))
717735
assertEquals(4, resultsFlow.toList().size)
@@ -722,12 +740,12 @@ class AggregatesBuilderTest {
722740
data class Results(val count: Int, val matches: List<Int>)
723741
val resultsFlow = screenCollection.aggregate<Results>(listOf(
724742
// :snippet-start: bucket-options
725-
bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
743+
Aggregates.bucket("\$${Screen::screenSize.name}", listOf(0, 24, 32, 50, 70),
726744
BucketOptions()
727745
.defaultBucket("monster")
728746
.output(
729-
sum("count", 1),
730-
push("matches", "\$${Screen::screenSize.name}")
747+
Accumulators.sum("count", 1),
748+
Accumulators.push("matches", "\$${Screen::screenSize.name}")
731749
)
732750
)
733751
// :snippet-end:
@@ -741,7 +759,7 @@ class AggregatesBuilderTest {
741759
data class Results(@BsonId val id: MinMax, val count: Int)
742760
val resultsFlow = screenCollection.aggregate<Results>(listOf(
743761
// :snippet-start: bucket-auto
744-
bucketAuto("\$${Screen::screenSize.name}", 5)
762+
Aggregates.bucketAuto("\$${Screen::screenSize.name}", 5)
745763
// :snippet-end:
746764
))
747765
assertEquals(5, resultsFlow.toList().size)
@@ -755,11 +773,11 @@ class AggregatesBuilderTest {
755773
// example kotlin nested data classes
756774
val resultsFlow = screenCollection.aggregate<Results>(listOf(
757775
// :snippet-start: bucket-auto-options
758-
bucketAuto(
776+
Aggregates.bucketAuto(
759777
"\$${Screen::price.name}", 5,
760778
BucketAutoOptions()
761779
.granularity(BucketGranularity.POWERSOF2)
762-
.output(sum("count", 1), avg("avgPrice", "\$${Screen::price.name}"))
780+
.output(Accumulators.sum("count", 1), Accumulators.avg("avgPrice", "\$${Screen::price.name}"))
763781
)
764782
// :snippet-end:
765783
))
@@ -774,19 +792,19 @@ class AggregatesBuilderTest {
774792
data class Results(val `Screen Sizes`: List<ScreenSize>)
775793
val resultsFlow = screenCollection.aggregate<Results>(listOf(
776794
// :snippet-start: facet
777-
facet(
795+
Aggregates.facet(
778796
Facet(
779797
"Screen Sizes",
780-
bucketAuto(
798+
Aggregates.bucketAuto(
781799
"\$${Screen::screenSize.name}",
782800
5,
783-
BucketAutoOptions().output(sum("count", 1))
801+
BucketAutoOptions().output(Accumulators.sum("count", 1))
784802
)
785803
),
786804
Facet(
787805
"Manufacturer",
788-
sortByCount("\$${Screen::manufacturer.name}"),
789-
limit(5)
806+
Aggregates.sortByCount("\$${Screen::manufacturer.name}"),
807+
Aggregates.limit(5)
790808
)
791809
)
792810
// :snippet-end:
@@ -852,7 +870,7 @@ class AggregatesBuilderTest {
852870
val resultsFlow = weatherCollection.aggregate<Weather>(
853871
listOf(
854872
Aggregates.fill(
855-
FillOptions.fillOptions().sortBy(ascending(Weather::hour.name)),
873+
FillOptions.fillOptions().sortBy(Sorts.ascending(Weather::hour.name)),
856874
FillOutputField.value(Weather::temperature.name, "23.6C"),
857875
FillOutputField.linear(Weather::air_pressure.name)
858876
)
@@ -881,7 +899,7 @@ class AggregatesBuilderTest {
881899
weatherCollection.insertMany(weather)
882900
val resultsFlow = weatherCollection.aggregate<Document>(listOf(
883901
// :snippet-start: densify
884-
densify(
902+
Aggregates.densify(
885903
"ts",
886904
DensifyRange.partitionRangeWithStep(15, MongoTimeUnit.MINUTE),
887905
DensifyOptions.densifyOptions().partitionByFields("Position.coordinates")

examples/src/test/kotlin/AuthTest.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11

2-
import com.mongodb.*
2+
import com.mongodb.AwsCredential
3+
import com.mongodb.ConnectionString
4+
import com.mongodb.MongoClientSettings
5+
import com.mongodb.MongoCredential
6+
import com.mongodb.MongoException
7+
import com.mongodb.ServerAddress
38
import com.mongodb.connection.ClusterSettings
49
import com.mongodb.kotlin.client.coroutine.MongoClient
510
import io.github.cdimascio.dotenv.dotenv
611
import kotlinx.coroutines.runBlocking
712
import org.bson.BsonInt64
813
import org.bson.Document
914
import org.junit.jupiter.api.TestInstance
10-
import java.util.*
1115
import java.util.function.Supplier
1216
import kotlin.test.Ignore
1317

examples/src/test/kotlin/BuildersTest.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

2-
import com.mongodb.*
3-
import com.mongodb.client.model.Filters.*
4-
import com.mongodb.client.model.Projections.*
2+
import com.mongodb.client.model.Filters
3+
import com.mongodb.client.model.Projections
54
import com.mongodb.kotlin.client.coroutine.MongoClient
65
import config.getConfig
76
import kotlinx.coroutines.flow.first
@@ -10,11 +9,10 @@ import org.bson.BsonObjectId
109
import org.bson.Document
1110
import org.bson.codecs.pojo.annotations.BsonId
1211
import org.junit.jupiter.api.AfterAll
13-
import org.junit.jupiter.api.Assertions.*
12+
import org.junit.jupiter.api.Assertions.assertEquals
1413
import org.junit.jupiter.api.BeforeAll
14+
import org.junit.jupiter.api.Test
1515
import org.junit.jupiter.api.TestInstance
16-
import java.util.*
17-
import kotlin.test.*
1816

1917
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2018
internal class BuildersTest {
@@ -75,8 +73,8 @@ internal class BuildersTest {
7573
// :snippet-start: builders
7674
data class Results(val email: String)
7775

78-
val filter = and(eq(User::gender.name, "female"), gt(User::age.name, 29))
79-
val projection = fields(excludeId(), include("email"))
76+
val filter = Filters.and(Filters.eq(User::gender.name, "female"), Filters.gt(User::age.name, 29))
77+
val projection = Projections.fields(Projections.excludeId(), Projections.include("email"))
8078
val results = collection.find<Results>(filter).projection(projection)
8179
// :snippet-end:
8280
assertEquals("[email protected]", results.first().email)

examples/src/test/kotlin/BulkTest.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11

22
import com.mongodb.MongoBulkWriteException
3-
import com.mongodb.client.model.*
3+
import com.mongodb.client.model.BulkWriteOptions
4+
import com.mongodb.client.model.DeleteManyModel
5+
import com.mongodb.client.model.DeleteOneModel
6+
import com.mongodb.client.model.Filters
7+
import com.mongodb.client.model.InsertOneModel
8+
import com.mongodb.client.model.ReplaceOneModel
9+
import com.mongodb.client.model.UpdateOneModel
10+
import com.mongodb.client.model.Updates
411
import com.mongodb.kotlin.client.coroutine.MongoClient
512
import config.getConfig
613
import kotlinx.coroutines.flow.toList
714
import kotlinx.coroutines.runBlocking
815
import org.bson.codecs.pojo.annotations.BsonId
916
import org.junit.jupiter.api.AfterAll
10-
import org.junit.jupiter.api.Assertions.*
17+
import org.junit.jupiter.api.Assertions.assertEquals
18+
import org.junit.jupiter.api.Assertions.assertFalse
19+
import org.junit.jupiter.api.Assertions.assertTrue
1120
import org.junit.jupiter.api.BeforeAll
21+
import org.junit.jupiter.api.Test
1222
import org.junit.jupiter.api.TestInstance
13-
import java.util.*
14-
import kotlin.test.*
1523

1624
// :snippet-start: bulk-data-model
1725
data class Person(

examples/src/test/kotlin/ChangeStreamsTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import kotlinx.coroutines.runBlocking
1616
import org.bson.Document
1717
import org.junit.jupiter.api.AfterAll
1818
import org.junit.jupiter.api.AfterEach
19-
import org.junit.jupiter.api.Assertions.*
2019
import org.junit.jupiter.api.BeforeEach
20+
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.TestInstance
22-
import java.util.*
23-
import kotlin.test.*
24-
22+
import java.util.UUID
23+
import kotlin.test.assertEquals
24+
import kotlin.test.Ignore
2525

2626
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2727
internal class ChangeStreamsTest {

examples/src/test/kotlin/ChangeTest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import config.getConfig
66
import kotlinx.coroutines.runBlocking
77
import org.bson.codecs.pojo.annotations.BsonId
88
import org.junit.jupiter.api.AfterAll
9-
import org.junit.jupiter.api.Assertions.*
9+
import org.junit.jupiter.api.Assertions.assertEquals
1010
import org.junit.jupiter.api.BeforeAll
11+
import org.junit.jupiter.api.Test
1112
import org.junit.jupiter.api.TestInstance
12-
import java.util.*
13-
import kotlin.test.*
1413

1514
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
1615
internal class ChangeTest {

examples/src/test/kotlin/CodecTest.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ import kotlinx.coroutines.runBlocking
77
import org.bson.BsonReader
88
import org.bson.BsonType
99
import org.bson.BsonWriter
10-
import org.bson.codecs.*
10+
import org.bson.codecs.BsonTypeClassMap
11+
import org.bson.codecs.Codec
12+
import org.bson.codecs.DecoderContext
13+
import org.bson.codecs.EncoderContext
14+
import org.bson.codecs.IntegerCodec
1115
import org.bson.codecs.configuration.CodecProvider
1216
import org.bson.codecs.configuration.CodecRegistries
1317
import org.bson.codecs.configuration.CodecRegistry

examples/src/test/kotlin/CollationsTest.kt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11

2-
import com.mongodb.client.model.*
2+
import com.mongodb.client.model.Accumulators
3+
import com.mongodb.client.model.Aggregates
4+
import com.mongodb.client.model.Collation
5+
import com.mongodb.client.model.CollationAlternate
6+
import com.mongodb.client.model.CollationCaseFirst
7+
import com.mongodb.client.model.CollationMaxVariable
8+
import com.mongodb.client.model.CollationStrength
9+
import com.mongodb.client.model.CreateCollectionOptions
10+
import com.mongodb.client.model.Filters
11+
import com.mongodb.client.model.FindOneAndDeleteOptions
12+
import com.mongodb.client.model.FindOneAndUpdateOptions
13+
import com.mongodb.client.model.IndexOptions
14+
import com.mongodb.client.model.Indexes
15+
import com.mongodb.client.model.ReturnDocument
16+
import com.mongodb.client.model.Sorts
17+
import com.mongodb.client.model.Updates
318
import com.mongodb.kotlin.client.coroutine.MongoClient
419
import config.getConfig
520
import kotlinx.coroutines.flow.first

examples/src/test/kotlin/CompoundTest.kt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11

2-
import com.mongodb.client.model.*
3-
import com.mongodb.client.model.Sorts.*
2+
import com.mongodb.client.model.Filters
3+
import com.mongodb.client.model.FindOneAndDeleteOptions
4+
import com.mongodb.client.model.FindOneAndReplaceOptions
5+
import com.mongodb.client.model.FindOneAndUpdateOptions
6+
import com.mongodb.client.model.ReturnDocument
7+
import com.mongodb.client.model.Sorts
8+
import com.mongodb.client.model.Updates
49
import com.mongodb.kotlin.client.coroutine.MongoClient
510
import config.getConfig
611
import kotlinx.coroutines.flow.first
712
import kotlinx.coroutines.flow.firstOrNull
813
import kotlinx.coroutines.runBlocking
914
import org.bson.codecs.pojo.annotations.BsonId
10-
import org.junit.jupiter.api.*
11-
import org.junit.jupiter.api.Assertions.*
15+
import org.junit.jupiter.api.AfterAll
16+
import org.junit.jupiter.api.AfterEach
17+
import org.junit.jupiter.api.Assertions.assertEquals
18+
import org.junit.jupiter.api.Assertions.assertTrue
19+
import org.junit.jupiter.api.BeforeEach
1220
import org.junit.jupiter.api.Test
13-
import java.util.*
21+
import org.junit.jupiter.api.TestInstance
1422
import java.util.concurrent.TimeUnit
15-
import kotlin.test.*
16-
1723
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
1824
internal class CompoundOperationsTest {
1925
// :snippet-start: compound-data-model

0 commit comments

Comments
 (0)