Test pre commit

.gitignore

@@ -33,3 +33,4 @@ ENV/
 
 # SNYK
 .dccache
+neqsim/neqsimpython.py.orig

neqsim/__init__.py

@@ -27,13 +27,14 @@ def has_tabulate():
 
 def setDatabase(connectionString):
     jNeqSim.util.database.NeqSimDataBase.setConnectionString(connectionString)
+
     jNeqSim.util.database.NeqSimDataBase.setCreateTemporaryTables(True)
 
 
 def save_xml(javaobject, filename):
-    xstream = jpype.JPackage("com.thoughtworks.xstream")
+    xstream =         jpype.JPackage("com.thoughtworks.xstream")
     streamer = xstream.XStream()
-    xml = streamer.toXML(javaobject)
+    xml =              streamer.toXML(javaobject)
     print(xml, file=open(filename, "w"))
     return xml
 

neqsim/neqsimpython.py

@@ -1,12 +1,19 @@
 import jpype
 
 if not jpype.isJVMStarted():
-    jpype.addClassPath("./lib/*")
+    # Could call jpype.getDefaultJVMPath() to get default JVM,
+    # but not able to get the orders to force loading a specific JVM
     jpype.startJVM(convertStrings=False)
-    jvmVersion = jpype.getJVMVersion()[0]
-    if jvmVersion <= 8:
+    jvm_version = jpype.getJVMVersion()[0]
+    if jvm_version == 1 and jpype.getJVMVersion()[1] >= 8:
+        jpype.addClassPath("./lib/java8/*")
+    elif jvm_version >= 21:
+        jpype.addClassPath("./lib/java21/*")
+    elif jvm_version >= 11:
+        jpype.addClassPath("./lib/java11/*")
+    else:
         print(
-            "Your version of Java is not supported. Please upgrade to Java version 11 or higher."
+            "Your version of Java is not supported. Please upgrade to Java version 8 or higher."
         )
         print("See: https://github.com/equinor/neqsimpython#prerequisites")