From ea64c99c339a27d1fae374431a82e91d51ec9bf9 Mon Sep 17 00:00:00 2001
From: Andrey <loki@ubuntu.(none)>
Date: Wed, 16 May 2012 07:42:54 +0400
Subject: [PATCH] DATAGRAPH-123: Compile time errors OpenJDK. Helped OpenJDK to
 deduce generic param types.

---
 .../data/neo4j/support/mapping/Neo4jEntityConverterImpl.java  | 4 ++--
 .../data/neo4j/support/mapping/Neo4jEntityFetchHandler.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityConverterImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityConverterImpl.java
index da6d63205..c93aa5956 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityConverterImpl.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityConverterImpl.java
@@ -95,7 +95,7 @@ public class Neo4jEntityConverterImpl<T,S extends PropertyContainer> implements
     @Override
     public <R extends T> R loadEntity(R entity, S source, MappingPolicy mappingPolicy, Neo4jPersistentEntityImpl<R> persistentEntity, final Neo4jTemplate template) {
         if (mappingPolicy.shouldLoad()) {
-            final BeanWrapper<Neo4jPersistentEntity<R>, R> wrapper = BeanWrapper.create(entity, conversionService);
+            final BeanWrapper<Neo4jPersistentEntity<R>, R> wrapper = BeanWrapper.<Neo4jPersistentEntity<R>, R>create(entity, conversionService);
             sourceStateTransmitter.copyPropertiesFrom(wrapper, source, persistentEntity,mappingPolicy, template);
             // 6) handle cascading fetches
             cascadeFetch(persistentEntity, wrapper, mappingPolicy, template);
@@ -141,7 +141,7 @@ public class Neo4jEntityConverterImpl<T,S extends PropertyContainer> implements
             return;
         }
 
-        final BeanWrapper<Neo4jPersistentEntity<T>, T> wrapper = BeanWrapper.create(source, conversionService);
+        final BeanWrapper<Neo4jPersistentEntity<T>, T> wrapper = BeanWrapper.<Neo4jPersistentEntity<T>, T>create(source, conversionService);
         if (sink == null) {
             sink = entityStateHandler.useOrCreateState(source,sink); // todo handling of changed state
             entityStateHandler.setPersistentState(source, sink);
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityFetchHandler.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityFetchHandler.java
index 4e487da5b..37a663ee9 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityFetchHandler.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jEntityFetchHandler.java
@@ -55,7 +55,7 @@ public class Neo4jEntityFetchHandler {
         if (property.getTypeInformation().isCollectionLike()) {
             List<Object> replacement = new ArrayList<Object>();
             for (Object inner : ((Iterable) value)) {
-                final BeanWrapper<Neo4jPersistentEntity<Object>, Object> innerWrapper = BeanWrapper.create(inner, conversionService);
+                final BeanWrapper<Neo4jPersistentEntity<Object>, Object> innerWrapper = BeanWrapper.<Neo4jPersistentEntity<Object>, Object>create(inner, conversionService);
                 final PropertyContainer state = entityStateHandler.getPersistentState(inner);
                 fetchValue(innerWrapper, state, persistentEntity, mappingPolicy, template);
                 replacement.add(inner);
@@ -63,7 +63,7 @@ public class Neo4jEntityFetchHandler {
             }
             return replacement;
         } else {
-            final BeanWrapper<Neo4jPersistentEntity<Object>, Object> innerWrapper = BeanWrapper.create(value, conversionService);
+            final BeanWrapper<Neo4jPersistentEntity<Object>, Object> innerWrapper = BeanWrapper.<Neo4jPersistentEntity<Object>, Object>create(value, conversionService);
             final PropertyContainer state = entityStateHandler.getPersistentState(value);
             fetchValue(innerWrapper, state, persistentEntity, mappingPolicy, template);
 //                        sourceStateTransmitter.copyPropertiesFrom(innerWrapper, entityStateHandler.<S>getPersistentState(value), persistentEntity);