noticket: Move EntitySchema ID field validation to after the entity's JavaFields have been properly reflected

Author: nvamelichev

repository/src/main/java/tech/ydb/yoj/repository/db/EntityIdSchema.java

@@ -144,7 +144,7 @@ public static <T extends Entity<T>, ID extends Entity.Id<T>> EntityIdSchema<ID>
         return entitySchema.getRegistry().getOrCreate(EntityIdSchema.class, (k, r) -> new EntityIdSchema<>(entitySchema), key);
     }
 
-    static Class<?> resolveEntityType(Class<?> idType) {
+    static Class<?> resolveEntityType(Type idType) {
         return TypeToken.of(idType).resolveType(ENTITY_TYPE_PARAMETER).getRawType();
     }
 

repository/src/main/java/tech/ydb/yoj/repository/db/EntitySchema.java

@@ -47,6 +47,8 @@ public static <T extends Entity<T>> EntitySchema<T> of(SchemaRegistry registry,
 
     private EntitySchema(SchemaKey<T> key, Reflector reflector, SchemaRegistry registry) {
         super(checkEntityType(key), reflector);
+        checkIdField();
+
         this.registry = registry;
     }
 
@@ -55,38 +57,40 @@ private static <T extends Entity<T>> SchemaKey<T> checkEntityType(SchemaKey<T> k
 
         if (!Entity.class.isAssignableFrom(entityType)) {
             throw new IllegalArgumentException(format(
-                    "Entity type [%s] must implement [%s]", entityType.getName(), Entity.class));
+                    "Entity type [%s] must implement [%s]", entityType.getName(), Entity.class.getName()
+            ));
         }
 
         Class<?> entityTypeFromEntityIface = resolveEntityTypeFromEntityIface(entityType);
         if (!entityTypeFromEntityIface.equals(entityType)) {
             throw new IllegalArgumentException(format(
                     "Entity type [%s] must implement [%s] specified by the same type, but it is specified by [%s]",
-                    entityType.getName(), Entity.class, entityTypeFromEntityIface.getName()));
+                    entityType.getName(), Entity.class.getName(), entityTypeFromEntityIface.getName()
+            ));
         }
 
-        Class<?> idFieldType;
-        try {
-            idFieldType = entityType.getDeclaredField(EntityIdSchema.ID_FIELD_NAME).getType();
-        } catch (NoSuchFieldException e) {
-            throw new IllegalArgumentException(format(
-                    "Entity type [%s] does not contain a mandatory \"%s\" field",
-                    entityType.getName(), EntityIdSchema.ID_FIELD_NAME));
-        }
+        return key;
+    }
+
+    private void checkIdField() {
+        JavaField idField = findField(EntityIdSchema.ID_FIELD_NAME)
+                .orElseThrow(() -> new IllegalArgumentException(format(
+                        "Entity type [%s] does not contain a mandatory \"%s\" field",
+                        getType().getName(), EntityIdSchema.ID_FIELD_NAME
+                )));
 
-        if (!Entity.Id.class.isAssignableFrom(idFieldType)) {
+        if (!Entity.Id.class.isAssignableFrom(idField.getRawType())) {
             throw new IllegalArgumentException(format(
-                    "Entity ID type [%s] must implement [%s]", idFieldType.getName(), Entity.Id.class));
+                    "Entity ID type [%s] must implement %s", idField.getType().getTypeName(), Entity.Id.class.getName()
+            ));
         }
 
-        Class<?> entityTypeFromIdType = EntityIdSchema.resolveEntityType(idFieldType);
-        if (!entityTypeFromIdType.equals(entityType)) {
+        Class<?> entityTypeFromIdType = EntityIdSchema.resolveEntityType(idField.getType());
+        if (!entityTypeFromIdType.equals(getType())) {
             throw new IllegalArgumentException(format(
                     "An identifier field \"%s\" has a type [%s] that is not an identifier type for an entity of type [%s]",
-                    EntityIdSchema.ID_FIELD_NAME, idFieldType.getName(), entityType.getName()));
+                    EntityIdSchema.ID_FIELD_NAME, idField.getType().getTypeName(), getType().getTypeName()));
         }
-
-        return key;
     }
 
     static Class<?> resolveEntityTypeFromEntityIface(Class<?> entityType) {

repository/src/test/java/tech/ydb/yoj/repository/db/PojoEntitySchemaTest.java

@@ -43,6 +43,8 @@ public void testEntitySchemaEntityNotId() {
     @Test
     public void testEntitySchemaEntityIncorrectIdType() {
         assertThatIllegalArgumentException().isThrownBy(() -> EntitySchema.of(EntityIncorrectIdType.class));
+        assertThatIllegalArgumentException().isThrownBy(() -> EntitySchema.of(EntityIncorrectIdExplicitGeneric.class));
+        assertThatIllegalArgumentException().isThrownBy(() -> EntitySchema.of(EntityIncorrectRawTypeEntityId.class));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -97,6 +99,27 @@ public Id<EntityIncorrectIdType> getId() {
         }
     }
 
+    @Value
+    static class EntityIncorrectIdExplicitGeneric implements Entity<EntityIncorrectIdExplicitGeneric> {
+        Entity.Id<CorrectEntity> id;
+
+        @Override
+        public Id<EntityIncorrectIdExplicitGeneric> getId() {
+            return null;
+        }
+    }
+
+    @Value
+    static class EntityIncorrectRawTypeEntityId implements Entity<EntityIncorrectRawTypeEntityId> {
+        @SuppressWarnings("rawtypes")
+        Entity.Id id;
+
+        @Override
+        public Id<EntityIncorrectRawTypeEntityId> getId() {
+            return null;
+        }
+    }
+
     @Value
     private static final class ColumnNameClashes implements Entity<ColumnNameClashes> {
         @Column