You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/26 16:21:08 UTC

[camel] 04/04: CAMEL-18014: camel-java-dsl - Allow to capture compiled byte code

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

commit 693ecd9d23d961fe7cbe2f79e989bada01e90999
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 26 18:20:39 2022 +0200

    CAMEL-18014: camel-java-dsl - Allow to capture compiled byte code
---
 .../camel/dsl/java/joor/ByteArrayClassLoader.java  | 43 ++++++++++++++++++++++
 .../dsl/java/joor/ClassRoutesBuilderLoader.java    |  2 +-
 .../apache/camel/dsl/java/joor/MultiCompile.java   | 22 -----------
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java
new file mode 100644
index 00000000000..da1dd726116
--- /dev/null
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java
@@ -0,0 +1,43 @@
+/*
+ * 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.dsl.java.joor;
+
+import java.util.Map;
+
+/**
+ * {@link ClassLoader} that loads byte code from a byte array.
+ */
+final class ByteArrayClassLoader extends ClassLoader {
+    private final Map<String, byte[]> classes;
+
+    public ByteArrayClassLoader(Map<String, byte[]> classes) {
+        super(ByteArrayClassLoader.class.getClassLoader());
+
+        this.classes = classes;
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        byte[] bytes = classes.get(name);
+
+        if (bytes == null) {
+            return super.findClass(name);
+        } else {
+            return defineClass(name, bytes, 0, bytes.length);
+        }
+    }
+}
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
index b94a690026c..aacf7b211b8 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoader.java
@@ -45,7 +45,7 @@ public class ClassRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport
             }
         }
 
-        MultiCompile.ByteArrayClassLoader cl = new MultiCompile.ByteArrayClassLoader(byteCodes);
+        ByteArrayClassLoader cl = new ByteArrayClassLoader(byteCodes);
 
         // instantiate classes from the byte codes
         for (Resource res : resources) {
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
index 3f59f0b6bbf..b2443958a7f 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
@@ -197,28 +197,6 @@ public final class MultiCompile {
         return sf != null ? sf.getDeclaringClass() : null;
     }
 
-    /* [java-9] */
-    static final class ByteArrayClassLoader extends ClassLoader {
-        private final Map<String, byte[]> classes;
-
-        ByteArrayClassLoader(Map<String, byte[]> classes) {
-            super(ByteArrayClassLoader.class.getClassLoader());
-
-            this.classes = classes;
-        }
-
-        @Override
-        protected Class<?> findClass(String name) throws ClassNotFoundException {
-            byte[] bytes = classes.get(name);
-
-            if (bytes == null) {
-                return super.findClass(name);
-            } else {
-                return defineClass(name, bytes, 0, bytes.length);
-            }
-        }
-    }
-
     static final class JavaFileObject extends SimpleJavaFileObject {
         final ByteArrayOutputStream os = new ByteArrayOutputStream();