diff --git a/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/ConfigurationCollectorDoclet.java b/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/ConfigurationCollectorDoclet.java index ed64517c1..2e56e9fe3 100644 --- a/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/ConfigurationCollectorDoclet.java +++ b/maven-resolver-tools/src/main/java/org/eclipse/aether/tools/ConfigurationCollectorDoclet.java @@ -734,6 +734,9 @@ public String visitLink(LinkTree node, Void p) { VariableElement referenced = resolveReferencedField(docTreePath, node); String configurationKey = getConfigurationKey(referenced); if (configurationKey != null) { + rendered = node.getKind() == DocTree.Kind.LINK_PLAIN + ? escape(mode, configurationKey) + : renderAsCode(configurationKey); return "" + rendered + ""; } Optional javadocUrl = getJavadocUrl(docTreePath, node.getReference()); diff --git a/maven-resolver-tools/src/test/java/org/eclipse/aether/tools/ConfigurationCollectorDocletTest.java b/maven-resolver-tools/src/test/java/org/eclipse/aether/tools/ConfigurationCollectorDocletTest.java index 0fff2cad2..5108ea568 100644 --- a/maven-resolver-tools/src/test/java/org/eclipse/aether/tools/ConfigurationCollectorDocletTest.java +++ b/maven-resolver-tools/src/test/java/org/eclipse/aether/tools/ConfigurationCollectorDocletTest.java @@ -130,7 +130,7 @@ void extractsBooleanStringAndEnumConfigurations(@TempDir Path tempDir) throws Ex enumKey.get("configurationTypeJavadocUrl")); assertEquals("VALUE_A", enumKey.get("defaultValue")); String enumDescription = enumKey.get("description"); - assertTrue(enumDescription.contains("#STRING_KEY")); + assertTrue(enumDescription.contains("sample.string")); assertTrue( enumDescription.contains( "SampleType#VALUE")); @@ -156,7 +156,7 @@ void extractsBooleanStringAndEnumConfigurations(@TempDir Path tempDir) throws Ex "expected explicit link label to be rendered, but got: " + enumDescription); // no @configurationRepoIdSuffix -> defaults to "No" assertEquals("No", enumKey.get("supportRepoIdSuffix")); - assertEquals("Use #ENUM2_KEY instead", enumKey.get("deprecated")); + assertEquals("Use sample.enum2 instead", enumKey.get("deprecated")); Map enum2Key = keys.get("sample.enum2"); assertNotNull(enum2Key, "enum key missing"); @@ -186,7 +186,7 @@ void rendersConfigurationAnchorsAndTypeJavadocLinks(@TempDir Path tempDir) throw assertTrue( markdown.contains( "[`org.eclipse.aether.sample.SampleConfigurationKeys.SampleEnum`](apidocs/org/eclipse/aether/sample/SampleConfigurationKeys.SampleEnum.html)")); - assertTrue(markdown.contains("#STRING_KEY")); + assertTrue(markdown.contains("sample.string")); assertTrue(markdown.contains("**Deprecated**. Use ")); }