Compare dot paths for equality, not containg.

Fixes #2578 in which the mere presence of a fragment triggered inclusion of an otherwise excluded property.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/core/mapping/PropertyFilter.java

@@ -111,7 +111,7 @@ public boolean contains(String dotPath, Class<?> typeToCheck) {
 
 			//noinspection OptionalGetWithoutIsPresent
 			return projectingPropertyPaths.stream().map(pp -> pp.propertyPath.toDotPath())
-						.anyMatch(ppDotPath -> ppDotPath.contains(dotPath))
+						.anyMatch(ppDotPath -> ppDotPath.equals(dotPath))
 					|| (dotPath.contains(".") && candidate.isPresent() &&
 						projectingPropertyPaths.stream()
 						.filter(pp -> pp.propertyPath.toDotPath().equals(candidate.get())).findFirst().get().isEntity);

src/test/java/org/springframework/data/neo4j/integration/imperative/ProjectionIT.java

@@ -21,9 +21,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,6 +48,8 @@
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
+import org.springframework.data.neo4j.core.Neo4jOperations;
+import org.springframework.data.neo4j.integration.shared.common.DoritoEatingPerson;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.Neo4jTemplate;
 import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
@@ -423,6 +427,38 @@ void saveWithCustomPropertyNameWorks(@Autowired Neo4jTemplate neo4jTemplate) {
 		}
 	}
 
+	@Test // GH-2578
+	public void projectionRespectedWithInexactPropertyNameMatch(@Autowired Neo4jOperations neo4jOperations) {
+		final DoritoEatingPerson person = new DoritoEatingPerson("Bob");
+		person.setEatsDoritos(true);
+		person.setFriendsAlsoEatDoritos(true);
+		Set<DoritoEatingPerson> friends = new HashSet<>();
+		friends.add(new DoritoEatingPerson("Alice"));
+		friends.add(new DoritoEatingPerson("Zoey"));
+		person.setFriends(friends);
+
+		neo4jOperations.saveAs(person, DoritoEatingPerson.PropertiesProjection1.class);
+
+		final Optional<DoritoEatingPerson> saved = neo4jOperations.findById(person.getId(), DoritoEatingPerson.class);
+		assertThat(saved).hasValueSatisfying(it -> assertThat(it.getFriends()).isEmpty());
+	}
+
+	@Test // GH-2578
+	public void projectionRespected(@Autowired Neo4jOperations neo4jOperations) {
+		final DoritoEatingPerson person = new DoritoEatingPerson("Ben");
+		person.setEatsDoritos(true);
+		person.setFriendsAlsoEatDoritos(true);
+		Set<DoritoEatingPerson> friends = new HashSet<>();
+		friends.add(new DoritoEatingPerson("Kid"));
+		friends.add(new DoritoEatingPerson("Jeremias"));
+		person.setFriends(friends);
+
+		neo4jOperations.saveAs(person, DoritoEatingPerson.PropertiesProjection2.class);
+
+		final Optional<DoritoEatingPerson> saved = neo4jOperations.findById(person.getId(), DoritoEatingPerson.class);
+		assertThat(saved).hasValueSatisfying(it -> assertThat(it.getFriends()).isEmpty());
+	}
+
 	private static void projectedEntities(PersonDepartmentQueryResult personAndDepartment) {
 		assertThat(personAndDepartment.getPerson()).extracting(PersonEntity::getId).isEqualTo("p1");
 		assertThat(personAndDepartment.getPerson()).extracting(PersonEntity::getEmail).isEqualTo("p1@dep1.org");

src/test/java/org/springframework/data/neo4j/integration/shared/common/DoritoEatingPerson.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.neo4j.integration.shared.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Property;
+import org.springframework.data.neo4j.core.schema.Relationship;
+
+/**
+ * @author Michael J. Simons
+ */
+@Data
+@ToString(exclude = { "friends" })
+@Node
+@NoArgsConstructor
+@AllArgsConstructor
+public class DoritoEatingPerson {
+
+	@Id
+	private long id;
+
+	@Property
+	private String name;
+
+	@Property
+	private boolean eatsDoritos;
+
+	@Property
+	private boolean friendsAlsoEatDoritos;
+
+	@Relationship
+	private Set<DoritoEatingPerson> friends = new HashSet<>();
+
+	public DoritoEatingPerson(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Projection containing ambiguous name
+	 */
+	public interface PropertiesProjection1 {
+
+		boolean getEatsDoritos();
+
+		boolean getFriendsAlsoEatDoritos();
+	}
+
+	/**
+	 * Projection not containing ambiguous name
+	 */
+	public interface PropertiesProjection2 {
+
+		boolean getEatsDoritos();
+	}
+}