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 d89950bb8d8 CAMEL-18458: camel-core - Remove eager loading classes
d89950bb8d8 is described below
commit d89950bb8d82d82335afe985f6cf278eb8fdf3ca
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Sep 5 20:22:47 2022 +0200
CAMEL-18458: camel-core - Remove eager loading classes
---
core/camel-main/pom.xml | 7 -
.../packaging/UpdateEagerClassloadedHelper.java | 148 ---------------------
2 files changed, 155 deletions(-)
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index f83093b18eb..187fb6f7c78 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -151,13 +151,6 @@
<goal>generate-configurer</goal>
</goals>
</execution>
- <execution>
- <id>update-classloaded</id>
- <phase>process-classes</phase>
- <goals>
- <goal>update-classloaded-helper</goal>
- </goals>
- </execution>
<execution>
<id>generate-test-configurer</id>
<phase>process-test-classes</phase>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
deleted file mode 100644
index 2f0411ac571..00000000000
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.maven.packaging;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.TreeSet;
-
-import org.apache.camel.maven.packaging.generics.JandexStore;
-import org.apache.camel.tooling.util.PackageHelper;
-import org.apache.camel.tooling.util.Strings;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.Index;
-
-import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
-
-/**
- * Updates the EagerClassloadedHelper.java with the class names to eager load
when using camel-main.
- */
-@Mojo(name = "update-classloaded-helper", threadSafe = true)
-public class UpdateEagerClassloadedHelper extends AbstractGeneratorMojo {
-
- public static final DotName EAGER_CLASSLOADED =
DotName.createSimple("org.apache.camel.spi.annotations.EagerClassloaded");
-
- private static final String[] MODULES = new String[] {
"camel-base-engine", "camel-core-processor", "camel-support" };
-
- private static final String START_TOKEN = "// EAGER-CLASSLOADED: START";
- private static final String END_TOKEN = "// EAGER-CLASSLOADED: END";
-
- @Parameter(defaultValue = "${project.basedir}/")
- protected File baseDir;
-
- @Override
- public void execute() throws MojoExecutionException {
- File mainDir = findCamelDirectory(baseDir, "core/camel-main");
- if (mainDir == null) {
- getLog().debug("No core/camel-main folder found, skipping
execution");
- return;
- }
-
- Set<String> fqns = new TreeSet<>();
- // discover classes from a set of known core modules
- for (String p : MODULES) {
- File dir = findCamelDirectory(baseDir, "core/" + p);
- if (dir != null && dir.exists() && dir.isDirectory()) {
- Path output = Paths.get(dir.getAbsolutePath() +
"/target/classes");
- discoverClasses(output, fqns);
- }
- }
-
- if (fqns.isEmpty()) {
- return;
- }
-
- getLog().info("There are " + fqns.size()
- + " classes to eager loaded across the Camel core
modules");
- try {
- boolean updated = updateHelper(mainDir, fqns);
- if (updated) {
- getLog().info("Updated
camel-main/src/main/java/org/apache/camel/main/EagerClassloadedHelper.java
file");
- } else {
- getLog().debug("No changes to
camel-main/src/main/java/org/apache/camel/main/EagerClassloadedHelper.java
file");
- }
-
- } catch (Exception e) {
- throw new MojoExecutionException("Error updating
EagerClassloadedHelper.java", e);
- }
- }
-
- private void discoverClasses(Path output, Set<String> fqns) {
- Index index;
-
- final JandexStore.Jandex jandex = JandexStore.read(output);
- if (jandex.getException() != null) {
- getLog().warn("Jandex reading path failed" +
jandex.getException().getMessage(), jandex.getException());
- return;
- }
-
- index = jandex.getIndex();
-
- // discover all classes annotated with @EagerClassloaded
- List<AnnotationInstance> annotations =
index.getAnnotations(EAGER_CLASSLOADED);
- annotations.stream()
- .filter(annotation -> annotation.target().kind() ==
AnnotationTarget.Kind.CLASS)
- .filter(annotation ->
annotation.target().asClass().nestingType() == ClassInfo.NestingType.TOP_LEVEL)
- .forEach(annotation -> {
- String fqn =
annotation.target().asClass().name().toString();
- fqns.add(fqn);
- });
- }
-
- private boolean updateHelper(File camelDir, Set<String> fqns) throws
Exception {
- // load source code and update
- File java = new File(camelDir,
"src/main/java/org/apache/camel/main/EagerClassloadedHelper.java");
- String text = PackageHelper.loadText(java);
- String spaces8 = " ";
-
- StringJoiner sb = new StringJoiner("\n");
- sb.add(spaces8 + "count = " + fqns.size() + ";");
- for (String name : fqns) {
- sb.add(spaces8 + name + ".onClassloaded(LOG);");
- }
- String changed = sb.toString();
-
- String existing = Strings.between(text, START_TOKEN, END_TOKEN);
- if (existing != null) {
- // remove leading line breaks etc
- existing = existing.trim();
- changed = changed.trim();
- if (existing.equals(changed)) {
- return false;
- } else {
- String before = Strings.before(text, START_TOKEN);
- String after = Strings.after(text, END_TOKEN);
- text = before + START_TOKEN + "\n" + spaces8 + changed + "\n"
+ spaces8 + END_TOKEN + after;
- PackageHelper.writeText(java, text);
- return true;
- }
- }
-
- return false;
- }
-
-}
