[camel] branch main updated: camel-jbang - Make it possible to load extra .class from classpath

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 704f6f0106a camel-jbang - Make it possible to load extra .class from classpath
704f6f0106a is described below

commit 704f6f0106aaf08b70a7bf0b3b4af261ed46f682
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 3 12:47:43 2023 +0200

    camel-jbang - Make it possible to load extra .class from classpath
---
 .../java/org/apache/camel/main/KameletMain.java    |  8 +++
 .../camel/main/util/ExtraClassesClassLoader.java   | 70 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index b1c67a5aae5..4fecc2b372c 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -59,6 +59,7 @@ import org.apache.camel.main.download.MavenDependencyDownloader;
 import org.apache.camel.main.download.PackageNameSourceLoader;
 import org.apache.camel.main.download.TypeConverterLoaderDownloadListener;
 import org.apache.camel.main.injection.AnnotationDependencyInjection;
+import org.apache.camel.main.util.ExtraClassesClassLoader;
 import org.apache.camel.main.util.ExtraFilesClassLoader;
 import org.apache.camel.main.xml.blueprint.BlueprintXmlBeansHandler;
 import org.apache.camel.main.xml.spring.SpringXmlBeansHandler;
@@ -601,6 +602,7 @@ public class KameletMain extends MainCommandLineSupport {
         if (classLoader == null) {
             // jars need to be added to dependency downloader classloader
             List<String> jars = new ArrayList<>();
+            List<String> classes = new ArrayList<>();
             // create class loader (that are download capable) only once
             // any additional files to add to classpath
             ClassLoader parentCL = KameletMain.class.getClassLoader();
@@ -611,10 +613,16 @@ public class KameletMain extends MainCommandLineSupport {
                 for (String s : arr) {
                     if (s.endsWith(".jar")) {
                         jars.add(s);
+                    } else if (s.endsWith(".class")) {
+                        classes.add(s);
                     } else {
                         files.add(s);
                     }
                 }
+                if (!classes.isEmpty()) {
+                    parentCL = new ExtraClassesClassLoader(parentCL, classes);
+                    LOG.info("Additional classes added to classpath: {}", String.join(", ", classes));
+                }
                 if (!files.isEmpty()) {
                     parentCL = new ExtraFilesClassLoader(parentCL, files);
                     LOG.info("Additional files added to classpath: {}", String.join(", ", files));
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraClassesClassLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraClassesClassLoader.java
new file mode 100644
index 00000000000..0df9519fec6
--- /dev/null
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraClassesClassLoader.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.main.util;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.util.StringHelper;
+
+public class ExtraClassesClassLoader extends ClassLoader {
+
+    private final Map<String, byte[]> classes = new HashMap<>();
+
+    public ExtraClassesClassLoader(ClassLoader classLoader, List<String> names) {
+        super(classLoader);
+
+        for (String n : names) {
+            addClass(new File(n));
+        }
+    }
+
+    public void addClass(File file) {
+        try {
+            byte[] data = Files.readAllBytes(file.toPath());
+            String name = file.getPath();
+            // file to java name
+            name = name.replace('/', '.').replace('\\', '.');
+            name = name.replace(".class", "");
+            classes.put(name, data);
+        } catch (Exception e) {
+            // ignore
+        }
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        // find by FQN, then fallback to find by simple name
+        byte[] bytes = classes.get(name);
+        if (bytes == null) {
+            String simple = StringHelper.afterLast(name, ".");
+            if (simple != null) {
+                bytes = classes.get(simple);
+            }
+        }
+
+        if (bytes == null) {
+            return super.findClass(name);
+        } else {
+            return defineClass(name, bytes, 0, bytes.length);
+        }
+    }
+
+}