Skip to content

Commit 6c5e723

Browse files
committed
* Remove forRemoval attr from @Deprecated markers for Security classes:
looks like to mark `@Deprecated` and even `@SuppressWarnings("deprecation")` don't silence warnings on compilation
1 parent 419e288 commit 6c5e723

File tree

9 files changed

+8
-14
lines changed

9 files changed

+8
-14
lines changed

spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ public HttpMethod getMethod() {
111111
return null;
112112
}
113113

114-
@Override
115-
@Deprecated
116-
public String getMethodValue() {
117-
return null;
118-
}
119-
120114
public ClientHttpResponse execute() {
121115
allHeaders.add(headers);
122116
return new ClientHttpResponse() {

spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelAccessPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @deprecated since 6.0 in favor of literally
3131
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
3232
*/
33-
@Deprecated(since = "6.0", forRemoval = true)
33+
@Deprecated(since = "6.0")
3434
public interface ChannelAccessPolicy {
3535

3636
Collection<ConfigAttribute> getConfigAttributesForSend();

spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @deprecated since 6.0 in favor of literally
3434
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
3535
*/
36-
@Deprecated(since = "6.0", forRemoval = true)
36+
@Deprecated(since = "6.0")
3737
public class ChannelInvocation {
3838

3939
private final MessageChannel channel;

spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* However, the {@link org.springframework.security.messaging.access.intercept.AuthorizationChannelInterceptor}
4040
* can be configured with any {@link org.springframework.security.authorization.AuthorizationManager} implementation.
4141
*/
42-
@Deprecated(since = "6.0", forRemoval = true)
42+
@Deprecated(since = "6.0")
4343
public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor implements MethodInterceptor {
4444

4545
private final ChannelSecurityMetadataSource securityMetadataSource;

spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityMetadataSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @deprecated since 6.0 in favor of literally
4141
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
4242
*/
43-
@Deprecated(since = "6.0", forRemoval = true)
43+
@Deprecated(since = "6.0")
4444
public class ChannelSecurityMetadataSource implements SecurityMetadataSource {
4545

4646
private final Map<Pattern, ChannelAccessPolicy> patternMappings;

spring-integration-security/src/main/java/org/springframework/integration/security/channel/DefaultChannelAccessPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @deprecated since 6.0 in favor of literally
3838
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
3939
*/
40-
@Deprecated(since = "6.0", forRemoval = true)
40+
@Deprecated(since = "6.0")
4141
public class DefaultChannelAccessPolicy implements ChannelAccessPolicy {
4242

4343
private final Collection<ConfigAttribute> configAttributeDefinitionForSend;

spring-integration-security/src/main/java/org/springframework/integration/security/channel/SecuredChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @deprecated since 6.0 in favor of literally
3838
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
3939
*/
40-
@Deprecated(since = "6.0", forRemoval = true)
40+
@Deprecated(since = "6.0")
4141
@Target(ElementType.METHOD)
4242
@Retention(RetentionPolicy.RUNTIME)
4343
@Documented

spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @deprecated since 6.0 in favor of literally
4747
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
4848
*/
49-
@Deprecated(since = "6.0", forRemoval = true)
49+
@Deprecated(since = "6.0")
5050
@SuppressWarnings("serial")
5151
public class ChannelSecurityInterceptorBeanPostProcessor extends AbstractAutoProxyCreator {
5252

spring-integration-security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @deprecated since 6.0 in favor of literally
4646
* {@code new AuthorizationChannelInterceptor(AuthorityAuthorizationManager.hasAnyRole())}
4747
*/
48-
@Deprecated(since = "6.0", forRemoval = true)
48+
@Deprecated(since = "6.0")
4949
public class SecuredChannelsParser extends AbstractSingleBeanDefinitionParser {
5050

5151
@Override

0 commit comments

Comments
 (0)