Skip to content

Commit 186e70c

Browse files
committed
Use code includes and tabs in MVC Config documentation
Additional fixes. See spring-projectsgh-22171
1 parent 91bb7d8 commit 186e70c

File tree

8 files changed

+14
-0
lines changed

8 files changed

+14
-0
lines changed

Diff for: framework-docs/framework-docs.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ dependencies {
7373
api("com.mchange:c3p0:0.9.5.5")
7474
api("com.fasterxml.jackson.core:jackson-databind")
7575
api("com.fasterxml.jackson.module:jackson-module-parameter-names")
76+
api("jakarta.validation:jakarta.validation-api")
7677

7778
implementation(project(":spring-core-test"))
7879
implementation("org.assertj:assertj-core")

Diff for: framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigadvancedxml/MyPostProcessor.java

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class MyPostProcessor implements BeanPostProcessor {
2626

2727
public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
2828
// ...
29+
return bean;
2930
}
3031
}
3132
// end::snippet[]

Diff for: framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigpathmatching/WebConfiguration.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
1717
}
1818

1919
private PathPatternParser patternParser() {
20+
PathPatternParser pathPatternParser = new PathPatternParser();
2021
// ...
22+
return pathPatternParser;
2123
}
2224
}
2325
// end::snippet[]

Diff for: framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigvalidation/WebConfiguration.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.springframework.context.annotation.Configuration;
2020
import org.springframework.validation.Validator;
21+
import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean;
2122
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
2223

2324
// tag::snippet[]
@@ -26,7 +27,9 @@ public class WebConfiguration implements WebMvcConfigurer {
2627

2728
@Override
2829
public Validator getValidator() {
30+
Validator validator = new OptionalValidatorFactoryBean();
2931
// ...
32+
return validator;
3033
}
3134
}
3235
// end::snippet[]

Diff for: framework-docs/src/main/kotlin/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigadvancedxml/MyPostProcessor.kt

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class MyPostProcessor : BeanPostProcessor {
2525

2626
override fun postProcessBeforeInitialization(bean: Any, name: String): Any {
2727
// ...
28+
return bean
2829
}
2930
}
3031
// end::snippet[]

Diff for: framework-docs/src/main/kotlin/org/springframework/docs/web/webmvc/mvcconfig/mvcconfiginterceptors/WebConfiguration.kt

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:Suppress("DEPRECATION")
1718
package org.springframework.docs.web.webmvc.mvcconfig.mvcconfiginterceptors
1819

1920
import org.springframework.context.annotation.Configuration

Diff for: framework-docs/src/main/kotlin/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigpathmatching/WebConfiguration.kt

+2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ class WebConfiguration : WebMvcConfigurer {
3232
}
3333

3434
fun patternParser(): PathPatternParser {
35+
val pathPatternParser = PathPatternParser()
3536
//...
37+
return pathPatternParser
3638
}
3739
}
3840
// end::snippet[]

Diff for: framework-docs/src/main/kotlin/org/springframework/docs/web/webmvc/mvcconfig/mvcconfigvalidation/WebConfiguration.kt

+3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ package org.springframework.docs.web.webmvc.mvcconfig.mvcconfigvalidation
1818

1919
import org.springframework.context.annotation.Configuration
2020
import org.springframework.validation.Validator
21+
import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean
2122
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
2223

2324
// tag::snippet[]
2425
@Configuration
2526
class WebConfiguration : WebMvcConfigurer {
2627

2728
override fun getValidator(): Validator {
29+
val validator = OptionalValidatorFactoryBean()
2830
// ...
31+
return validator
2932
}
3033
}
3134
// end::snippet[]

0 commit comments

Comments
 (0)