Skip to content

Commit 7e3a4a1

Browse files
committed
Use consistent version strings for 6.2
1 parent b82b83c commit 7e3a4a1

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

framework-docs/modules/ROOT/pages/core/aot.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ If you forgot to contribute a hint, the test will fail and provide some details
561561
[source,txt,indent=0,subs="verbatim,quotes"]
562562
----
563563
org.springframework.docs.core.aot.hints.testing.SampleReflection performReflection
564-
INFO: Spring version:6.0.0-SNAPSHOT
564+
INFO: Spring version: 6.2.0
565565
566566
Missing <"ReflectionHints"> for invocation <java.lang.Class#forName>
567567
with arguments ["org.springframework.core.SpringVersion",

framework-docs/src/main/java/org/springframework/docs/core/aot/hints/testing/SampleReflection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public void performReflection() {
3232
Class<?> springVersion = ClassUtils.forName("org.springframework.core.SpringVersion", null);
3333
Method getVersion = ClassUtils.getMethod(springVersion, "getVersion");
3434
String version = (String) getVersion.invoke(null);
35-
logger.info("Spring version:" + version);
35+
logger.info("Spring version: " + version);
3636
}
3737
catch (Exception exc) {
3838
logger.error("reflection failed", exc);

spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@
123123
/**
124124
* Exceptions handled by the annotated method. If empty, will default to any
125125
* exceptions listed in the method argument list.
126-
* @since 6.2.0
126+
* @since 6.2
127127
*/
128128
@AliasFor("value")
129129
Class<? extends Throwable>[] exception() default {};
130130

131131
/**
132132
* Media Types that can be produced by the annotated method.
133-
* @since 6.2.0
133+
* @since 6.2
134134
*/
135135
String[] produces() default {};
136136

spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMappingInfo.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <li>the method in charge of handling the exception
3131
* </ul>
3232
* @author Brian Clozel
33-
* @since 6.2.0
33+
* @since 6.2
3434
*/
3535
public class ExceptionHandlerMappingInfo {
3636

@@ -40,6 +40,7 @@ public class ExceptionHandlerMappingInfo {
4040

4141
private final Method handlerMethod;
4242

43+
4344
ExceptionHandlerMappingInfo(Set<Class<? extends Throwable>> exceptionTypes, Set<MediaType> producibleMediaTypes, Method handlerMethod) {
4445
Assert.notNull(exceptionTypes, "exceptionTypes should not be null");
4546
Assert.notNull(producibleMediaTypes, "producibleMediaTypes should not be null");
@@ -49,6 +50,7 @@ public class ExceptionHandlerMappingInfo {
4950
this.handlerMethod = handlerMethod;
5051
}
5152

53+
5254
/**
5355
* Return the method responsible for handling the exception.
5456
*/

spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public Method resolveMethodByThrowable(Throwable exception) {
186186
* @param exception the exception
187187
* @param mediaType the media type requested by the HTTP client
188188
* @return a Method to handle the exception, or {@code null} if none found
189-
* @since 6.2.0
189+
* @since 6.2
190190
*/
191191
@Nullable
192192
public ExceptionHandlerMappingInfo resolveExceptionMapping(Throwable exception, MediaType mediaType) {

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public ArgumentResolverConfigurer getArgumentResolverConfigurer() {
156156
/**
157157
* Set the {@link RequestedContentTypeResolver} to use to determine requested
158158
* media types. If not set, the default constructor is used.
159-
* @since 6.2.0
159+
* @since 6.2
160160
*/
161161
public void setContentTypeResolver(RequestedContentTypeResolver contentTypeResolver) {
162162
Assert.notNull(contentTypeResolver, "'contentTypeResolver' must not be null");
@@ -165,7 +165,7 @@ public void setContentTypeResolver(RequestedContentTypeResolver contentTypeResol
165165

166166
/**
167167
* Return the configured {@link RequestedContentTypeResolver}.
168-
* @since 6.2.0
168+
* @since 6.2
169169
*/
170170
public RequestedContentTypeResolver getContentTypeResolver() {
171171
return this.contentTypeResolver;

0 commit comments

Comments
 (0)