Changes in the way TNS_ASMIN logic is handled as TNS_ADMIN is resolved automatically by jdbc driver. So cli will only use the ORACLE_HOME resolution when TNS_ADMIN is not defined.

Removed `oraclepki` as pom dependency. It is now delivered together with jdbc as part of java-api 3.2.5.

Author: jgebal

pom.xml

@@ -14,9 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>17</maven.compiler.release>
 
-        <utplsql-java-api.version>3.2.4</utplsql-java-api.version>
-        <!-- Temporarly here - it needs to be moved to java-api. Keep in sync with the ojdbc version used by utplsql-java-api -->
-        <oraclepki.version>23.7.0.25.01</oraclepki.version>
+        <utplsql-java-api.version>3.2.5-SNAPSHOT</utplsql-java-api.version>
 
         <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <picocli.version>4.7.7</picocli.version>
@@ -75,12 +73,6 @@
             <artifactId>utplsql-java-api</artifactId>
             <version>${utplsql-java-api.version}</version>
         </dependency>
-        <!-- Temporarly here - it needs to be moved to java-api. Required by ojdbc to read Oracle Wallets (Secure External Password Store) -->
-        <dependency>
-            <groupId>com.oracle.database.security</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>${oraclepki.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

src/main/java/org/utplsql/cli/DataSourceProvider.java

@@ -13,17 +13,32 @@
  */
 public class DataSourceProvider {
 
+    private static final String TNS_ADMIN_PROPERTY = "oracle.net.tns_admin";
+
     static {
-        if (System.getProperty("oracle.net.tns_admin") == null) {
-            String tnsAdmin = System.getenv("TNS_ADMIN");
-            String oracleHome = System.getenv("ORACLE_HOME");
-            if (tnsAdmin != null && !tnsAdmin.isEmpty()) {
-                System.setProperty("oracle.net.tns_admin", tnsAdmin);
-            } else if (oracleHome != null) {
-                System.setProperty("oracle.net.tns_admin",
-                        String.join(File.separator, oracleHome, "NETWORK", "ADMIN"));
-            }
+        String tnsAdminFallback = getTnsAdminFallback(
+                System.getProperty(TNS_ADMIN_PROPERTY), System.getenv("TNS_ADMIN"), System.getenv("ORACLE_HOME"));
+        if (tnsAdminFallback != null) {
+            System.setProperty(TNS_ADMIN_PROPERTY, tnsAdminFallback);
+        }
+    }
+
+    /**
+     * The JDBC driver resolves tnsnames.ora / ojdbc.properties from the {@value TNS_ADMIN_PROPERTY} property
+     * or the TNS_ADMIN environment variable on its own, but it doesn't look into ORACLE_HOME.
+     * The property takes precedence over the environment variable, so it must not be set when TNS_ADMIN is.
+     *
+     * @return ORACLE_HOME/NETWORK/ADMIN when neither {@value TNS_ADMIN_PROPERTY} nor TNS_ADMIN is set, otherwise null
+     */
+    static String getTnsAdminFallback(String tnsAdminProperty, String tnsAdminEnv, String oracleHome) {
+        if (isEmpty(tnsAdminProperty) && isEmpty(tnsAdminEnv) && !isEmpty(oracleHome)) {
+            return String.join(File.separator, oracleHome, "NETWORK", "ADMIN");
         }
+        return null;
+    }
+
+    private static boolean isEmpty(String value) {
+        return value == null || value.isEmpty();
     }
 
     public static DataSource getDataSource(String connectString, int maxConnections) throws SQLException {

src/test/java/org/utplsql/cli/DataSourceProviderTest.java

@@ -0,0 +1,36 @@
+package org.utplsql.cli;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class DataSourceProviderTest {
+
+    private static final String ORACLE_HOME = "/opt/oracle";
+
+    @Test
+    void tnsAdminFallsBackToOracleHome() {
+        assertEquals(String.join(File.separator, ORACLE_HOME, "NETWORK", "ADMIN"),
+                DataSourceProvider.getTnsAdminFallback(null, null, ORACLE_HOME));
+    }
+
+    @Test
+    void tnsAdminEnvVariableIsLeftToJdbcDriver() {
+        // Setting the property would override the TNS_ADMIN environment variable in the JDBC driver
+        assertNull(DataSourceProvider.getTnsAdminFallback(null, "/my/tns_admin", ORACLE_HOME));
+    }
+
+    @Test
+    void tnsAdminPropertyIsNotOverridden() {
+        assertNull(DataSourceProvider.getTnsAdminFallback("/my/tns_admin", null, ORACLE_HOME));
+    }
+
+    @Test
+    void noFallbackWithoutOracleHome() {
+        assertNull(DataSourceProvider.getTnsAdminFallback(null, null, null));
+        assertNull(DataSourceProvider.getTnsAdminFallback("", "", ""));
+    }
+}