Merge pull request #306 from eclipse-rcptt/merge/master/release/2.8

Merge release/2.8 into master

Author: basilevs

core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/ReflectionUtil.java

@@ -133,6 +133,12 @@ public static Field findField(Class<?> clazz, String name) {
 		} catch (NoSuchFieldException e) {
 			// check superclass
 		}
+		for (Class<?> clazz1 : clazz.getInterfaces()) {
+			Field result = findField(clazz1, name);
+			if (result != null) {
+				return result;
+			}
+		}
 		return findField(clazz.getSuperclass(), name);
 	}
 
@@ -157,6 +163,12 @@ public static Method findMethod(Class<?> clazz, String name,
 		} catch (NoSuchMethodException e) {
 			// check superclass
 		}
+		for (Class<?> clazz1 : clazz.getInterfaces()) {
+			Method result = findMethod(clazz1, name);
+			if (result != null) {
+				return result;
+			}
+		}
 		return findMethod(clazz.getSuperclass(), name, params);
 	}
 

runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/swt/reflection/JavaMembersHelper.java

@@ -11,6 +11,7 @@
 package org.eclipse.rcptt.tesla.swt.reflection;
 
 import static org.eclipse.rcptt.tesla.core.TeslaFeatures.isProtectedEnabled;
+import static java.lang.String.format;
 import static java.lang.reflect.Modifier.PROTECTED;
 import static java.lang.reflect.Modifier.PUBLIC;
 import static java.lang.reflect.Modifier.STATIC;
@@ -525,6 +526,10 @@ PropertyValue getValue(Object object) throws IllegalArgumentException,
 			}
 			Field field = ReflectionUtil.findField(object.getClass(),
 					memberName);
+			if (field == null) {
+				throw new IllegalArgumentException(format("Class: %s, field: %s",
+						object.getClass(), memberName));
+			}
 			Object value = field.get(object);
 			return new PropertyValue(object, value, memberName, field.getType());
 		}
@@ -546,6 +551,10 @@ PropertyValue getValue(Object object) throws IllegalArgumentException,
 
 			Method method = ReflectionUtil.findMethod(object.getClass(),
 					memberName);
+			if (method == null) {
+				throw new IllegalArgumentException(format("Class: %s, method: %s",
+						object.getClass(), memberName));
+			}
 			Object value = method.invoke(object);
 			return new PropertyValue(object, value, memberName,
 					method.getReturnType());

tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/core/tests/util/ReflectionUtilTest.java

@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2026 DSA GmbH, Aachen and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ *     DSA GmbH, Aachen - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.core.tests.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.rcptt.util.ReflectionUtil;
+import org.junit.Test;
+
+public class ReflectionUtilTest {
+	@Test
+	public void testCallMethod1() {
+		List<String> test = List.of("value");
+		assertEquals(1, ReflectionUtil.callMethod(test, "size"));
+	}
+	
+	@Test
+	public void testCallMethod2() {
+		List<String> test = Collections.unmodifiableList(List.of("value"));
+		assertEquals(1, ReflectionUtil.callMethod(test, "size"));
+	}
+
+	@Test
+	public void testFindMethod1() {
+		assertNotNull(ReflectionUtil.findMethod(List.class, "size"));
+	}
+
+	@Test
+	public void testFindMethod2() {
+		List<String> test = Collections.unmodifiableList(List.of("value"));
+		assertNotNull(ReflectionUtil.findMethod(test.getClass(), "size"));
+	}
+
+	@Test
+	public void testGetField() {
+		Path p = new Path("");
+		assertEquals(IPath.SEPARATOR, ReflectionUtil.getField(p, "SEPARATOR"));
+	}
+
+	@Test
+	public void testFindField() {
+		assertNotNull(ReflectionUtil.findField(IFile.class, "DEPTH_INFINITE"));
+	}
+}