Add converter from java.util.Map to org.neo4j.driver.Value.

Closes #2576.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java

@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
@@ -102,10 +103,15 @@ final class AdditionalTypes {
 		hlp.add(ConverterBuilder.reading(Value.class, Entity.class, Value::asEntity));
 		hlp.add(ConverterBuilder.reading(Value.class, Node.class, Value::asNode));
 		hlp.add(ConverterBuilder.reading(Value.class, Relationship.class, Value::asRelationship));
+		hlp.add(ConverterBuilder.reading(Value.class, Map.class, Value::asMap).andWriting(AdditionalTypes::value));
 
 		CONVERTERS = Collections.unmodifiableList(hlp);
 	}
 
+	static Value value(Map<?, ?> map) {
+		return Values.value(map);
+	}
+
 	static TimeZone asTimeZone(Value value) {
 		return TimeZone.getTimeZone(value.asString());
 	}

src/test/java/org/springframework/data/neo4j/integration/issues/IssuesIT.java

@@ -47,6 +47,7 @@
 import org.neo4j.driver.QueryRunner;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.Transaction;
+import org.neo4j.driver.Values;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -115,6 +116,9 @@
 import org.springframework.data.neo4j.integration.issues.gh2542.TestNodeRepository;
 import org.springframework.data.neo4j.integration.issues.gh2572.GH2572Repository;
 import org.springframework.data.neo4j.integration.issues.gh2572.GH2572Child;
+import org.springframework.data.neo4j.integration.issues.gh2576.College;
+import org.springframework.data.neo4j.integration.issues.gh2576.CollegeRepository;
+import org.springframework.data.neo4j.integration.issues.gh2576.Student;
 import org.springframework.data.neo4j.integration.misc.ConcreteImplementationTwo;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.repository.query.QueryFragmentsAndParameters;
@@ -834,6 +838,34 @@ void getOneShouldNotFailWithoutMatchingRootNodes(@Autowired GH2572Repository GH2
 		assertThat(gh2572Child).isNull();
 	}
 
+	@Test
+	@Tag("GH-2576")
+	void listOfMapsShouldBeUsableAsArguments(@Autowired Neo4jTemplate template,  @Autowired CollegeRepository collegeRepository) {
+
+		var student = template.save(new Student("S1"));
+		var college = template.save(new College("C1"));
+
+		var pair = Map.of("stuGuid", student.getGuid(), "collegeGuid", college.getGuid());
+		var listOfPairs = List.of(pair);
+
+		var uuids = collegeRepository.addStudentToCollege(listOfPairs);
+		assertThat(uuids).containsExactly(student.getGuid());
+	}
+
+	@Test
+	@Tag("GH-2576")
+	void listOfMapsShouldBeUsableAsArgumentsWithWorkaround(@Autowired Neo4jTemplate template,  @Autowired CollegeRepository collegeRepository) {
+
+		var student = template.save(new Student("S1"));
+		var college = template.save(new College("C1"));
+
+		var pair = Map.of("stuGuid", student.getGuid(), "collegeGuid", college.getGuid());
+		var listOfPairs = List.of(Values.value(pair));
+
+		var uuids = collegeRepository.addStudentToCollegeWorkaround(listOfPairs);
+		assertThat(uuids).containsExactly(student.getGuid());
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(namedQueriesLocation = "more-custom-queries.properties")

src/test/java/org/springframework/data/neo4j/integration/issues/gh2576/College.java

@@ -0,0 +1,49 @@
+/*
+ * 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.issues.gh2576;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.support.UUIDStringGenerator;
+
+/**
+ * @author Michael J. Simons
+ */
+@Node
+public class College {
+
+	@Id @GeneratedValue(UUIDStringGenerator.class)
+	private String guid;
+
+	private String name;
+
+	public College(String name) {
+		this.name = name;
+	}
+
+	public String getGuid() {
+		return guid;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh2576/CollegeRepository.java

@@ -0,0 +1,45 @@
+/*
+ * 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.issues.gh2576;
+
+import java.util.List;
+import java.util.Map;
+
+import org.neo4j.driver.Value;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.query.Query;
+
+/**
+ * @author Michael J. Simons
+ */
+public interface CollegeRepository extends Neo4jRepository<College, String> {
+
+	@Query("""
+		UNWIND $0 AS row
+		MATCH (student:Student{guid:row.stuGuid})
+		MATCH (college:College{guid:row.collegeGuid})
+		CREATE (student)<-[:STUDENT_OF]-(college) RETURN student.guid"""
+	)
+	List<String> addStudentToCollege(List<Map<String, String>> list);
+
+	@Query("""
+		UNWIND $0 AS row
+		MATCH (student:Student{guid:row.stuGuid})
+		MATCH (college:College{guid:row.collegeGuid})
+		CREATE (student)<-[:STUDENT_OF]-(college) RETURN student.guid"""
+	)
+	List<String> addStudentToCollegeWorkaround(List<Value> list);
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh2576/Student.java

@@ -0,0 +1,61 @@
+/*
+ * 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.issues.gh2576;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Relationship;
+import org.springframework.data.neo4j.core.support.UUIDStringGenerator;
+
+/**
+ * @author Michael J. Simons
+ */
+@Node
+public class Student {
+
+	@Id @GeneratedValue(UUIDStringGenerator.class)
+	private String guid;
+
+	private String name;
+
+	@Relationship(type = "STUDENT_OF", direction = Relationship.Direction.OUTGOING)
+	private College college;
+
+	public Student(String name) {
+		this.name = name;
+	}
+
+	public String getGuid() {
+		return guid;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public College getCollege() {
+		return college;
+	}
+
+	public void setCollege(College college) {
+		this.college = college;
+	}
+}