Revert "Revert "Gjoranv/java9 prep 05""

4 files changed, 27 insertions, 10 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
index 8c10e045759..ef2074b7703 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java
@@ -2,14 +2,27 @@
 package com.yahoo.jdisc.application;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.inject.*;
+import com.google.inject.Binding;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Module;
 import com.google.inject.spi.DefaultElementVisitor;
 import com.google.inject.spi.Element;
 import com.google.inject.spi.Elements;
 import com.yahoo.jdisc.Container;
 import org.osgi.framework.Bundle;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 /**
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java
index 3f89ba04aa5..04be3c1e3d4 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java
@@ -19,6 +19,7 @@ public final class ContentInputStream extends UnsafeContentInputStream {
     }
 
     @Override
+    @SuppressWarnings("deprecation")  // finalize() is deprecated from Java 9
     public void finalize() throws Throwable {
         try {
             close();
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
index e8fb53892f0..965a132cd92 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
@@ -1,22 +1,25 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.core;
 
-import com.google.inject.*;
+import com.google.inject.Binding;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
 import com.yahoo.jdisc.application.ContainerActivator;
 import com.yahoo.jdisc.application.ContainerBuilder;
 import com.yahoo.jdisc.application.OsgiFramework;
 import com.yahoo.jdisc.service.CurrentContainer;
 import com.yahoo.jdisc.test.NonWorkingOsgiFramework;
+import org.junit.Test;
 
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ThreadFactory;
 
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
@@ -37,8 +40,7 @@ public class ApplicationEnvironmentModuleTestCase {
             expected.add(entry.getKey().getTypeLiteral().getRawType());
         }
 
-        ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(),
-                                                         Collections.<Module>emptyList());
+        ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), emptyList());
         injector = Guice.createInjector(new ApplicationEnvironmentModule(loader));
         for (Map.Entry<Key<?>, Binding<?>> entry : injector.getBindings().entrySet()) {
             assertNotNull(expected.remove(entry.getKey().getTypeLiteral().getRawType()));
@@ -48,8 +50,7 @@ public class ApplicationEnvironmentModuleTestCase {
 
     @Test
     public void requireThatContainerBuilderCanBeInjected() {
-        ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(),
-                                                         Collections.<Module>emptyList());
+        ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), emptyList());
         assertNotNull(new ApplicationEnvironmentModule(loader).containerBuilder());
         assertNotNull(Guice.createInjector(new ApplicationEnvironmentModule(loader))
                            .getInstance(ContainerBuilder.class));
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 a5897bea124..7dca8c45d0b 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
@@ -70,6 +70,8 @@ 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();