fix: exclude non-persisted inherited properties from Schema [DHIS2-21374] (#24467) (#24472)

* fix: exclude non-persisted inherited properties from Schema [DHIS2-21374]

* fix: refine detection

* fix: handle properties without getter

Author: jbee

dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java

@@ -92,6 +92,8 @@ public class Property implements Ordered, Klass {
    */
   @Setter private boolean persisted;
 
+  @Getter @Setter private boolean isTransient;
+
   /** Name of collection wrapper. */
   @Setter private String collectionName;
 

dhis-2/dhis-services/dhis-service-schema/src/main/java/org/hisp/dhis/schema/introspection/JacksonPropertyIntrospector.java

@@ -49,6 +49,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -71,6 +72,7 @@
 import org.hisp.dhis.schema.Property;
 import org.hisp.dhis.schema.SchemaService;
 import org.hisp.dhis.system.util.ReflectionUtils;
+import org.hisp.dhis.translation.Translatable;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -117,6 +119,20 @@ public void introspect(Class<?> type, Map<String, Property> properties) {
 
       if (persistedProperties.containsKey(fieldName)) {
         initFromPersistedProperty(property, persistedProperties.get(fieldName));
+      } else {
+        Method getter = property.getGetterMethod();
+        if (getter != null) {
+          Class<?> declaringClass = getter.getDeclaringClass();
+          if (declaringClass.getName().startsWith("Base")
+              && !property.isTransient()
+              && (!getter.isAnnotationPresent(Translatable.class)
+                  || !persistedProperties.containsKey(
+                      getter.getAnnotation(Translatable.class).propertyName()))) {
+            // this is assumed to be an inherited property that is not persisted,
+            // so we skip it and do not add it
+            continue;
+          }
+        }
       }
 
       initFromDescription(property);
@@ -224,6 +240,7 @@ private static void initFromEnumConstants(Property property) {
   private static void initFromPersistedProperty(Property property, Property persisted) {
     property.setPersisted(true);
     property.setWritable(true);
+    property.setTransient(false);
     property.setFieldName(persisted.getFieldName());
     property.setUnique(persisted.isUnique());
     property.setRequired(persisted.isRequired());
@@ -331,6 +348,7 @@ private static List<Property> collectProperties(Class<?> type) {
 
       property.setName(name);
       property.setFieldName(fieldName);
+      property.setTransient(Modifier.isTransient(field.getModifiers()));
       property.setSetterMethod(findSetterMethod(fieldName, type, field.getType()));
       property.setGetterMethod(findGetterMethod(fieldName, type));
       property.setNamespace(trimToNull(jsonProperty.namespace()));