2025.12.0

Author: pvlasov

capability-tests/capability-tests.log

@@ -5,7 +5,6 @@
 import org.eclipse.emf.ecore.resource.Resource.Factory;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl;
-import org.nasdanika.capability.CapabilityFactory.Loader;
 import org.nasdanika.common.ProgressMonitor;
 
 public class BinaryResourceFactoryCapabilityFactory extends ResourceFactoryCapabilityFactory {

capability/src/main/java/org/nasdanika/capability/emf/BinaryResourceFactoryCapabilityFactory.java

@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
 import java.net.URLDecoder;
@@ -21,6 +22,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -244,7 +246,13 @@ protected CompletionStage<Iterable<CapabilityProvider<Invocable>>> handleSpec(
 				return wrapError(new IllegalArgumentException("Diagram and script are mutually exclusive"));
 			}
 
-			CompletionStage<DiagramRequirement> diagramRequirementCS = classLoaderCS.thenApply(classLoader -> createDiagramRequirement(requirement, invocableRequirement, classLoader, loader, progressMonitor));
+			CompletionStage<DiagramRequirement> diagramRequirementCS = classLoaderCS.thenApply(classLoader -> createDiagramRequirement(
+					requirement, 
+					invocableRequirement, 
+					classLoader, 
+					loader,
+					ao -> true, // To support scripting reflection. TODO - implement as invocable attribute/component
+					progressMonitor));
 			CompletionStage<Object> diagramCS = diagramRequirementCS.thenCompose(diagramRequirement -> loader.loadOne(diagramRequirement, progressMonitor));
 			return wrapCompletionStage(diagramCS.thenApply(Invocable::ofValue));
 		}
@@ -368,6 +376,7 @@ protected DiagramRequirement createDiagramRequirement(
 			InvocableRequirement spec, 
 			ClassLoader classLoader,
 			Loader loader,
+			Predicate<AccessibleObject> makeAccessiblePredicate, 
 			ProgressMonitor progressMonitor) {
 		String[] diagramInterfaces = spec.diagram().interfaces();
 		Class<?>[] interfaces;
@@ -409,6 +418,7 @@ protected DiagramRequirement createDiagramRequirement(
 				spec.diagram().processor(), 
 				spec.diagram().bind(), 
 				classLoader, 
+				makeAccessiblePredicate,
 				interfaces);
 
 		return diagramRequirement;

capability/src/main/java/org/nasdanika/capability/factories/URIInvocableCapabilityFactory.java

@@ -1,7 +1,9 @@
 package org.nasdanika.capability.requirements;
 
 import java.io.InputStream;
+import java.lang.reflect.AccessibleObject;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -36,6 +38,8 @@ public record DiagramRequirement(
 
 //		Function<ProcessorInfo<Invocable>,Invocable> processorFilter, Not supported yet		
 
+		Predicate<AccessibleObject> makeAccessiblePredicate, 
+		
 		/**
 		 * Interfaces to be implemented by a proxy.
 		 * If not provided, no proxy is created and a map of elements to processor info (registry) is used as a result.

capability/src/main/java/org/nasdanika/capability/requirements/DiagramRequirement.java

@@ -12,6 +12,7 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -286,18 +287,22 @@ public URI toURI(String str) {
 
 	// URI
 
-	public InputStream toInputStream(URI uri, ClassLoader classLoader) throws IOException {
+	public InputStream toInputStream(URI uri, ClassLoader classLoader) throws IOException, URISyntaxException {
 		if (Util.CLASSPATH_SCHEME.equals(uri.scheme())) {
 			String resource = uri.toString().substring(Util.CLASSPATH_URL_PREFIX.length());
 			return Objects.requireNonNull(classLoader.getResourceAsStream(resource), "ClassLoader resource not found: " + resource);
 		}
-		return toInputStream(new URL(uri.toString()));
+		return toInputStream(new java.net.URI(uri.toString()).toURL());
 	}
 
 	@ConverterMethod
 	public InputStream toInputStream(URI uri) throws IOException {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();		
-		return toInputStream(uri, cl);
+		try {
+			return toInputStream(uri, cl);
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
 	}
 
 	/**

common/src/main/java/org/nasdanika/common/DefaultConverter.java

@@ -11,6 +11,7 @@
 import java.lang.annotation.Target;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
@@ -169,7 +170,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 						if (method.getDeclaringClass().isInterface()) {
 							return invokeMethod(target, (Method) annotatedElement, args);
 						}
-						
+						if (!method.canAccess(this) && isMakeAccessible(method)) {
+							method.setAccessible(true);
+						}						
 						return method.invoke(this, args); // equals, hashCode, ...
 					}
 				};
@@ -413,6 +416,9 @@ protected void onEvaluationException(Object obj, String expr, Map<String,Object>
 	 */
 	protected Object getFieldValue(Object target, Field field) {
 		try {
+			if (!field.canAccess(target) && isMakeAccessible(field)) {
+				field.setAccessible(true);
+			}			
 			return  field.get(target);
 		} catch (IllegalAccessException e) {
 			throw new NasdanikaException("Cannot access field " + field + " of " + target + ": " + e, e);
@@ -432,12 +438,19 @@ protected void setFieldValue(Object target, Field field, Object value) {
 			if (value instanceof Invocable && !field.getType().isInstance(value) && field.getType().isInterface()) {
 				value = ((Invocable) value).createProxy(field.getType());
 			}
+			if (!field.canAccess(target) && isMakeAccessible(field)) {
+				field.setAccessible(true);
+			}
 			field.set(target, value);
 		} catch (IllegalAccessException e) {
 			throw new NasdanikaException("Cannot access field " + field + " of " + target + ": " + e, e);
 		}	
 	}
 
+	protected boolean isMakeAccessible(AccessibleObject accessibleObject) {
+		return false;
+	}
+	
 	/**
 	 * Invokes method. May need to be overridden if the target class is not exported by its module.
 	 * @param target
@@ -456,7 +469,9 @@ protected Object invokeMethod(Object target, Method method, Object... args) {
 					args[i] = ((Invocable) arg).createProxy(parameterType);
 				}
 			}
-			
+			if (!method.canAccess(target) && isMakeAccessible(method)) {
+				method.setAccessible(true);
+			}			
 			return method.invoke(target, args);
 		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 			throw new NasdanikaException("Error invoking " + method + " of " + target + ": " + e, e);

common/src/main/java/org/nasdanika/common/Reflector.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.AccessibleObject;
 import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;
@@ -68,7 +69,15 @@ public String getProperty(String name) {
 				return wrap(document);
 			}
 
-			ElementInvocableFactory<Object,Object,Object> elementInvocableFactory = new ElementInvocableFactory<>(requirement.selector() == null ? document : (org.nasdanika.drawio.Element<?>) requirement.selector().apply(document), requirement.processor());
+			ElementInvocableFactory<Object,Object,Object> elementInvocableFactory = new ElementInvocableFactory<>(requirement.selector() == null ? document : (org.nasdanika.drawio.Element<?>) requirement.selector().apply(document), requirement.processor()) {
+				
+				@Override
+				protected boolean isMakeAccessible(AccessibleObject accessibleObject) {
+					return requirement.makeAccessiblePredicate() != null && requirement.makeAccessiblePredicate().test(accessibleObject);
+				}
+				
+			};			
+			
 			if (requirement.bind() == null) {
 				// Processors
 				Map<Element, ProcessorInfo<Object,Object,Object,Object>> processors = elementInvocableFactory.createProcessors(null, false, progressMonitor);						

drawio/src/main/java/org/nasdanika/drawio/processor/DiagramCapabilityFactory.java

@@ -1,5 +1,6 @@
 package org.nasdanika.graph.processor;
 
+import java.lang.reflect.AccessibleObject;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -13,7 +14,18 @@
  */
 public abstract class ReflectiveWiringProcessorFactory<H,E,K,P> extends ProcessorFactory<H,E,K,P> {
 
-	ReflectiveProcessorWirer<H,E,K,P> wirerer = new ReflectiveProcessorWirer<>();
+	ReflectiveProcessorWirer<H,E,K,P> wirerer = new ReflectiveProcessorWirer<>() {
+		
+		@Override
+		protected boolean isMakeAccessible(AccessibleObject accessibleObject) {
+			return ReflectiveWiringProcessorFactory.this.isMakeAccessible(accessibleObject);
+		}
+		
+	};
+		
+	protected boolean isMakeAccessible(AccessibleObject accessibleObject) {
+		return false;
+	}	
 
 	@Override
 	protected ProcessorInfo<H,E,K,P> createProcessor(