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

extracted conversionFactory Bean method, changed info message about missing field factory to warning

Browse Source
This commit is contained in:
Michael Hunger
2011-03-27 10:20:52 +02:00
parent 69690d3919
commit 4af1f342ee
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java
View File

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.ConversionService;
import org.springframework.data.graph.core.NodeBacked;
import org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean;
import org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory;
@@ -92,7 +93,7 @@ public class Neo4jConfiguration {
gdc.setRelationshipEntityInstantiator(graphRelationshipInstantiator());
EntityInstantiator<NodeBacked, Node> graphEntityInstantiator = graphEntityInstantiator();
gdc.setGraphEntityInstantiator(graphEntityInstantiator);
gdc.setConversionService(new Neo4jConversionServiceFactoryBean().getObject());
gdc.setConversionService(conversionService());
NodeTypeStrategyFactoryBean nodeTypeStrategyFactoryBean = new NodeTypeStrategyFactoryBean(graphDatabaseService, graphEntityInstantiator);
gdc.setNodeTypeStrategy(nodeTypeStrategyFactoryBean.getObject());
if (validator!=null) {
@@ -101,6 +102,11 @@ public class Neo4jConfiguration {
return gdc;
}
@Bean
protected ConversionService conversionService() throws Exception {
return new Neo4jConversionServiceFactoryBean().getObject();
}
@Bean
protected ConstructorBypassingGraphRelationshipInstantiator graphRelationshipInstantiator() {
return new ConstructorBypassingGraphRelationshipInstantiator();

3
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java
View File

@@ -73,8 +73,7 @@ public abstract class DelegatingFieldAccessorFactory<T> implements FieldAccessor
return (FieldAccessorFactory<E>) fieldAccessorFactory;
}
}
//throw new RuntimeException("No FieldAccessor configured for field: " + field);
if (log.isInfoEnabled()) log.info("No FieldAccessor configured for field: " + field);
if (log.isWarnEnabled()) log.warn("No FieldAccessor configured for field: " + field);
return null;
}