From 9b22e6c88920b4d06ff0a8a67153452f8fd1bd1b Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 04 Aug 2026 08:29:20 +0000
Subject: [PATCH] Fix CodeQL note-severity alerts: deprecated JDK calls and inefficient expressions (#823)

---
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index f3a968c..ad08625 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -1047,7 +1047,7 @@
           certificateNumber++;
           X509Certificate certif = (X509Certificate) keystore.getCertificate(alias);
           builder.addNumberedOption(INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_ALIAS.get(
-                                                                                alias, certif.getSubjectDN().getName()),
+                                                                                alias, certif.getSubjectX500Principal().getName()),
                                     MenuResult.success(alias));
         }
       }
@@ -1429,12 +1429,12 @@
       }
 
       // Certificate DN
-      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN.get(cert.getSubjectDN()));
+      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN.get(cert.getSubjectX500Principal()));
       // certificate validity
       app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY.get(
           cert.getNotBefore(), cert.getNotAfter()));
       // certificate Issuer
-      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER.get(cert.getIssuerDN()));
+      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER.get(cert.getIssuerX500Principal()));
     }
   }
 
@@ -1487,7 +1487,7 @@
     // User choice if to add the certificate to the trust store for the current session or permanently.
     for (final X509Certificate cert : chain)
     {
-      state.truststore.setCertificateEntry(cert.getSubjectDN().getName(), cert);
+      state.truststore.setCertificateEntry(cert.getSubjectX500Principal().getName(), cert);
     }
 
     // Update the trust manager
@@ -1524,7 +1524,7 @@
 
     for (final X509Certificate cert : chain)
     {
-      keyStore.setCertificateEntry(cert.getSubjectDN().getName(), cert);
+      keyStore.setCertificateEntry(cert.getSubjectX500Principal().getName(), cert);
     }
 
     try (final FileOutputStream trustStoreOutputFile = new FileOutputStream(trustStorePath))

--
Gitblit v1.10.0