use java.util.UUID

Author: rahul2393

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/KeyRecipe.java

@@ -31,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
@@ -559,65 +560,20 @@ private static void validateUuid(String uuid) {
 
   private static long[] parseUuid(String uuid) {
     String originalUuid = uuid;
-
-    // Handle optional braces
     if (uuid.startsWith("{")) {
       if (!uuid.endsWith("}")) {
         throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
       }
       uuid = uuid.substring(1, uuid.length() - 1);
-    }
-
-    // Minimum 36 characters required (standard UUID format: 8-4-4-4-12)
-    if (uuid.length() < 36) {
-      throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
-    }
-
-    // Check for leading hyphen
-    if (uuid.startsWith("-")) {
+    } else if (uuid.endsWith("}")) {
       throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
     }
-
-    // Parse 32 hex digits (ignoring hyphens in between)
-    long high = 0;
-    long low = 0;
-    int hexCount = 0;
-
-    for (int i = 0; i < uuid.length(); i++) {
-      char c = uuid.charAt(i);
-      if (c == '-') {
-        continue; // Skip hyphens
-      }
-      int digit = hexDigit(c);
-      if (digit < 0) {
-        throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
-      }
-      if (hexCount < 16) {
-        high = (high << 4) | digit;
-      } else {
-        low = (low << 4) | digit;
-      }
-      hexCount++;
-    }
-
-    if (hexCount != 32) {
-      throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
-    }
-
-    // After parsing, verify there are no trailing characters
-    // (uuid must be exactly consumed)
-    if (uuid.length() > 36) {
-      throw new IllegalArgumentException("Invalid UUID string: " + originalUuid);
+    try {
+      UUID parsed = UUID.fromString(uuid);
+      return new long[] {parsed.getMostSignificantBits(), parsed.getLeastSignificantBits()};
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("Invalid UUID string: " + originalUuid, e);
     }
-
-    return new long[] {high, low};
-  }
-
-  private static int hexDigit(char c) {
-    if (c >= '0' && c <= '9') return c - '0';
-    if (c >= 'a' && c <= 'f') return 10 + (c - 'a');
-    if (c >= 'A' && c <= 'F') return 10 + (c - 'A');
-    return -1;
   }
 
   private TargetRange encodeKeyInternal(