Release version 3.3.10 (2021.1.10).

See #4206
Prepare 3.3.10 (2021.1.10).
2022-11-18 10:22:09 +01:00 · 2022-11-18 10:21:05 +01:00 · 2022-10-31 13:20:07 +01:00 · 2022-10-27 10:17:55 +02:00 · 2022-10-13 12:37:05 +00:00 · 2022-10-13 12:36:52 +00:00
22 changed files with 135 additions and 101 deletions
--- a/ci/openjdk11-mongodb-4.4/Dockerfile
+++ b/ci/openjdk11-mongodb-4.4/Dockerfile
@@ -7,15 +7,16 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
-	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
-	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
-	echo ${TZ} > /etc/timezone;
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
+	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
+	echo ${TZ} > /etc/timezone

-RUN apt-get update ; \
-	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
-	apt-get clean; \
-	rm -rf /var/lib/apt/lists/*;
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
--- a/ci/openjdk17-mongodb-4.4/Dockerfile
+++ b/ci/openjdk17-mongodb-4.4/Dockerfile
@@ -7,15 +7,16 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
-	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
-	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
-	echo ${TZ} > /etc/timezone;
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
+	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
+	echo ${TZ} > /etc/timezone

-RUN apt-get update ; \
-	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
-	apt-get clean; \
-	rm -rf /var/lib/apt/lists/*;
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
--- a/ci/openjdk8-mongodb-4.0/Dockerfile
+++ b/ci/openjdk8-mongodb-4.0/Dockerfile
@@ -6,16 +6,17 @@ ARG MONGODB
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

-RUN RUN set -eux; \
-	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
-	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
-	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list; \
-	echo ${TZ} > /etc/timezone;
+RUN set -eux; \
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 && \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list && \
+	echo ${TZ} > /etc/timezone

-RUN apt-get update ; \
-	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
-	apt-get clean; \
-	rm -rf /var/lib/apt/lists/*;
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
--- a/ci/openjdk8-mongodb-4.4/Dockerfile
+++ b/ci/openjdk8-mongodb-4.4/Dockerfile
@@ -7,17 +7,18 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
-	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
-	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
-	echo ${TZ} > /etc/timezone;
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
+	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
+	echo ${TZ} > /etc/timezone

-RUN apt-get update ; \
-	ln -T /bin/true /usr/bin/systemctl ; \
-	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
-    rm /usr/bin/systemctl ; \
-	apt-get clean ; \
-	rm -rf /var/lib/apt/lists/* ;
+RUN apt-get update && \
+	ln -T /bin/true /usr/bin/systemctl && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+    rm /usr/bin/systemctl && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
--- a/ci/openjdk8-mongodb-5.0/Dockerfile
+++ b/ci/openjdk8-mongodb-5.0/Dockerfile
@@ -7,17 +7,18 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
-	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget ; \
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
 	# MongoDB 5.0 release signing key
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \
 	# Needed when MongoDB creates a 5.0 folder.
-	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list; \
-	echo ${TZ} > /etc/timezone;
+	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
+	echo ${TZ} > /etc/timezone

-RUN apt-get update; \
-	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
-	apt-get clean; \
-	rm -rf /var/lib/apt/lists/*;
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,7 +1,7 @@
 # Java versions
-java.main.tag=8u322-b06-jdk
-java.next.tag=11.0.14.1_1-jdk
-java.lts.tag=17.0.2_8-jdk
+java.main.tag=8u345-b01-jdk-focal
+java.next.tag=11.0.16.1_1-jdk-focal
+java.lts.tag=17.0.4.1_1-jdk-focal

 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>3.3.7</version>
+	<version>3.3.10</version>
 	<packaging>pom</packaging>

 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.6.7</version>
+		<version>2.6.10</version>
 	</parent>

 	<modules>
@@ -26,7 +26,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.6.7</springdata.commons>
+		<springdata.commons>2.6.10</springdata.commons>
 		<mongo>4.4.2</mongo>
 		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
--- a/spring-data-mongodb-benchmarks/pom.xml
+++ b/spring-data-mongodb-benchmarks/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.3.7</version>
+		<version>3.3.10</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.3.7</version>
+		<version>3.3.10</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.3.7</version>
+		<version>3.3.10</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ScriptOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ScriptOperators.java
@@ -446,7 +446,7 @@ public class ScriptOperators {
 			/**
 			 * Define the optional {@code initArgs} for the {@link #init(String)} function.
 			 *
-			 * @param function must not be {@literal null}.
+			 * @param args must not be {@literal null}.
 			 * @return this.
 			 */
 			@Override
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java
@@ -73,7 +73,7 @@ public class BasicQuery extends Query {
 	 *
 	 * @param queryObject must not be {@literal null}.
 	 * @param fieldsObject must not be {@literal null}.
-	 * @throws IllegalArgumentException when {@code sortObject} or {@code fieldsObject} is {@literal null}.
+	 * @throws IllegalArgumentException when {@code queryObject} or {@code fieldsObject} is {@literal null}.
 	 */
 	public BasicQuery(Document queryObject, Document fieldsObject) {

--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
@@ -450,7 +450,7 @@ public class Criteria implements CriteriaDefinition {

 		Assert.notNull(types, "Types must not be null!");

-		criteria.put("$type", types.stream().map(Type::value).collect(Collectors.toList()));
+		criteria.put("$type", types.stream().map(Type::toBsonType).map(Type::value).collect(Collectors.toList()));
 		return this;
 	}

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
@@ -29,6 +29,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
 import org.springframework.data.mongodb.test.util.Client;
 import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
@@ -83,6 +85,28 @@ public class JsonSchemaQueryTests {
 		template.save(jellyBelly);
 		template.save(roseSpringHeart);
 		template.save(kazmardBoombub);
+
+	}
+
+	@Test // DATAMONGO-1835
+	public void createsWorkingSchema() {
+
+		try {
+			template.dropCollection("person_schema");
+		} catch (Exception e) {}
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create(template.getConverter()).createSchemaFor(Person.class);
+
+		template.createCollection("person_schema", CollectionOptions.empty().schema(schema));
+	}
+
+	@Test // DATAMONGO-1835
+	public void queriesBooleanType() {
+
+		MongoJsonSchema schema = MongoJsonSchema.builder().properties(JsonSchemaProperty.bool("alive")).build();
+
+		assertThat(template.find(query(matchingDocumentStructure(schema)), Person.class)).hasSize(3);
+		assertThat(template.find(query(Criteria.where("alive").type(Type.BOOLEAN)), Person.class)).hasSize(3);
 	}

 	@Test // DATAMONGO-1835
@@ -201,6 +225,8 @@ public class JsonSchemaQueryTests {
 		Gender gender;
 		Address address;
 		Object value;
+
+		boolean alive;
 	}

 	@Data
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
@@ -66,6 +66,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
 import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
 import org.springframework.data.mongodb.test.util.MongoTestTemplate;
 import org.springframework.data.mongodb.test.util.MongoVersion;
@@ -315,6 +316,7 @@ public class AggregationTests {
 	}

 	@Test // DATAMONGO-1391
+	@EnableIfMongoServerVersion(isLessThan = "6.0")
 	void shouldUnwindPreserveEmpty() {

 		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java
@@ -117,8 +117,8 @@ public class GeoSpatialIndexTests extends AbstractIntegrationTests {
 	/**
 	 * Returns whether an index with the given name exists for the given entity type.
 	 *
-	 * @param indexName
 	 * @param entityType
+	 * @param type
 	 * @return
 	 */
 	private boolean hasIndexOfType(Class<?> entityType, final String type) {
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java
@@ -45,7 +45,7 @@ class SubscriptionUtils {
 	 * Wait for all {@link Subscription Subscriptions} to {@link Subscription#isActive() become active} but not longer
 	 * than {@link #DEFAULT_TIMEOUT}.
 	 *
-	 * @param subscription
+	 * @param subscriptions
 	 * @throws InterruptedException
 	 */
 	static void awaitSubscriptions(Subscription... subscriptions) throws InterruptedException {
@@ -131,7 +131,8 @@ class SubscriptionUtils {
 	/**
 	 * {@link MessageListener} implementation collecting received {@link Message messages}.
 	 *
-	 * @param <M>
+	 * @param <S> source message type.
+	 * @param <T> target message type.
 	 */
 	static class CollectingMessageListener<S, T> implements MessageListener<S, T> {

--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java
@@ -23,11 +23,11 @@ import java.util.Collections;

 import org.bson.Document;
 import org.junit.Test;
-
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;

 /**
@@ -90,8 +90,7 @@ public class CriteriaUnitTests {
 	@Test // GH-3286
 	public void shouldBuildCorrectAndOperator() {

-		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true),
-				Criteria.where("y").is(42),
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
 				Criteria.where("z").is("value"));

 		Criteria criteria = Criteria.where("foo").is("bar").andOperator(operatorCriteria);
@@ -103,8 +102,7 @@ public class CriteriaUnitTests {
 	@Test // GH-3286
 	public void shouldBuildCorrectOrOperator() {

-		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true),
-				Criteria.where("y").is(42),
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
 				Criteria.where("z").is("value"));

 		Criteria criteria = Criteria.where("foo").is("bar").orOperator(operatorCriteria);
@@ -116,8 +114,7 @@ public class CriteriaUnitTests {
 	@Test // GH-3286
 	public void shouldBuildCorrectNorOperator() {

-		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true),
-				Criteria.where("y").is(42),
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
 				Criteria.where("z").is("value"));

 		Criteria criteria = Criteria.where("foo").is("bar").norOperator(operatorCriteria);
@@ -205,6 +202,14 @@ public class CriteriaUnitTests {
 		assertThat(document).isEqualTo(new Document().append("$not", new Document("$lt", "foo")));
 	}

+	@Test // GH-4220
+	public void usesCorrectBsonType() {
+
+		Document document = new Criteria("foo").type(Type.BOOLEAN).getCriteriaObject();
+
+		assertThat(document).containsEntry("foo.$type", Collections.singletonList("bool"));
+	}
+
 	@Test // DATAMONGO-1135
 	public void geoJsonTypesShouldBeWrappedInGeometry() {

@@ -302,8 +307,7 @@ public class CriteriaUnitTests {

 		Criteria numericBitmaskCriteria = new Criteria("field").bits().allClear(0b101);

-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo("{ \"field\" : { \"$bitsAllClear\" : 5} }");
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllClear\" : 5} }");
 	}

 	@Test // DATAMONGO-1808
@@ -320,8 +324,7 @@ public class CriteriaUnitTests {

 		Criteria numericBitmaskCriteria = new Criteria("field").bits().allSet(0b101);

-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo("{ \"field\" : { \"$bitsAllSet\" : 5} }");
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllSet\" : 5} }");
 	}

 	@Test // DATAMONGO-1808
@@ -338,8 +341,7 @@ public class CriteriaUnitTests {

 		Criteria numericBitmaskCriteria = new Criteria("field").bits().anyClear(0b101);

-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo("{ \"field\" : { \"$bitsAnyClear\" : 5} }");
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnyClear\" : 5} }");
 	}

 	@Test // DATAMONGO-1808
@@ -356,8 +358,7 @@ public class CriteriaUnitTests {

 		Criteria numericBitmaskCriteria = new Criteria("field").bits().anySet(0b101);

-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo("{ \"field\" : { \"$bitsAnySet\" : 5} }");
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnySet\" : 5} }");
 	}

 	@Test // DATAMONGO-1808
@@ -429,14 +430,10 @@ public class CriteriaUnitTests {
 	@Test // GH-3414
 	public void shouldEqualForNestedPattern() {

-		Criteria left = new Criteria("a").orOperator(
-			new Criteria("foo").regex("value", "i"),
-			new Criteria("bar").regex("value")
-		);
-		Criteria right = new Criteria("a").orOperator(
-			new Criteria("foo").regex("value", "i"),
-			new Criteria("bar").regex("value")
-		);
+		Criteria left = new Criteria("a").orOperator(new Criteria("foo").regex("value", "i"),
+				new Criteria("bar").regex("value"));
+		Criteria right = new Criteria("a").orOperator(new Criteria("foo").regex("value", "i"),
+				new Criteria("bar").regex("value"));

 		assertThat(left).isEqualTo(right);
 	}
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java
@@ -32,7 +32,7 @@ public abstract class Assertions extends org.assertj.core.api.Assertions {
 	/**
 	 * Create assertion for {@link Document}.
 	 *
-	 * @param actual the actual value.
+	 * @param document the actual value.
 	 * @return the created assertion object.
 	 */
 	public static DocumentAssert assertThat(Document document) {
--- a/src/main/asciidoc/reference/client-session-transactions.adoc
+++ b/src/main/asciidoc/reference/client-session-transactions.adoc
@@ -302,10 +302,10 @@ The following example shows how to create and use transactions with a `ReactiveM
 [source,java]
 ----
@Configuration
-static class Config extends AbstractMongoClientConfiguration {
+public class Config extends AbstractReactiveMongoConfiguration {

    @Bean
-    ReactiveMongoTransactionManager transactionManager(ReactiveDatabaseFactory factory) {  <1>
+    ReactiveMongoTransactionManager transactionManager(ReactiveMongoDatabaseFactory factory) {  <1>
        return new ReactiveMongoTransactionManager(factory);
    }

--- a/src/main/asciidoc/reference/mongo-json-schema.adoc
+++ b/src/main/asciidoc/reference/mongo-json-schema.adoc
@@ -252,7 +252,7 @@ static class Patient {

 [TIP]
 ====
-The `@Encrypted` Annoation supports resolving keyIds via SpEL Expressions.
+The `@Encrypted` Annotation supports resolving keyIds via SpEL Expressions.
 To do so additional environment metadata (via the `MappingContext`) is required and must be provided.

 [source,java]
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data MongoDB 3.3.7 (2021.1.7)
+Spring Data MongoDB 3.3.10 (2021.1.10)
 Copyright (c) [2010-2019] Pivotal Software, Inc.

 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -35,6 +35,9 @@ conditions of the subcomponent's license, as noted in the LICENSE file.



+
+
+
Author	SHA1	Message	Date
Mark Paluch	4bca0ca015	Release version 3.3.10 (2021.1.10). See #4206	2022-11-18 10:22:09 +01:00
Mark Paluch	80d63a576c	Prepare 3.3.10 (2021.1.10). See #4206	2022-11-18 10:21:05 +01:00
Mark Paluch	0f6ee3ddbc	Upgrade to Java 8u345-b01-jdk-focal and pin base image distribution. See #4206	2022-10-31 13:20:07 +01:00
Mark Paluch	c3a5f325d2	Use correct `boolean` type for JSON Schema creation. We now use the correct JSON type boolean again when creating schemas. Furthermore, we use the bool type for MongoDB $type queries. Closes #4220	2022-10-27 10:17:55 +02:00
Spring Builds	957397eff9	After release cleanups. See #4205	2022-10-13 12:37:05 +00:00
Spring Builds	f322d5b18f	Prepare next development iteration. See #4205	2022-10-13 12:36:52 +00:00
Spring Builds	24e423b8d1	Release version 3.3.9 (2021.1.9). See #4205	2022-10-13 11:54:15 +00:00
Spring Builds	4d5f3c66d5	Prepare 3.3.9 (2021.1.9). See #4205	2022-10-13 11:51:37 +00:00
Spring Builds	f29d03f9c8	After release cleanups. See #4172	2022-10-13 07:52:07 +00:00
Spring Builds	fbf4726e56	Prepare next development iteration. See #4172	2022-10-13 07:51:54 +00:00
Spring Builds	85382f0dd8	Release version 3.3.8 (2021.1.8). See #4172	2022-10-13 07:28:21 +00:00
Spring Builds	739b44f6e5	Prepare 3.3.8 (2021.1.8). See #4172	2022-10-13 07:25:55 +00:00
Christoph Strobl	49cd518647	Update tests. Original Pull Request: #4196	2022-10-11 09:55:54 +02:00
gongxuanzhang	b59c7f774f	Fix json schema type name for boolean. Was boolean should have been bool. Closes: #4196	2022-10-11 09:55:08 +02:00
Christoph Strobl	b7ac5f7970	Update reactive transaction sample in reference documentation. Closes: #4190	2022-10-06 13:18:44 +02:00
Christoph Ahlers	9af1689fbf	Fix javadoc parameter names. Closes: #4179	2022-10-04 12:39:48 +02:00
Wan Bachtiar	51ca3be48f	Fix typo in reference documentation. Closes: #4180	2022-10-04 12:25:43 +02:00
Seungwoo Jo	8f8e9c6585	Fix documentation typo in `BasicQuery`. Closes #4169 Original pull request: #4170.	2022-09-21 10:58:22 +02:00
Spring Builds	092217e425	After release cleanups. See #4115	2022-09-19 09:04:54 +00:00
Spring Builds	9d1e1b8c17	Prepare next development iteration. See #4115	2022-09-19 09:04:41 +00:00