Skip to content

Commit b626622

Browse files
committed
Merge pull request #33245 from ngocnhan-tran1996
* pr/33245: Polish "Update links in reference manual" Update links in reference manual Closes gh-33245
2 parents 0bb309f + a3b737e commit b626622

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

framework-docs/antora.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ asciidoc:
7070
kotlin-coroutines-api: '{kotlin-site}/api/kotlinx.coroutines'
7171
kotlin-github-org: 'https://github.com/Kotlin'
7272
kotlin-issues: 'https://youtrack.jetbrains.com/issue'
73+
micrometer-docs: 'https://docs.micrometer.io/micrometer/reference'
74+
micrometer-context-propagation-docs: 'https://docs.micrometer.io/context-propagation/reference'
7375
reactive-streams-site: 'https://www.reactive-streams.org'
7476
reactive-streams-spec: 'https://github.com/reactive-streams/reactive-streams-jvm/blob/master/README.md#specification'
7577
reactor-github-org: 'https://github.com/reactor'
@@ -87,4 +89,5 @@ asciidoc:
8789
stackoverflow-questions: '{stackoverflow-site}/questions'
8890
stackoverflow-spring-tag: "{stackoverflow-questions}/tagged/spring"
8991
stackoverflow-spring-kotlin-tags: "{stackoverflow-spring-tag}+kotlin"
90-
testcontainers-site: 'https://www.testcontainers.org'
92+
testcontainers-site: 'https://www.testcontainers.org'
93+
vavr-docs: 'https://vavr-io.github.io/vavr-docs'

framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-dependson.adoc

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
= Using `depends-on`
33

44
If a bean is a dependency of another bean, that usually means that one bean is set as a
5-
property of another. Typically you accomplish this with the <<beans-ref-element, `<ref/>`
6-
element>> in XML-based configuration metadata. However, sometimes dependencies between
7-
beans are less direct. An example is when a static initializer in a class needs to be
8-
triggered, such as for database driver registration. The `depends-on` attribute can
9-
explicitly force one or more beans to be initialized before the bean using this element
10-
is initialized. The following example uses the `depends-on` attribute to express a
11-
dependency on a single bean:
5+
property of another. Typically you accomplish this with the
6+
xref:core/beans/dependencies/factory-properties-detailed.adoc#beans-ref-element[`<ref/>` element>]
7+
in XML-based configuration metadata. However, sometimes dependencies between beans are
8+
less direct. An example is when a static initializer in a class needs to be triggered,
9+
such as for database driver registration. The `depends-on` attribute can explicitly force
10+
one or more beans to be initialized before the bean using this element is initialized.
11+
The following example uses the `depends-on` attribute to express a dependency on a single
12+
bean:
1213

1314
[source,xml,indent=0,subs="verbatim,quotes"]
1415
----

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/rolling-back.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ As of Spring Framework 5.2, the default configuration also provides support for
2323
Vavr's `Try` method to trigger transaction rollbacks when it returns a 'Failure'.
2424
This allows you to handle functional-style errors using Try and have the transaction
2525
automatically rolled back in case of a failure. For more information on Vavr's Try,
26-
refer to the https://docs.vavr.io/#_try[official Vavr documentation].
26+
refer to the {vavr-docs}/#_try[official Vavr documentation].
2727
Here's an example of how to use Vavr's Try with a transactional method:
2828

2929
[tabs]

framework-docs/modules/ROOT/pages/integration/observability.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[observability]]
22
= Observability Support
33

4-
Micrometer defines an https://micrometer.io/docs/observation[Observation concept that enables both Metrics and Traces] in applications.
4+
Micrometer defines an {micrometer-docs}/observation.html[Observation concept that enables both Metrics and Traces] in applications.
55
Metrics support offers a way to create timers, gauges, or counters for collecting statistics about the runtime behavior of your application.
66
Metrics can help you to track error rates, usage patterns, performance, and more.
77
Traces provide a holistic view of an entire system, crossing application boundaries; you can zoom in on particular user requests and follow their entire completion across applications.
@@ -38,7 +38,7 @@ As outlined xref:integration/observability.adoc[at the beginning of this section
3838
|===
3939

4040
NOTE: Observations are using Micrometer's official naming convention, but Metrics names will be automatically converted
41-
https://micrometer.io/docs/concepts#_naming_meters[to the format preferred by the monitoring system backend]
41+
{micrometer-docs}/concepts/naming.html[to the format preferred by the monitoring system backend]
4242
(Prometheus, Atlas, Graphite, InfluxDB...).
4343

4444

@@ -368,7 +368,7 @@ This means that during the execution of that task, the ThreadLocals and logging
368368

369369
If the application globally configures a custom `ApplicationEventMulticaster` with a strategy that schedules event processing on different threads, this is no longer true.
370370
All `@EventListener` methods will be processed on a different thread, outside the main event publication thread.
371-
In these cases, the https://micrometer.io/docs/contextPropagation[Micrometer Context Propagation library] can help propagate such values and better correlate the processing of the events.
371+
In these cases, the {micrometer-context-propagation-docs}/[Micrometer Context Propagation library] can help propagate such values and better correlate the processing of the events.
372372
The application can configure the chosen `TaskExecutor` to use a `ContextPropagatingTaskDecorator` that decorates tasks and propagates context.
373373
For this to work, the `io.micrometer:context-propagation` library must be present on the classpath:
374374

framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-async.adoc

+2-3
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,8 @@ directly. For example:
445445
}
446446
----
447447

448-
For more details, see the
449-
https://micrometer.io/docs/contextPropagation[documentation] of the Micrometer Context
450-
Propagation library.
448+
For more details, see the {micrometer-context-propagation-docs}/[documentation] of the
449+
Micrometer Context Propagation library.
451450

452451

453452

0 commit comments

Comments
 (0)