Skip to content

Commit 3a0a19c

Browse files
rwinchrstoyanchev
authored andcommitted
Fix migration to asciidoctor tabs
The automation to asciidoctor tabs did not migrate properly for all cases this commit fixes the migration. See gh-30435
1 parent 6930d4d commit 3a0a19c

File tree

72 files changed

+448
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+448
-300
lines changed

framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -605,11 +605,11 @@ Java::
605605
// ...
606606
}
607607
----
608-
======
609608
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
610609
610+
Kotlin::
611+
+
611612
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
612-
.Kotlin
613613
----
614614
@Before("com.xyz.Pointcuts.publicMethod() && @annotation(auditable)") // <1>
615615
fun audit(auditable: Auditable) {
@@ -618,6 +618,7 @@ Java::
618618
}
619619
----
620620
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
621+
======
621622

622623
[[aop-ataspectj-advice-params-generics]]
623624
=== Advice Parameters and Generics
@@ -770,12 +771,12 @@ Java::
770771
// ... use code and bean
771772
}
772773
----
773-
======
774774
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
775775
<2> Declares `bean` and `auditable` as the argument names.
776776
777+
Kotlin::
778+
+
777779
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
778-
.Kotlin
779780
----
780781
@Before(
781782
value = "com.xyz.Pointcuts.publicMethod() && target(bean) && @annotation(auditable)", // <1>
@@ -787,6 +788,7 @@ Java::
787788
----
788789
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
789790
<2> Declares `bean` and `auditable` as the argument names.
791+
======
790792

791793
If the first parameter is of type `JoinPoint`, `ProceedingJoinPoint`, or
792794
`JoinPoint.StaticPart`, you can omit the name of the parameter from the value of the
@@ -807,12 +809,12 @@ Java::
807809
// ... use code, bean, and jp
808810
}
809811
----
810-
======
811812
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
812813
<2> Declares `bean` and `auditable` as the argument names.
813814
815+
Kotlin::
816+
+
814817
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
815-
.Kotlin
816818
----
817819
@Before(
818820
value = "com.xyz.Pointcuts.publicMethod() && target(bean) && @annotation(auditable)", // <1>
@@ -824,6 +826,7 @@ Java::
824826
----
825827
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
826828
<2> Declares `bean` and `auditable` as the argument names.
829+
======
827830

828831
The special treatment given to the first parameter of type `JoinPoint`,
829832
`ProceedingJoinPoint`, or `JoinPoint.StaticPart` is particularly convenient for advice
@@ -842,18 +845,19 @@ Java::
842845
// ... use jp
843846
}
844847
----
845-
======
846848
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
847849
850+
Kotlin::
851+
+
848852
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
849-
.Kotlin
850853
----
851854
@Before("com.xyz.Pointcuts.publicMethod()") // <1>
852855
fun audit(jp: JoinPoint) {
853856
// ... use jp
854857
}
855858
----
856859
<1> References the `publicMethod` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-pointcuts-combining[Combining Pointcut Expressions].
860+
======
857861

858862

859863
[[aop-ataspectj-advice-proceeding-with-the-call]]
@@ -879,11 +883,11 @@ Java::
879883
return pjp.proceed(new Object[] {newPattern});
880884
}
881885
----
882-
======
883886
<1> References the `inDataAccessLayer` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
884887
888+
Kotlin::
889+
+
885890
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
886-
.Kotlin
887891
----
888892
@Around("execution(List<Account> find*(..)) && " +
889893
"com.xyz.CommonPointcuts.inDataAccessLayer() && " +
@@ -895,6 +899,7 @@ Java::
895899
}
896900
----
897901
<1> References the `inDataAccessLayer` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
902+
======
898903

899904
In many cases, you do this binding anyway (as in the preceding example).
900905

framework-docs/modules/ROOT/pages/core/aop/ataspectj/example.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ Java::
5959
}
6060
}
6161
----
62-
======
6362
<1> References the `businessService` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
6463
64+
Kotlin::
65+
+
6566
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
66-
.Kotlin
6767
----
6868
@Aspect
6969
class ConcurrentOperationExecutor : Ordered {
@@ -102,6 +102,7 @@ Java::
102102
}
103103
----
104104
<1> References the `businessService` named pointcut defined in xref:core/aop/ataspectj/pointcuts.adoc#aop-common-pointcuts[Sharing Named Pointcut Definitions].
105+
======
105106

106107
Note that the aspect implements the `Ordered` interface so that we can set the precedence of
107108
the aspect higher than the transaction advice (we want a fresh transaction each time we

framework-docs/modules/ROOT/pages/core/aop/ataspectj/pointcuts.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ Java::
167167
public void tradingOperation() {} // <3>
168168
}
169169
----
170-
======
171170
<1> `publicMethod` matches if a method execution join point represents the execution
172171
of any public method.
173172
<2> `inTrading` matches if a method execution is in the trading module.
174173
<3> `tradingOperation` matches if a method execution represents any public method in the
175174
trading module.
176175
176+
Kotlin::
177+
+
177178
[source,kotlin,indent=0,subs="verbatim",role="secondary",chomp="-packages"]
178-
.Kotlin
179179
----
180180
package com.xyz
181181
@@ -197,6 +197,7 @@ of any public method.
197197
<2> `inTrading` matches if a method execution is in the trading module.
198198
<3> `tradingOperation` matches if a method execution represents any public method in the
199199
trading module.
200+
======
200201

201202
It is a best practice to build more complex pointcut expressions out of smaller _named
202203
pointcuts_, as shown above. When referring to pointcuts by name, normal Java visibility

framework-docs/modules/ROOT/pages/core/appendix/xml-custom.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ Java::
233233
234234
}
235235
----
236-
======
237236
<1> We use the Spring-provided `AbstractSingleBeanDefinitionParser` to handle a lot of
238237
the basic grunt work of creating a single `BeanDefinition`.
239238
<2> We supply the `AbstractSingleBeanDefinitionParser` superclass with the type that our
240239
single `BeanDefinition` represents.
241240
241+
Kotlin::
242+
+
242243
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
243-
.Kotlin
244244
----
245245
package org.springframework.samples.xml
246246
@@ -274,6 +274,7 @@ single `BeanDefinition` represents.
274274
the basic grunt work of creating a single `BeanDefinition`.
275275
<2> We supply the `AbstractSingleBeanDefinitionParser` superclass with the type that our
276276
single `BeanDefinition` represents.
277+
======
277278

278279

279280
In this simple case, this is all that we need to do. The creation of our single
@@ -540,7 +541,7 @@ Kotlin::
540541
fun setChildren(children: List<Component>) {
541542
this.children = children
542543
}
543-
544+
544545
override fun getObject(): Component? {
545546
if (this.children != null && this.children!!.isNotEmpty()) {
546547
for (child in children!!) {

framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,11 @@ Java::
374374
// ...
375375
}
376376
----
377-
======
378377
<1> This line adds the `@Offline` annotation.
379378
379+
Kotlin::
380+
+
380381
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
381-
.Kotlin
382382
----
383383
class MovieRecommender {
384384
@@ -390,6 +390,7 @@ class MovieRecommender {
390390
}
391391
----
392392
<1> This line adds the `@Offline` annotation.
393+
======
393394
--
394395

395396
Now the bean definition only needs a qualifier `type`, as shown in the following example:

framework-docs/modules/ROOT/pages/core/beans/annotation-config/resource.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Java::
2727
}
2828
}
2929
----
30-
======
3130
<1> This line injects a `@Resource`.
3231
32+
Kotlin::
33+
+
3334
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
34-
.Kotlin
3535
----
3636
class SimpleMovieLister {
3737
@@ -40,6 +40,7 @@ class SimpleMovieLister {
4040
}
4141
----
4242
<1> This line injects a `@Resource`.
43+
======
4344
--
4445

4546

@@ -118,12 +119,12 @@ Java::
118119
// ...
119120
}
120121
----
121-
======
122122
<1> The `context` field is injected based on the known resolvable dependency type:
123123
`ApplicationContext`.
124124
125+
Kotlin::
126+
+
125127
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
126-
.Kotlin
127128
----
128129
class MovieRecommender {
129130
@@ -139,5 +140,6 @@ Java::
139140
----
140141
<1> The `context` field is injected based on the known resolvable dependency type:
141142
`ApplicationContext`.
143+
======
142144
--
143145

framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ Java::
7070
// ...
7171
}
7272
----
73-
======
7473
<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
7574
75+
Kotlin::
76+
+
7677
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
77-
.Kotlin
7878
----
7979
@Target(AnnotationTarget.TYPE)
8080
@Retention(AnnotationRetention.RUNTIME)
@@ -86,6 +86,7 @@ Java::
8686
}
8787
----
8888
<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
89+
======
8990

9091
You can also combine meta-annotations to create "`composed annotations`". For example,
9192
the `@RestController` annotation from Spring MVC is composed of `@Controller` and

framework-docs/modules/ROOT/pages/core/beans/environment.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ Java::
184184
}
185185
}
186186
----
187-
======
188187
<1> `@Bean(destroyMethod = "")` disables default destroy method inference.
189188
189+
Kotlin::
190+
+
190191
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
191-
.Kotlin
192192
----
193193
@Configuration
194194
@Profile("production")
@@ -202,6 +202,7 @@ Java::
202202
}
203203
----
204204
<1> `@Bean(destroyMethod = "")` disables default destroy method inference.
205+
======
205206
--
206207

207208
NOTE: As mentioned earlier, with `@Bean` methods, you typically choose to use programmatic
@@ -294,12 +295,12 @@ Java::
294295
}
295296
}
296297
----
297-
======
298298
<1> The `standaloneDataSource` method is available only in the `development` profile.
299299
<2> The `jndiDataSource` method is available only in the `production` profile.
300300
301+
Kotlin::
302+
+
301303
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
302-
.Kotlin
303304
----
304305
@Configuration
305306
class AppConfig {
@@ -322,6 +323,7 @@ Java::
322323
----
323324
<1> The `standaloneDataSource` method is available only in the `development` profile.
324325
<2> The `jndiDataSource` method is available only in the `production` profile.
326+
======
325327
--
326328

327329
[NOTE]

framework-docs/modules/ROOT/pages/core/beans/java/instantiating-container.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ Java::
144144
// ...
145145
}
146146
----
147-
======
148147
<1> This annotation enables component scanning.
149148
149+
Kotlin::
150+
+
150151
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
151-
.Kotlin
152152
----
153153
@Configuration
154154
@ComponentScan(basePackages = ["com.acme"]) // <1>
@@ -157,6 +157,7 @@ Java::
157157
}
158158
----
159159
<1> This annotation enables component scanning.
160+
======
160161

161162

162163
[TIP]

0 commit comments

Comments
 (0)