From 89e0a748bd591a4279683fe28a05a49c1a3e53d1 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Mon, 4 Mar 2019 15:19:21 +0100
Subject: JDK 11: Replace LogRecord.setMillis with setInstant.

- Suppress deprecation warnings locally instead of globally
  in controller-server.
---
 .../src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'jdisc_core/src')

diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
index 3338b631030..b3dbd8712c4 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
@@ -5,6 +5,7 @@ import org.junit.Test;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.ResourceBundle;
@@ -70,15 +71,13 @@ public class OsgiLogHandlerTestCase {
     }
 
     @Test
-    // TODO: Remove deprecation annotation and replace calls to LogRecord.setMillis() when we no longer have to support Java 8
-    @SuppressWarnings("deprecation")
     public void requireThatJdk14PropertiesAreAvailableThroughServiceReference() {
         MyLogService logService = new MyLogService();
 
         Logger log = newLogger(logService);
         LogRecord record = new LogRecord(Level.INFO, "message");
         record.setLoggerName("loggerName");
-        record.setMillis(69);
+        record.setInstant(Instant.ofEpochMilli(69));
         Object[] parameters = new Object[0];
         record.setParameters(parameters);
         ResourceBundle resouceBundle = new MyResourceBundle();
-- 
cgit v1.2.3