From 8d31827f285b47f3b41fc4dbc4edfb7695e0f606 Mon Sep 17 00:00:00 2001 From: javanna Date: Thu, 5 Jan 2017 23:31:50 +0100 Subject: [PATCH] Migrate ToXContent impls to ToXContentObject Original commit: elastic/x-pack-elasticsearch@b09f537ef4461a1e6fcdf856bfb77c2c5d7fba0c --- .../java/org/elasticsearch/license/License.java | 3 ++- .../elasticsearch/license/XPackInfoResponse.java | 5 +++-- .../org/elasticsearch/xpack/XPackFeatureSet.java | 4 ++-- .../xpack/common/http/HttpRequest.java | 4 ++-- .../xpack/common/http/HttpRequestTemplate.java | 4 ++-- .../xpack/common/http/HttpResponse.java | 5 ++--- .../xpack/common/http/auth/ApplicableHttpAuth.java | 4 ++-- .../xpack/common/http/auth/HttpAuth.java | 4 ++-- .../xpack/notification/email/Attachment.java | 2 +- .../xpack/notification/email/DataAttachment.java | 3 ++- .../xpack/notification/email/Email.java | 3 ++- .../xpack/notification/email/EmailTemplate.java | 4 ++-- .../notification/email/support/BodyPartSource.java | 5 ++--- .../xpack/notification/hipchat/HipChatMessage.java | 3 ++- .../xpack/notification/hipchat/SentMessages.java | 3 ++- .../xpack/notification/jira/JiraIssue.java | 4 ++-- .../xpack/notification/pagerduty/IncidentEvent.java | 3 ++- .../xpack/notification/pagerduty/SentEvent.java | 6 +++--- .../xpack/notification/slack/SentMessages.java | 3 ++- .../notification/slack/message/Attachment.java | 4 ++-- .../notification/slack/message/MessageElement.java | 4 ++-- .../security/action/role/DeleteRoleResponse.java | 4 ++-- .../xpack/security/action/user/PutUserResponse.java | 4 ++-- .../xpack/security/authz/RoleDescriptor.java | 3 ++- .../org/elasticsearch/xpack/security/user/User.java | 7 +++---- .../elasticsearch/xpack/watcher/actions/Action.java | 3 ++- .../xpack/watcher/actions/ActionStatus.java | 3 ++- .../xpack/watcher/actions/ActionWrapper.java | 3 ++- .../xpack/watcher/actions/ExecutableAction.java | 6 +++--- .../xpack/watcher/client/WatchSourceBuilder.java | 3 ++- .../xpack/watcher/condition/AlwaysCondition.java | 6 ------ .../xpack/watcher/condition/Condition.java | 3 ++- .../watcher/execution/WatchExecutionResult.java | 4 ++-- .../watcher/execution/WatchExecutionSnapshot.java | 4 ++-- .../xpack/watcher/history/WatchRecord.java | 6 +++--- .../xpack/watcher/input/ExecutableInput.java | 4 ++-- .../elasticsearch/xpack/watcher/input/Input.java | 8 +++----- .../search/WatcherSearchTemplateRequest.java | 4 ++-- .../xpack/watcher/transform/Transform.java | 5 +++-- .../actions/stats/WatcherStatsResponse.java | 4 ++-- .../xpack/watcher/trigger/Trigger.java | 4 ++-- .../xpack/watcher/trigger/TriggerEvent.java | 4 ++-- .../elasticsearch/xpack/watcher/watch/Payload.java | 4 ++-- .../elasticsearch/xpack/watcher/watch/Watch.java | 13 ++----------- .../xpack/watcher/watch/WatchStatus.java | 3 ++- 45 files changed, 94 insertions(+), 98 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/license/License.java b/elasticsearch/src/main/java/org/elasticsearch/license/License.java index 2026260d72a..7eae2c3088d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/license/License.java +++ b/elasticsearch/src/main/java/org/elasticsearch/license/License.java @@ -12,6 +12,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; @@ -29,7 +30,7 @@ import java.util.Locale; * Data structure for license. Use {@link Builder} to build a license. * Provides serialization/deserialization & validation methods for license object */ -public class License implements ToXContent { +public class License implements ToXContentObject { public static final int VERSION_START = 1; public static final int VERSION_NO_FEATURE_TYPE = 2; public static final int VERSION_START_DATE = 3; diff --git a/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java index 2ab7feec18d..1945def2437 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java @@ -11,6 +11,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.XPackBuild; @@ -140,7 +141,7 @@ public class XPackInfoResponse extends ActionResponse { } } - public static class BuildInfo implements ToXContent, Writeable { + public static class BuildInfo implements ToXContentObject, Writeable { private final String hash; private final String timestamp; @@ -180,7 +181,7 @@ public class XPackInfoResponse extends ActionResponse { } } - public static class FeatureSetsInfo implements ToXContent, Writeable { + public static class FeatureSetsInfo implements ToXContentObject, Writeable { private final Map featureSets; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java index 6e9b17b3782..6995bf66d61 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack; import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -25,7 +25,7 @@ public interface XPackFeatureSet { Usage usage(); - abstract class Usage implements ToXContent, NamedWriteable { + abstract class Usage implements ToXContentObject, NamedWriteable { private static final String AVAILABLE_XFIELD = "available"; private static final String ENABLED_XFIELD = "enabled"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java index d0d1a245b93..0993ff127a4 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java @@ -8,10 +8,10 @@ package org.elasticsearch.xpack.common.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; @@ -35,7 +35,7 @@ import java.util.Objects; import static java.util.Collections.emptyMap; import static java.util.Collections.unmodifiableMap; -public class HttpRequest implements ToXContent { +public class HttpRequest implements ToXContentObject { final String host; final int port; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java index 2052ddf9a78..4ff248faeb2 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java @@ -8,11 +8,11 @@ package org.elasticsearch.xpack.common.http; import io.netty.handler.codec.http.HttpHeaders; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.rest.RestUtils; @@ -33,7 +33,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static java.util.Collections.unmodifiableMap; -public class HttpRequestTemplate implements ToXContent { +public class HttpRequestTemplate implements ToXContentObject { private final Scheme scheme; private final String host; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java index 4bf3e883d53..8c6ea5804ef 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java @@ -9,11 +9,10 @@ import io.netty.handler.codec.http.HttpHeaders; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.MapBuilder; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; @@ -29,7 +28,7 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.unmodifiableMap; -public class HttpResponse implements ToXContent { +public class HttpResponse implements ToXContentObject { private final int status; private final Map headers; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java index 70d4747968a..7da8a9d8fa8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java @@ -7,13 +7,13 @@ package org.elasticsearch.xpack.common.http.auth; import org.apache.http.auth.AuthScope; import org.apache.http.client.CredentialsProvider; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.net.HttpURLConnection; -public abstract class ApplicableHttpAuth implements ToXContent { +public abstract class ApplicableHttpAuth implements ToXContentObject { protected final Auth auth; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java index 2049424bc77..2f2cdd4f168 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.xpack.common.http.auth; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; -public interface HttpAuth extends ToXContent { +public interface HttpAuth extends ToXContentObject { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java index 292ac50bcb4..e2cb9788aa1 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java @@ -57,7 +57,7 @@ public abstract class Attachment extends BodyPartSource { * intentionally not emitting path as it may come as an information leak */ @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { return builder.startObject() .field("type", type()) .field("id", id) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java index 56cfba1f838..cb97fb5922b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java @@ -8,6 +8,7 @@ package org.elasticsearch.xpack.notification.email; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; @@ -19,7 +20,7 @@ import java.util.Map; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; -public enum DataAttachment implements ToXContent { +public enum DataAttachment implements ToXContentObject { YAML() { @Override diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java index 1420049ec09..c1b85b61e52 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java @@ -9,6 +9,7 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.joda.time.DateTime; @@ -31,7 +32,7 @@ import java.util.Map; import static java.util.Collections.unmodifiableMap; -public class Email implements ToXContent { +public class Email implements ToXContentObject { final String id; final Address from; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java index a41f0cd6a96..0fc1b589f6c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java @@ -6,7 +6,7 @@ package org.elasticsearch.xpack.notification.email; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.common.text.TextTemplate; @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -public class EmailTemplate implements ToXContent { +public class EmailTemplate implements ToXContentObject { final TextTemplate from; final TextTemplate[] replyTo; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java index 667c2bfa605..099ec1daf65 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java @@ -6,16 +6,15 @@ package org.elasticsearch.xpack.notification.email.support; import org.elasticsearch.SpecialPermission; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; -import javax.activation.CommandMap; import javax.activation.FileTypeMap; import javax.mail.MessagingException; import javax.mail.internet.MimeBodyPart; import java.security.AccessController; import java.security.PrivilegedAction; -public abstract class BodyPartSource implements ToXContent { +public abstract class BodyPartSource implements ToXContentObject { protected static FileTypeMap fileTypeMap; static { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java index 5de4c7939b0..2bb435afad9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java @@ -10,6 +10,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.common.text.TextTemplate; @@ -23,7 +24,7 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; -public class HipChatMessage implements ToXContent { +public class HipChatMessage implements ToXContentObject { final String body; @Nullable final String[] rooms; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java index d94fba86aa8..be56fe4b4a9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.notification.hipchat; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.common.http.HttpRequest; import org.elasticsearch.xpack.common.http.HttpResponse; @@ -17,7 +18,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -public class SentMessages implements ToXContent, Iterable { +public class SentMessages implements ToXContentObject, Iterable { private String accountName; private List messages; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/jira/JiraIssue.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/jira/JiraIssue.java index e3d4bc8e281..0b21d9717da 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/jira/JiraIssue.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/jira/JiraIssue.java @@ -10,7 +10,7 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -public class JiraIssue implements ToXContent { +public class JiraIssue implements ToXContentObject { @Nullable final String account; private final Map fields; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java index 2300727ba76..1a11b1a56e8 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java @@ -10,6 +10,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.common.http.HttpMethod; @@ -35,7 +36,7 @@ import java.util.Objects; * https://developer.pagerduty.com/documentation/integration/events/acknowledge * https://developer.pagerduty.com/documentation/integration/events/resolve */ -public class IncidentEvent implements ToXContent { +public class IncidentEvent implements ToXContentObject { static final String HOST = "events.pagerduty.com"; static final String PATH = "/generic/2010-04-15/create_event.json"; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java index c861881b9fb..b65e938e7c9 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java @@ -9,20 +9,20 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; import org.elasticsearch.xpack.common.http.HttpRequest; import org.elasticsearch.xpack.common.http.HttpResponse; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; -public class SentEvent implements ToXContent { +public class SentEvent implements ToXContentObject { final IncidentEvent event; @Nullable final HttpRequest request; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java index 387d2de087c..540f3e376c0 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.notification.slack; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.common.http.HttpRequest; import org.elasticsearch.xpack.common.http.HttpResponse; @@ -17,7 +18,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -public class SentMessages implements ToXContent, Iterable { +public class SentMessages implements ToXContentObject, Iterable { private String accountName; private List messages; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java index cfce07a2182..e0ad1fbfe03 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.notification.slack.message; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.common.text.TextTemplate; @@ -142,7 +142,7 @@ public class Attachment implements MessageElement { return builder.endObject(); } - static class Template implements ToXContent { + static class Template implements ToXContentObject { final TextTemplate fallback; final TextTemplate color; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java index 149c4d7374a..26ad5752a6d 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java @@ -6,9 +6,9 @@ package org.elasticsearch.xpack.notification.slack.message; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; -public interface MessageElement extends ToXContent { +public interface MessageElement extends ToXContentObject { interface XField { ParseField TITLE = new ParseField("title"); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java index 0072d163f2d..0269d6cbf80 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.security.action.role; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -16,7 +16,7 @@ import java.io.IOException; /** * Response for a role being deleted from the security index */ -public class DeleteRoleResponse extends ActionResponse implements ToXContent { +public class DeleteRoleResponse extends ActionResponse implements ToXContentObject { private boolean found = false; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java index 3badc5f7edc..690311cc4fc 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.security.action.user; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -17,7 +17,7 @@ import java.io.IOException; * Response when adding a user to the security index. Returns a * single boolean field for whether the user was created or updated. */ -public class PutUserResponse extends ActionResponse implements ToXContent { +public class PutUserResponse extends ActionResponse implements ToXContentObject { private boolean created; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java index 7a0f9feee3b..d3e2f2fc514 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java @@ -18,6 +18,7 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; @@ -37,7 +38,7 @@ import java.util.Map; * A holder for a Role that contains user-readable information about the Role * without containing the actual Role object. */ -public class RoleDescriptor implements ToXContent { +public class RoleDescriptor implements ToXContentObject { private final String name; private final String[] clusterPrivileges; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/user/User.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/user/User.java index e65e5e11b9d..10e2e7d4c31 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/user/User.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/user/User.java @@ -11,11 +11,10 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.security.support.MetadataUtils; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -24,7 +23,7 @@ import java.util.Map; /** * An authenticated user */ -public class User implements ToXContent { +public class User implements ToXContentObject { private final String username; private final String[] roles; @@ -170,7 +169,7 @@ public class User implements ToXContent { } @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field(Fields.USERNAME.getPreferredName(), principal()); builder.array(Fields.ROLES.getPreferredName(), roles()); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java index 7dd90765c48..4bdc5b9279f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java @@ -8,12 +8,13 @@ package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Locale; -public interface Action extends ToXContent { +public interface Action extends ToXContentObject { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java index 8b88c91f3c5..542d622ed7b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java @@ -11,6 +11,7 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.joda.time.DateTime; @@ -23,7 +24,7 @@ import java.util.Objects; import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.dateTimeFormatter; -public class ActionStatus implements ToXContent { +public class ActionStatus implements ToXContentObject { private AckStatus ackStatus; @Nullable private Execution lastExecution; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java index 8e1fb213217..db3d8e016ef 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java @@ -13,6 +13,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.license.XPackLicenseState; @@ -31,7 +32,7 @@ import java.time.Clock; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -public class ActionWrapper implements ToXContent { +public class ActionWrapper implements ToXContentObject { private String id; @Nullable diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java index 0cb0ad5ca43..a610f65e044 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java @@ -6,14 +6,14 @@ package org.elasticsearch.xpack.watcher.actions; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -public abstract class ExecutableAction implements ToXContent { +public abstract class ExecutableAction implements ToXContentObject { protected final A action; protected final Logger logger; @@ -59,7 +59,7 @@ public abstract class ExecutableAction implements ToXContent { } @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { return action.toXContent(builder, params); } diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java index 4e82a0b785e..9e4483dbf65 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java @@ -9,6 +9,7 @@ import org.elasticsearch.action.support.ToXContentToBytes; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.watcher.actions.throttler.Throttler; @@ -162,7 +163,7 @@ public class WatchSourceBuilder extends ToXContentToBytes implements ToXContent return builder.endObject(); } - static class TransformedAction implements ToXContent { + static class TransformedAction implements ToXContentObject { private final String id; private final Action action; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/AlwaysCondition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/AlwaysCondition.java index f463705155e..a8b4ce9e1b3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/AlwaysCondition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/AlwaysCondition.java @@ -6,7 +6,6 @@ package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; @@ -40,11 +39,6 @@ public final class AlwaysCondition extends Condition { return RESULT_INSTANCE; } - @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - return builder.startObject().endObject(); - } - @Override public boolean equals(Object obj) { return obj instanceof AlwaysCondition; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java index edf9f9cb993..a70699fe618 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; @@ -14,7 +15,7 @@ import java.io.IOException; import java.util.Locale; import java.util.Map; -public abstract class Condition implements ToXContent { +public abstract class Condition implements ToXContentObject { protected final String type; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java index 12456ce873d..275f963dadd 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.actions.ActionWrapper; import org.elasticsearch.xpack.watcher.condition.Condition; @@ -19,7 +19,7 @@ import org.joda.time.DateTime; import java.io.IOException; import java.util.Map; -public class WatchExecutionResult implements ToXContent { +public class WatchExecutionResult implements ToXContentObject { private final DateTime executionTime; private final long executionDurationMs; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java index f5912775121..0562062ba82 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.actions.ActionWrapper; import org.joda.time.DateTime; @@ -17,7 +17,7 @@ import org.joda.time.DateTimeZone; import java.io.IOException; import java.util.Map; -public class WatchExecutionSnapshot implements Streamable, ToXContent { +public class WatchExecutionSnapshot implements Streamable, ToXContentObject { private String watchId; private String watchRecordId; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java index f3c1c7d6d85..21a21f5256f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.MapBuilder; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.watcher.actions.ActionWrapper; @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; -public abstract class WatchRecord implements ToXContent { +public abstract class WatchRecord implements ToXContentObject { protected final Wid id; protected final TriggerEvent triggerEvent; @@ -117,7 +117,7 @@ public abstract class WatchRecord implements ToXContent { } @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field(Field.WATCH_ID.getPreferredName(), id.watchId()); builder.field(Field.STATE.getPreferredName(), state.id()); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java index e1d702c9170..bc5b815a661 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java @@ -7,14 +7,14 @@ package org.elasticsearch.xpack.watcher.input; import org.apache.logging.log4j.Logger; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; -public abstract class ExecutableInput implements ToXContent { +public abstract class ExecutableInput implements ToXContentObject { protected final I input; protected final Logger logger; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java index 7c96adc08f8..9ec5ecbe746 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java @@ -7,18 +7,18 @@ package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; -public interface Input extends ToXContent { +public interface Input extends ToXContentObject { String type(); - abstract class Result implements ToXContent { + abstract class Result implements ToXContentObject { public enum Status { SUCCESS, FAILURE @@ -85,9 +85,7 @@ public interface Input extends ToXContent { } interface Builder { - I build(); - } interface Field { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java index aeb24618a91..3d78e6d3b22 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java @@ -12,7 +12,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.script.Script; @@ -30,7 +30,7 @@ import java.util.Objects; * A {@link WatcherSearchTemplateRequest} contains the search request and the eventual template that will * be rendered as a script by {@link WatcherSearchTemplateService} before being executed. */ -public class WatcherSearchTemplateRequest implements ToXContent { +public class WatcherSearchTemplateRequest implements ToXContentObject { private final String[] indices; private final String[] types; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java index 5efbc778fb6..853cd52e278 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java @@ -9,6 +9,7 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.watch.Payload; @@ -19,7 +20,7 @@ public interface Transform extends ToXContent { String type(); - abstract class Result implements ToXContent { + abstract class Result implements ToXContentObject { public enum Status { SUCCESS, FAILURE @@ -67,7 +68,7 @@ public interface Transform extends ToXContent { } @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field(Field.TYPE.getPreferredName(), type); builder.field(Field.STATUS.getPreferredName(), status.name().toLowerCase(Locale.ROOT)); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java index a7c552bd0a1..17187acfc1f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java @@ -9,7 +9,7 @@ import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.WatcherMetaData; import org.elasticsearch.xpack.watcher.WatcherState; @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -public class WatcherStatsResponse extends ActionResponse implements ToXContent { +public class WatcherStatsResponse extends ActionResponse implements ToXContentObject { private long watchesCount; private WatcherState watcherState; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java index cbe98b87bde..9090aa072ae 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java @@ -5,12 +5,12 @@ */ package org.elasticsearch.xpack.watcher.trigger; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; -public interface Trigger extends ToXContent { +public interface Trigger extends ToXContentObject { String type(); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java index c00b4dfa561..ecb83d1f4a7 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java @@ -6,7 +6,7 @@ package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; import org.joda.time.DateTime; @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public abstract class TriggerEvent implements ToXContent { +public abstract class TriggerEvent implements ToXContentObject { private final String jobName; protected final DateTime triggeredTime; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java index e4935c8e8c1..d53bb24bae6 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java @@ -20,7 +20,7 @@ import static org.elasticsearch.xpack.watcher.support.WatcherUtils.responseToDat public interface Payload extends ToXContent { - Simple EMPTY = new Simple(Collections.emptyMap()); + Simple EMPTY = new Simple(Collections.emptyMap()); Map data(); @@ -29,7 +29,7 @@ public interface Payload extends ToXContent { private final Map data; public Simple() { - this(new HashMap()); + this(new HashMap<>()); } public Simple(String key, Object value) { diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java index 6ff47d35661..d8a61ca040c 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java @@ -15,7 +15,7 @@ import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.common.secret.Secret; @@ -31,7 +31,6 @@ import org.elasticsearch.xpack.watcher.input.ExecutableInput; import org.elasticsearch.xpack.watcher.input.InputRegistry; import org.elasticsearch.xpack.watcher.input.none.ExecutableNoneInput; import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; import org.elasticsearch.xpack.watcher.trigger.Trigger; @@ -45,17 +44,15 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; import static java.util.Collections.unmodifiableMap; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentHelper.createParser; import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; import static org.joda.time.DateTimeZone.UTC; -public class Watch implements TriggerEngine.Job, ToXContent { +public class Watch implements TriggerEngine.Job, ToXContentObject { public static final String ALL_ACTIONS_ID = "_all"; public static final String INCLUDE_STATUS_KEY = "include_status"; @@ -197,12 +194,6 @@ public class Watch implements TriggerEngine.Job, ToXContent { return builder; } - public BytesReference getAsBytes() throws IOException { - // we don't want to cache this and instead rebuild it every time on demand. The watch is in - // memory and we don't need this redundancy - return toXContent(jsonBuilder(), WatcherParams.builder().put(Watch.INCLUDE_STATUS_KEY, true).build()).bytes(); - } - public static class Parser extends AbstractComponent { private final TriggerService triggerService; diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java index 04ec5f4a8bc..c084078bab3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java @@ -12,6 +12,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.ToXContent; +import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.watcher.actions.Action; @@ -35,7 +36,7 @@ import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.write import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.writeOptionalDate; import static org.joda.time.DateTimeZone.UTC; -public class WatchStatus implements ToXContent, Streamable { +public class WatchStatus implements ToXContentObject, Streamable { private State state;