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

Merge release/2.8 into master

Author: basilevs

core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaFeatures.java

@@ -200,7 +200,7 @@ public TeslaFeatures() {
 				.showIn(TeslaFeatures.ADV_OPTIONS, TeslaFeatures.CP_OPTIONS);
 
 		option(ENABLE_PROTECTED_MEMBERS)
-				.name("Use protected members in Advanced properties")
+				.name("Use protected members in Advanced properties (deprecated)")
 				.description(
 						"Enable assertions for protected fields and methods")
 				.value("false").defaultValue("false").values(BOOLEAN_VALUES)

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

@@ -34,7 +34,6 @@ public static Object callMethod(Object instance, String name,
 			return null;
 		}
 
-		method.setAccessible(true);
 		try {
 			return method.invoke(instance,
 					args.toArray(new Object[args.size()]));
@@ -103,7 +102,6 @@ public static Object getField(Object instance, String name, boolean checked)
 			}
 			return null;
 		}
-		field.setAccessible(true);
 		try {
 			return field.get(instance);
 		} catch (IllegalAccessException e) {
@@ -126,12 +124,16 @@ public static Field findField(Class<?> clazz, String name) {
 			return null;
 		}
 		try {
-			return clazz.getDeclaredField(name);
+			Field result = clazz.getDeclaredField(name);
+			if (result.trySetAccessible()) {
+				return result;
+			}
 		} catch (SecurityException e) {
 			return null;
 		} catch (NoSuchFieldException e) {
-			return findField(clazz.getSuperclass(), name);
+			// check superclass
 		}
+		return findField(clazz.getSuperclass(), name);
 	}
 
 	public static Method findMethod(Class<?> clazz, String name) {
@@ -145,13 +147,17 @@ public static Method findMethod(Class<?> clazz, String name,
 		}
 
 		try {
-			return clazz.getDeclaredMethod(name,
+			Method result = clazz.getDeclaredMethod(name,
 					params.toArray(new Class<?>[params.size()]));
-		} catch (NoSuchMethodException e) {
-			return findMethod(clazz.getSuperclass(), name, params);
+			if (result.trySetAccessible()) {
+				return result;
+			}
 		} catch (SecurityException e) {
 			return null;
+		} catch (NoSuchMethodException e) {
+			// check superclass
 		}
+		return findMethod(clazz.getSuperclass(), name, params);
 	}
 
 }

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

@@ -297,16 +297,16 @@ private static MembersContainer collectObjectMembers(Object object) {
 	}
 
 	private static void collectMembers(Class<?> clazz, MembersContainer acc) {
-		for (Field field : clazz.getDeclaredFields()) {
-			if (checkField(field)) {
-				field.setAccessible(true);
-				acc.addField(field);
+		if ((clazz.getModifiers() & PUBLIC) != 0 || (isProtectedEnabled() && (clazz.getModifiers() & PROTECTED) != 0))  {
+			for (Field field : clazz.getDeclaredFields()) {
+				if (checkField(field) && field.trySetAccessible()) {
+					acc.addField(field);
+				}
 			}
-		}
-		for (Method method : clazz.getDeclaredMethods()) {
-			if (checkMethod(method)) {
-				method.setAccessible(true);
-				acc.addMethod(method);
+			for (Method method : clazz.getDeclaredMethods()) {
+				if (checkMethod(method) && method.trySetAccessible()) {
+					acc.addMethod(method);
+				}
 			}
 		}
 		Class<?> parent = clazz.getSuperclass();
@@ -525,7 +525,6 @@ PropertyValue getValue(Object object) throws IllegalArgumentException,
 			}
 			Field field = ReflectionUtil.findField(object.getClass(),
 					memberName);
-			field.setAccessible(true);
 			Object value = field.get(object);
 			return new PropertyValue(object, value, memberName, field.getType());
 		}
@@ -547,7 +546,6 @@ PropertyValue getValue(Object object) throws IllegalArgumentException,
 
 			Method method = ReflectionUtil.findMethod(object.getClass(),
 					memberName);
-			method.setAccessible(true);
 			Object value = method.invoke(object);
 			return new PropertyValue(object, value, memberName,
 					method.getReturnType());

runtime/tests/org.eclipse.rcptt.tesla.swt.test/src/org/eclipse/rcptt/tesla/swt/reflection/JavaMembersHelperTest.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Xored Software Inc 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:
+ *     Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.tesla.swt.reflection;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.rcptt.tesla.core.ui.PropertyNode;
+import org.junit.Test;
+
+public class JavaMembersHelperTest {
+
+	@Test
+	public void collectProperties() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+		Set<Integer> protectedObject = Set.of(4);
+		EList<PropertyNode> nodes = new BasicEList<PropertyNode>();
+		JavaMembersHelper.fillProperties(protectedObject, nodes); // should not throw
+		// Should use size() method from a non-private super class
+		assertEquals(List.of("1"), nodes.stream().filter(n -> n.getName().equals("size()")).map(PropertyNode::getValue).toList() );
+		nodes.clear();
+		JavaMembersHelper.fillProperties(protectedObject, "size()", nodes); // should not throw
+		
+		assertEquals("1", nodes.stream().filter(n -> n.getName().equals("toString()")).findFirst().get().getValue());
+		assertEquals("1", JavaMembersHelper.getPropertyValue(protectedObject, "size()"));
+	}
+
+}