This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch fix/CAMEL-23816 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 61e2d881b3f210cd334cac2990f5dae3ea38138b Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jun 23 17:13:45 2026 +0200 CAMEL-23816: Simplify findJavaDoc in SchemaGeneratorMojo Descriptions are now always in @Metadata annotations, so remove the dead field/setter/getter javadoc parsing paths. Only the builder pattern fallback is kept for RouteDefinition properties that have no field. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .../camel/maven/packaging/SchemaGeneratorMojo.java | 41 ++-------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java index c0d1417934ff..4334a4c913ba 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java @@ -69,7 +69,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProjectHelper; import org.codehaus.plexus.build.BuildContext; import org.jboss.forge.roaster.Roaster; -import org.jboss.forge.roaster.model.source.FieldSource; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.jboss.forge.roaster.model.source.MethodSource; import org.jboss.jandex.AnnotationTarget.Kind; @@ -1468,6 +1467,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo { private String findJavaDoc( Field fieldElement, String fieldName, String name, Class<?> classElement, boolean builderPattern) { + // prefer @Metadata(description) on the field if (fieldElement != null) { Metadata md = fieldElement.getAnnotation(Metadata.class); if (md != null) { @@ -1478,44 +1478,9 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo { } } - JavaClassSource source = javaClassSource(classElement.getName()); - FieldSource<JavaClassSource> field = source.getField(fieldName); - if (field != null) { - String doc = field.getJavaDoc().getFullText(); - if (!Strings.isNullOrEmpty(doc)) { - return doc; - } - } - - String setterName = "set" + Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); - - // special for mdcLoggingKeysPattern - if ("setMdcLoggingKeysPattern".equals(setterName)) { - setterName = "setMDCLoggingKeysPattern"; - } - - for (MethodSource<JavaClassSource> setter : source.getMethods()) { - if (setter.getParameters().size() == 1 - && setter.getName().equals(setterName)) { - String doc = setter.getJavaDoc().getFullText(); - if (!Strings.isNullOrEmpty(doc)) { - return doc; - } - } - } - - String getterName = "get" + Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); - for (MethodSource<JavaClassSource> setter : source.getMethods()) { - if (setter.getParameters().isEmpty() - && setter.getName().equals(getterName)) { - String doc = setter.getJavaDoc().getFullText(); - if (!Strings.isNullOrEmpty(doc)) { - return doc; - } - } - } - + // fallback to fluent builder javadoc (used by RouteDefinition properties that have no field) if (builderPattern) { + JavaClassSource source = javaClassSource(classElement.getName()); if (name != null && !name.equals(fieldName)) { String doc = getDoc(source, name); if (doc != null) {
