Rename preciseCount -> exactCount and reduce method visibility.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java

@@ -1181,8 +1181,8 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * @return the count of matching documents.
 	 * @since 3.4
 	 */
-	default long preciseCount(Query query, Class<?> entityClass) {
-		return preciseCount(query, entityClass, getCollectionName(entityClass));
+	default long exactCount(Query query, Class<?> entityClass) {
+		return exactCount(query, entityClass, getCollectionName(entityClass));
 	}
 
 	/**
@@ -1206,8 +1206,8 @@ default long preciseCount(Query query, Class<?> entityClass) {
 	 * @see #count(Query, Class, String)
 	 * @since 3.4
 	 */
-	default long preciseCount(Query query, String collectionName) {
-		return preciseCount(query, null, collectionName);
+	default long exactCount(Query query, String collectionName) {
+		return exactCount(query, null, collectionName);
 	}
 
 	/**
@@ -1231,7 +1231,7 @@ default long preciseCount(Query query, String collectionName) {
 	 * @return the count of matching documents.
 	 * @since 3.4
 	 */
-	long preciseCount(Query query, @Nullable Class<?> entityClass, String collectionName);
+	long exactCount(Query query, @Nullable Class<?> entityClass, String collectionName);
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

@@ -188,7 +188,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 
 	private SessionSynchronization sessionSynchronization = SessionSynchronization.ON_ACTUAL_TRANSACTION;
 
-	private CountExecution countExecution = this::doPreciseCount;
+	private CountExecution countExecution = this::doExactCount;
 
 	/**
 	 * Constructor used for a basic template configuration.
@@ -366,14 +366,14 @@ public void useEstimatedCount(boolean enabled) {
 	 * @param estimationFilter the {@link BiPredicate filter}.
 	 * @since 3.4
 	 */
-	public void useEstimatedCount(boolean enabled, BiPredicate<Document, CountOptions> estimationFilter) {
+	private void useEstimatedCount(boolean enabled, BiPredicate<Document, CountOptions> estimationFilter) {
 
 		if (enabled) {
 
 			this.countExecution = (collectionName, filter, options) -> {
 
 				if (!estimationFilter.test(filter, options)) {
-					return doPreciseCount(collectionName, filter, options);
+					return doExactCount(collectionName, filter, options);
 				}
 
 				EstimatedDocumentCountOptions estimatedDocumentCountOptions = new EstimatedDocumentCountOptions();
@@ -384,7 +384,7 @@ public void useEstimatedCount(boolean enabled, BiPredicate<Document, CountOption
 				return doEstimatedCount(collectionName, estimatedDocumentCountOptions);
 			};
 		} else {
-			this.countExecution = this::doPreciseCount;
+			this.countExecution = this::doExactCount;
 		}
 	}
 
@@ -1150,14 +1150,14 @@ public long count(Query query, String collectionName) {
 	}
 
 	@Override
-	public long preciseCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
+	public long exactCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		CountContext countContext = queryOperations.countQueryContext(query);
 
 		CountOptions options = countContext.getCountOptions(entityClass);
 		Document mappedQuery = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
 
-		return doPreciseCount(collectionName, mappedQuery, options);
+		return doExactCount(collectionName, mappedQuery, options);
 	}
 
 	/*
@@ -1188,7 +1188,7 @@ protected long doCount(String collectionName, Document filter, CountOptions opti
 		return countExecution.countDocuments(collectionName, filter, options);
 	}
 
-	protected long doPreciseCount(String collectionName, Document filter, CountOptions options) {
+	protected long doExactCount(String collectionName, Document filter, CountOptions options) {
 		return execute(collectionName,
 				collection -> collection.countDocuments(CountQuery.of(filter).toQueryDocument(), options));
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java

@@ -953,8 +953,8 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * @return the count of matching documents.
 	 * @since 3.4
 	 */
-	default Mono<Long> preciseCount(Query query, Class<?> entityClass) {
-		return preciseCount(query, entityClass, getCollectionName(entityClass));
+	default Mono<Long> exactCount(Query query, Class<?> entityClass) {
+		return exactCount(query, entityClass, getCollectionName(entityClass));
 	}
 
 	/**
@@ -978,8 +978,8 @@ default Mono<Long> preciseCount(Query query, Class<?> entityClass) {
 	 * @see #count(Query, Class, String)
 	 * @since 3.4
 	 */
-	default Mono<Long> preciseCount(Query query, String collectionName) {
-		return preciseCount(query, null, collectionName);
+	default Mono<Long> exactCount(Query query, String collectionName) {
+		return exactCount(query, null, collectionName);
 	}
 
 	/**
@@ -1003,7 +1003,7 @@ default Mono<Long> preciseCount(Query query, String collectionName) {
 	 * @return the count of matching documents.
 	 * @since 3.4
 	 */
-	Mono<Long> preciseCount(Query query, @Nullable Class<?> entityClass, String collectionName);
+	Mono<Long> exactCount(Query query, @Nullable Class<?> entityClass, String collectionName);
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java

@@ -191,7 +191,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 	private SessionSynchronization sessionSynchronization = SessionSynchronization.ON_ACTUAL_TRANSACTION;
 
-	private CountExecution countExecution = this::doPreciseCount;
+	private CountExecution countExecution = this::doExactCount;
 
 	/**
 	 * Constructor used for a basic template configuration.
@@ -384,22 +384,22 @@ public void useEstimatedCount(boolean enabled) {
 	}
 
 	/**
-	 * En-/Disable usage of estimated count based on the given {@link BiPredicate estimationFilter}.
+	 * En-/Disable usage of estimated count based on the given {@link BiFunction estimationFilter}.
 	 *
 	 * @param enabled if {@literal true} {@link com.mongodb.client.MongoCollection#estimatedDocumentCount()} will we used for {@link Document
-	 *          filter queries} that pass the given {@link BiPredicate estimationFilter}.
-	 * @param estimationFilter the {@link BiPredicate filter}.
+	 *          filter queries} that pass the given {@link BiFunction estimationFilter}.
+	 * @param estimationFilter the {@link BiFunction filter}.
 	 * @since 3.4
 	 */
-	public void useEstimatedCount(boolean enabled, BiFunction<Document, CountOptions, Mono<Boolean>> estimationFilter) {
+	private void useEstimatedCount(boolean enabled, BiFunction<Document, CountOptions, Mono<Boolean>> estimationFilter) {
 
 		if (enabled) {
 
 			this.countExecution = (collectionName, filter, options) -> {
 
 				return estimationFilter.apply(filter, options).flatMap(canEstimate -> {
 					if (!canEstimate) {
-						return doPreciseCount(collectionName, filter, options);
+						return doExactCount(collectionName, filter, options);
 					}
 
 					EstimatedDocumentCountOptions estimatedDocumentCountOptions = new EstimatedDocumentCountOptions();
@@ -411,7 +411,7 @@ public void useEstimatedCount(boolean enabled, BiFunction<Document, CountOptions
 				});
 			};
 		} else {
-			this.countExecution = this::doPreciseCount;
+			this.countExecution = this::doExactCount;
 		}
 	}
 
@@ -1236,14 +1236,14 @@ public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String colle
 	}
 
 	@Override
-	public Mono<Long> preciseCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
+	public Mono<Long> exactCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		CountContext countContext = queryOperations.countQueryContext(query);
 
 		CountOptions options = countContext.getCountOptions(entityClass);
 		Document mappedQuery = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
 
-		return doPreciseCount(collectionName, mappedQuery, options);
+		return doExactCount(collectionName, mappedQuery, options);
 	}
 
 	/*
@@ -1317,7 +1317,7 @@ protected Mono<Long> doCount(String collectionName, Document filter, CountOption
 		return countExecution.countDocuments(collectionName, filter, options);
 	}
 
-	protected Mono<Long> doPreciseCount(String collectionName, Document filter, CountOptions options) {
+	protected Mono<Long> doExactCount(String collectionName, Document filter, CountOptions options) {
 
 		return createMono(collectionName,
 				collection -> collection.countDocuments(CountQuery.of(filter).toQueryDocument(), options));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveSessionBoundMongoTemplateUnitTests.java

@@ -229,7 +229,7 @@ public void countShouldUseProxiedCollection() {
 	}
 
 	@Test // GH-3522
-	public void countShouldDelegateToPreciseCountNoMatterWhat() {
+	public void countShouldDelegateToExactCountNoMatterWhat() {
 
 		template.useEstimatedCount(true);
 		template.count(new Query(), Person.class).subscribe();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java

@@ -229,7 +229,7 @@ public void countShouldUseProxiedCollection() {
 	}
 
 	@Test // DATAMONGO-1880, GH-3522
-	public void countShouldDelegateToPreciseCountNoMatterWhat() {
+	public void countShouldDelegateToExactCountNoMatterWhat() {
 
 		template.useEstimatedCount(true);
 		template.count(new Query(), Person.class);

src/main/asciidoc/reference/mongodb.adoc

@@ -2161,7 +2161,7 @@ If the application is fine with the limitations of working upon collection stati
 [TIP]
 ====
 By setting `MongoTemplate#useEstimatedCount(...)` to `true` _MongoTemplate#count(...)_ operations, that use an empty filter query, will be delegated to `estimatedCount`, as long as there is no transaction active and the template is not bound to a <<mongo.sessions,session>>.
-It will still be possible to obtain exact numbers via `MongoTemplate#preciseCount`, but may speed up things.
+It will still be possible to obtain exact numbers via `MongoTemplate#exactCount`, but may speed up things.
 ====
 
 [NOTE]