Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-1171 - Polishing.

Browse Source
This commit is contained in:
Michael Simons
2018-12-18 16:12:36 +01:00
parent 5c5ab2c8f9
commit d3cb83aac9
6 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -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>

3
spring-data-neo4j/pom.xml
View File

@@ -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">

4
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
View File

@@ -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[]> {

8
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
View File

@@ -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);

3
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java
View File

@@ -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":

3
spring-data-neo4j/src/test/resources/logback-test.xml
View File

@@ -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>