support for maven with functions from extensions

Author: michaeloffner

core/src/main/java/lucee/runtime/functions/FunctionHandlerPool.java

@@ -27,6 +27,7 @@
 import lucee.runtime.listener.JavaSettingsImpl;
 import lucee.runtime.op.Caster;
 import lucee.runtime.reflection.Reflector;
+import lucee.transformer.library.ClassDefinitionImpl;
 
 // TODO kann man nicht auf context ebene
 
@@ -40,6 +41,10 @@ public static Object invoke(PageContext pc, Object[] args, String className, Str
 		return use(pc, className, bundleName, bundleVersion).invoke(pc, args);
 	}
 
+	public static Object invoke(PageContext pc, Object[] args, String className, String maven) throws PageException {
+		return use(pc, className, maven).invoke(pc, args);
+	}
+
 	public static Object invoke(PageContext pc, Object[] args, String className) throws PageException {
 		return use(pc, className).invoke(pc, args);
 	}
@@ -77,6 +82,32 @@ public static BIF use(PageContext pc, String className, String bundleName, Strin
 		return bif;
 	}
 
+	public static BIF use(PageContext pc, String className, String maven) throws PageException {
+		String id = toId(className, maven, null);
+		BIF bif = map.get(id);
+		if (bif != null) return bif;
+
+		try {
+			Class<?> clazz;
+			// Maven
+			if (!StringUtil.isEmpty(maven)) {
+				clazz = new ClassDefinitionImpl(className, maven).getClazz();
+			}
+			// JAR
+			else {
+				clazz = ClassUtil.loadClass(pc, className);
+			}
+
+			if (Reflector.isInstaneOf(clazz, BIF.class, false)) bif = (BIF) ClassUtil.newInstance(clazz);
+			else bif = new BIFProxy(clazz);
+		}
+		catch (Exception e) {
+			throw Caster.toPageException(e);
+		}
+		map.put(id, bif);
+		return bif;
+	}
+
 	public static BIF use(PageContext pc, String className) throws PageException {
 		BIF bif = map.get(className);
 		if (bif != null) return bif;

core/src/main/java/lucee/transformer/bytecode/expression/var/VariableImpl.java

@@ -71,6 +71,7 @@
 import lucee.transformer.expression.var.NamedMember;
 import lucee.transformer.expression.var.Variable;
 import lucee.transformer.interpreter.literal.LitStringImpl;
+import lucee.transformer.library.ClassDefinitionImpl;
 import lucee.transformer.library.function.FunctionLibFunction;
 import lucee.transformer.library.function.FunctionLibFunctionArg;
 import lucee.transformer.library.tag.TagLibTag;
@@ -127,6 +128,7 @@ public final class VariableImpl extends ExpressionBase implements Variable {
 	private static final Method STATIC_GET1 = new Method("staticGet", Types.OBJECT, new Type[] { Types.OBJECT });
 	private static final Method STATIC_TOUCH1 = new Method("staticTouch", Types.OBJECT, new Type[] { Types.OBJECT });
 	private static final Method INVOKE3 = new Method("invoke", Types.OBJECT, new Type[] { Types.PAGE_CONTEXT, Types.OBJECT_ARRAY, Types.STRING });
+	private static final Method INVOKE4 = new Method("invoke", Types.OBJECT, new Type[] { Types.PAGE_CONTEXT, Types.OBJECT_ARRAY, Types.STRING, Types.STRING });
 	private static final Method INVOKE5 = new Method("invoke", Types.OBJECT, new Type[] { Types.PAGE_CONTEXT, Types.OBJECT_ARRAY, Types.STRING, Types.STRING, Types.STRING });
 
 	// GET
@@ -549,8 +551,7 @@ static Type _writeOutFirstBIF(BytecodeContext bc, BIF bif, int mode, boolean las
 			try {
 				if (clazzz.getMethods("call", true, -1).size() == 0) core = false;
 			}
-			catch (Exception e) {
-			}
+			catch (Exception e) {}
 		}
 		// load method
 		List<lucee.transformer.dynamic.meta.Method> methods = null;
@@ -559,8 +560,7 @@ static Type _writeOutFirstBIF(BytecodeContext bc, BIF bif, int mode, boolean las
 				methods = clazzz.getMethods("call", true, args.length + 1);
 				if (methods != null && methods.size() == 0) methods = null;
 			}
-			catch (Exception e) {
-			}
+			catch (Exception e) {}
 		}
 
 		if (bif.getArgType() == FunctionLibFunction.ARG_FIX && !bifCD.isBundle() && core) {
@@ -722,6 +722,11 @@ static Type _writeOutFirstBIF(BytecodeContext bc, BIF bif, int mode, boolean las
 
 				adapter.invokeStatic(Types.FUNCTION_HANDLER_POOL, INVOKE5);
 			}
+			else if (((ClassDefinitionImpl) bifCD).isMaven()) {
+				adapter.push(((ClassDefinitionImpl) bifCD).getMavenRaw());// maven data
+
+				adapter.invokeStatic(Types.FUNCTION_HANDLER_POOL, INVOKE4);
+			}
 			else adapter.invokeStatic(Types.FUNCTION_HANDLER_POOL, INVOKE3);
 			rtnType = Types.OBJECT;
 		}

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.2.0.18-ALPHA"/>
+  <property name="version" value="7.2.0.19-ALPHA"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.2.0.18-ALPHA</version>
+  <version>7.2.0.19-ALPHA</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>