Merge pull request #17 from m-dzianishchyts/deprecated-env-vars

Deprecate old env vars

Author: stariy95

src/main/java/org/dflib/jjava/JJava.java

@@ -39,11 +39,41 @@
 import java.util.logging.Level;
 
 public class JJava {
-    public static final String COMPILER_OPTS_KEY = "JJAVA_COMPILER_OPTS";
-    public static final String TIMEOUT_DURATION_KEY = "JJAVA_TIMEOUT";
-    public static final String CLASSPATH_KEY = "JJAVA_CLASSPATH";
-    public static final String STARTUP_SCRIPTS_KEY = "JJAVA_STARTUP_SCRIPTS_PATH";
-    public static final String STARTUP_SCRIPT_KEY = "JJAVA_STARTUP_SCRIPT";
+    /**
+     * @see #JJ_COMPILER_OPTS_KEY
+     * */
+    @Deprecated(since = "1.0")
+    public static final String COMPILER_OPTS_KEY = "IJAVA_COMPILER_OPTS";
+
+    /**
+     * @see #JJ_TIMEOUT_DURATION_KEY
+     * */
+    @Deprecated(since = "1.0")
+    public static final String TIMEOUT_DURATION_KEY = "IJAVA_TIMEOUT";
+
+    /**
+     * @see #JJ_CLASSPATH_KEY
+     * */
+    @Deprecated(since = "1.0")
+    public static final String CLASSPATH_KEY = "IJAVA_CLASSPATH";
+
+    /**
+     * @see #JJ_STARTUP_SCRIPTS_KEY
+     * */
+    @Deprecated(since = "1.0")
+    public static final String STARTUP_SCRIPTS_KEY = "IJAVA_STARTUP_SCRIPTS_PATH";
+
+    /**
+     * @see #JJ_STARTUP_SCRIPT_KEY
+     * */
+    @Deprecated(since = "1.0")
+    public static final String STARTUP_SCRIPT_KEY = "IJAVA_STARTUP_SCRIPT";
+
+    public static final String JJ_COMPILER_OPTS_KEY = "JJAVA_COMPILER_OPTS";
+    public static final String JJ_TIMEOUT_DURATION_KEY = "JJAVA_TIMEOUT";
+    public static final String JJ_CLASSPATH_KEY = "JJAVA_CLASSPATH";
+    public static final String JJ_STARTUP_SCRIPTS_KEY = "JJAVA_STARTUP_SCRIPTS_PATH";
+    public static final String JJ_STARTUP_SCRIPT_KEY = "JJAVA_STARTUP_SCRIPT";
 
     public static final String DEFAULT_SHELL_INIT_RESOURCE_PATH = "jjava-jshell-init.jshell";
 

src/main/java/org/dflib/jjava/JavaKernel.java

@@ -85,11 +85,16 @@ public static String maybeCompleteCodeSignifier() {
     public JavaKernel() {
         this.evaluator = new CodeEvaluatorBuilder()
                 .addClasspathFromString(System.getenv(JJava.CLASSPATH_KEY))
+                .addClasspathFromString(System.getenv(JJava.JJ_CLASSPATH_KEY))
                 .compilerOptsFromString(System.getenv(JJava.COMPILER_OPTS_KEY))
+                .compilerOptsFromString(System.getenv(JJava.JJ_COMPILER_OPTS_KEY))
                 .startupScript(JJava.resource(JJava.DEFAULT_SHELL_INIT_RESOURCE_PATH))
                 .startupScriptFiles(System.getenv(JJava.STARTUP_SCRIPTS_KEY))
+                .startupScriptFiles(System.getenv(JJava.JJ_STARTUP_SCRIPTS_KEY))
                 .startupScript(System.getenv(JJava.STARTUP_SCRIPT_KEY))
+                .startupScript(System.getenv(JJava.JJ_STARTUP_SCRIPT_KEY))
                 .timeoutFromString(System.getenv(JJava.TIMEOUT_DURATION_KEY))
+                .timeoutFromString(System.getenv(JJava.JJ_TIMEOUT_DURATION_KEY))
                 .sysStdout()
                 .sysStderr()
                 .sysStdin()