Merge remote-tracking branch 'origin/master'

oliemansm · oliemansm · commit d05325d1bb66 · 2019-05-21T21:55:13.000+02:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version = 7.4.1-SNAPSHOT
+version = 7.4.2-SNAPSHOT
 group = com.graphql-java-kickstart
 
 LIB_GRAPHQL_JAVA_VER = 12.0
diff --git a/src/main/java/graphql/servlet/GraphQLObjectMapper.java b/src/main/java/graphql/servlet/GraphQLObjectMapper.java
@@ -133,7 +133,7 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
             result.put("errors", executionResult.getErrors());
         }
 
-        if(executionResult.getExtensions() != null){
+        if(executionResult.getExtensions() != null && !executionResult.getExtensions().isEmpty()){
             result.put("extensions", executionResult.getExtensions());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 7.4.1-SNAPSHOT`
	`1`	`+version = 7.4.2-SNAPSHOT`
`2`	`2`	`group = com.graphql-java-kickstart`
`3`	`3`
`4`	`4`	`LIB_GRAPHQL_JAVA_VER = 12.0`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu`
`133`	`133`	`result.put("errors", executionResult.getErrors());`
`134`	`134`	`}`
`135`	`135`
`136`		`- if(executionResult.getExtensions() != null){`
	`136`	`+ if(executionResult.getExtensions() != null && !executionResult.getExtensions().isEmpty()){`
`137`	`137`	`result.put("extensions", executionResult.getExtensions());`
`138`	`138`	`}`
`139`	`139`