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:07 UTC
[camel] 03/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 bd73e37db82f034d946a5e726cf8d7f3c0c2829a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 26 18:18:28 2022 +0200
CAMEL-18014: camel-java-dsl - Allow to capture compiled byte code
---
.../dsl/java/joor/ClassRoutesBuilderLoader.java | 40 ++++++--
.../apache/camel/dsl/java/joor/MultiCompile.java | 5 +-
.../java/joor/ClassRoutesBuilderLoaderTest.java | 11 +-
.../dsl/java/joor/JavaJoorCaptureByteCodeTest.java | 114 +++++++++++++++++++++
.../src/test/resources/routes/MyMockRoute.java | 25 +++++
5 files changed, 177 insertions(+), 18 deletions(-)
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 541b5a05632..b94a690026c 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
@@ -1,5 +1,11 @@
package org.apache.camel.dsl.java.joor;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import org.apache.camel.CamelContextAware;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.api.management.ManagedResource;
@@ -12,10 +18,6 @@ import org.apache.camel.spi.annotations.RoutesLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
@ManagedResource(description = "Managed ClassRoutesBuilderLoader")
@RoutesLoader(ClassRoutesBuilderLoader.EXTENSION)
public class ClassRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport {
@@ -32,13 +34,23 @@ public class ClassRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport
protected Collection<RoutesBuilder> doLoadRoutesBuilders(Collection<Resource> resources) throws Exception {
Collection<RoutesBuilder> answer = new ArrayList<>();
+ // load all the byte code first from the resources
+ Map<String, byte[]> byteCodes = new LinkedHashMap<>();
for (Resource res : resources) {
- String className = res.getLocation();
- className = className.replace('/', '.');
- if (className.endsWith(".class")) {
- className = className.substring(0, className.length() - 6);
+ String className = asClassName(res);
+ InputStream is = res.getInputStream();
+ if (is != null) {
+ byte[] code = is.readAllBytes();
+ byteCodes.put(className, code);
}
- Class<?> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(className);
+ }
+
+ MultiCompile.ByteArrayClassLoader cl = new MultiCompile.ByteArrayClassLoader(byteCodes);
+
+ // instantiate classes from the byte codes
+ for (Resource res : resources) {
+ String className = asClassName(res);
+ Class<?> clazz = cl.findClass(className);
Object obj;
try {
@@ -63,9 +75,17 @@ public class ClassRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport
RouteBuilder builder = (RouteBuilder) obj;
answer.add(builder);
}
-
}
return answer;
}
+
+ private static String asClassName(Resource resource) {
+ String className = resource.getLocation();
+ className = className.replace('/', '.');
+ if (className.endsWith(".class")) {
+ className = className.substring(0, className.length() - 6);
+ }
+ return className;
+ }
}
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 20ac864c381..3f59f0b6bbf 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
@@ -35,7 +35,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicReference;
import javax.tools.FileObject;
import javax.tools.ForwardingJavaFileManager;
@@ -65,8 +64,8 @@ public final class MultiCompile {
/**
* Compiles multiple files as one unit
*
- * @param unit the files to compile in the same unit
- * @return the compilation result
+ * @param unit the files to compile in the same unit
+ * @return the compilation result
*/
public static CompilationUnit.Result compileUnit(CompilationUnit unit) {
CompilationUnit.Result result = CompilationUnit.result();
diff --git a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoaderTest.java b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoaderTest.java
index 0df7230a139..c0d9cfbbe4a 100644
--- a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoaderTest.java
+++ b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/ClassRoutesBuilderLoaderTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.dsl.java.joor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -25,10 +29,6 @@ import org.apache.camel.support.ResourceSupport;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-
import static org.assertj.core.api.Assertions.assertThat;
public class ClassRoutesBuilderLoaderTest {
@@ -44,7 +44,8 @@ public class ClassRoutesBuilderLoaderTest {
@Override
public InputStream getInputStream() throws IOException {
- return null;
+ return ClassRoutesBuilderLoaderTest.class
+ .getResourceAsStream("/org/apache/camel/dsl/java/joor/DummyRoute.class");
}
};
Collection<RoutesBuilder> builders = context.getRoutesLoader().findRoutesBuilders(resource);
diff --git a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaJoorCaptureByteCodeTest.java b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaJoorCaptureByteCodeTest.java
new file mode 100644
index 00000000000..12c91100328
--- /dev/null
+++ b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaJoorCaptureByteCodeTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.dsl.support.CompilePostProcessor;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.Resource;
+import org.apache.camel.support.ResourceSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class JavaJoorCaptureByteCodeTest {
+
+ private final MyPostCompiler postCompiler = new MyPostCompiler();
+
+ @Test
+ public void testCaptureByteCode() throws Exception {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ context.getRegistry().bind("MyPostCompiler", postCompiler);
+ context.start();
+
+ Resource resource = context.getResourceLoader().resolveResource("/routes/MyMockRoute.java");
+ Collection<RoutesBuilder> builders = context.getRoutesLoader().findRoutesBuilders(resource);
+
+ assertThat(builders).hasSize(1);
+
+ RouteBuilder builder = (RouteBuilder) builders.iterator().next();
+ builder.setCamelContext(context);
+ builder.configure();
+
+ assertEquals("MyMockRoute", postCompiler.getName());
+ assertNotNull(postCompiler.getCode());
+ }
+
+ // load the route (its byte code) from another context
+
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ context.start();
+
+ Resource res = new ResourceSupport("class", "MyMockRoute.class") {
+ @Override
+ public boolean exists() {
+ return true;
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return new ByteArrayInputStream(postCompiler.getCode());
+ }
+ };
+
+ Collection<RoutesBuilder> builders = context.getRoutesLoader().findRoutesBuilders(res);
+ assertThat(builders).hasSize(1);
+
+ RouteBuilder builder = (RouteBuilder) builders.iterator().next();
+ builder.setCamelContext(context);
+ context.addRoutes(builder);
+
+ MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
+ mock.expectedBodiesReceived("Hello ByteCode");
+ ProducerTemplate template = context.createProducerTemplate();
+ template.sendBody("direct:start", "Hello ByteCode");
+ mock.assertIsSatisfied();
+ }
+ }
+
+ private static final class MyPostCompiler implements CompilePostProcessor {
+
+ private String name;
+ private byte[] code;
+
+ @Override
+ public void postCompile(CamelContext camelContext, String name, Class<?> clazz, byte[] byteCode, Object instance)
+ throws Exception {
+ this.name = name;
+ this.code = byteCode;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public byte[] getCode() {
+ return code;
+ }
+ }
+}
diff --git a/dsl/camel-java-joor-dsl/src/test/resources/routes/MyMockRoute.java b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyMockRoute.java
new file mode 100644
index 00000000000..f211004504a
--- /dev/null
+++ b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyMockRoute.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+import org.apache.camel.builder.RouteBuilder;
+
+public class MyMockRoute extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("mock:result");
+ }
+}
\ No newline at end of file