GH-671 - Fix mapping exception when querying for a narrower type then…

… returned from the database.

- Fix check if result type is assignable to provided generic type
- Add test to verify result type compatibility check

This fixes #671.

core/src/main/java/org/neo4j/ogm/session/delegates/ExecuteQueriesDelegate.java

@@ -85,7 +85,7 @@ public <T> T queryForObject(Class<T> type, String cypher, Map<String, ?> paramet
 
         T next = results.iterator().next();
 
-        if (!next.getClass().isAssignableFrom(type)) {
+        if (!type.isAssignableFrom(next.getClass())) {
 
             String typeOfResult = next.getClass().getName();
             String wantedType = type.getName();

neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityTest.java

@@ -696,6 +696,12 @@ public void shouldThrowExceptionIfTypeMismatchesInQueryForObject() {
                 Restaurant.class.getName());
     }
 
+    @Test // GH-671
+    public void shouldNotThrowExceptionIfTypeIsSuperTypeOfResultObject() {
+    	session.queryForObject(Long.class, "MATCH (n:User) return count(n)", emptyMap());
+    	session.queryForObject(Number.class, "MATCH (n:User) return count(n)", emptyMap());
+    }
+
     @Test
     public void queryForObjectFindsNestedClasses() {