Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove code deprecated in 2.x and add since and forRemoval attributes

Browse Source 
Closes gh-32548
Closes gh-32549
This commit is contained in:
Andy Wilkinson
2022-09-30 12:02:16 +01:00
parent 03b3a772c9
commit 51df7813a5
52 changed files with 85 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProvider.java
View File

@@ -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.
@@ -58,7 +58,7 @@ public interface ApplicationContextAssertProvider<C extends ApplicationContext>
* @deprecated to prevent accidental use. Prefer standard AssertJ
* {@code assertThat(context)...} calls instead.
*/
@Deprecated
@Deprecated(since = "2.0.0", forRemoval = false)
@Override
ApplicationContextAssert<C> assertThat();

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 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.
@@ -76,7 +76,7 @@ public final class JsonContent<T> implements AssertProvider<JsonContentAssert> {
* {@code assertThat(context)...} calls instead.
*/
@Override
@Deprecated
@Deprecated(since = "1.5.7", forRemoval = false)
public JsonContentAssert assertThat() {
return new JsonContentAssert(this.resourceLoadClass, null, this.json, this.configuration);
}