From db0c9bebee4cbc587d4da0a624f671ffcf7a649f Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Fri, 27 Jul 2018 16:54:41 -0600
Subject: Make driver-core ready for Java 11 (#188)

- Remove code that accesed internal APIs which have been removed.
- Add dependencies to libraries which have become Java modules.
---
 src/main/scala/xyz/driver/core/app/DriverApp.scala |  3 +--
 src/main/scala/xyz/driver/core/stats.scala         | 20 ++++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala
index 9cb53af..2572d85 100644
--- a/src/main/scala/xyz/driver/core/app/DriverApp.scala
+++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala
@@ -255,8 +255,7 @@ class DriverApp(
               "freeSpace"   -> f.freeSpace.toJson,
               "totalSpace"  -> f.totalSpace.toJson,
               "usableSpace" -> f.usableSpace.toJson)
-          }.toJson,
-          "operatingSystem" -> SystemStats.operatingSystemStats.toJson
+          }.toJson
         ))
     }
   }
diff --git a/src/main/scala/xyz/driver/core/stats.scala b/src/main/scala/xyz/driver/core/stats.scala
index dbcf6e4..8e0d980 100644
--- a/src/main/scala/xyz/driver/core/stats.scala
+++ b/src/main/scala/xyz/driver/core/stats.scala
@@ -2,7 +2,6 @@ package xyz.driver.core
 
 import java.io.File
 import java.lang.management.ManagementFactory
-import java.lang.reflect.Modifier
 
 object stats {
 
@@ -41,18 +40,11 @@ object stats {
       }
     }
 
-    def operatingSystemStats: Map[String, String] = {
-      val operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean
-      operatingSystemMXBean.getClass.getDeclaredMethods
-        .map(method => { method.setAccessible(true); method })
-        .filter(method => method.getName.startsWith("get") && Modifier.isPublic(method.getModifiers))
-        .map { method =>
-          try {
-            method.getName -> String.valueOf(method.invoke(operatingSystemMXBean))
-          } catch {
-            case t: Throwable => method.getName -> t.getMessage
-        }
-      } toMap
-    }
+    @deprecated(
+      "OS stats accessed internal APIs which have been removed in new versions of Java. " +
+        "Refer to InfluxDB and Grafana instead for OS metrics.",
+      "1.11.9")
+    def operatingSystemStats: Map[String, String] = Map.empty
+
   }
 }
-- 
cgit v1.2.3