Add java 8 support in compile and test (#304)

* add java 8 support in compile and test Signed-off-by: Zhongnan Su <szhongna@amazon.com>
opensearch-project · Mar 10, 2022 · e753b07 · e753b07
1 parent 265e2a7
commit e753b07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -10,6 +10,7 @@ jobs:
     strategy:
       matrix:
         java:
+          - 8
           - 11
           - 14
     runs-on: ubuntu-latest

diff --git a/reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/settings/PluginSettings.kt b/reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/settings/PluginSettings.kt
@@ -15,7 +15,7 @@ import org.opensearch.common.settings.Settings
 import org.opensearch.reportsscheduler.ReportsSchedulerPlugin.Companion.LOG_PREFIX
 import org.opensearch.reportsscheduler.ReportsSchedulerPlugin.Companion.PLUGIN_NAME
 import java.io.IOException
-import java.nio.file.Path
+import java.nio.file.Paths
 
 /**
  * settings specific to reports scheduler Plugin.
@@ -93,9 +93,9 @@ internal object PluginSettings {
 
     init {
         var settings: Settings? = null
-        val configDirName = BootstrapInfo.getSystemProperties()?.get("es.path.conf")?.toString()
+        val configDirName = BootstrapInfo.getSystemProperties()?.get("opensearch.path.conf")?.toString()
         if (configDirName != null) {
-            val defaultSettingYmlFile = Path.of(configDirName, PLUGIN_NAME, "reports-scheduler.yml")
+            val defaultSettingYmlFile = Paths.get(configDirName, PLUGIN_NAME, "reports-scheduler.yml")
             try {
                 settings = Settings.builder().loadFromPath(defaultSettingYmlFile).build()
             } catch (exception: IOException) {

diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/integTest/PluginRestTestCase.kt b/reports-scheduler/src/test/kotlin/org/opensearch/integTest/PluginRestTestCase.kt
@@ -39,7 +39,7 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
-import java.nio.file.Path
+import java.nio.file.Paths
 import java.security.cert.X509Certificate
 import javax.management.MBeanServerInvocationHandler
 import javax.management.ObjectName
@@ -265,7 +265,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
                     false
                 )
                 proxy.getExecutionData(false)?.let {
-                    val path = Path.of("$jacocoBuildPath/integTest.exec")
+                    val path = Paths.get("$jacocoBuildPath/integTest.exec")
                     Files.write(path, it)
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ jobs: @@
         strategy:
           matrix:
             java:
+              - 8
               - 11
               - 14
         runs-on: ubuntu-latest
@@ Expand Down @@