From 854ebedcc6eda12f31915980560011da343bae9c Mon Sep 17 00:00:00 2001
From: Mouhsin Elmajdouby <mouhsin.e.elmajdouby@oracle.com>
Date: Wed, 11 Dec 2024 12:24:49 +0100
Subject: [PATCH] Optimize Wallet expiration date handling

---
 .../oracle/jdbc/provider/util/Wallet.java     | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/Wallet.java b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/Wallet.java
index bb2d6b34..4744994c 100644
--- a/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/Wallet.java
+++ b/ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/Wallet.java
@@ -112,6 +112,18 @@ public final class Wallet {
    */
   private final SSLContext sslContext;
 
+  /**
+   * A static DateTimeFormatter used to parse expiration dates in the README.
+   */
+  private static final DateTimeFormatter EXPIRATION_DATE_FORMATTER =
+    new DateTimeFormatterBuilder()
+      .appendPattern("yyyy-MM-dd HH:mm:ss")
+      .optionalStart()
+      .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
+      .optionalEnd()
+      .appendPattern("X") // Accept 'Z' as offset
+      .toFormatter(Locale.ENGLISH);
+
   private Wallet(TNSNames tnsNames, SSLContext sslContext, OffsetDateTime expirationDate) {
     this.tnsNames = tnsNames;
     this.sslContext = sslContext;
@@ -270,10 +282,6 @@ private static IllegalStateException missingFile(String fileName) {
    */
   private static String findExpirationDateInStream(InputStream inputStream)
     throws IOException {
-
-    if (inputStream == null) {
-      return null;
-    }
     BufferedReader reader = new BufferedReader(
             new InputStreamReader(inputStream, UTF_8));
     String line;
@@ -299,23 +307,30 @@ private static String findExpirationDateInStream(InputStream inputStream)
    */
   public static OffsetDateTime parseExpirationDateFromReadme(InputStream inputStream)
           throws IOException {
-      String expiryDateString = findExpirationDateInStream(inputStream);
-      if (expiryDateString != null) {
-        try {
-          DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-            .appendPattern("yyyy-MM-dd HH:mm:ss")
-            .optionalStart()
-            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
-            .optionalEnd()
-            .appendPattern("X") // Accept 'Z' as offset
-            .toFormatter(Locale.ENGLISH);
-
-          return OffsetDateTime.parse(expiryDateString, formatter);
-        } catch (DateTimeParseException e) {
-          return null;
-        }
-      }
-    return null;
+    if (inputStream == null) {
+      return null;
+    }
+    String expiryDateString = findExpirationDateInStream(inputStream);
+    if (expiryDateString == null) {
+      return null;
+    }
+    return parseOffsetDateTime(expiryDateString);
   }
 
+  /**
+   * Parses a date-time string into an OffsetDateTime.
+   * The method uses the predefined {@code EXPIRATION_DATE_FORMATTER} to parse
+   * the given string. If parsing fails due to an invalid format or other reasons,
+   * the method returns {@code null}.
+   *
+   * @param dateTimeString The date-time string to parse.
+   * @return The parsed OffsetDateTime, or null if parsing fails.
+   */
+  private static OffsetDateTime parseOffsetDateTime(String dateTimeString) {
+    try {
+      return OffsetDateTime.parse(dateTimeString, EXPIRATION_DATE_FORMATTER);
+    } catch (DateTimeParseException e) {
+      return null;
+    }
+  }
 }