(hop) branch main updated: "Informix Servername" field value not saved or used in Informix connections,fixes #8085 (#8088)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 21da7fc013 "Informix Servername" field value not saved or used in 
Informix connections,fixes  #8085 (#8088)
21da7fc013 is described below

commit 21da7fc013050f2ea0f4f7d05140d7988d47c29e
Author: Hans Van Akelyen <hans.van.akel...@gmail.com>
AuthorDate: Tue Aug 25 15:22:36 2026 +0200

    "Informix Servername" field value not saved or used in Informix 
connections,fixes  #8085 (#8088)
---
 .../apache/hop/metadata/util/ReflectionUtil.java   | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git 
a/core/src/main/java/org/apache/hop/metadata/util/ReflectionUtil.java 
b/core/src/main/java/org/apache/hop/metadata/util/ReflectionUtil.java
index 079e026a96..e9d56563a4 100644
--- a/core/src/main/java/org/apache/hop/metadata/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/hop/metadata/util/ReflectionUtil.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.function.Function;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.exception.HopException;
+import org.apache.hop.metadata.api.HopMetadataProperty;
 
 public class ReflectionUtil {
   private ReflectionUtil() {}
@@ -67,8 +68,16 @@ public class ReflectionUtil {
     while (superClass != null) {
       Field[] parentFields = superClass.getDeclaredFields();
       for (Field parentField : parentFields) {
-        if (doesNotHaveFieldWithName(fields, parentField.getName())) {
+        int index = indexOfFieldWithName(fields, parentField.getName());
+        if (index < 0) {
           fields.add(parentField);
+        } else if (isMetadataProperty(parentField) && 
!isMetadataProperty(fields.get(index))) {
+          // A subclass can hide a parent field with one of its own, typically 
to hang a
+          // @GuiWidgetElement off it. That placeholder is not the serialized 
property: the
+          // annotated parent field is. Letting the placeholder win drops the 
property from
+          // serialization altogether.
+          //
+          fields.set(index, parentField);
         }
       }
 
@@ -148,12 +157,20 @@ public class ReflectionUtil {
   }
 
   private static boolean doesNotHaveFieldWithName(List<Field> fields, String 
name) {
-    for (Field field : fields) {
-      if (field.getName().equals(name)) {
-        return false;
+    return indexOfFieldWithName(fields, name) < 0;
+  }
+
+  private static int indexOfFieldWithName(List<Field> fields, String name) {
+    for (int i = 0; i < fields.size(); i++) {
+      if (fields.get(i).getName().equals(name)) {
+        return i;
       }
     }
-    return true;
+    return -1;
+  }
+
+  private static boolean isMetadataProperty(Field field) {
+    return field.getAnnotation(HopMetadataProperty.class) != null;
   }
 
   public static Object getFieldValue(Object object, String fieldName, boolean 
isBoolean)