GH-2553 - Consolidate issue related integration tests.

Closes #2553.

Author: michael-simons

src/main/asciidoc/appendix/custom-queries.adoc

@@ -140,7 +140,9 @@ and a domain model as shown in the <<custom-query.paths.dm,mapping>> (Constructo
 [source,java,indent=0,tabsize=4]
 .Domain model for a <<custom-query.paths.g>>.
 ----
-include::../../../../src/test/java/org/springframework/data/neo4j/integration/issues/gh2210/GH2210IT.java[tag=custom-query.paths.dm]
+include::../../../../src/test/java/org/springframework/data/neo4j/integration/issues/gh2210/SomeEntity.java[tag=custom-query.paths.dm]
+
+include::../../../../src/test/java/org/springframework/data/neo4j/integration/issues/gh2210/SomeRelation.java[tag=custom-query.paths.dm]
 ----
 
 As you see, the relationships are only outgoing. Generated finder methods (including `findById`) will always try to match
@@ -194,7 +196,7 @@ Mapped entities (everything with a `@Node`) passed as parameter to a function th
 a custom query will be turned into a nested map.
 The following example represents the structure as Neo4j parameters.
 
-Given are a `Movie`, `Person` and `Actor` classes annotated as shown in <<movie-model, the movie model>>:
+Given are a `Movie`, `Vertex` and `Actor` classes annotated as shown in <<movie-model, the movie model>>:
 
 [[movie-model]]
 [source,java]

src/main/asciidoc/faq/faq.adoc

@@ -744,8 +744,8 @@ Which looks like this:
 
 image::bacon-distance.png[]
 
-We find 3 nodes labeled `Person` and 2 nodes labeled `Movie`. Both can be mapped with a custom query.
-Assume there's a node entity for both `Person` and `Movie` as well as `Actor` taking care of the relationship:
+We find 3 nodes labeled `Vertex` and 2 nodes labeled `Movie`. Both can be mapped with a custom query.
+Assume there's a node entity for both `Vertex` and `Movie` as well as `Actor` taking care of the relationship:
 
 
 [source,java]
@@ -791,7 +791,7 @@ public final class Movie {
 }
 ----
 
-When using a query as shown in <<bacon-distance>> for a domain class of type `Person` like this
+When using a query as shown in <<bacon-distance>> for a domain class of type `Vertex` like this
 
 [source,java]
 ----

src/main/asciidoc/object-mapping/sdc-object-mapping.adoc

@@ -132,7 +132,7 @@ This is, to enable mutations of otherwise immutable properties.
 <.> By default, Spring Data uses field-access to read and write property values.
 As per visibility rules of `private` fields, `MethodHandles` are used to interact with fields.
 <.> The class exposes a `withId(…)` method that's used to set the identifier, e.g. when an instance is inserted into the datastore and an identifier has been generated.
-Calling `withId(…)` creates a new `Person` object.
+Calling `withId(…)` creates a new `Vertex` object.
 All subsequent mutations will take place in the new instance leaving the previous untouched.
 <.> Using property-access allows direct method invocations without using `MethodHandles`.
 ====
@@ -192,7 +192,7 @@ class Person {
 ====
 <.> The identifier property is final but set to `null` in the constructor.
 The class exposes a `withId(…)` method that's used to set the identifier, e.g. when an instance is inserted into the datastore and an identifier has been generated.
-The original `Person` instance stays unchanged as a new one is created.
+The original `Vertex` instance stays unchanged as a new one is created.
 The same pattern is usually applied for other properties that are store managed but might have to be changed for persistence operations.
 <.> The `firstname` and `lastname` properties are ordinary immutable properties potentially exposed through getters.
 <.> The `age` property is an immutable but derived one from the `birthday` property.
@@ -241,7 +241,7 @@ Spring Data adapts specifics of Kotlin to allow object creation and mutation.
 === Kotlin object creation
 
 Kotlin classes are supported to be instantiated , all classes are immutable by default and require explicit property declarations to define mutable properties.
-Consider the following `data` class `Person`:
+Consider the following `data` class `Vertex`:
 
 ====
 [source,java]
@@ -281,7 +281,7 @@ Every time the `name` parameter is either not part of the result or its value is
 === Property population of Kotlin data classes
 
 In Kotlin, all classes are immutable by default and require explicit property declarations to define mutable properties.
-Consider the following `data` class `Person`:
+Consider the following `data` class `Vertex`:
 
 ====
 [source,java]

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

@@ -53,21 +53,14 @@
 import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.Neo4jTemplate;
-import org.springframework.data.neo4j.core.mapping.Constants;
-import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext;
-import org.springframework.data.neo4j.core.mapping.Neo4jPersistentEntity;
 import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
 import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
 import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
-import org.springframework.data.neo4j.integration.issues.gh2415.BaseNodeEntity;
-import org.springframework.data.neo4j.integration.issues.gh2415.NodeEntity;
-import org.springframework.data.neo4j.integration.issues.gh2415.NodeWithDefinedCredentials;
 import org.springframework.data.neo4j.integration.shared.common.EntityWithPrimitiveConstructorArguments;
 import org.springframework.data.neo4j.integration.shared.common.Person;
 import org.springframework.data.neo4j.integration.shared.common.PersonWithAllConstructor;
 import org.springframework.data.neo4j.integration.shared.common.PersonWithAssignedId;
 import org.springframework.data.neo4j.integration.shared.common.ThingWithGeneratedId;
-import org.springframework.data.neo4j.repository.query.QueryFragmentsAndParameters;
 import org.springframework.data.neo4j.test.BookmarkCapture;
 import org.springframework.data.neo4j.test.Neo4jExtension.Neo4jConnectionSupport;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
@@ -125,14 +118,6 @@ void setupData() {
 			transaction.run("CREATE (p:Person{firstName: 'Bela', lastName: 'B.'})");
 			transaction.run("CREATE (p:PersonWithAssignedId{id: 'x', firstName: 'John', lastName: 'Doe'})");
 
-			transaction.run(
-					"CREATE (root:NodeEntity:BaseNodeEntity{nodeId: 'root'}) " +
-					"CREATE (company:NodeEntity:BaseNodeEntity{nodeId: 'comp'}) " +
-					"CREATE (cred:Credential{id: 'uuid-1', name: 'Creds'}) " +
-					"CREATE (company)-[:CHILD_OF]->(root) " +
-					"CREATE (root)-[:HAS_CREDENTIAL]->(cred) " +
-					"CREATE (company)-[:WITH_CREDENTIAL]->(cred)");
-
 			transaction.commit();
 			bookmarkCapture.seedWith(session.lastBookmark());
 		}
@@ -923,21 +908,6 @@ void statementWithParamsShouldWork() {
 		assertThat(people).extracting(Person::getLastName).containsExactly("Schnitzel");
 	}
 
-	@Test // GH-2415
-	void saveWithProjectionImplementedByEntity(@Autowired Neo4jMappingContext mappingContext) {
-
-		Neo4jPersistentEntity<?> metaData = mappingContext.getPersistentEntity(BaseNodeEntity.class);
-		NodeEntity nodeEntity = neo4jTemplate
-				.find(BaseNodeEntity.class)
-				.as(NodeEntity.class)
-				.matching(QueryFragmentsAndParameters.forCondition(metaData, Constants.NAME_OF_TYPED_ROOT_NODE.apply(metaData).property("nodeId").isEqualTo(Cypher.literalOf("root"))))
-				.one().get();
-		neo4jTemplate.saveAs(nodeEntity, NodeWithDefinedCredentials.class);
-
-		nodeEntity = neo4jTemplate.findById(nodeEntity.getNodeId(), NodeEntity.class).get();
-		assertThat(nodeEntity.getChildren()).hasSize(1);
-	}
-
 	@Configuration
 	@EnableTransactionManagement
 	static class Config extends Neo4jImperativeTestConfiguration {