Move username

Author: hub-cap

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java

@@ -156,6 +156,9 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params)
         builder.field(NODE.getPreferredName(), nodeId);
         builder.field(STATE.getPreferredName(), state.id());
 
+        if (user != null) {
+            builder.field(USER.getPreferredName(), user);
+        }
         if (watch != null && watch.status() != null) {
             builder.field(STATUS.getPreferredName(), watch.status(), params);
         }
@@ -183,9 +186,6 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params)
         if (executionResult != null) {
             builder.field(EXECUTION_RESULT.getPreferredName(), executionResult, params);
         }
-        if (user != null) {
-            builder.field(USER.getPreferredName(), user);
-        }
         innerToXContent(builder, params);
         builder.endObject();
         return builder;