Browse Source

Use consistent version strings for 6.2

pull/32896/head
Sam Brannen 2 years ago
parent
commit
7e3a4a12f8
  1. 2
      framework-docs/modules/ROOT/pages/core/aot.adoc
  2. 4
      framework-docs/src/main/java/org/springframework/docs/core/aot/hints/testing/SampleReflection.java
  3. 4
      spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
  4. 4
      spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMappingInfo.java
  5. 2
      spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
  6. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java

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

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

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -32,7 +32,7 @@ public class SampleReflection { @@ -32,7 +32,7 @@ public class SampleReflection {
Class<?> springVersion = ClassUtils.forName("org.springframework.core.SpringVersion", null);
Method getVersion = ClassUtils.getMethod(springVersion, "getVersion");
String version = (String) getVersion.invoke(null);
logger.info("Spring version:" + version);
logger.info("Spring version: " + version);
}
catch (Exception exc) {
logger.error("reflection failed", exc);

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

@ -123,14 +123,14 @@ public @interface ExceptionHandler { @@ -123,14 +123,14 @@ public @interface ExceptionHandler {
/**
* Exceptions handled by the annotated method. If empty, will default to any
* exceptions listed in the method argument list.
* @since 6.2.0
* @since 6.2
*/
@AliasFor("value")
Class<? extends Throwable>[] exception() default {};
/**
* Media Types that can be produced by the annotated method.
* @since 6.2.0
* @since 6.2
*/
String[] produces() default {};

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

@ -30,7 +30,7 @@ import org.springframework.util.Assert; @@ -30,7 +30,7 @@ import org.springframework.util.Assert;
* <li>the method in charge of handling the exception
* </ul>
* @author Brian Clozel
* @since 6.2.0
* @since 6.2
*/
public class ExceptionHandlerMappingInfo {
@ -40,6 +40,7 @@ public class ExceptionHandlerMappingInfo { @@ -40,6 +40,7 @@ public class ExceptionHandlerMappingInfo {
private final Method handlerMethod;
ExceptionHandlerMappingInfo(Set<Class<? extends Throwable>> exceptionTypes, Set<MediaType> producibleMediaTypes, Method handlerMethod) {
Assert.notNull(exceptionTypes, "exceptionTypes should not be null");
Assert.notNull(producibleMediaTypes, "producibleMediaTypes should not be null");
@ -49,6 +50,7 @@ public class ExceptionHandlerMappingInfo { @@ -49,6 +50,7 @@ public class ExceptionHandlerMappingInfo {
this.handlerMethod = handlerMethod;
}
/**
* Return the method responsible for handling the exception.
*/

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

@ -186,7 +186,7 @@ public class ExceptionHandlerMethodResolver { @@ -186,7 +186,7 @@ public class ExceptionHandlerMethodResolver {
* @param exception the exception
* @param mediaType the media type requested by the HTTP client
* @return a Method to handle the exception, or {@code null} if none found
* @since 6.2.0
* @since 6.2
*/
@Nullable
public ExceptionHandlerMappingInfo resolveExceptionMapping(Throwable exception, MediaType mediaType) {

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

@ -156,7 +156,7 @@ public class RequestMappingHandlerAdapter @@ -156,7 +156,7 @@ public class RequestMappingHandlerAdapter
/**
* Set the {@link RequestedContentTypeResolver} to use to determine requested
* media types. If not set, the default constructor is used.
* @since 6.2.0
* @since 6.2
*/
public void setContentTypeResolver(RequestedContentTypeResolver contentTypeResolver) {
Assert.notNull(contentTypeResolver, "'contentTypeResolver' must not be null");
@ -165,7 +165,7 @@ public class RequestMappingHandlerAdapter @@ -165,7 +165,7 @@ public class RequestMappingHandlerAdapter
/**
* Return the configured {@link RequestedContentTypeResolver}.
* @since 6.2.0
* @since 6.2
*/
public RequestedContentTypeResolver getContentTypeResolver() {
return this.contentTypeResolver;

Loading…
Cancel
Save