Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Fix compilation error
Change-Id: Ib6c85b4b55754ccc4acbc29841672bca78b3d355
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
index 5423a50..a82f0c5 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
@@ -31,7 +31,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
-import java.util.function.Supplier;
@Singleton
class SQLQueryMaker implements QueryMaker {
@@ -39,19 +38,19 @@
private static final String TIME_ONE = "t1";
private static final String TIME_TWO = "t2";
private static final ThreadLocal<DateFormat> DATE_TIME_FORMAT =
- ThreadLocal.withInitial(new Supplier<DateFormat>() {
+ new ThreadLocal<DateFormat>() {
@Override
- public DateFormat get() {
+ protected DateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
- });
+ };
private static final ThreadLocal<DateFormat> DATE_ONLY_FORMAT =
- ThreadLocal.withInitial(new Supplier<DateFormat>() {
+ new ThreadLocal<DateFormat>() {
@Override
- public DateFormat get() {
+ protected DateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd");
}
- });
+ };
private final int returnLimit;