From c48770c525b6b50300f4e0c1907daec8d85d9172 Mon Sep 17 00:00:00 2001 From: Areek Zillur Date: Wed, 3 Jun 2015 14:43:11 -0400 Subject: [PATCH] fix DateMathParser compilation error Original commit: elastic/x-pack-elasticsearch@e3cd2e0e455366b5fb24a2aa647f6fdf02431028 --- .../src/test/java/org/elasticsearch/license/core/TestUtils.java | 2 +- .../test/java/org/elasticsearch/license/licensor/TestUtils.java | 2 +- .../license/plugin/AbstractLicensesIntegrationTests.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/license/core/TestUtils.java b/core/src/test/java/org/elasticsearch/license/core/TestUtils.java index 800affa8831..e6d30e57edf 100644 --- a/core/src/test/java/org/elasticsearch/license/core/TestUtils.java +++ b/core/src/test/java/org/elasticsearch/license/core/TestUtils.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; public class TestUtils { private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); - private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter, TimeUnit.MILLISECONDS); + private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); public static void isSame(Set firstLicenses, Set secondLicenses) { diff --git a/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java b/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java index e4c28e28f84..2752550967e 100644 --- a/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java +++ b/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java @@ -36,7 +36,7 @@ public class TestUtils { public static final String PRIVATE_KEY_RESOURCE = "/private.key"; private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); - private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter, TimeUnit.MILLISECONDS); + private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); public static void isSame(Set firstLicenses, Set secondLicenses) { diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java index 94f90284099..003d3e0e231 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java @@ -44,7 +44,7 @@ public abstract class AbstractLicensesIntegrationTests extends ElasticsearchInte private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); - private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter, TimeUnit.MILLISECONDS); + private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); public static String dateMathString(String time, final long now) { return dateTimeFormatter.print(dateMathParser.parse(time, new Callable() {