Skip to content

Commit b594b69

Browse files
committed
GH-1193 - Remove deprecated support for Spring AutoRestDocs for Javadoc extraction.
1 parent 74ffd65 commit b594b69

File tree

2 files changed

+1
-321
lines changed

2 files changed

+1
-321
lines changed

spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.springframework.modulith.core.SpringBean;
4141
import org.springframework.modulith.docs.ConfigurationProperties.ModuleProperty;
4242
import org.springframework.modulith.docs.Documenter.CanvasOptions;
43-
import org.springframework.modulith.docs.util.BuildSystemUtils;
4443
import org.springframework.util.Assert;
4544
import org.springframework.util.StringUtils;
4645

@@ -57,8 +56,7 @@ class Asciidoctor {
5756
private static final Pattern LINE_BREAKS = Pattern.compile("\\<\\s*br\\s*\\>");
5857
private static final Logger LOG = LoggerFactory.getLogger(Asciidoctor.class);
5958

60-
private static final Optional<DocumentationSource> DOC_SOURCE = getSpringModulithDocsSource()
61-
.or(() -> getSpringAutoRestDocsSource());
59+
private static final Optional<DocumentationSource> DOC_SOURCE = getSpringModulithDocsSource();
6260

6361
private final ApplicationModules modules;
6462
private final String javaDocBase;
@@ -424,19 +422,6 @@ public String renderGeneralInclude(String componentsFilename) {
424422
return "include::" + componentsFilename + "[]" + System.lineSeparator();
425423
}
426424

427-
@SuppressWarnings("deprecation")
428-
private static Optional<DocumentationSource> getSpringAutoRestDocsSource() {
429-
430-
return BuildSystemUtils.getTargetResource("generated-javadoc-json")
431-
.map(__ -> SpringAutoRestDocsDocumentationSource.INSTANCE)
432-
.map(it -> {
433-
LOG.debug("Using Javadoc generated by Spring Auto RESTDocs found in generated-javadoc-json.");
434-
LOG.warn(
435-
"Javadoc metadata generated by Spring Auto RESTDocs is deprecated! Switch to spring-modulith-apt instead!");
436-
return it;
437-
});
438-
}
439-
440425
private static Optional<DocumentationSource> getSpringModulithDocsSource() {
441426

442427
return SpringModulithDocumentationSource.getInstance()

spring-modulith-docs/src/main/java/org/springframework/modulith/docs/SpringAutoRestDocsDocumentationSource.java

Lines changed: 0 additions & 305 deletions
This file was deleted.

0 commit comments

Comments
 (0)