honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Licensing: Parse start date in milliseconds as well 

In order to behave like expiration date and and the issue date,
license parsing should be able to parse the start date in milliseconds
as well.

Relates elastic/elasticsearch#3385

Original commit: elastic/x-pack-elasticsearch@54c821192e
This commit is contained in:
Alexander Reelsen 2016-09-13 09:57:29 +02:00
parent 4cac77e2ad
commit 67f7da18da
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java
View File

@ -408,10 +408,12 @@ public class License implements ToXContent {
builder.feature(parser.text()); builder.feature(parser.text());
} else if (Fields.EXPIRY_DATE.equals(currentFieldName)) { } else if (Fields.EXPIRY_DATE.equals(currentFieldName)) {
builder.expiryDate(parseDate(parser, "expiration", true)); builder.expiryDate(parseDate(parser, "expiration", true));
} else if (Fields.START_DATE.equals(currentFieldName)) {
builder.startDate(parseDate(parser, "start", false));
} else if (Fields.EXPIRY_DATE_IN_MILLIS.equals(currentFieldName)) { } else if (Fields.EXPIRY_DATE_IN_MILLIS.equals(currentFieldName)) {
builder.expiryDate(parser.longValue()); builder.expiryDate(parser.longValue());
} else if (Fields.START_DATE.equals(currentFieldName)) {
builder.startDate(parseDate(parser, "start", false));
} else if (Fields.START_DATE_IN_MILLIS.equals(currentFieldName)) {
builder.startDate(parser.longValue());
} else if (Fields.MAX_NODES.equals(currentFieldName)) { } else if (Fields.MAX_NODES.equals(currentFieldName)) {
builder.maxNodes(parser.intValue()); builder.maxNodes(parser.intValue());
} else if (Fields.ISSUED_TO.equals(currentFieldName)) { } else if (Fields.ISSUED_TO.equals(currentFieldName)) {