Skip to content

Do not serialize basic license exp in x-pack info #30848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2018
Merged

Do not serialize basic license exp in x-pack info #30848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c3ba9
Do not serialize basic license exp in x-pack info
Tim-Brooks May 24, 2018
32fd2dc
Merge remote-tracking branch 'upstream/master' into do_not_serialize_…
Tim-Brooks May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,15 @@ public License.Status getStatus() {

@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
return builder.startObject()
.field("uid", uid)
.field("type", type)
.field("mode", mode)
.field("status", status.label())
.timeField("expiry_date_in_millis", "expiry_date", expiryDate)
.endObject();
builder.startObject()
.field("uid", uid)
.field("type", type)
.field("mode", mode)
.field("status", status.label());
if (expiryDate != LicenseService.BASIC_SELF_GENERATED_LICENSE_EXPIRATION_MILLIS) {
builder.timeField("expiry_date_in_millis", "expiry_date", expiryDate);
}
return builder.endObject();
}

public void writeTo(StreamOutput out) throws IOException {
Expand Down