diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java index a4d3491b9d2..f7270441966 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java @@ -355,11 +355,11 @@ public class License implements ToXContent { if (version == VERSION_START) { builder.field(Fields.SUBSCRIPTION_TYPE, subscriptionType); } - builder.dateValueField(Fields.ISSUE_DATE_IN_MILLIS, Fields.ISSUE_DATE, issueDate); + builder.dateField(Fields.ISSUE_DATE_IN_MILLIS, Fields.ISSUE_DATE, issueDate); if (version == VERSION_START) { builder.field(Fields.FEATURE, feature); } - builder.dateValueField(Fields.EXPIRY_DATE_IN_MILLIS, Fields.EXPIRY_DATE, expiryDate); + builder.dateField(Fields.EXPIRY_DATE_IN_MILLIS, Fields.EXPIRY_DATE, expiryDate); builder.field(Fields.MAX_NODES, maxNodes); builder.field(Fields.ISSUED_TO, issuedTo); builder.field(Fields.ISSUER, issuer); diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java index a37ae85ee55..d7a201201f1 100644 --- a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java +++ b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java @@ -126,10 +126,10 @@ public class RoleDescriptor implements ToXContent { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(Fields.CLUSTER.getPreferredName(), (Object[]) clusterPrivileges); - builder.field(Fields.INDICES.getPreferredName(), (Object[]) indicesPrivileges); + builder.array(Fields.CLUSTER.getPreferredName(), clusterPrivileges); + builder.array(Fields.INDICES.getPreferredName(), (Object[]) indicesPrivileges); if (runAs != null) { - builder.field(Fields.RUN_AS.getPreferredName(), runAs); + builder.array(Fields.RUN_AS.getPreferredName(), runAs); } builder.field(Fields.METADATA.getPreferredName(), metadata); return builder.endObject(); diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java index 84bed0b7be6..c729c6f6fbc 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java @@ -129,7 +129,7 @@ public class XPackInfoResponse extends ActionResponse { .field("type", type) .field("mode", mode) .field("status", status.label()) - .dateValueField("expiry_date_in_millis", "expiry_date", expiryDate) + .dateField("expiry_date_in_millis", "expiry_date", expiryDate) .endObject(); } diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java index 34b552b8a3a..7629e69421b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java @@ -235,7 +235,7 @@ public abstract class WatchRecord implements ToXContent { @Override void innerToXContent(XContentBuilder builder, Params params) throws IOException { if (messages != null) { - builder.field(Field.MESSAGES.getPreferredName(), messages); + builder.array(Field.MESSAGES.getPreferredName(), messages); } } } diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java index 93902dbffee..2e6b322724a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java @@ -56,7 +56,7 @@ public class HourlySchedule extends CronnableSchedule { if (params.paramAsBoolean("normalize", false) && minutes.length == 1) { builder.field(Parser.MINUTE_FIELD.getPreferredName(), minutes[0]); } else { - builder.field(Parser.MINUTE_FIELD.getPreferredName(), minutes); + builder.array(Parser.MINUTE_FIELD.getPreferredName(), minutes); } return builder.endObject(); } diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java index a2e1c4c7a13..ad3af2213e6 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java @@ -138,8 +138,8 @@ public class DayTimes implements Times { return builder.value(time); } return builder.startObject() - .field(HOUR_FIELD.getPreferredName(), hour) - .field(MINUTE_FIELD.getPreferredName(), minute) + .array(HOUR_FIELD.getPreferredName(), hour) + .array(MINUTE_FIELD.getPreferredName(), minute) .endObject(); } diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java index 339cf0b9a55..0add079ef35 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java @@ -135,7 +135,7 @@ public class MonthTimes implements Times { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(DAY_FIELD.getPreferredName(), days); + builder.array(DAY_FIELD.getPreferredName(), days); builder.startArray(TIME_FIELD.getPreferredName()); for (DayTimes dayTimes : times) { dayTimes.toXContent(builder, params); diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java index 57396b43d87..781099e08ed 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java @@ -124,7 +124,7 @@ public class YearTimes implements Times { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field(MONTH_FIELD.getPreferredName(), months); - builder.field(DAY_FIELD.getPreferredName(), days); + builder.array(DAY_FIELD.getPreferredName(), days); builder.startArray(TIME_FIELD.getPreferredName()); for (DayTimes dayTimes : times) { dayTimes.toXContent(builder, params); diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java index 330aa2ce3f6..9e97016d7b7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java @@ -46,7 +46,7 @@ public interface Payload extends ToXContent { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - return builder.value(data); + return builder.map(data); } @Override diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java index fcb55fc994a..91894a3fdc2 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java @@ -44,7 +44,7 @@ public class SimpleInputTests extends ESTestCase { data.put("foo", "bar"); data.put("baz", new ArrayList()); - XContentBuilder jsonBuilder = jsonBuilder().value(data); + XContentBuilder jsonBuilder = jsonBuilder().map(data); InputFactory parser = new SimpleInputFactory(Settings.builder().build()); XContentParser xContentParser = JsonXContent.jsonXContent.createParser(jsonBuilder.bytes()); xContentParser.nextToken(); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java index 18cabae6073..a8f1d2b4825 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java @@ -40,7 +40,7 @@ public class FilterXContentTests extends ESTestCase { data.put("key6", 7.1); data.put("key7", false); - XContentBuilder builder = jsonBuilder().value(data); + XContentBuilder builder = jsonBuilder().map(data); XContentParser parser = XContentHelper.createParser(builder.bytes()); Set keys = new HashSet<>(); @@ -66,7 +66,7 @@ public class FilterXContentTests extends ESTestCase { Map innerMap = MapBuilder.newMapBuilder().put("key1", "value1").put("key2", "value2").map(); data.put("leaf3", MapBuilder.newMapBuilder().put("key1", "value1").put("key2", innerMap).map()); - BytesReference bytes = jsonBuilder().value(data).bytes(); + BytesReference bytes = jsonBuilder().map(data).bytes(); XContentParser parser = XContentHelper.createParser(bytes); Set keys = new HashSet<>(Arrays.asList("leaf1.key2")); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java index 97bca8f6a80..d664daa1614 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java @@ -26,7 +26,6 @@ import org.elasticsearch.search.SearchRequestParsers; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.common.text.TextTemplate; import org.elasticsearch.xpack.watcher.actions.ExecutableActions; import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java index 18d6ee385f6..b2779a4669e 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java @@ -78,8 +78,8 @@ public class DailyScheduleTests extends ScheduleTestCase { XContentBuilder builder = jsonBuilder() .startObject() .startObject("at") - .field("hour", time.hour()) - .field("minute", time.minute()) + .array("hour", time.hour()) + .array("minute", time.minute()) .endObject() .endObject(); BytesReference bytes = builder.bytes(); @@ -197,7 +197,7 @@ public class DailyScheduleTests extends ScheduleTestCase { String[] times = invalidDayTimesAsStrings(); XContentBuilder builder = jsonBuilder() .startObject() - .field("at", times) + .array("at", times) .endObject(); BytesReference bytes = builder.bytes(); XContentParser parser = JsonXContent.jsonXContent.createParser(bytes); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java index c361a5a7d28..7290bba4f90 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java @@ -84,8 +84,8 @@ public class MonthlyScheduleTests extends ScheduleTestCase { .startObject() .field("on", day) .startObject("at") - .field("hour", time.hour()) - .field("minute", time.minute()) + .array("hour", time.hour()) + .array("minute", time.minute()) .endObject() .endObject(); BytesReference bytes = builder.bytes(); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java index f0033de7725..6355bff8f85 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java @@ -82,8 +82,8 @@ public class WeeklyScheduleTests extends ScheduleTestCase { .startObject() .field("on", "mon") .startObject("at") - .field("hour", time.hour()) - .field("minute", time.minute()) + .array("hour", time.hour()) + .array("minute", time.minute()) .endObject() .endObject(); BytesReference bytes = builder.bytes(); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java index d230e1122ac..aa03e00ebcf 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java @@ -92,8 +92,8 @@ public class YearlyScheduleTests extends ScheduleTestCase { .field("in", month) .field("on", day) .startObject("at") - .field("hour", time.hour()) - .field("minute", time.minute()) + .array("hour", time.hour()) + .array("minute", time.minute()) .endObject() .endObject(); BytesReference bytes = builder.bytes();