From d3cb83aac9c44ebf09467694be7e012b2d1a91d4 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Tue, 18 Dec 2018 16:12:36 +0100
Subject: [PATCH] DATAGRAPH-1171 - Polishing.

---
 pom.xml                                                   | 8 +++-----
 spring-data-neo4j/pom.xml                                 | 3 ---
 .../data/neo4j/mapping/Neo4jMappingContext.java           | 4 +---
 .../config/Neo4jRepositoryConfigurationExtension.java     | 8 +++-----
 .../data/neo4j/transaction/SharedSessionCreator.java      | 3 +--
 spring-data-neo4j/src/test/resources/logback-test.xml     | 3 ---
 6 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index f29e1e24e..88148d363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,9 @@
  | 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.
- | Copyright 2011-2019 the original author or authors.
- |
- | Licensed under the Apache License, Version 2.0 (the "License");
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.data</groupId>
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index 97d4c76b5..fa5b41629 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -13,9 +13,6 @@
  | 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.
- | Copyright 2011-2019 the original author or authors.
- |
- | Licensed under the Apache License, Version 2.0 (the "License");
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
index 36b502708..54e7b79eb 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
@@ -203,9 +203,7 @@ public class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersistentE
 	}
 
 	/**
-	 * This is used internally for automatic conversion of Spring Data Point to a fitting Neo4j point. If you want to be
-	 * explicit which coordinate system you use, please use {@link org.neo4j.ogm.types.spatial.GeographicPoint2d} or
-	 * {@link CartesianPoint2d} directly.
+	 * Wrapper delegating to {@link NativePointConverter} for arrays of points.
 	 */
 	private static class NativePointArrayConverter implements AttributeConverter<Point[], GeographicPoint2d[]> {
 
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
index 1bdf318b4..a44861ecd 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
@@ -185,17 +185,15 @@ public class Neo4jRepositoryConfigurationExtension extends RepositoryConfigurati
 		super.registerBeansForRoot(registry, config);
 
 		Object source = config.getSource();
-		if(source == null) {
+		if (source == null) {
 			return;
 		}
 
-		String configuredSessionBeanName = Optional.of("sessionBeanName").flatMap(config::getAttribute)
-				.orElse(GENERATE_BEAN_NAME);
+		String configuredSessionBeanName = config.getAttribute("sessionBeanName").orElse(GENERATE_BEAN_NAME);
 		this.sessionBeanName = registerWithGeneratedNameOrUseConfigured(createSharedSessionCreatorBeanDefinition(config),
 				registry, configuredSessionBeanName, source);
 
-		String configuredMappingContextBeanName = Optional.of("mappingContextBeanName").flatMap(config::getAttribute)
-				.orElse(GENERATE_BEAN_NAME);
+		String configuredMappingContextBeanName = config.getAttribute("mappingContextBeanName").orElse(GENERATE_BEAN_NAME);
 		this.neo4jMappingContextBeanName = registerWithGeneratedNameOrUseConfigured(
 				createNeo4jMappingContextFactoryBeanDefinition(config), registry, configuredMappingContextBeanName, source);
 
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java
index e155d37b6..bddc7e253 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java
@@ -86,8 +86,7 @@ public class SharedSessionCreator {
 		}
 
 		@Override
-		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-
+		public Object invoke(Object proxy, Method method, Object[] args) {
 			String methodName = method.getName();
 			switch (methodName) {
 				case "equals":
diff --git a/spring-data-neo4j/src/test/resources/logback-test.xml b/spring-data-neo4j/src/test/resources/logback-test.xml
index 2a5cc3c34..009c7d5b9 100644
--- a/spring-data-neo4j/src/test/resources/logback-test.xml
+++ b/spring-data-neo4j/src/test/resources/logback-test.xml
@@ -13,9 +13,6 @@
  | 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.
- | Copyright 2011-2019 the original author or authors.
- |
- | Licensed under the Apache License, Version 2.0 (the "License");
 -->
 <configuration>