noticket: FIX: UuidFieldValue.getRaw() should return the underlying java.util.UUID

nvamelichev · nvamelichev · commit c701438d375e · 2025-07-14T20:15:50.000+02:00
...and **not** the UUID's `java.lang.String` representation, which is used
for proper sort order (`UuidFieldValue.getComparableByType()`).
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/BooleanFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/BooleanFieldValue.java
@@ -1,5 +1,6 @@
 package tech.ydb.yoj.databind.expression.values;
 
+import lombok.NonNull;
 import tech.ydb.yoj.databind.FieldValueType;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.BooleanFieldExpected;
 
@@ -27,6 +28,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT
                 : invalidFieldValue(BooleanFieldExpected::new, p -> format("Specified a boolean value for non-boolean field \"%s\"", p));
     }
 
+    @NonNull
     @Override
     public String toString() {
         return Boolean.toString(bool);
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/ByteArrayFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/ByteArrayFieldValue.java
@@ -30,6 +30,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT
                 : invalidFieldValue(ByteArrayFieldExpected::new, p -> format("Specified a ByteArray value for non-ByteArray field \"%s\"", p));
     }
 
+    @NonNull
     @Override
     public String toString() {
         return byteArray.toString();
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/FieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/FieldValue.java
@@ -32,6 +32,16 @@ public sealed interface FieldValue extends tech.ydb.yoj.databind.expression.Fiel
 
     ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueType);
 
+    /**
+     * Provides a human-readable representation of this {@code FieldValue}, potentially indicating
+     * this value's type (e.g., value will be in {@code "double quotes"} for {@code StringFieldValue}).
+     *
+     * @return human-readable representation of field value
+     */
+    @NonNull
+    @Override
+    String toString();
+
     @Override
     default Object getRaw(@NonNull JavaField field) {
         field = field.isFlat() ? field.toFlatField() : field;
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/IntegerFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/IntegerFieldValue.java
@@ -1,5 +1,6 @@
 package tech.ydb.yoj.databind.expression.values;
 
+import lombok.NonNull;
 import tech.ydb.yoj.databind.FieldValueType;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.IntegerBadTimestamp;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.IntegerFieldExpected;
@@ -34,6 +35,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT
         };
     }
 
+    @NonNull
     @Override
     public String toString() {
         return Long.toString(num);
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/RealFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/RealFieldValue.java
@@ -1,5 +1,6 @@
 package tech.ydb.yoj.databind.expression.values;
 
+import lombok.NonNull;
 import tech.ydb.yoj.databind.FieldValueType;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.IntegerToRealInexact;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.RealFieldExpected;
@@ -37,6 +38,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT
         };
     }
 
+    @NonNull
     @Override
     public String toString() {
         return Double.toString(real);
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/StringFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/StringFieldValue.java
@@ -68,6 +68,7 @@ private static boolean enumHasConstant(@NonNull Class<?> enumClass, @NonNull Str
         return stream(enumClass.getEnumConstants()).anyMatch(c -> enumConstant.equals(((Enum<?>) c).name()));
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "\"" + str + "\"";
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/TimestampFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/TimestampFieldValue.java
@@ -43,6 +43,7 @@ private boolean isValidInteger() {
         }
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "#" + timestamp + "#";
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/TupleFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/TupleFieldValue.java
@@ -57,6 +57,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT
                 .orElse(ValidationResult.validFieldValue());
     }
 
+    @NonNull
     @Override
     public String toString() {
         return tuple.toString();
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/expression/values/UuidFieldValue.java b/databind/src/main/java/tech/ydb/yoj/databind/expression/values/UuidFieldValue.java
@@ -3,6 +3,7 @@
 import lombok.NonNull;
 import tech.ydb.yoj.databind.FieldValueType;
 import tech.ydb.yoj.databind.expression.IllegalExpressionException.FieldTypeError.UuidFieldExpected;
+import tech.ydb.yoj.databind.schema.Schema;
 
 import java.lang.reflect.Type;
 import java.util.Optional;
@@ -21,15 +22,26 @@ public Optional<Comparable<?>> getComparableByType(Type fieldType, FieldValueTyp
         };
     }
 
+    @Override
+    public Object getRaw(@NonNull Schema.JavaField field) {
+        field = field.isFlat() ? field.toFlatField() : field;
+        if (field.getValueType() == FieldValueType.UUID) {
+            return uuid;
+        }
+
+        return FieldValue.super.getRaw(field);
+    }
+
     @Override
     public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueType) {
         return valueType == FieldValueType.UUID || valueType == FieldValueType.STRING
                 ? validFieldValue() // All UUIDs are representable as both UUID and String
                 : invalidFieldValue(UuidFieldExpected::new, p -> format("Specified an UUID value for non-UUID/non-String field \"%s\"", p));
     }
 
+    @NonNull
     @Override
     public String toString() {
-        return uuid.toString();
+        return "{" + uuid + "}";
     }
 }
diff --git a/repository-test/src/main/java/tech/ydb/yoj/repository/test/ListingTest.java b/repository-test/src/main/java/tech/ydb/yoj/repository/test/ListingTest.java
@@ -19,8 +19,10 @@
 import tech.ydb.yoj.repository.test.sample.model.Project;
 import tech.ydb.yoj.repository.test.sample.model.TypeFreak;
 import tech.ydb.yoj.repository.test.sample.model.TypeFreak.Status;
+import tech.ydb.yoj.repository.test.sample.model.annotations.UniqueEntityNative;
 
 import java.time.Instant;
+import java.util.UUID;
 
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.util.Collections.emptyList;
@@ -127,6 +129,38 @@ public void complexIdFullScan() {
         });
     }
 
+    @Test
+    public void uuid() {
+        UUID uuid1 = UUID.fromString("5bedcf4a-d2fb-4ff1-817f-98589adff554");
+        UUID uuid2 = UUID.fromString("5bedcf4a-d2fb-4ff1-817f-98589adff555");
+        UUID uuid3 = UUID.fromString("5bedcf4a-d2fb-4ff1-817f-98589adff556");
+        UUID uuid4 = UUID.fromString("5bedcf4a-d2fb-4ff1-817f-98589adff557");
+
+        UniqueEntityNative c1 = new UniqueEntityNative(new UniqueEntityNative.Id(uuid1), "c1");
+        UniqueEntityNative c2 = new UniqueEntityNative(new UniqueEntityNative.Id(uuid2), "c2");
+        UniqueEntityNative c3 = new UniqueEntityNative(new UniqueEntityNative.Id(uuid3), "c3");
+        UniqueEntityNative c4 = new UniqueEntityNative(new UniqueEntityNative.Id(uuid4), "c4");
+        db.tx(() -> db.table(UniqueEntityNative.class).insert(c1, c2, c3, c4));
+
+        db.tx(() -> {
+            ListResult<UniqueEntityNative> page1 = db.table(UniqueEntityNative.class).list(
+                    ListRequest.builder(UniqueEntityNative.class)
+                            .pageSize(3)
+                            .build()
+            );
+            assertThat(page1).containsExactly(c1, c2, c3);
+
+            ListResult<UniqueEntityNative> page2 = db.table(UniqueEntityNative.class).list(
+                    ListRequest.builder(UniqueEntityNative.class)
+                            .pageSize(3)
+                            .filter(fb -> fb.where("id").gt(c3.id()))
+                            .build()
+            );
+            assertThat(page2).containsExactly(c4);
+            assertThat(page2.isLastPage()).isTrue();
+        });
+    }
+
     @Test
     public void failOnZeroPageSize() {
         db.tx(() -> {
@@ -285,7 +319,7 @@ public void complexIdIn() {
             ListResult<Complex> page = listComplex(ListRequest.builder(Complex.class)
                     .pageSize(100)
                     .filter(fb -> fb
-                            .where("id.a").in(999_999,999_000)
+                            .where("id.a").in(999_999, 999_000)
                             .and("id.b").in(15L, 13L)
                             .and("id.c").in("AAA", "CCC")
                             .and("id.d").in(Complex.Status.OK, Complex.Status.FAIL)
@@ -311,7 +345,7 @@ public void complexUnixTimestampRelational() {
         db.tx(() -> {
             ListResult<Complex> page = listComplex(ListRequest.builder(Complex.class)
                     .pageSize(100)
-                    .filter(fb -> fb.where("id.a").in(999_999,999_000).and("id.b").gte(now).and("id.b").lt(nowPlus2))
+                    .filter(fb -> fb.where("id.a").in(999_999, 999_000).and("id.b").gte(now).and("id.b").lt(nowPlus2))
                     .orderBy(ob -> ob.orderBy("id.a").descending())
                     .build());
             Assertions.assertThat(page).containsExactlyInAnyOrder(c1, c2);
@@ -333,7 +367,7 @@ public void complexUnixTimestampIn() {
         db.tx(() -> {
             ListResult<Complex> page = listComplex(ListRequest.builder(Complex.class)
                     .pageSize(100)
-                    .filter(fb -> fb.where("id.a").in(999_999,999_000).and("id.b").in(now, nowPlus2))
+                    .filter(fb -> fb.where("id.a").in(999_999, 999_000).and("id.b").in(now, nowPlus2))
                     .orderBy(ob -> ob.orderBy("id.a").descending())
                     .build());
             Assertions.assertThat(page).containsExactly(c1, c3);

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT`
`30`	`30`	`: invalidFieldValue(ByteArrayFieldExpected::new, p -> format("Specified a ByteArray value for non-ByteArray field \"%s\"", p));`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ @NonNull`
`33`	`34`	`@Override`
`34`	`35`	`public String toString() {`
`35`	`36`	`return byteArray.toString();`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ private static boolean enumHasConstant(@NonNull Class<?> enumClass, @NonNull Str`
`68`	`68`	`return stream(enumClass.getEnumConstants()).anyMatch(c -> enumConstant.equals(((Enum<?>) c).name()));`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ @NonNull`
`71`	`72`	`@Override`
`72`	`73`	`public String toString() {`
`73`	`74`	`return "\"" + str + "\"";`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ private boolean isValidInteger() {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ @NonNull`
`46`	`47`	`@Override`
`47`	`48`	`public String toString() {`
`48`	`49`	`return "#" + timestamp + "#";`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public ValidationResult isValidValueOfType(Type fieldType, FieldValueType valueT`
`57`	`57`	`.orElse(ValidationResult.validFieldValue());`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ @NonNull`
`60`	`61`	`@Override`
`61`	`62`	`public String toString() {`
`62`	`63`	`return tuple.toString();`