#550 Do not rely on exceptions for flow control in HISinOneResolver#g…

…etFieldValue
ThULB · Sep 30, 2024 · c847951 · c847951
1 parent b8d0288
commit c847951
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/common/src/main/java/de/uni_jena/thunibib/his/xml/HISinOneResolver.java b/common/src/main/java/de/uni_jena/thunibib/his/xml/HISinOneResolver.java
@@ -42,6 +42,7 @@
 import java.lang.reflect.Field;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -842,10 +843,12 @@ protected Object getFieldValue(SysValue sysValue, String fieldName) {
 
         /* lookup field in class hierarchy */
         while (clazz != null && field == null) {
-            try {
-                LOGGER.debug("Checking for field {} in {}", fieldName, clazz.getSimpleName());
-                field = clazz.getDeclaredField(fieldName);
-            } catch (Exception e) {
+            LOGGER.debug("Checking for field {} in {}", fieldName, clazz.getSimpleName());
+            Optional<Field> f = Arrays.stream(clazz.getDeclaredFields())
+                .filter(df -> df.getName().equals(fieldName)).findFirst();
+            if (f.isPresent()) {
+                field = f.get();
+            } else {
                 LOGGER.debug("Field {} could not be obtained from {}. Checking superclass {}", fieldName,
                     clazz.getSimpleName(),
                     clazz.getSuperclass().getSimpleName());