From 4af1f342ee7b670700022e31718e1ef7a8701d68 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Sun, 27 Mar 2011 10:20:52 +0200 Subject: [PATCH] extracted conversionFactory Bean method, changed info message about missing field factory to warning --- .../data/graph/neo4j/config/Neo4jConfiguration.java | 8 +++++++- .../neo4j/fieldaccess/DelegatingFieldAccessorFactory.java | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java index 096f1133d..7cccb26b0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java @@ -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 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(); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java index bc48e4bae..ab4849d30 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java @@ -73,8 +73,7 @@ public abstract class DelegatingFieldAccessorFactory implements FieldAccessor return (FieldAccessorFactory) 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; }