From c72f3d79af26ce3b07a4c9ae1506a5b0170bc9c7 Mon Sep 17 00:00:00 2001 From: prd Date: Thu, 7 Apr 2022 11:22:42 +0800 Subject: [PATCH 1/2] Add link to @Order annotation See gh-30572 --- .../springframework/boot/context/annotation/Configurations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java index 59056d2e8e..b17c88e1c4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java @@ -47,7 +47,7 @@ import org.springframework.util.ClassUtils; * This class is primarily intended for use with tests that need to specify configuration * classes but can't use {@link SpringRunner}. *

- * Implementations of this class should be annotated with {@code @Order} or implement + * Implementations of this class should be annotated with {@link org.springframework.core.annotation.Order @Order} or implement * {@link Ordered}. * * @author Phillip Webb From c6546386547011da68240e278ff82d89803cecad Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 14 Apr 2022 10:37:15 +0200 Subject: [PATCH 2/2] Polish "Add link to @Order annotation" See gh-30572 --- .../boot/context/annotation/Configurations.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java index b17c88e1c4..522c1469bc 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 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. @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportSelector; import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -47,8 +48,8 @@ import org.springframework.util.ClassUtils; * This class is primarily intended for use with tests that need to specify configuration * classes but can't use {@link SpringRunner}. *

- * Implementations of this class should be annotated with {@link org.springframework.core.annotation.Order @Order} or implement - * {@link Ordered}. + * Implementations of this class should be annotated with {@link Order @Order} or + * implement {@link Ordered}. * * @author Phillip Webb * @since 2.0.0