Merge pull request #158 from bsara/json-property-order

Reordered properties in JSON response according to recommendation in GraphQL spec

Author: oliemansm

src/main/java/graphql/servlet/GraphQLObjectMapper.java

@@ -129,10 +129,6 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
     public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult executionResult, boolean includeData) {
         final Map<String, Object> result = new LinkedHashMap<>();
 
-        if(includeData) {
-            result.put("data", executionResult.getData());
-        }
-
         if (areErrorsPresent(executionResult)) {
             result.put("errors", executionResult.getErrors());
         }
@@ -141,6 +137,10 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
             result.put("extensions", executionResult.getExtensions());
         }
 
+        if(includeData) {
+            result.put("data", executionResult.getData());
+        }
+
         return result;
     }