Skip to content

Commit a0ccaf7

Browse files
committed
Remove deprecated DBCollection methods
* getStats * isCapped JAVA-5116
1 parent db1866a commit a0ccaf7

File tree

3 files changed

+5
-68
lines changed

3 files changed

+5
-68
lines changed

driver-legacy/src/main/com/mongodb/DBCollection.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,38 +1917,6 @@ public void dropIndexes(final String indexName) {
19171917
dropIndex(indexName);
19181918
}
19191919

1920-
/**
1921-
* The collStats command returns a variety of storage statistics for a given collection
1922-
*
1923-
* @return a CommandResult containing the statistics about this collection
1924-
* @mongodb.driver.manual reference/command/collStats/ collStats Command
1925-
* @mongodb.driver.manual reference/operator/aggregation/collStats/ $collStats
1926-
* @deprecated If you are using server release 3.4 or newer, use the {@code $collStats} aggregation pipeline stage via
1927-
* {@link #aggregate(List, AggregationOptions)} instead.
1928-
* This method uses the {@code collStats} command, which is deprecated since server release 6.2.
1929-
*/
1930-
@Deprecated
1931-
public CommandResult getStats() {
1932-
return getDB().executeCommand(new BsonDocument("collStats", new BsonString(getName())), getReadPreference());
1933-
}
1934-
1935-
/**
1936-
* Checks whether this collection is capped
1937-
*
1938-
* @return true if this is a capped collection
1939-
* @mongodb.driver.manual core/capped-collections/#check-if-a-collection-is-capped Capped Collections
1940-
* @mongodb.driver.manual reference/operator/aggregation/collStats/ $collStats
1941-
* @deprecated If you are using server release 3.4 or newer, use the {@code $collStats} aggregation pipeline stage via
1942-
* {@link #aggregate(List, AggregationOptions)} instead, and inspect the {@code storageStats.capped} field.
1943-
* This method uses the {@code collStats} command, which is deprecated since server release 6.2.
1944-
*/
1945-
@Deprecated
1946-
public boolean isCapped() {
1947-
CommandResult commandResult = getStats();
1948-
Object cappedField = commandResult.get("capped");
1949-
return cappedField != null && (cappedField.equals(1) || cappedField.equals(true));
1950-
}
1951-
19521920
/**
19531921
* Gets the default class for objects in the collection
19541922
*

driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import com.mongodb.internal.bulk.UpdateRequest
3535
import com.mongodb.internal.operation.AggregateOperation
3636
import com.mongodb.internal.operation.AggregateToCollectionOperation
3737
import com.mongodb.internal.operation.BatchCursor
38-
import com.mongodb.internal.operation.CommandReadOperation
3938
import com.mongodb.internal.operation.CountOperation
4039
import com.mongodb.internal.operation.CreateIndexesOperation
4140
import com.mongodb.internal.operation.DistinctOperation
@@ -53,18 +52,15 @@ import org.bson.BsonDocument
5352
import org.bson.BsonDocumentWrapper
5453
import org.bson.BsonInt32
5554
import org.bson.BsonJavaScript
56-
import org.bson.BsonString
5755
import org.bson.UuidRepresentation
5856
import org.bson.codecs.BsonDocumentCodec
5957
import org.bson.codecs.BsonValueCodec
6058
import org.bson.codecs.UuidCodec
61-
import spock.lang.IgnoreIf
6259
import spock.lang.Specification
6360

6461
import java.util.concurrent.TimeUnit
6562

6663
import static Fixture.getMongoClient
67-
import static com.mongodb.ClusterFixture.serverVersionAtLeast
6864
import static com.mongodb.CustomMatchers.isTheSameAs
6965
import static com.mongodb.LegacyMixedBulkWriteOperation.createBulkWriteOperationForDelete
7066
import static com.mongodb.LegacyMixedBulkWriteOperation.createBulkWriteOperationForUpdate
@@ -262,23 +258,6 @@ class DBCollectionSpecification extends Specification {
262258
thrown(IllegalArgumentException)
263259
}
264260

265-
@IgnoreIf({ serverVersionAtLeast(6, 2) })
266-
def 'getStats should execute the expected command with the collection default read preference'() {
267-
given:
268-
def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonInt32(1))])
269-
def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
270-
collection.setReadPreference(ReadPreference.secondary())
271-
272-
when:
273-
collection.getStats()
274-
275-
then:
276-
expect executor.getReadOperation(), isTheSameAs(new CommandReadOperation('myDatabase',
277-
new BsonDocument('collStats', new BsonString('test')),
278-
new BsonDocumentCodec()))
279-
executor.getReadPreference() == collection.getReadPreference()
280-
}
281-
282261
def 'find should create the correct FindOperation'() {
283262
given:
284263
def cursor = Stub(BatchCursor) {

driver-legacy/src/test/functional/com/mongodb/DBTest.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
3838
import static com.mongodb.ClusterFixture.isSharded;
3939
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
40-
import static com.mongodb.ClusterFixture.serverVersionLessThan;
4140
import static com.mongodb.DBObjectMatchers.hasFields;
4241
import static com.mongodb.DBObjectMatchers.hasSubdocument;
4342
import static com.mongodb.Fixture.getDefaultDatabaseName;
@@ -351,23 +350,14 @@ BsonDocument getCollectionInfo(final String collectionName) {
351350
}
352351

353352
private boolean isCapped(final DBCollection collection) {
354-
if (serverVersionLessThan(6, 2)) {
355-
return collection.isCapped();
356-
} else {
357-
Object capped = storageStats(collection).get("capped");
358-
return Boolean.TRUE.equals(capped) || Integer.valueOf(1).equals(capped);
359-
}
353+
return Boolean.TRUE.equals(storageStats(collection).get("capped"));
360354
}
361355

362356
private DBObject storageStats(final DBCollection collection) {
363-
if (serverVersionLessThan(6, 2)) {
364-
return collection.getStats();
365-
} else {
366-
try (Cursor cursor = collection.aggregate(singletonList(
367-
new BasicDBObject("$collStats", new BasicDBObject("storageStats", new BasicDBObject()))),
368-
AggregationOptions.builder().build())) {
369-
return (DBObject) cursor.next().get("storageStats");
370-
}
357+
try (Cursor cursor = collection.aggregate(singletonList(
358+
new BasicDBObject("$collStats", new BasicDBObject("storageStats", new BasicDBObject()))),
359+
AggregationOptions.builder().build())) {
360+
return (DBObject) cursor.next().get("storageStats");
371361
}
372362
}
373363
}

0 commit comments

Comments
 (0)