Fix NullPointerException when entity not found

VanRoy · Jan 31, 2017 · 5f3f0fc · 5f3f0fc
1 parent 205864e
commit 5f3f0fc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...jest/src/main/java/com/github/vanroy/springdata/jest/mapper/DefaultJestResultsMapper.java b/...jest/src/main/java/com/github/vanroy/springdata/jest/mapper/DefaultJestResultsMapper.java
@@ -69,7 +69,7 @@ public EntityMapper getEntityMapper() {
 	}
 
 	public <T> T mapResult(DocumentResult response, Class<T> clazz) {
-		T result = mapEntity(response.getJsonObject().get("_source").toString(), clazz);
+		T result = mapEntity(response.getSourceAsString(), clazz);
 		if (result != null) {
 			setPersistentEntityId(result, response.getId(), clazz);
 		}

diff --git a/...-jest/src/test/java/com/github/vanroy/springdata/jest/JestElasticsearchTemplateTests.java b/...-jest/src/test/java/com/github/vanroy/springdata/jest/JestElasticsearchTemplateTests.java
@@ -159,6 +159,17 @@ public void shouldReturnObjectForGivenId() {
 		assertEquals(sampleEntity, sampleEntity1);
 	}
 
+	@Test
+	public void shouldReturnNullForInexistentId() {
+		// given
+		// when
+		GetQuery getQuery = new GetQuery();
+		getQuery.setId("1");
+		SampleEntity sampleEntity1 = elasticsearchTemplate.queryForObject(getQuery, SampleEntity.class);
+		// then
+		assertNull("entity must be null....", sampleEntity1);
+	}
+
 	@Test
 	public void shouldReturnObjectsForGivenIdsUsingMultiGet() {
 		// given