feat: Componentize and support java 8, Add named configurations (#6221)

Componentize packages and support java 8 for the Enterprise product #6219 and support named Configurations #6220
deephaven · Oct 31, 2024 · 7c999c3 · 7c999c3
1 parent 56e3cdf
commit 7c999c3
Show file tree

Hide file tree

Showing 68 changed files with 645 additions and 277 deletions.
diff --git a/Base/gradle.properties b/Base/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/.../java/io/deephaven/stats/util/OSUtil.java → ...c/main/java/io/deephaven/base/OSUtil.java b/.../java/io/deephaven/stats/util/OSUtil.java → ...c/main/java/io/deephaven/base/OSUtil.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.stats.util;
+package io.deephaven.base;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/Configuration/build.gradle b/Configuration/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api libs.trove
 
     implementation project(':Base')
-    implementation project(':DataStructures')
     implementation project(':IO')
     implementation project(':log-factory')
     implementation libs.commons.lang3

diff --git a/Configuration/gradle.properties b/Configuration/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java b/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java
@@ -4,6 +4,7 @@
 package io.deephaven.configuration;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 /**
@@ -30,9 +31,8 @@ public final class CacheDir {
      * @return the cache dir
      */
     public static Path get() {
-        return viaProperty()
-                .or(CacheDir::viaEnvVar)
-                .map(Path::of)
+        return getOptional()
+                .map(Paths::get)
                 .orElseGet(CacheDir::viaTmpDir);
     }
 
@@ -45,12 +45,20 @@ public static Path get() {
      * @return the cache directory
      */
     public static Path getOrSet(String defaultValue) {
-        final String existing = viaProperty().or(CacheDir::viaEnvVar).orElse(null);
+        final String existing = getOptional().orElse(null);
         if (existing != null) {
-            return Path.of(existing);
+            return Paths.get(existing);
         }
         System.setProperty(PROPERTY, defaultValue);
-        return Path.of(defaultValue);
+        return Paths.get(defaultValue);
+    }
+
+    private static Optional<String> getOptional() {
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaEnvVar();
+        }
+        return optional;
     }
 
     private static Optional<String> viaProperty() {
@@ -62,6 +70,6 @@ private static Optional<String> viaEnvVar() {
     }
 
     private static Path viaTmpDir() {
-        return Path.of(System.getProperty(JAVA_IO_TMPDIR), "deephaven", "cache");
+        return Paths.get(System.getProperty(JAVA_IO_TMPDIR), "deephaven", "cache");
     }
 }
diff --git a/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java b/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java
@@ -5,6 +5,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 public final class ConfigDir {
@@ -21,9 +22,7 @@ public final class ConfigDir {
      * @return the config directory
      */
     public static Optional<Path> get() {
-        return viaProperty()
-                .or(ConfigDir::viaEnvVar)
-                .map(Path::of);
+        return getOptional().map(Paths::get);
     }
 
     /**
@@ -35,14 +34,12 @@ public static Optional<Path> get() {
      * @return the config directory
      */
     public static Path getOrSet(String defaultValue) {
-        final String existing = viaProperty()
-                .or(ConfigDir::viaEnvVar)
-                .orElse(null);
+        final String existing = getOptional().orElse(null);
         if (existing != null) {
-            return Path.of(existing);
+            return Paths.get(existing);
         }
         System.setProperty(PROPERTY, defaultValue);
-        return Path.of(defaultValue);
+        return Paths.get(defaultValue);
     }
 
     /**
@@ -53,10 +50,11 @@ public static Path getOrSet(String defaultValue) {
      * @return the configuration file
      */
     public static String configurationFile() {
-        return Optional
-                .ofNullable(System.getProperty(ROOT_FILE_PROP))
-                .or(ConfigDir::configDirectoryFileIfExists)
-                .orElse(DEFAULT_CONFIGURATION_FILE);
+        Optional<String> optional = Optional.ofNullable(System.getProperty(ROOT_FILE_PROP));
+        if (!optional.isPresent()) {
+            optional = configDirectoryFileIfExists();
+        }
+        return optional.orElse(DEFAULT_CONFIGURATION_FILE);
     }
 
     private static Optional<String> configDirectoryFileIfExists() {
@@ -66,6 +64,14 @@ private static Optional<String> configDirectoryFileIfExists() {
                 .map(Path::toString);
     }
 
+    private static Optional<String> getOptional() {
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaEnvVar();
+        }
+        return optional;
+    }
+
     private static Path defaultFileName(Path p) {
         return p.resolve(DEFAULT_CONFIG_FILE_NAME);
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		io.deephaven.project.ProjectType=JAVA_PUBLIC
		languageLevel=8