Revert "Gjoranv/java9 prep 05"

3 files changed, 21 insertions, 28 deletions

diff --git a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
index db2ed6b0b83..619643a32b6 100644
--- a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
+++ b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
@@ -5,7 +5,6 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.plugin.Plugin;
 import com.yahoo.plugin.SystemPropertyConfig;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Logger;
 
 /**
@@ -21,8 +20,8 @@ public abstract class AbstractPluginLoader implements PluginLoader {
     protected void loadFromClass(Class<? extends Plugin> pluginClass) {
         Plugin plugin;
         try {
-            plugin = pluginClass.getDeclaredConstructor().newInstance();
-        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            plugin = (Plugin) pluginClass.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
             log.log(LogLevel.ERROR, pluginClass.getName() + ": load failed: " + e);
             throw new RuntimeException(e);
         }
diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java
index 36b1c3e31a0..f87c66ecd92 100644
--- a/logserver/src/main/java/com/yahoo/logserver/Server.java
+++ b/logserver/src/main/java/com/yahoo/logserver/Server.java
@@ -50,6 +50,9 @@ public class Server implements Runnable {
 
     private final boolean isInitialized;
 
+    /**
+     * Server constructor
+     */
     private Server() {
         dispatch = new LogDispatcher();
         dispatch.setBatchedMode(true);
@@ -72,7 +75,7 @@ public class Server implements Runnable {
         return ht;
     }
 
-    private void registerPluginLoader(PluginLoader loader) {
+    public void registerPluginLoader(PluginLoader loader) {
         loader.loadPlugins();
     }
 
@@ -87,7 +90,7 @@ public class Server implements Runnable {
         unregisterLogHandler(lh, threadName);
     }
 
-    private void unregisterLogHandler(LogHandler lh, String threadName) {
+    public void unregisterLogHandler(LogHandler lh, String threadName) {
         HandlerThread ht = getHandlerThread(threadName);
         ht.unregisterHandler(lh);
         threadNameForHandler.remove(lh);
diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java
index 434131878c0..2e0b3d67c49 100644
--- a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java
+++ b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java
@@ -83,29 +83,20 @@ public class LogMetricsTestCase {
         assertEquals(levelCount.entrySet().size(), 5);
         for (Map.Entry<String, Long> entry : levelCount.entrySet()) {
             String key = entry.getKey();
-            switch (key) {
-                case "config":
-                    assertEquals(entry.getValue(), Long.valueOf(1));
-                    break;
-                case "info":
-                    assertEquals(entry.getValue(), Long.valueOf(4));
-                    break;
-                case "warning":
-                    assertEquals(entry.getValue(), Long.valueOf(1));
-                    break;
-                case "severe":
-                    assertEquals(entry.getValue(), Long.valueOf(0));
-                    break;
-                case "error":
-                    assertEquals(entry.getValue(), Long.valueOf(1));
-                    break;
-                case "fatal":
-                    assertEquals(entry.getValue(), Long.valueOf(1));
-                    break;
-                case "debug":
-                    assertEquals(entry.getValue(), Long.valueOf(0));  // always 0
-
-                    break;
+            if (key.equals("config")) {
+                assertEquals(entry.getValue(), new Long(1));
+            } else if (key.equals("info")) {
+                assertEquals(entry.getValue(), new Long(4));
+            } else if (key.equals("warning")) {
+                assertEquals(entry.getValue(), new Long(1));
+            } else if (key.equals("severe")) {
+                assertEquals(entry.getValue(), new Long(0));
+            } else if (key.equals("error")) {
+                assertEquals(entry.getValue(), new Long(1));
+            } else if (key.equals("fatal")) {
+                assertEquals(entry.getValue(), new Long(1));
+            } else if (key.equals("debug")) {
+                assertEquals(entry.getValue(), new Long(0));  // always 0
             }
         }
         a.close();