Fix $or / $nor keyword mapping in query mapper.

This commit fixes an issue with the pattern used for detecting $or / $nor which also matched other keywords like $floor.

Closes: spring-projects#3635
Original pull request: spring-projects#3637.

Author: christophstrobl

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

@@ -792,7 +792,6 @@ private Object applyFieldTargetTypeHintToValue(Field documentField, @Nullable Ob
 	 */
 	static class Keyword {
 
-		private static final String N_OR_PATTERN = "\\$.*or";
 		private static final Set<String> NON_DBREF_CONVERTING_KEYWORDS = new HashSet<>(
 				Arrays.asList("$", "$size", "$slice", "$gt", "$lt"));
 
@@ -823,7 +822,7 @@ public boolean isExists() {
 		}
 
 		public boolean isOrOrNor() {
-			return key.matches(N_OR_PATTERN);
+			return key.equalsIgnoreCase("$or") || key.equalsIgnoreCase("$nor");
 		}
 
 		/**

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

@@ -1268,6 +1268,14 @@ void mapsNullValueForFieldWithCustomTargetType() {
 		assertThat(document).isEqualTo(new org.bson.Document("stringAsOid", null));
 	}
 
+	@Test // GH-3635
+	void $floorKeywordDoesNotMatch$or$norPattern() {
+
+		Query query = new BasicQuery(" { $expr: { $gt: [ \"$spent\" , { $floor : \"$budget\" } ] } }");
+		assertThatNoException()
+				.isThrownBy(() -> mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(Foo.class)));
+	}
+
 	class WithDeepArrayNesting {
 
 		List<WithNestedArray> level0;