This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch joor in repository https://gitbox.apache.org/repos/asf/camel.git
commit 66cf76603e3cc21f2bac927cf1f9a1350bed7c0c Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Dec 12 16:32:07 2023 +0100 CAMEL-20141: Consolidate camel-joor and camel-java-joor-dsl --- .../java/org/apache/camel/language/joor/JoorScriptingCompiler.java | 5 +---- .../src/main/java/org/apache/camel/language/joor/MultiCompile.java | 5 ++--- .../java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java index 81c0f2d555b..f5eb4fed93c 100644 --- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java +++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java @@ -87,10 +87,7 @@ public class JoorScriptingCompiler extends ServiceSupport implements StaticServi classLoader = (JavaJoorClassLoader) context.getClassResolver().getClassLoader("JavaJoorClassLoader"); if (classLoader == null) { classLoader = new JavaJoorClassLoader(); - LOG.warn("Creating new JavaJoorClassLoader"); context.getClassResolver().addClassLoader(classLoader); - } else { - LOG.warn("Using existing JavaJoorClassLoader"); } // use work dir for classloader as it writes compiled classes to disk CompileStrategy cs = context.getCamelContextExtension().getContextPlugin(CompileStrategy.class); @@ -103,7 +100,7 @@ public class JoorScriptingCompiler extends ServiceSupport implements StaticServi @Override protected void doStop() throws Exception { if (counter > 0) { - LOG.info("jOOR scripting language compiled {} scripts in {} millis", counter, taken); + LOG.info("Java language compiled {} scripts in {} millis", counter, taken); } } diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java index 1f880647838..9ef05add484 100644 --- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java +++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java @@ -90,14 +90,13 @@ public final class MultiCompile { Lookup lookup = MethodHandles.lookup(); ClassLoader cl = unit.getClassLoader() != null ? unit.getClassLoader() : lookup.lookupClass().getClassLoader(); - LOG.warn("Using classloader: {}", System.identityHashCode(cl)); unit.getInput().forEach((cn, code) -> { try { Class<?> clazz = cl.loadClass(cn); result.addResult(cn, clazz, null); - LOG.warn("Class already compiled: {}", cn); + LOG.debug("Class already compiled: {}", cn); } catch (ClassNotFoundException ignore) { - LOG.warn("Class must be compiled: {}", cn); + LOG.debug("Class must be compiled: {}", cn); files.add(new CharSequenceJavaFileObject(cn, code)); } }); diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java index 32c5b1f4ca2..73f74bbe366 100644 --- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java +++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java @@ -80,10 +80,7 @@ public class JavaRoutesBuilderLoader extends ExtendedRouteBuilderLoaderSupport { classLoader = (JavaJoorClassLoader) context.getClassResolver().getClassLoader("JavaJoorClassLoader"); if (classLoader == null) { classLoader = new JavaJoorClassLoader(); - LOG.warn("Creating new JavaJoorClassLoader"); context.getClassResolver().addClassLoader(classLoader); - } else { - LOG.warn("Using existing JavaJoorClassLoader"); } // use work dir for classloader as it writes compiled classes to disk CompileStrategy cs = context.getCamelContextExtension().getContextPlugin(CompileStrategy.class);