From ba88d9af57c1d26f3abb30c106c406477ee87af8 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Wed, 5 Oct 2016 09:47:20 -0700 Subject: [PATCH] Remove all date 'now' methods from the Painless whitelist to ensure Painless scripts are pure functions. --- .../painless/java.time.chrono.txt | 20 ------------------- .../org/elasticsearch/painless/java.time.txt | 20 ------------------- 2 files changed, 40 deletions(-) diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.chrono.txt b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.chrono.txt index 7374efea04b..286141e2921 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.chrono.txt +++ b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.chrono.txt @@ -82,8 +82,6 @@ class Chronology -> java.time.chrono.Chronology extends Comparable { ChronoLocalDate date(Era,int,int,int) ChronoLocalDate date(int,int,int) ChronoLocalDate dateEpochDay(long) - ChronoLocalDate dateNow() - ChronoLocalDate dateNow(ZoneId) ChronoLocalDate dateYearDay(Era,int,int) ChronoLocalDate dateYearDay(int,int) boolean equals(Object) @@ -171,8 +169,6 @@ class HijrahChronology -> java.time.chrono.HijrahChronology extends AbstractChro HijrahDate date(int,int,int) HijrahDate date(Era,int,int,int) HijrahDate dateEpochDay(long) - HijrahDate dateNow() - HijrahDate dateNow(ZoneId) HijrahDate dateYearDay(int,int) HijrahDate dateYearDay(Era,int,int) HijrahEra eraOf(int) @@ -185,8 +181,6 @@ class HijrahDate -> java.time.chrono.HijrahDate extends ChronoLocalDate,Temporal HijrahEra getEra() HijrahDate minus(TemporalAmount) HijrahDate minus(long,TemporalUnit) - HijrahDate now() - HijrahDate now(ZoneId) HijrahDate of(int,int,int) HijrahDate plus(TemporalAmount) HijrahDate plus(long,TemporalUnit) @@ -201,8 +195,6 @@ class IsoChronology -> java.time.chrono.IsoChronology extends AbstractChronology LocalDate date(int,int,int) LocalDate date(Era,int,int,int) LocalDate dateEpochDay(long) - LocalDate dateNow() - LocalDate dateNow(ZoneId) LocalDate dateYearDay(int,int) LocalDate dateYearDay(Era,int,int) IsoEra eraOf(int) @@ -219,8 +211,6 @@ class JapaneseChronology -> java.time.chrono.JapaneseChronology extends Abstract JapaneseDate date(int,int,int) JapaneseDate date(Era,int,int,int) JapaneseDate dateEpochDay(long) - JapaneseDate dateNow() - JapaneseDate dateNow(ZoneId) JapaneseDate dateYearDay(int,int) JapaneseDate dateYearDay(Era,int,int) JapaneseEra eraOf(int) @@ -228,8 +218,6 @@ class JapaneseChronology -> java.time.chrono.JapaneseChronology extends Abstract } class JapaneseDate -> java.time.chrono.JapaneseDate extends ChronoLocalDate,Temporal,TemporalAccessor,TemporalAdjuster,Comparable,Object { - JapaneseDate now() - JapaneseDate now(ZoneId) JapaneseDate of(int,int,int) JapaneseDate from(TemporalAccessor) JapaneseChronology getChronology() @@ -259,8 +247,6 @@ class MinguoChronology -> java.time.chrono.MinguoChronology extends AbstractChro MinguoDate date(int,int,int) MinguoDate date(Era,int,int,int) MinguoDate dateEpochDay(long) - MinguoDate dateNow() - MinguoDate dateNow(ZoneId) MinguoDate dateYearDay(int,int) MinguoDate dateYearDay(Era,int,int) MinguoEra eraOf(int) @@ -268,8 +254,6 @@ class MinguoChronology -> java.time.chrono.MinguoChronology extends AbstractChro } class MinguoDate -> java.time.chrono.MinguoDate extends ChronoLocalDate,Temporal,TemporalAccessor,TemporalAdjuster,Comparable,Object { - MinguoDate now() - MinguoDate now(ZoneId) MinguoDate of(int,int,int) MinguoDate from(TemporalAccessor) MinguoChronology getChronology() @@ -288,8 +272,6 @@ class ThaiBuddhistChronology -> java.time.chrono.ThaiBuddhistChronology extends ThaiBuddhistDate date(int,int,int) ThaiBuddhistDate date(Era,int,int,int) ThaiBuddhistDate dateEpochDay(long) - ThaiBuddhistDate dateNow() - ThaiBuddhistDate dateNow(ZoneId) ThaiBuddhistDate dateYearDay(int,int) ThaiBuddhistDate dateYearDay(Era,int,int) ThaiBuddhistEra eraOf(int) @@ -297,8 +279,6 @@ class ThaiBuddhistChronology -> java.time.chrono.ThaiBuddhistChronology extends } class ThaiBuddhistDate -> java.time.chrono.ThaiBuddhistDate extends ChronoLocalDate,Temporal,TemporalAccessor,TemporalAdjuster,Comparable,Object { - ThaiBuddhistDate now() - ThaiBuddhistDate now(ZoneId) ThaiBuddhistDate of(int,int,int) ThaiBuddhistDate from(TemporalAccessor) ThaiBuddhistChronology getChronology() diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.txt b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.txt index 4481004fdf6..4c99be712ad 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.txt +++ b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/java.time.txt @@ -103,8 +103,6 @@ class Instant -> java.time.Instant extends Comparable,Temporal,TemporalAccessor, Instant minusMillis(long) Instant minusNanos(long) Instant minusSeconds(long) - Instant now() - Instant now(Clock) Instant ofEpochSecond(long) Instant ofEpochSecond(long,long) Instant ofEpochMilli(long) @@ -143,8 +141,6 @@ class LocalDate -> java.time.LocalDate extends ChronoLocalDate,Temporal,Temporal LocalDate minusMonths(long) LocalDate minusWeeks(long) LocalDate minusDays(long) - LocalDate now() - LocalDate now(ZoneId) LocalDate of(int,int,int) LocalDate ofYearDay(int,int) LocalDate ofEpochDay(long) @@ -191,8 +187,6 @@ class LocalDateTime -> java.time.LocalDateTime extends ChronoLocalDateTime,Tempo LocalDateTime minusSeconds(long) LocalDateTime minusWeeks(long) LocalDateTime minusYears(long) - LocalDateTime now() - LocalDateTime now(ZoneId) LocalDateTime of(LocalDate,LocalTime) LocalDateTime of(int,int,int,int,int) LocalDateTime of(int,int,int,int,int,int) @@ -246,8 +240,6 @@ class LocalTime -> java.time.LocalTime extends Temporal,TemporalAccessor,Tempora LocalTime minusMinutes(long) LocalTime minusNanos(long) LocalTime minusSeconds(long) - LocalTime now() - LocalTime now(ZoneId) LocalTime of(int,int) LocalTime of(int,int,int) LocalTime of(int,int,int,int) @@ -283,8 +275,6 @@ class MonthDay -> java.time.MonthDay extends TemporalAccessor,TemporalAdjuster,C boolean isAfter(MonthDay) boolean isBefore(MonthDay) boolean isValidYear(int) - MonthDay now() - MonthDay now(ZoneId) MonthDay of(int,int) MonthDay parse(CharSequence) MonthDay parse(CharSequence,DateTimeFormatter) @@ -325,8 +315,6 @@ class OffsetDateTime -> java.time.OffsetDateTime extends Temporal,TemporalAccess OffsetDateTime minusMinutes(long) OffsetDateTime minusSeconds(long) OffsetDateTime minusNanos(long) - OffsetDateTime now() - OffsetDateTime now(ZoneId) OffsetDateTime of(LocalDate,LocalTime,ZoneOffset) OffsetDateTime of(LocalDateTime,ZoneOffset) OffsetDateTime of(int,int,int,int,int,int,int,ZoneOffset) @@ -380,8 +368,6 @@ class OffsetTime -> java.time.OffsetTime extends Temporal,TemporalAccessor,Tempo boolean isAfter(OffsetTime) boolean isBefore(OffsetTime) boolean isEqual(OffsetTime) - OffsetTime now() - OffsetTime now(ZoneId) OffsetTime of(LocalTime,ZoneOffset) OffsetTime of(int,int,int,int,ZoneOffset) OffsetTime ofInstant(Instant,ZoneId) @@ -460,8 +446,6 @@ class Year -> java.time.Year extends Temporal,TemporalAccessor,TemporalAdjuster, Year minus(TemporalAmount) Year minus(long,TemporalUnit) Year minusYears(long) - Year now() - Year now(ZoneId) Year of(int) Year parse(CharSequence) Year parse(CharSequence,DateTimeFormatter) @@ -491,8 +475,6 @@ class YearMonth -> java.time.YearMonth extends Temporal,TemporalAccessor,Tempora YearMonth minus(long,TemporalUnit) YearMonth minusYears(long) YearMonth minusMonths(long) - YearMonth now() - YearMonth now(ZoneId) YearMonth of(int,int) YearMonth parse(CharSequence) YearMonth parse(CharSequence,DateTimeFormatter) @@ -530,8 +512,6 @@ class ZonedDateTime -> java.time.ZonedDateTime extends ChronoZonedDateTime,Tempo ZonedDateTime minusMinutes(long) ZonedDateTime minusSeconds(long) ZonedDateTime minusNanos(long) - ZonedDateTime now() - ZonedDateTime now(ZoneId) ZonedDateTime of(LocalDate,LocalTime,ZoneId) ZonedDateTime of(LocalDateTime,ZoneId) ZonedDateTime of(int,int,int,int,int,int,int,ZoneId)