Consistent jar handling for Local and Remote UDFs

sqrl-base/src/main/java/com/datasqrl/module/resolver/FileResourceResolver.java

@@ -21,10 +21,6 @@ public FileResourceResolver(Path baseDir) {
     this.baseDir = baseDir;
   }
 
-  public Optional<URI> resolve(Path path) {
-    return Optional.of(path.toFile().toURI());
-  }
-
   @Override
   public String toString() {
     return "FileResourceResolver[" + baseDir + ']';
@@ -51,4 +47,13 @@ public Optional<Path> resolveFile(NamePath namePath) {
     }
     return Optional.of(path);
   }
+
+  @Override
+  public Optional<Path> resolve(Path relativePath) {
+    Path resolvedPath = baseDir.resolve(relativePath);
+    if (Files.exists(resolvedPath)) {
+      return Optional.of(resolvedPath);
+    }
+    return Optional.empty();
+  }
 }

sqrl-base/src/main/java/com/datasqrl/module/resolver/ResourceResolver.java

@@ -14,6 +14,8 @@ public interface ResourceResolver {
 
   Optional<Path> resolveFile(NamePath namePath);
 
+  Optional<Path> resolve(Path relativePath);
+
   static URL toURL(URI uri) {
     try {
       return uri.toURL();

sqrl-planner/src/main/java/com/datasqrl/loaders/ObjectLoaderImpl.java

@@ -25,7 +25,6 @@
 import com.datasqrl.util.StringUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Preconditions;
-import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Files;
@@ -180,8 +179,9 @@ private List<NamespaceObject> loadFunction(Path path, NamePath namePath) {
     String jarPath = json.get("jarPath").asText();
     String functionClassName = json.get("functionClass").asText();
 
-    URL jarUrl = new File(jarPath).toURI().toURL();
-    Class<?> functionClass = loadClass(jarPath, functionClassName);
+    Optional<Path> resolvedJarPath = resourceResolver.resolve(Path.of(jarPath));
+    URL jarUrl = resolvedJarPath.get().toUri().toURL();
+    Class<?> functionClass = loadClass(jarUrl, functionClassName);
     Preconditions.checkArgument(UDF_FUNCTION_CLASS.isAssignableFrom(functionClass), "Class is not a UserDefinedFunction");
 
     UserDefinedFunction udf = (UserDefinedFunction) functionClass.getDeclaredConstructor().newInstance();
@@ -191,8 +191,8 @@ private List<NamespaceObject> loadFunction(Path path, NamePath namePath) {
   }
 
   @SneakyThrows
-  private Class<?> loadClass(String jarPath, String functionClassName) {
-    URL[] urls = {new File(jarPath).toURI().toURL()};
+  private Class<?> loadClass(URL jarUrl, String functionClassName) {
+    URL[] urls = { jarUrl };
     URLClassLoader classLoader = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
     return Class.forName(functionClassName, true, classLoader);
   }

sqrl-tools/sqrl-packager/src/main/java/com/datasqrl/packager/preprocess/JarPreprocessor.java

@@ -89,8 +89,11 @@ private Void processJarEntry(JarEntry entry, JarFile file,
       processorContext.addLibrary(path);
     }
 
+    processorContext.addDependency(path);
+
     return null;
   }
+
   /**
    * Checks if the jar entry is valid
    */