Return java.util.UUID

Author: gene-db

parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java

@@ -131,10 +131,7 @@ public byte[] getBinary() {
    * @return the UUID value
    */
   public UUID getUUID() {
-    byte[] uuidBytes = VariantUtil.getUUID(value, pos);
-    long msb = ByteBuffer.wrap(uuidBytes, 0, 8).order(ByteOrder.BIG_ENDIAN).getLong();
-    long lsb = ByteBuffer.wrap(uuidBytes, 8, 8).order(ByteOrder.BIG_ENDIAN).getLong();
-    return new UUID(msb, lsb);
+    return VariantUtil.getUUID(value, pos);
   }
 
   /**
@@ -540,8 +537,7 @@ private static void toJsonImpl(
         }
         break;
       case UUID:
-        ByteBuffer bb = ByteBuffer.wrap(VariantUtil.getUUID(value, pos)).order(ByteOrder.BIG_ENDIAN);
-        gen.writeString(new java.util.UUID(bb.getLong(), bb.getLong()).toString());
+        gen.writeString(VariantUtil.getUUID(value, pos).toString());
         break;
       default:
         throw new IllegalArgumentException("Unsupported type: " + VariantUtil.getType(value, pos));

parquet-variant/src/main/java/org/apache/parquet/variant/VariantUtil.java

@@ -18,6 +18,8 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 
 /**
@@ -594,14 +596,15 @@ public static String getString(byte[] value, int pos) {
     throw unexpectedType(Type.STRING);
   }
 
-  public static byte[] getUUID(byte[] value, int pos) {
+  public static java.util.UUID getUUID(byte[] value, int pos) {
     checkIndex(pos, value.length);
     int basicType = value[pos] & BASIC_TYPE_MASK;
     int typeInfo = (value[pos] >> BASIC_TYPE_BITS) & PRIMITIVE_TYPE_MASK;
     if (basicType != PRIMITIVE || typeInfo != UUID) throw unexpectedType(Type.UUID);
     int start = pos + 1;
     checkIndex(start + UUID_SIZE - 1, value.length);
-    return Arrays.copyOfRange(value, start, start + UUID_SIZE);
+    ByteBuffer bb = ByteBuffer.wrap(value, start, UUID_SIZE).order(ByteOrder.BIG_ENDIAN);
+    return new java.util.UUID(bb.getLong(), bb.getLong());
   }
 
   /**