root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Consistent use of @Deprecated(since = "6.0")

This commit is contained in:
Sam Brannen 2022-09-20 14:32:27 +02:00
parent 91bca55cbf
commit 321092ce6f
101 changed files with 174 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurerSupport.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ import org.springframework.lang.Nullable;
* @see CachingConfigurerSupport * @see CachingConfigurerSupport
* @deprecated as of 6.0 in favor of implementing {@link JCacheConfigurer} directly * @deprecated as of 6.0 in favor of implementing {@link JCacheConfigurer} directly
*/ */
@Deprecated @Deprecated(since = "6.0")
public class JCacheConfigurerSupport extends CachingConfigurerSupport implements JCacheConfigurer { public class JCacheConfigurerSupport extends CachingConfigurerSupport implements JCacheConfigurer {
@Override @Override

4
spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,7 +31,7 @@ import org.springframework.lang.Nullable;
* @see CachingConfigurer * @see CachingConfigurer
* @deprecated as of 6.0 in favor of implementing {@link CachingConfigurer} directly * @deprecated as of 6.0 in favor of implementing {@link CachingConfigurer} directly
*/ */
@Deprecated @Deprecated(since = "6.0")
public class CachingConfigurerSupport implements CachingConfigurer { public class CachingConfigurerSupport implements CachingConfigurer {
@Override @Override

10
spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
View File

@ -104,7 +104,7 @@ public interface TaskScheduler {
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #schedule(Runnable, Instant)} * @deprecated as of 6.0, in favor of {@link #schedule(Runnable, Instant)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default ScheduledFuture<?> schedule(Runnable task, Date startTime) { default ScheduledFuture<?> schedule(Runnable task, Date startTime) {
return schedule(task, startTime.toInstant()); return schedule(task, startTime.toInstant());
} }
@ -139,7 +139,7 @@ public interface TaskScheduler {
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Instant, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Instant, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Date startTime, long period) { default ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Date startTime, long period) {
return scheduleAtFixedRate(task, startTime.toInstant(), Duration.ofMillis(period)); return scheduleAtFixedRate(task, startTime.toInstant(), Duration.ofMillis(period));
} }
@ -170,7 +170,7 @@ public interface TaskScheduler {
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long period) { default ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long period) {
return scheduleAtFixedRate(task, Duration.ofMillis(period)); return scheduleAtFixedRate(task, Duration.ofMillis(period));
} }
@ -208,7 +208,7 @@ public interface TaskScheduler {
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Instant, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Instant, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { default ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Date startTime, long delay) {
return scheduleWithFixedDelay(task, startTime.toInstant(), Duration.ofMillis(delay)); return scheduleWithFixedDelay(task, startTime.toInstant(), Duration.ofMillis(delay));
} }
@ -240,7 +240,7 @@ public interface TaskScheduler {
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long delay) { default ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long delay) {
return scheduleWithFixedDelay(task, Duration.ofMillis(delay)); return scheduleWithFixedDelay(task, Duration.ofMillis(delay));
} }

2
spring-context/src/main/java/org/springframework/scheduling/Trigger.java
View File

@ -40,7 +40,7 @@ public interface Trigger {
* or {@code null} if the trigger won't fire anymore * or {@code null} if the trigger won't fire anymore
* @deprecated as of 6.0, in favor of {@link #nextExecution(TriggerContext)} * @deprecated as of 6.0, in favor of {@link #nextExecution(TriggerContext)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
default Date nextExecutionTime(TriggerContext triggerContext) { default Date nextExecutionTime(TriggerContext triggerContext) {
Instant instant = nextExecution(triggerContext); Instant instant = nextExecution(triggerContext);

6
spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
View File

@ -47,7 +47,7 @@ public interface TriggerContext {
* @deprecated as of 6.0, in favor on {@link #lastScheduledExecution()} * @deprecated as of 6.0, in favor on {@link #lastScheduledExecution()}
*/ */
@Nullable @Nullable
@Deprecated @Deprecated(since = "6.0")
default Date lastScheduledExecutionTime() { default Date lastScheduledExecutionTime() {
Instant instant = lastScheduledExecution(); Instant instant = lastScheduledExecution();
return instant != null ? Date.from(instant) : null; return instant != null ? Date.from(instant) : null;
@ -66,7 +66,7 @@ public interface TriggerContext {
* or {@code null} if not scheduled before. * or {@code null} if not scheduled before.
* @deprecated as of 6.0, in favor on {@link #lastActualExecution()} * @deprecated as of 6.0, in favor on {@link #lastActualExecution()}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
default Date lastActualExecutionTime() { default Date lastActualExecutionTime() {
Instant instant = lastActualExecution(); Instant instant = lastActualExecution();
@ -85,7 +85,7 @@ public interface TriggerContext {
* or {@code null} if not scheduled before. * or {@code null} if not scheduled before.
* @deprecated as of 6.0, in favor on {@link #lastCompletion()} * @deprecated as of 6.0, in favor on {@link #lastCompletion()}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
default Date lastCompletionTime() { default Date lastCompletionTime() {
Instant instant = lastCompletion(); Instant instant = lastCompletion();

4
spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,7 +30,7 @@ import org.springframework.lang.Nullable;
* @since 4.1 * @since 4.1
* @deprecated as of 6.0 in favor of implementing {@link AsyncConfigurer} directly * @deprecated as of 6.0 in favor of implementing {@link AsyncConfigurer} directly
*/ */
@Deprecated @Deprecated(since = "6.0")
public class AsyncConfigurerSupport implements AsyncConfigurer { public class AsyncConfigurerSupport implements AsyncConfigurer {
@Override @Override

2
spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
View File

@ -47,7 +47,7 @@ import org.springframework.util.concurrent.SuccessCallback;
* @see #forExecutionException(Throwable) * @see #forExecutionException(Throwable)
* @deprecated as of 6.0, in favor of {@link CompletableFuture} * @deprecated as of 6.0, in favor of {@link CompletableFuture}
*/ */
@Deprecated @Deprecated(since = "6.0")
public class AsyncResult<V> implements ListenableFuture<V> { public class AsyncResult<V> implements ListenableFuture<V> {
@Nullable @Nullable

2
spring-context/src/main/java/org/springframework/scheduling/config/FixedDelayTask.java
View File

@ -36,7 +36,7 @@ public class FixedDelayTask extends IntervalTask {
* @param initialDelay the initial delay before first execution of the task * @param initialDelay the initial delay before first execution of the task
* @deprecated as of 6.0, in favor on {@link #FixedDelayTask(Runnable, Duration, Duration)} * @deprecated as of 6.0, in favor on {@link #FixedDelayTask(Runnable, Duration, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public FixedDelayTask(Runnable runnable, long interval, long initialDelay) { public FixedDelayTask(Runnable runnable, long interval, long initialDelay) {
super(runnable, interval, initialDelay); super(runnable, interval, initialDelay);
} }

2
spring-context/src/main/java/org/springframework/scheduling/config/FixedRateTask.java
View File

@ -36,7 +36,7 @@ public class FixedRateTask extends IntervalTask {
* @param initialDelay the initial delay before first execution of the task * @param initialDelay the initial delay before first execution of the task
* @deprecated as of 6.0, in favor on {@link #FixedRateTask(Runnable, Duration, Duration)} * @deprecated as of 6.0, in favor on {@link #FixedRateTask(Runnable, Duration, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public FixedRateTask(Runnable runnable, long interval, long initialDelay) { public FixedRateTask(Runnable runnable, long interval, long initialDelay) {
super(runnable, interval, initialDelay); super(runnable, interval, initialDelay);
} }

8
spring-context/src/main/java/org/springframework/scheduling/config/IntervalTask.java
View File

@ -45,7 +45,7 @@ public class IntervalTask extends Task {
* @param initialDelay the initial delay before first execution of the task * @param initialDelay the initial delay before first execution of the task
* @deprecated as of 6.0, in favor on {@link #IntervalTask(Runnable, Duration, Duration)} * @deprecated as of 6.0, in favor on {@link #IntervalTask(Runnable, Duration, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public IntervalTask(Runnable runnable, long interval, long initialDelay) { public IntervalTask(Runnable runnable, long interval, long initialDelay) {
this(runnable, Duration.ofMillis(interval), Duration.ofMillis(initialDelay)); this(runnable, Duration.ofMillis(interval), Duration.ofMillis(initialDelay));
} }
@ -56,7 +56,7 @@ public class IntervalTask extends Task {
* @param interval how often in milliseconds the task should be executed * @param interval how often in milliseconds the task should be executed
* @deprecated as of 6.0, in favor on {@link #IntervalTask(Runnable, Duration)} * @deprecated as of 6.0, in favor on {@link #IntervalTask(Runnable, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public IntervalTask(Runnable runnable, long interval) { public IntervalTask(Runnable runnable, long interval) {
this(runnable, Duration.ofMillis(interval), Duration.ZERO); this(runnable, Duration.ofMillis(interval), Duration.ZERO);
} }
@ -105,7 +105,7 @@ public class IntervalTask extends Task {
* Return how often in milliseconds the task should be executed. * Return how often in milliseconds the task should be executed.
* @deprecated as of 6.0, in favor of {@link #getIntervalDuration()} * @deprecated as of 6.0, in favor of {@link #getIntervalDuration()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public long getInterval() { public long getInterval() {
return this.interval.toMillis(); return this.interval.toMillis();
} }
@ -122,7 +122,7 @@ public class IntervalTask extends Task {
* Return the initial delay before first execution of the task. * Return the initial delay before first execution of the task.
* @deprecated as of 6.0, in favor of {@link #getInitialDelayDuration()} * @deprecated as of 6.0, in favor of {@link #getInitialDelayDuration()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public long getInitialDelay() { public long getInitialDelay() {
return this.initialDelay.toMillis(); return this.initialDelay.toMillis();
} }

4
spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
View File

@ -294,7 +294,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing
* Add a {@code Runnable} task to be triggered at the given fixed-rate interval. * Add a {@code Runnable} task to be triggered at the given fixed-rate interval.
* @deprecated as of 6.0, in favor of {@link #addFixedRateTask(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #addFixedRateTask(Runnable, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void addFixedRateTask(Runnable task, long interval) { public void addFixedRateTask(Runnable task, long interval) {
addFixedRateTask(new IntervalTask(task, Duration.ofMillis(interval))); addFixedRateTask(new IntervalTask(task, Duration.ofMillis(interval)));
} }
@ -324,7 +324,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing
* Add a Runnable task to be triggered with the given fixed delay. * Add a Runnable task to be triggered with the given fixed delay.
* @deprecated as of 6.0, in favor of {@link #addFixedDelayTask(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #addFixedDelayTask(Runnable, Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void addFixedDelayTask(Runnable task, long delay) { public void addFixedDelayTask(Runnable task, long delay) {
addFixedDelayTask(new IntervalTask(task, Duration.ofMillis(delay))); addFixedDelayTask(new IntervalTask(task, Duration.ofMillis(delay)));
} }

12
spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
View File

@ -64,7 +64,7 @@ public class PeriodicTrigger implements Trigger {
* Create a trigger with the given period in milliseconds. * Create a trigger with the given period in milliseconds.
* @deprecated as of 6.0, in favor on {@link #PeriodicTrigger(Duration)} * @deprecated as of 6.0, in favor on {@link #PeriodicTrigger(Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public PeriodicTrigger(long period) { public PeriodicTrigger(long period) {
this(period, null); this(period, null);
} }
@ -75,7 +75,7 @@ public class PeriodicTrigger implements Trigger {
* configured on this Trigger later via {@link #setInitialDelay(long)}. * configured on this Trigger later via {@link #setInitialDelay(long)}.
* @deprecated as of 6.0, in favor on {@link #PeriodicTrigger(Duration)} * @deprecated as of 6.0, in favor on {@link #PeriodicTrigger(Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public PeriodicTrigger(long period, @Nullable TimeUnit timeUnit) { public PeriodicTrigger(long period, @Nullable TimeUnit timeUnit) {
this(toDuration(period, timeUnit), timeUnit); this(toDuration(period, timeUnit), timeUnit);
} }
@ -115,7 +115,7 @@ public class PeriodicTrigger implements Trigger {
* @since 5.0.2 * @since 5.0.2
* @deprecated as of 6.0, in favor on {@link #getPeriodDuration()} * @deprecated as of 6.0, in favor on {@link #getPeriodDuration()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public long getPeriod() { public long getPeriod() {
if (this.chronoUnit != null) { if (this.chronoUnit != null) {
return this.period.get(this.chronoUnit); return this.period.get(this.chronoUnit);
@ -138,7 +138,7 @@ public class PeriodicTrigger implements Trigger {
* @since 5.0.2 * @since 5.0.2
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public TimeUnit getTimeUnit() { public TimeUnit getTimeUnit() {
if (this.chronoUnit != null) { if (this.chronoUnit != null) {
return TimeUnit.of(this.chronoUnit); return TimeUnit.of(this.chronoUnit);
@ -154,7 +154,7 @@ public class PeriodicTrigger implements Trigger {
* provided upon instantiation, the default is milliseconds. * provided upon instantiation, the default is milliseconds.
* @deprecated as of 6.0, in favor of {@link #setInitialDelay(Duration)} * @deprecated as of 6.0, in favor of {@link #setInitialDelay(Duration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setInitialDelay(long initialDelay) { public void setInitialDelay(long initialDelay) {
if (this.chronoUnit != null) { if (this.chronoUnit != null) {
this.initialDelay = Duration.of(initialDelay, this.chronoUnit); this.initialDelay = Duration.of(initialDelay, this.chronoUnit);
@ -177,7 +177,7 @@ public class PeriodicTrigger implements Trigger {
* @since 5.0.2 * @since 5.0.2
* @deprecated as of 6.0, in favor on {@link #getInitialDelayDuration()} * @deprecated as of 6.0, in favor on {@link #getInitialDelayDuration()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public long getInitialDelay() { public long getInitialDelay() {
Duration initialDelay = this.initialDelay; Duration initialDelay = this.initialDelay;
if (initialDelay != null) { if (initialDelay != null) {

4
spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
View File

@ -59,7 +59,7 @@ public class SimpleTriggerContext implements TriggerContext {
* @param lastCompletionTime last completion time * @param lastCompletionTime last completion time
* @deprecated as of 6.0, in favor of {@link #SimpleTriggerContext(Instant, Instant, Instant)} * @deprecated as of 6.0, in favor of {@link #SimpleTriggerContext(Instant, Instant, Instant)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public SimpleTriggerContext(@Nullable Date lastScheduledExecutionTime, @Nullable Date lastActualExecutionTime, public SimpleTriggerContext(@Nullable Date lastScheduledExecutionTime, @Nullable Date lastActualExecutionTime,
@Nullable Date lastCompletionTime) { @Nullable Date lastCompletionTime) {
@ -106,7 +106,7 @@ public class SimpleTriggerContext implements TriggerContext {
* @param lastCompletionTime last completion time * @param lastCompletionTime last completion time
* @deprecated as of 6.0, in favor of {@link #update(Instant, Instant, Instant)} * @deprecated as of 6.0, in favor of {@link #update(Instant, Instant, Instant)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void update(@Nullable Date lastScheduledExecutionTime, @Nullable Date lastActualExecutionTime, public void update(@Nullable Date lastScheduledExecutionTime, @Nullable Date lastActualExecutionTime,
@Nullable Date lastCompletionTime) { @Nullable Date lastCompletionTime) {

4
spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ import org.springframework.lang.Nullable;
* @author Juergen Hoeller * @author Juergen Hoeller
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface HierarchicalThemeSource extends ThemeSource { public interface HierarchicalThemeSource extends ThemeSource {
/** /**

4
spring-context/src/main/java/org/springframework/ui/context/Theme.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,7 +30,7 @@ import org.springframework.context.MessageSource;
* @see org.springframework.web.servlet.ThemeResolver * @see org.springframework.web.servlet.ThemeResolver
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface Theme { public interface Theme {
/** /**

4
spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,7 +28,7 @@ import org.springframework.lang.Nullable;
* @see Theme * @see Theme
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface ThemeSource { public interface ThemeSource {
/** /**

4
spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ import org.springframework.ui.context.ThemeSource;
* @see UiApplicationContextUtils * @see UiApplicationContextUtils
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class DelegatingThemeSource implements HierarchicalThemeSource { public class DelegatingThemeSource implements HierarchicalThemeSource {
@Nullable @Nullable

4
spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,7 +44,7 @@ import org.springframework.ui.context.ThemeSource;
* @see org.springframework.context.support.ResourceBundleMessageSource * @see org.springframework.context.support.ResourceBundleMessageSource
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class ResourceBundleThemeSource implements HierarchicalThemeSource, BeanClassLoaderAware { public class ResourceBundleThemeSource implements HierarchicalThemeSource, BeanClassLoaderAware {
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());

4
spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,7 +28,7 @@ import org.springframework.util.Assert;
* @since 17.06.2003 * @since 17.06.2003
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class SimpleTheme implements Theme { public class SimpleTheme implements Theme {
private final String name; private final String name;

4
spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ import org.springframework.ui.context.ThemeSource;
* @since 17.06.2003 * @since 17.06.2003
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public abstract class UiApplicationContextUtils { public abstract class UiApplicationContextUtils {
/** /**

2
spring-core/src/main/java/org/springframework/core/NestedExceptionUtils.java
View File

@ -40,7 +40,7 @@ public abstract class NestedExceptionUtils {
* @deprecated as of 6.0, in favor of custom exception messages * @deprecated as of 6.0, in favor of custom exception messages
* with selective inclusion of cause messages * with selective inclusion of cause messages
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
public static String buildMessage(@Nullable String message, @Nullable Throwable cause) { public static String buildMessage(@Nullable String message, @Nullable Throwable cause) {
if (cause == null) { if (cause == null) {

12
spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java
View File

@ -114,7 +114,7 @@ public interface DataBuffer {
* @deprecated as of 6.0, in favor of {@link #ensureWritable(int)}, which * @deprecated as of 6.0, in favor of {@link #ensureWritable(int)}, which
* has different semantics * has different semantics
*/ */
@Deprecated @Deprecated(since = "6.0")
DataBuffer capacity(int capacity); DataBuffer capacity(int capacity);
/** /**
@ -126,7 +126,7 @@ public interface DataBuffer {
* @since 5.1.4 * @since 5.1.4
* @deprecated since 6.0, in favor of {@link #ensureWritable(int)} * @deprecated since 6.0, in favor of {@link #ensureWritable(int)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default DataBuffer ensureCapacity(int capacity) { default DataBuffer ensureCapacity(int capacity) {
return ensureWritable(capacity); return ensureWritable(capacity);
} }
@ -304,7 +304,7 @@ public interface DataBuffer {
* @deprecated as of 6.0, in favor of {@link #split(int)}, which * @deprecated as of 6.0, in favor of {@link #split(int)}, which
* has different semantics * has different semantics
*/ */
@Deprecated @Deprecated(since = "6.0")
DataBuffer slice(int index, int length); DataBuffer slice(int index, int length);
/** /**
@ -322,7 +322,7 @@ public interface DataBuffer {
* @deprecated as of 6.0, in favor of {@link #split(int)}, which * @deprecated as of 6.0, in favor of {@link #split(int)}, which
* has different semantics * has different semantics
*/ */
@Deprecated @Deprecated(since = "6.0")
default DataBuffer retainedSlice(int index, int length) { default DataBuffer retainedSlice(int index, int length) {
return DataBufferUtils.retain(slice(index, length)); return DataBufferUtils.retain(slice(index, length));
} }
@ -356,7 +356,7 @@ public interface DataBuffer {
* @deprecated as of 6.0, in favor of {@link #toByteBuffer()}, which does * @deprecated as of 6.0, in favor of {@link #toByteBuffer()}, which does
* <strong>not</strong> share data and returns a copy. * <strong>not</strong> share data and returns a copy.
*/ */
@Deprecated @Deprecated(since = "6.0")
ByteBuffer asByteBuffer(); ByteBuffer asByteBuffer();
/** /**
@ -371,7 +371,7 @@ public interface DataBuffer {
* @deprecated as of 6.0, in favor of {@link #toByteBuffer(int, int)}, which * @deprecated as of 6.0, in favor of {@link #toByteBuffer(int, int)}, which
* does <strong>not</strong> share data and returns a copy. * does <strong>not</strong> share data and returns a copy.
*/ */
@Deprecated @Deprecated(since = "6.0")
ByteBuffer asByteBuffer(int index, int length); ByteBuffer asByteBuffer(int index, int length);
/** /**

2
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferFactory.java
View File

@ -36,7 +36,7 @@ public interface DataBufferFactory {
* @return the allocated buffer * @return the allocated buffer
* @deprecated as of 6.0, in favor of {@link #allocateBuffer(int)} * @deprecated as of 6.0, in favor of {@link #allocateBuffer(int)}
*/ */
@Deprecated @Deprecated(since = "6.0")
DataBuffer allocateBuffer(); DataBuffer allocateBuffer();
/** /**

2
spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
View File

@ -270,7 +270,7 @@ public class SpringFactoriesLoader {
* @see #loadFactories * @see #loadFactories
* @deprecated as of 6.0 in favor of {@link #load(Class, ArgumentResolver, FailureHandler)} * @deprecated as of 6.0 in favor of {@link #load(Class, ArgumentResolver, FailureHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public static List<String> loadFactoryNames(Class<?> factoryType, @Nullable ClassLoader classLoader) { public static List<String> loadFactoryNames(Class<?> factoryType, @Nullable ClassLoader classLoader) {
return forDefaultResourceLocation(classLoader).loadFactoryNames(factoryType); return forDefaultResourceLocation(classLoader).loadFactoryNames(factoryType);
} }

2
spring-core/src/main/java/org/springframework/core/task/AsyncListenableTaskExecutor.java
View File

@ -31,7 +31,7 @@ import org.springframework.util.concurrent.ListenableFuture;
* {@link AsyncTaskExecutor#submitCompletable(Runnable)} and * {@link AsyncTaskExecutor#submitCompletable(Runnable)} and
* {@link AsyncTaskExecutor#submitCompletable(Callable)} * {@link AsyncTaskExecutor#submitCompletable(Callable)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface AsyncListenableTaskExecutor extends AsyncTaskExecutor { public interface AsyncListenableTaskExecutor extends AsyncTaskExecutor {
/** /**

2
spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
View File

@ -159,7 +159,7 @@ public final class ConcurrentLruCache<K, V> {
* Return the maximum number of entries in the cache. * Return the maximum number of entries in the cache.
* @deprecated in favor of {@link #capacity()} as of 6.0. * @deprecated in favor of {@link #capacity()} as of 6.0.
*/ */
@Deprecated @Deprecated(since = "6.0")
public int sizeLimit() { public int sizeLimit() {
return this.capacity; return this.capacity;
} }

2
spring-core/src/main/java/org/springframework/util/MimeType.java
View File

@ -708,7 +708,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
* @param <T> the type of mime types that may be compared by this comparator * @param <T> the type of mime types that may be compared by this comparator
* @deprecated As of 6.0, with no direct replacement * @deprecated As of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static class SpecificityComparator<T extends MimeType> implements Comparator<T> { public static class SpecificityComparator<T extends MimeType> implements Comparator<T> {
@Override @Override

4
spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -55,7 +55,7 @@ public abstract class MimeTypeUtils {
* Comparator formally used by {@link #sortBySpecificity(List)}. * Comparator formally used by {@link #sortBySpecificity(List)}.
* @deprecated As of 6.0, with no direct replacement * @deprecated As of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static final Comparator<MimeType> SPECIFICITY_COMPARATOR = new MimeType.SpecificityComparator<>(); public static final Comparator<MimeType> SPECIFICITY_COMPARATOR = new MimeType.SpecificityComparator<>();
/** /**

2
spring-core/src/main/java/org/springframework/util/StreamUtils.java
View File

@ -215,7 +215,7 @@ public abstract class StreamUtils {
* @since 4.2.2 * @since 4.2.2
* @deprecated as of 6.0 in favor of {@link InputStream#nullInputStream()} * @deprecated as of 6.0 in favor of {@link InputStream#nullInputStream()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public static InputStream emptyInput() { public static InputStream emptyInput() {
return InputStream.nullInputStream(); return InputStream.nullInputStream();
} }

2
spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java
View File

@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException;
* @param <T> the result type returned by this Future's {@code get} method * @param <T> the result type returned by this Future's {@code get} method
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class CompletableToListenableFutureAdapter<T> implements ListenableFuture<T> { public class CompletableToListenableFutureAdapter<T> implements ListenableFuture<T> {
private final CompletableFuture<T> completableFuture; private final CompletableFuture<T> completableFuture;

2
spring-core/src/main/java/org/springframework/util/concurrent/FailureCallback.java
View File

@ -26,7 +26,7 @@ import java.util.function.BiConsumer;
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)} * {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@FunctionalInterface @FunctionalInterface
public interface FailureCallback { public interface FailureCallback {

2
spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java
View File

@ -35,7 +35,7 @@ import org.springframework.util.Assert;
* @param <S> the type of the adaptee's {@code Future} * @param <S> the type of the adaptee's {@code Future}
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public abstract class FutureAdapter<T, S> implements Future<T> { public abstract class FutureAdapter<T, S> implements Future<T> {
private final Future<S> adaptee; private final Future<S> adaptee;

6
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java
View File

@ -34,7 +34,7 @@ import java.util.function.BiConsumer;
* @param <T> the result type returned by this Future's {@code get} method * @param <T> the result type returned by this Future's {@code get} method
* @deprecated as of 6.0, in favor of {@link CompletableFuture} * @deprecated as of 6.0, in favor of {@link CompletableFuture}
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface ListenableFuture<T> extends Future<T> { public interface ListenableFuture<T> extends Future<T> {
/** /**
@ -43,7 +43,7 @@ public interface ListenableFuture<T> extends Future<T> {
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link CompletableFuture#whenComplete(BiConsumer)} * {@link CompletableFuture#whenComplete(BiConsumer)}
*/ */
@Deprecated @Deprecated(since = "6.0")
void addCallback(ListenableFutureCallback<? super T> callback); void addCallback(ListenableFutureCallback<? super T> callback);
/** /**
@ -54,7 +54,7 @@ public interface ListenableFuture<T> extends Future<T> {
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link CompletableFuture#whenComplete(BiConsumer)} * {@link CompletableFuture#whenComplete(BiConsumer)}
*/ */
@Deprecated @Deprecated(since = "6.0")
void addCallback(SuccessCallback<? super T> successCallback, FailureCallback failureCallback); void addCallback(SuccessCallback<? super T> successCallback, FailureCallback failureCallback);

2
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java
View File

@ -34,7 +34,7 @@ import org.springframework.lang.Nullable;
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link java.util.concurrent.CompletableFuture} * {@link java.util.concurrent.CompletableFuture}
*/ */
@Deprecated @Deprecated(since = "6.0")
public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S> implements ListenableFuture<T> { public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S> implements ListenableFuture<T> {
/** /**

2
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallback.java
View File

@ -29,7 +29,7 @@ import java.util.function.BiConsumer;
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)} * {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface ListenableFutureCallback<T> extends SuccessCallback<T>, FailureCallback { public interface ListenableFutureCallback<T> extends SuccessCallback<T>, FailureCallback {
} }

2
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
View File

@ -35,7 +35,7 @@ import org.springframework.util.Assert;
* @param <T> the callback result type * @param <T> the callback result type
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class ListenableFutureCallbackRegistry<T> { public class ListenableFutureCallbackRegistry<T> {
private final Queue<SuccessCallback<? super T>> successCallbacks = new ArrayDeque<>(1); private final Queue<SuccessCallback<? super T>> successCallbacks = new ArrayDeque<>(1);

2
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureTask.java
View File

@ -31,7 +31,7 @@ import org.springframework.lang.Nullable;
* @param <T> the result type returned by this Future's {@code get} method * @param <T> the result type returned by this Future's {@code get} method
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class ListenableFutureTask<T> extends FutureTask<T> implements ListenableFuture<T> { public class ListenableFutureTask<T> extends FutureTask<T> implements ListenableFuture<T> {
private final ListenableFutureCallbackRegistry<T> callbacks = new ListenableFutureCallbackRegistry<>(); private final ListenableFutureCallbackRegistry<T> callbacks = new ListenableFutureCallbackRegistry<>();

2
spring-core/src/main/java/org/springframework/util/concurrent/MonoToListenableFutureAdapter.java
View File

@ -29,7 +29,7 @@ import reactor.core.publisher.Mono;
* @param <T> the object type * @param <T> the object type
* @deprecated as of 6.0, in favor of {@link Mono#toFuture()} * @deprecated as of 6.0, in favor of {@link Mono#toFuture()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public class MonoToListenableFutureAdapter<T> extends CompletableToListenableFutureAdapter<T> { public class MonoToListenableFutureAdapter<T> extends CompletableToListenableFutureAdapter<T> {
public MonoToListenableFutureAdapter(Mono<T> mono) { public MonoToListenableFutureAdapter(Mono<T> mono) {

2
spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java
View File

@ -38,7 +38,7 @@ import org.springframework.util.Assert;
* @param <T> the result type returned by this Future's {@code get} method * @param <T> the result type returned by this Future's {@code get} method
* @deprecated as of 6.0, in favor of {@link CompletableFuture} * @deprecated as of 6.0, in favor of {@link CompletableFuture}
*/ */
@Deprecated @Deprecated(since = "6.0")
public class SettableListenableFuture<T> implements ListenableFuture<T> { public class SettableListenableFuture<T> implements ListenableFuture<T> {
private static final Callable<Object> DUMMY_CALLABLE = () -> { private static final Callable<Object> DUMMY_CALLABLE = () -> {

2
spring-core/src/main/java/org/springframework/util/concurrent/SuccessCallback.java
View File

@ -29,7 +29,7 @@ import org.springframework.lang.Nullable;
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)} * {@link java.util.concurrent.CompletableFuture#whenComplete(BiConsumer)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@FunctionalInterface @FunctionalInterface
public interface SuccessCallback<T> { public interface SuccessCallback<T> {

2
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java
View File

@ -67,7 +67,7 @@ public interface AsyncHandlerMethodReturnValueHandler extends HandlerMethodRetur
* @deprecated as of 6.0, in favor of * @deprecated as of 6.0, in favor of
* {@link #toCompletableFuture(Object, MethodParameter)} * {@link #toCompletableFuture(Object, MethodParameter)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
default org.springframework.util.concurrent.ListenableFuture<?> toListenableFuture( default org.springframework.util.concurrent.ListenableFuture<?> toListenableFuture(
Object returnValue, MethodParameter returnType) { Object returnValue, MethodParameter returnType) {

2
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/ListenableFutureReturnValueHandler.java
View File

@ -28,7 +28,7 @@ import org.springframework.util.concurrent.ListenableFuture;
* @since 4.2 * @since 4.2
* @deprecated as of 6.0, in favor of {@link CompletableFutureReturnValueHandler} * @deprecated as of 6.0, in favor of {@link CompletableFutureReturnValueHandler}
*/ */
@Deprecated @Deprecated(since = "6.0")
public class ListenableFutureReturnValueHandler extends AbstractAsyncReturnValueHandler { public class ListenableFutureReturnValueHandler extends AbstractAsyncReturnValueHandler {
@Override @Override

2
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.java
View File

@ -35,7 +35,7 @@ public interface ConnectionHandlingStompSession extends StompSession, StompTcpCo
* Return a future that will complete when the session is ready for use. * Return a future that will complete when the session is ready for use.
* @deprecated as of 6.0, in favor of {@link #getSession()} * @deprecated as of 6.0, in favor of {@link #getSession()}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<StompSession> getSessionFuture() { default org.springframework.util.concurrent.ListenableFuture<StompSession> getSessionFuture() {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
getSession()); getSession());

4
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.java
View File

@ -96,7 +96,7 @@ public class ReactorNettyTcpStompClient extends StompClientSupport {
* @return a ListenableFuture for access to the session when ready for use * @return a ListenableFuture for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(StompSessionHandler)} * @deprecated as of 6.0, in favor of {@link #connectAsync(StompSessionHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
StompSessionHandler handler) { StompSessionHandler handler) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
@ -122,7 +122,7 @@ public class ReactorNettyTcpStompClient extends StompClientSupport {
* @return a ListenableFuture for access to the session when ready for use * @return a ListenableFuture for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(StompHeaders, StompSessionHandler)} * @deprecated as of 6.0, in favor of {@link #connectAsync(StompHeaders, StompSessionHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
@Nullable StompHeaders connectHeaders, StompSessionHandler handler) { @Nullable StompHeaders connectHeaders, StompSessionHandler handler) {
ConnectionHandlingStompSession session = createSession(connectHeaders, handler); ConnectionHandlingStompSession session = createSession(connectHeaders, handler);

2
spring-messaging/src/main/java/org/springframework/messaging/tcp/TcpConnection.java
View File

@ -37,7 +37,7 @@ public interface TcpConnection<P> extends Closeable {
* message was successfully sent * message was successfully sent
* @deprecated as of 6.0, in favor of {@link #sendAsync(Message)} * @deprecated as of 6.0, in favor of {@link #sendAsync(Message)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<Void> send(Message<P> message) { default org.springframework.util.concurrent.ListenableFuture<Void> send(Message<P> message) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
sendAsync(message)); sendAsync(message));

6
spring-messaging/src/main/java/org/springframework/messaging/tcp/TcpOperations.java
View File

@ -34,7 +34,7 @@ public interface TcpOperations<P> {
* connection is successfully established * connection is successfully established
* @deprecated as of 6.0, in favor of {@link #connectAsync(TcpConnectionHandler)} * @deprecated as of 6.0, in favor of {@link #connectAsync(TcpConnectionHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<Void> connect( default org.springframework.util.concurrent.ListenableFuture<Void> connect(
TcpConnectionHandler<P> connectionHandler) { TcpConnectionHandler<P> connectionHandler) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
@ -58,7 +58,7 @@ public interface TcpOperations<P> {
* initial connection is successfully established * initial connection is successfully established
* @deprecated as of 6.0, in favor of {@link #connectAsync(TcpConnectionHandler, ReconnectStrategy)} * @deprecated as of 6.0, in favor of {@link #connectAsync(TcpConnectionHandler, ReconnectStrategy)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<Void> connect( default org.springframework.util.concurrent.ListenableFuture<Void> connect(
TcpConnectionHandler<P> connectionHandler, ReconnectStrategy reconnectStrategy) { TcpConnectionHandler<P> connectionHandler, ReconnectStrategy reconnectStrategy) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
@ -81,7 +81,7 @@ public interface TcpOperations<P> {
* connection is successfully closed * connection is successfully closed
* @deprecated as of 6.0, in favor of {@link #shutdownAsync()} * @deprecated as of 6.0, in favor of {@link #shutdownAsync()}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<Void> shutdown() { default org.springframework.util.concurrent.ListenableFuture<Void> shutdown() {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
shutdownAsync()); shutdownAsync());

2
spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
View File

@ -240,7 +240,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
* @since 5.2.7 * @since 5.2.7
* @deprecated as of Spring Framework 6.0 in favor of {@link #method(HttpMethod, String, Object...)} * @deprecated as of Spring Framework 6.0 in favor of {@link #method(HttpMethod, String, Object...)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public static BodyBuilder method(String httpMethod, String uri, Object... vars) { public static BodyBuilder method(String httpMethod, String uri, Object... vars) {
Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required."); Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
return new DefaultBodyBuilder(HttpMethod.valueOf(httpMethod), toUri(uri, vars)); return new DefaultBodyBuilder(HttpMethod.valueOf(httpMethod), toUri(uri, vars));

4
spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
View File

@ -57,7 +57,7 @@ public interface ContextLoader {
* @deprecated as of Spring Framework 6.0, in favor of methods defined in the * @deprecated as of Spring Framework 6.0, in favor of methods defined in the
* {@link SmartContextLoader} SPI * {@link SmartContextLoader} SPI
*/ */
@Deprecated @Deprecated(since = "6.0")
String[] processLocations(Class<?> clazz, String... locations); String[] processLocations(Class<?> clazz, String... locations);
/** /**
@ -84,7 +84,7 @@ public interface ContextLoader {
* @deprecated as of Spring Framework 6.0, in favor of methods defined in the * @deprecated as of Spring Framework 6.0, in favor of methods defined in the
* {@link SmartContextLoader} SPI * {@link SmartContextLoader} SPI
*/ */
@Deprecated @Deprecated(since = "6.0")
ApplicationContext loadContext(String... locations) throws Exception; ApplicationContext loadContext(String... locations) throws Exception;
} }

2
spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
View File

@ -256,7 +256,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
* @see #loadContext(MergedContextConfiguration) * @see #loadContext(MergedContextConfiguration)
* @deprecated as of Spring Framework 6.0, in favor of {@link #loadContext(MergedContextConfiguration)} * @deprecated as of Spring Framework 6.0, in favor of {@link #loadContext(MergedContextConfiguration)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Override @Override
public final ConfigurableApplicationContext loadContext(String... locations) throws Exception { public final ConfigurableApplicationContext loadContext(String... locations) throws Exception {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {

2
spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
View File

@ -181,7 +181,7 @@ public class ExchangeResult {
* @since 5.1.10 * @since 5.1.10
* @deprecated as of 6.0, in favor of {@link #getStatus()} * @deprecated as of 6.0, in favor of {@link #getStatus()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public int getRawStatusCode() { public int getRawStatusCode() {
return this.response.getRawStatusCode(); return this.response.getRawStatusCode();
} }

2
spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
View File

@ -361,7 +361,7 @@ public interface MockMvcWebTestClient {
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
ControllerSpec useTrailingSlashPatternMatch(boolean useTrailingSlashPatternMatch); ControllerSpec useTrailingSlashPatternMatch(boolean useTrailingSlashPatternMatch);
/** /**

2
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
View File

@ -345,7 +345,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public StandaloneMockMvcBuilder setUseTrailingSlashPatternMatch(boolean useTrailingSlashPatternMatch) { public StandaloneMockMvcBuilder setUseTrailingSlashPatternMatch(boolean useTrailingSlashPatternMatch) {
this.useTrailingSlashPatternMatch = useTrailingSlashPatternMatch; this.useTrailingSlashPatternMatch = useTrailingSlashPatternMatch;
return this; return this;

4
spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,7 +29,7 @@ import org.springframework.transaction.jta.JtaTransactionManager;
* @since 4.1.1 * @since 4.1.1
* @deprecated as of 6.0, in favor of a straight {@link JtaTransactionManager} definition * @deprecated as of 6.0, in favor of a straight {@link JtaTransactionManager} definition
*/ */
@Deprecated @Deprecated(since = "6.0")
public class JtaTransactionManagerFactoryBean implements FactoryBean<JtaTransactionManager>, InitializingBean { public class JtaTransactionManagerFactoryBean implements FactoryBean<JtaTransactionManager>, InitializingBean {
private final JtaTransactionManager transactionManager = new JtaTransactionManager(); private final JtaTransactionManager transactionManager = new JtaTransactionManager();

2
spring-web/src/main/java/org/springframework/http/HttpRequest.java
View File

@ -42,7 +42,7 @@ public interface HttpRequest extends HttpMessage {
* @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and * @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and
* {@link HttpMethod#name()} * {@link HttpMethod#name()}
*/ */
@Deprecated @Deprecated(since = "6.0")
String getMethodValue(); String getMethodValue();
/** /**

12
spring-web/src/main/java/org/springframework/http/MediaType.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -823,7 +823,7 @@ public class MediaType extends MimeType implements Serializable {
* @param mediaTypes the list of media types to be sorted * @param mediaTypes the list of media types to be sorted
* @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)} * @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public static void sortBySpecificity(List<MediaType> mediaTypes) { public static void sortBySpecificity(List<MediaType> mediaTypes) {
Assert.notNull(mediaTypes, "'mediaTypes' must not be null"); Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
if (mediaTypes.size() > 1) { if (mediaTypes.size() > 1) {
@ -852,7 +852,7 @@ public class MediaType extends MimeType implements Serializable {
* @see #getQualityValue() * @see #getQualityValue()
* @deprecated As of 6.0, with no direct replacement * @deprecated As of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static void sortByQualityValue(List<MediaType> mediaTypes) { public static void sortByQualityValue(List<MediaType> mediaTypes) {
Assert.notNull(mediaTypes, "'mediaTypes' must not be null"); Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
if (mediaTypes.size() > 1) { if (mediaTypes.size() > 1) {
@ -865,7 +865,7 @@ public class MediaType extends MimeType implements Serializable {
* primary criteria and quality value the secondary. * primary criteria and quality value the secondary.
* @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)} * @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public static void sortBySpecificityAndQuality(List<MediaType> mediaTypes) { public static void sortBySpecificityAndQuality(List<MediaType> mediaTypes) {
Assert.notNull(mediaTypes, "'mediaTypes' must not be null"); Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
if (mediaTypes.size() > 1) { if (mediaTypes.size() > 1) {
@ -878,7 +878,7 @@ public class MediaType extends MimeType implements Serializable {
* Comparator used by {@link #sortByQualityValue(List)}. * Comparator used by {@link #sortByQualityValue(List)}.
* @deprecated As of 6.0, with no direct replacement * @deprecated As of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static final Comparator<MediaType> QUALITY_VALUE_COMPARATOR = (mediaType1, mediaType2) -> { public static final Comparator<MediaType> QUALITY_VALUE_COMPARATOR = (mediaType1, mediaType2) -> {
double quality1 = mediaType1.getQualityValue(); double quality1 = mediaType1.getQualityValue();
double quality2 = mediaType2.getQualityValue(); double quality2 = mediaType2.getQualityValue();
@ -918,7 +918,7 @@ public class MediaType extends MimeType implements Serializable {
* Comparator used by {@link #sortBySpecificity(List)}. * Comparator used by {@link #sortBySpecificity(List)}.
* @deprecated As of 6.0, with no direct replacement * @deprecated As of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new SpecificityComparator<>() { public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new SpecificityComparator<>() {
@Override @Override

2
spring-web/src/main/java/org/springframework/http/ResponseEntity.java
View File

@ -157,7 +157,7 @@ public class ResponseEntity<T> extends HttpEntity<T> {
* @since 4.3 * @since 4.3
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public int getStatusCodeValue() { public int getStatusCodeValue() {
if (this.status instanceof HttpStatusCode statusCode) { if (this.status instanceof HttpStatusCode statusCode) {
return statusCode.value(); return statusCode.value();

4
spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ import org.springframework.http.HttpStatusCode;
* @since 3.1.1 * @since 3.1.1
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public abstract class AbstractClientHttpResponse implements ClientHttpResponse { public abstract class AbstractClientHttpResponse implements ClientHttpResponse {
@Override @Override

4
spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,7 +50,7 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
* @see #getStatusCode() * @see #getStatusCode()
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
int getRawStatusCode() throws IOException; int getRawStatusCode() throws IOException;
/** /**

4
spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -53,7 +53,7 @@ public interface ClientHttpResponse extends ReactiveHttpInputMessage {
* @see #getStatusCode() * @see #getStatusCode()
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
int getRawStatusCode(); int getRawStatusCode();
/** /**

4
spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -68,7 +68,7 @@ public interface ServerHttpResponse extends ReactiveHttpOutputMessage {
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Nullable @Nullable
@Deprecated @Deprecated(since = "6.0")
default Integer getRawStatusCode() { default Integer getRawStatusCode() {
HttpStatusCode httpStatus = getStatusCode(); HttpStatusCode httpStatus = getStatusCode();
return (httpStatus != null ? httpStatus.value() : null); return (httpStatus != null ? httpStatus.value() : null);

2
spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java
View File

@ -107,7 +107,7 @@ public class RestClientResponseException extends RestClientException {
* Return the raw HTTP status code value. * Return the raw HTTP status code value.
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public int getRawStatusCode() { public int getRawStatusCode() {
return this.statusCode.value(); return this.statusCode.value();
} }

4
spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -115,7 +115,7 @@ public class UnknownContentTypeException extends RestClientException {
* Return the raw HTTP status code value. * Return the raw HTTP status code value.
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public int getRawStatusCode() { public int getRawStatusCode() {
return this.statusCode.value(); return this.statusCode.value();
} }

2
spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
View File

@ -87,7 +87,7 @@ public class ModelAndViewContainer {
* @deprecated as of 6.0 without a replacement; once removed, the default * @deprecated as of 6.0 without a replacement; once removed, the default
* model will always be ignored on redirect * model will always be ignored on redirect
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) { public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) {
this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect; this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect;
} }

2
spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
View File

@ -81,7 +81,7 @@ public class MethodNotAllowedException extends ResponseStatusException {
* @since 5.1.13 * @since 5.1.13
* @deprecated as of 6.0 in favor of {@link #getHeaders()} * @deprecated as of 6.0 in favor of {@link #getHeaders()}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Override @Override
public HttpHeaders getResponseHeaders() { public HttpHeaders getResponseHeaders() {
return getHeaders(); return getHeaders();

2
spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java
View File

@ -76,7 +76,7 @@ public class NotAcceptableStatusException extends ResponseStatusException {
* @since 5.1.13 * @since 5.1.13
* @deprecated as of 6.0 in favor of {@link #getHeaders()} * @deprecated as of 6.0 in favor of {@link #getHeaders()}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Override @Override
public HttpHeaders getResponseHeaders() { public HttpHeaders getResponseHeaders() {
return getHeaders(); return getHeaders();

2
spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
View File

@ -104,7 +104,7 @@ public class ResponseStatusException extends ErrorResponseException {
* @since 5.1.13 * @since 5.1.13
* @deprecated as of 6.0 in favor of {@link #getHeaders()} * @deprecated as of 6.0 in favor of {@link #getHeaders()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public HttpHeaders getResponseHeaders() { public HttpHeaders getResponseHeaders() {
return HttpHeaders.EMPTY; return HttpHeaders.EMPTY;
} }

2
spring-web/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java
View File

@ -155,7 +155,7 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException
* Delegates to {@link #getHeaders()}. * Delegates to {@link #getHeaders()}.
* @deprecated as of 6.0 in favor of {@link #getHeaders()} * @deprecated as of 6.0 in favor of {@link #getHeaders()}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Override @Override
public HttpHeaders getResponseHeaders() { public HttpHeaders getResponseHeaders() {
return getHeaders(); return getHeaders();

2
spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
View File

@ -134,7 +134,7 @@ public class ResponseStatusExceptionHandler implements WebExceptionHandler {
* @since 5.3 * @since 5.3
* @deprecated as of 6.0, in favor of {@link #determineStatus(Throwable)} * @deprecated as of 6.0, in favor of {@link #determineStatus(Throwable)}
*/ */
@Deprecated @Deprecated(since = "6.0")
protected int determineRawStatusCode(Throwable ex) { protected int determineRawStatusCode(Throwable ex) {
if (ex instanceof ResponseStatusException responseStatusException) { if (ex instanceof ResponseStatusException responseStatusException) {
return responseStatusException.getStatusCode().value(); return responseStatusException.getStatusCode().value();

2
spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
View File

@ -41,7 +41,7 @@ import org.springframework.lang.Nullable;
* @see org.springframework.core.NestedRuntimeException * @see org.springframework.core.NestedRuntimeException
* @deprecated as of 6.0, in favor of standard {@link ServletException} nesting * @deprecated as of 6.0, in favor of standard {@link ServletException} nesting
*/ */
@Deprecated @Deprecated(since = "6.0")
public class NestedServletException extends ServletException { public class NestedServletException extends ServletException {
/** Use serialVersionUID from Spring 1.2 for interoperability. */ /** Use serialVersionUID from Spring 1.2 for interoperability. */

4
spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
View File

@ -54,7 +54,7 @@ public class PathPatternParser {
* 6.0 in favor of configuring explicit redirects through a proxy, * 6.0 in favor of configuring explicit redirects through a proxy,
* Servlet/web filter, or a controller. * Servlet/web filter, or a controller.
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setMatchOptionalTrailingSeparator(boolean matchOptionalTrailingSeparator) { public void setMatchOptionalTrailingSeparator(boolean matchOptionalTrailingSeparator) {
this.matchOptionalTrailingSeparator = matchOptionalTrailingSeparator; this.matchOptionalTrailingSeparator = matchOptionalTrailingSeparator;
} }
@ -63,7 +63,7 @@ public class PathPatternParser {
* Whether optional trailing slashing match is enabled. * Whether optional trailing slashing match is enabled.
* @deprecated as of 6.0 together with {@link #setMatchOptionalTrailingSeparator(boolean)}. * @deprecated as of 6.0 together with {@link #setMatchOptionalTrailingSeparator(boolean)}.
*/ */
@Deprecated @Deprecated(since = "6.0")
public boolean isMatchOptionalTrailingSeparator() { public boolean isMatchOptionalTrailingSeparator() {
return this.matchOptionalTrailingSeparator; return this.matchOptionalTrailingSeparator;
} }

2
spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java
View File

@ -61,7 +61,7 @@ public class PathMatchConfigurer {
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) { public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) {
this.trailingSlashMatch = trailingSlashMatch; this.trailingSlashMatch = trailingSlashMatch;
return this; return this;

4
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -63,7 +63,7 @@ public interface ClientResponse {
* @since 5.1 * @since 5.1
* @deprecated as of 6.0, in favor of {@link #statusCode()} * @deprecated as of 6.0, in favor of {@link #statusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
int rawStatusCode(); int rawStatusCode();
/** /**

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java
View File

@ -174,7 +174,7 @@ public class WebClientResponseException extends WebClientException {
* Return the raw HTTP status code value. * Return the raw HTTP status code value.
* @deprecated as of 6.0, in favor of {@link #getStatusCode()} * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
public int getRawStatusCode() { public int getRawStatusCode() {
return this.statusCode.value(); return this.statusCode.value();
} }

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
View File

@ -75,7 +75,7 @@ public interface ServerRequest {
* @return the HTTP method as a String * @return the HTTP method as a String
* @deprecated as of 6.0, in favor of {@link #method()} * @deprecated as of 6.0, in favor of {@link #method()}
*/ */
@Deprecated @Deprecated(since = "6.0")
String methodName(); String methodName();
/** /**

4
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -71,7 +71,7 @@ public interface ServerResponse {
* @since 5.2 * @since 5.2
* @deprecated as of 6.0, in favor of {@link #statusCode()} * @deprecated as of 6.0, in favor of {@link #statusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
int rawStatusCode(); int rawStatusCode();
/** /**

2
spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
View File

@ -98,7 +98,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setUseTrailingSlashMatch(boolean trailingSlashMatch) { public void setUseTrailingSlashMatch(boolean trailingSlashMatch) {
this.patternParser.setMatchOptionalTrailingSeparator(trailingSlashMatch); this.patternParser.setMatchOptionalTrailingSeparator(trailingSlashMatch);
} }

4
spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -47,7 +47,7 @@ import org.springframework.lang.Nullable;
* @see org.springframework.ui.context.ThemeSource * @see org.springframework.ui.context.ThemeSource
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public interface ThemeResolver { public interface ThemeResolver {
/** /**

2
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
View File

@ -111,7 +111,7 @@ public class PathMatchConfigurer {
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) { public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) {
this.trailingSlashMatch = trailingSlashMatch; this.trailingSlashMatch = trailingSlashMatch;
return this; return this;

4
spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -70,7 +70,7 @@ public interface ServerResponse {
* @return the status as an integer * @return the status as an integer
* @deprecated as of 6.0, in favor of {@link #statusCode()} * @deprecated as of 6.0, in favor of {@link #statusCode()}
*/ */
@Deprecated @Deprecated(since = "6.0")
int rawStatusCode(); int rawStatusCode();
/** /**

6
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
View File

@ -181,7 +181,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* @see org.springframework.web.util.UrlPathHelper#setAlwaysUseFullPath(boolean) * @see org.springframework.web.util.UrlPathHelper#setAlwaysUseFullPath(boolean)
* @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)} * @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setAlwaysUseFullPath(boolean alwaysUseFullPath) { public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
this.urlPathHelper.setAlwaysUseFullPath(alwaysUseFullPath); this.urlPathHelper.setAlwaysUseFullPath(alwaysUseFullPath);
if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) { if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
@ -196,7 +196,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* @see org.springframework.web.util.UrlPathHelper#setUrlDecode(boolean) * @see org.springframework.web.util.UrlPathHelper#setUrlDecode(boolean)
* @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)} * @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setUrlDecode(boolean urlDecode) { public void setUrlDecode(boolean urlDecode) {
this.urlPathHelper.setUrlDecode(urlDecode); this.urlPathHelper.setUrlDecode(urlDecode);
if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) { if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
@ -211,7 +211,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* @see org.springframework.web.util.UrlPathHelper#setRemoveSemicolonContent(boolean) * @see org.springframework.web.util.UrlPathHelper#setRemoveSemicolonContent(boolean)
* @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)} * @deprecated as of 6.0, in favor of using {@link #setUrlPathHelper(UrlPathHelper)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setRemoveSemicolonContent(boolean removeSemicolonContent) { public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
this.urlPathHelper.setRemoveSemicolonContent(removeSemicolonContent); this.urlPathHelper.setRemoveSemicolonContent(removeSemicolonContent);
if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) { if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
View File

@ -108,7 +108,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping i
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) { public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) {
this.useTrailingSlashMatch = useTrailingSlashMatch; this.useTrailingSlashMatch = useTrailingSlashMatch;
if (getPatternParser() != null) { if (getPatternParser() != null) {

4
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
View File

@ -377,7 +377,7 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleConte
* @see jakarta.servlet.http.HttpServletRequest#getLocale() * @see jakarta.servlet.http.HttpServletRequest#getLocale()
* @deprecated as of 6.0, in favor of {@link #setDefaultLocaleFunction(Function)} * @deprecated as of 6.0, in favor of {@link #setDefaultLocaleFunction(Function)}
*/ */
@Deprecated @Deprecated(since = "6.0")
protected Locale determineDefaultLocale(HttpServletRequest request) { protected Locale determineDefaultLocale(HttpServletRequest request) {
return this.defaultLocaleFunction.apply(request); return this.defaultLocaleFunction.apply(request);
} }
@ -392,7 +392,7 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleConte
* @see #setDefaultTimeZone * @see #setDefaultTimeZone
* @deprecated as of 6.0, in favor of {@link #setDefaultTimeZoneFunction(Function)} * @deprecated as of 6.0, in favor of {@link #setDefaultTimeZoneFunction(Function)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
protected TimeZone determineDefaultTimeZone(HttpServletRequest request) { protected TimeZone determineDefaultTimeZone(HttpServletRequest request) {
return this.defaultTimeZoneFunction.apply(request); return this.defaultTimeZoneFunction.apply(request);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
View File

@ -208,7 +208,7 @@ public class SessionLocaleResolver extends AbstractLocaleContextResolver {
* @see jakarta.servlet.http.HttpServletRequest#getLocale() * @see jakarta.servlet.http.HttpServletRequest#getLocale()
* @deprecated as of 6.0, in favor of {@link #setDefaultLocaleFunction(Function)} * @deprecated as of 6.0, in favor of {@link #setDefaultLocaleFunction(Function)}
*/ */
@Deprecated @Deprecated(since = "6.0")
protected Locale determineDefaultLocale(HttpServletRequest request) { protected Locale determineDefaultLocale(HttpServletRequest request) {
return this.defaultLocaleFunction.apply(request); return this.defaultLocaleFunction.apply(request);
} }
@ -223,7 +223,7 @@ public class SessionLocaleResolver extends AbstractLocaleContextResolver {
* @see #setDefaultTimeZone * @see #setDefaultTimeZone
* @deprecated as of 6.0, in favor of {@link #setDefaultTimeZoneFunction(Function)} * @deprecated as of 6.0, in favor of {@link #setDefaultTimeZoneFunction(Function)}
*/ */
@Deprecated @Deprecated(since = "6.0")
@Nullable @Nullable
protected TimeZone determineDefaultTimeZone(HttpServletRequest request) { protected TimeZone determineDefaultTimeZone(HttpServletRequest request) {
return this.defaultTimeZoneFunction.apply(request); return this.defaultTimeZoneFunction.apply(request);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
View File

@ -954,7 +954,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setTrailingSlashMatch(boolean trailingSlashMatch) { public void setTrailingSlashMatch(boolean trailingSlashMatch) {
this.trailingSlashMatch = trailingSlashMatch; this.trailingSlashMatch = trailingSlashMatch;
} }
@ -963,7 +963,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
* Return whether to apply trailing slash matching in PatternsRequestCondition. * Return whether to apply trailing slash matching in PatternsRequestCondition.
* @deprecated as of 6.0 together with {@link #setTrailingSlashMatch(boolean)} * @deprecated as of 6.0 together with {@link #setTrailingSlashMatch(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public boolean useTrailingSlashMatch() { public boolean useTrailingSlashMatch() {
return this.trailingSlashMatch; return this.trailingSlashMatch;
} }

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
View File

@ -479,7 +479,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
* @deprecated as of 6.0 without a replacement; once removed, the default * @deprecated as of 6.0 without a replacement; once removed, the default
* model will always be ignored on redirect * model will always be ignored on redirect
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) { public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) {
this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect; this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect;
} }

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
View File

@ -145,7 +145,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
* @deprecated as of 6.0, see * @deprecated as of 6.0, see
* {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)} * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) { public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) {
this.useTrailingSlashMatch = useTrailingSlashMatch; this.useTrailingSlashMatch = useTrailingSlashMatch;
if (getPatternParser() != null) { if (getPatternParser() != null) {

6
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
View File

@ -80,7 +80,7 @@ public class RequestContext {
* @see org.springframework.web.servlet.theme.AbstractThemeResolver#ORIGINAL_DEFAULT_THEME_NAME * @see org.springframework.web.servlet.theme.AbstractThemeResolver#ORIGINAL_DEFAULT_THEME_NAME
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public static final String DEFAULT_THEME_NAME = "theme"; public static final String DEFAULT_THEME_NAME = "theme";
/** /**
@ -392,7 +392,7 @@ public class RequestContext {
* <p>Resolved lazily for more efficiency when theme support is not being used. * <p>Resolved lazily for more efficiency when theme support is not being used.
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.ui.context.Theme getTheme() { public org.springframework.ui.context.Theme getTheme() {
if (this.theme == null) { if (this.theme == null) {
// Lazily determine theme to use for this RequestContext. // Lazily determine theme to use for this RequestContext.
@ -431,7 +431,7 @@ public class RequestContext {
* @see org.springframework.web.servlet.ThemeResolver#setThemeName * @see org.springframework.web.servlet.ThemeResolver#setThemeName
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public void changeTheme(@Nullable org.springframework.ui.context.Theme theme) { public void changeTheme(@Nullable org.springframework.ui.context.Theme theme) {
org.springframework.web.servlet.ThemeResolver themeResolver = RequestContextUtils.getThemeResolver(this.request); org.springframework.web.servlet.ThemeResolver themeResolver = RequestContextUtils.getThemeResolver(this.request);
if (themeResolver == null) { if (themeResolver == null) {

6
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
View File

@ -185,7 +185,7 @@ public abstract class RequestContextUtils {
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Nullable @Nullable
@Deprecated @Deprecated(since = "6.0")
public static org.springframework.web.servlet.ThemeResolver getThemeResolver(HttpServletRequest request) { public static org.springframework.web.servlet.ThemeResolver getThemeResolver(HttpServletRequest request) {
return (org.springframework.web.servlet.ThemeResolver) request.getAttribute(DispatcherServlet.THEME_RESOLVER_ATTRIBUTE); return (org.springframework.web.servlet.ThemeResolver) request.getAttribute(DispatcherServlet.THEME_RESOLVER_ATTRIBUTE);
} }
@ -198,7 +198,7 @@ public abstract class RequestContextUtils {
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Nullable @Nullable
@Deprecated @Deprecated(since = "6.0")
public static org.springframework.ui.context.ThemeSource getThemeSource(HttpServletRequest request) { public static org.springframework.ui.context.ThemeSource getThemeSource(HttpServletRequest request) {
return (org.springframework.ui.context.ThemeSource) request.getAttribute(DispatcherServlet.THEME_SOURCE_ATTRIBUTE); return (org.springframework.ui.context.ThemeSource) request.getAttribute(DispatcherServlet.THEME_SOURCE_ATTRIBUTE);
} }
@ -212,7 +212,7 @@ public abstract class RequestContextUtils {
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Nullable @Nullable
@Deprecated @Deprecated(since = "6.0")
public static org.springframework.ui.context.Theme getTheme(HttpServletRequest request) { public static org.springframework.ui.context.Theme getTheme(HttpServletRequest request) {
org.springframework.web.servlet.ThemeResolver themeResolver = getThemeResolver(request); org.springframework.web.servlet.ThemeResolver themeResolver = getThemeResolver(request);
org.springframework.ui.context.ThemeSource themeSource = getThemeSource(request); org.springframework.ui.context.ThemeSource themeSource = getThemeSource(request);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -125,7 +125,7 @@ import org.springframework.context.NoSuchMessageException;
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
@Deprecated @Deprecated(since = "6.0")
public class ThemeTag extends MessageTag { public class ThemeTag extends MessageTag {
/** /**

4
spring-webmvc/src/main/java/org/springframework/web/servlet/theme/AbstractThemeResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ import org.springframework.web.servlet.ThemeResolver;
* @since 17.06.2003 * @since 17.06.2003
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public abstract class AbstractThemeResolver implements ThemeResolver { public abstract class AbstractThemeResolver implements ThemeResolver {
/** /**

4
spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -41,7 +41,7 @@ import org.springframework.web.util.WebUtils;
* @see #setThemeName * @see #setThemeName
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class CookieThemeResolver extends CookieGenerator implements ThemeResolver { public class CookieThemeResolver extends CookieGenerator implements ThemeResolver {
/** /**

4
spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
* @see #setDefaultThemeName * @see #setDefaultThemeName
* @deprecated as of 6.0, with no direct replacement * @deprecated as of 6.0, with no direct replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class FixedThemeResolver extends AbstractThemeResolver { public class FixedThemeResolver extends AbstractThemeResolver {
@Override @Override

4
spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
* @see #setThemeName * @see #setThemeName
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class SessionThemeResolver extends AbstractThemeResolver { public class SessionThemeResolver extends AbstractThemeResolver {
/** /**

4
spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,7 +33,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
* @see org.springframework.web.servlet.ThemeResolver * @see org.springframework.web.servlet.ThemeResolver
* @deprecated as of 6.0, with no concrete replacement * @deprecated as of 6.0, with no concrete replacement
*/ */
@Deprecated @Deprecated(since = "6.0")
public class ThemeChangeInterceptor implements HandlerInterceptor { public class ThemeChangeInterceptor implements HandlerInterceptor {
/** /**

2
spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java
View File

@ -117,7 +117,7 @@ public abstract class AbstractWebSocketClient implements WebSocketClient {
* @return the established WebSocket session wrapped in a {@code ListenableFuture}. * @return the established WebSocket session wrapped in a {@code ListenableFuture}.
* @deprecated as of 6.0, in favor of {@link #executeInternal(WebSocketHandler, HttpHeaders, URI, List, List, Map)} * @deprecated as of 6.0, in favor of {@link #executeInternal(WebSocketHandler, HttpHeaders, URI, List, List, Map)}
*/ */
@Deprecated @Deprecated(since = "6.0")
protected org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshakeInternal( protected org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshakeInternal(
WebSocketHandler webSocketHandler, HttpHeaders headers, URI uri, List<String> subProtocols, WebSocketHandler webSocketHandler, HttpHeaders headers, URI uri, List<String> subProtocols,
List<WebSocketExtension> extensions, Map<String, Object> attributes) { List<WebSocketExtension> extensions, Map<String, Object> attributes) {

4
spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java
View File

@ -44,7 +44,7 @@ public interface WebSocketClient {
* @return a future that completes when the session is available * @return a future that completes when the session is available
* @deprecated as of 6.0, in favor of {@link #execute(WebSocketHandler, String, Object...)} * @deprecated as of 6.0, in favor of {@link #execute(WebSocketHandler, String, Object...)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshake( default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshake(
WebSocketHandler webSocketHandler, String uriTemplate, Object... uriVariables) { WebSocketHandler webSocketHandler, String uriTemplate, Object... uriVariables) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(
@ -71,7 +71,7 @@ public interface WebSocketClient {
* @return a future that completes when the session is available * @return a future that completes when the session is available
* @deprecated as of 6.0, in favor of {@link #execute(WebSocketHandler, WebSocketHttpHeaders, URI)} * @deprecated as of 6.0, in favor of {@link #execute(WebSocketHandler, WebSocketHttpHeaders, URI)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshake( default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> doHandshake(
WebSocketHandler webSocketHandler, @Nullable WebSocketHttpHeaders headers, URI uri) { WebSocketHandler webSocketHandler, @Nullable WebSocketHttpHeaders headers, URI uri) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(

8
spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
View File

@ -211,7 +211,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif
* @return a {@code ListenableFuture} for access to the session when ready for use * @return a {@code ListenableFuture} for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(String, StompSessionHandler, Object...)} * @deprecated as of 6.0, in favor of {@link #connectAsync(String, StompSessionHandler, Object...)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
String url, StompSessionHandler handler, Object... uriVars) { String url, StompSessionHandler handler, Object... uriVars) {
@ -244,7 +244,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif
* @return a {@code ListenableFuture} for access to the session when ready for use * @return a {@code ListenableFuture} for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(String, WebSocketHttpHeaders, StompSessionHandler, Object...)} * @deprecated as of 6.0, in favor of {@link #connectAsync(String, WebSocketHttpHeaders, StompSessionHandler, Object...)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
String url, @Nullable WebSocketHttpHeaders handshakeHeaders, String url, @Nullable WebSocketHttpHeaders handshakeHeaders,
StompSessionHandler handler, Object... uriVariables) { StompSessionHandler handler, Object... uriVariables) {
@ -283,7 +283,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif
* @return a {@code ListenableFuture} for access to the session when ready for use * @return a {@code ListenableFuture} for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(String, WebSocketHttpHeaders, StompHeaders, StompSessionHandler, Object...)} * @deprecated as of 6.0, in favor of {@link #connectAsync(String, WebSocketHttpHeaders, StompHeaders, StompSessionHandler, Object...)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
String url, @Nullable WebSocketHttpHeaders handshakeHeaders, String url, @Nullable WebSocketHttpHeaders handshakeHeaders,
@Nullable StompHeaders connectHeaders, StompSessionHandler handler, Object... uriVariables) { @Nullable StompHeaders connectHeaders, StompSessionHandler handler, Object... uriVariables) {
@ -324,7 +324,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif
* @return a {@code ListenableFuture} for access to the session when ready for use * @return a {@code ListenableFuture} for access to the session when ready for use
* @deprecated as of 6.0, in favor of {@link #connectAsync(URI, WebSocketHttpHeaders, StompHeaders, StompSessionHandler)} * @deprecated as of 6.0, in favor of {@link #connectAsync(URI, WebSocketHttpHeaders, StompHeaders, StompSessionHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public org.springframework.util.concurrent.ListenableFuture<StompSession> connect( public org.springframework.util.concurrent.ListenableFuture<StompSession> connect(
URI url, @Nullable WebSocketHttpHeaders handshakeHeaders, URI url, @Nullable WebSocketHttpHeaders handshakeHeaders,
@Nullable StompHeaders connectHeaders, StompSessionHandler sessionHandler) { @Nullable StompHeaders connectHeaders, StompSessionHandler sessionHandler) {

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java
View File

@ -71,7 +71,7 @@ public abstract class AbstractClientSockJsSession implements WebSocketSession {
* Create a new {@code AbstractClientSockJsSession}. * Create a new {@code AbstractClientSockJsSession}.
* @deprecated as of 6.0, in favor of {@link #AbstractClientSockJsSession(TransportRequest, WebSocketHandler, CompletableFuture)} * @deprecated as of 6.0, in favor of {@link #AbstractClientSockJsSession(TransportRequest, WebSocketHandler, CompletableFuture)}
*/ */
@Deprecated @Deprecated(since = "6.0")
protected AbstractClientSockJsSession(TransportRequest request, WebSocketHandler handler, protected AbstractClientSockJsSession(TransportRequest request, WebSocketHandler handler,
org.springframework.util.concurrent.SettableListenableFuture<WebSocketSession> connectFuture) { org.springframework.util.concurrent.SettableListenableFuture<WebSocketSession> connectFuture) {
this(request, handler, connectFuture.completable()); this(request, handler, connectFuture.completable());

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/Transport.java
View File

@ -45,7 +45,7 @@ public interface Transport {
* @return a future to indicate success or failure to connect * @return a future to indicate success or failure to connect
* @deprecated as of 6.0, in favor of {@link #connectAsync(TransportRequest, WebSocketHandler)} * @deprecated as of 6.0, in favor of {@link #connectAsync(TransportRequest, WebSocketHandler)}
*/ */
@Deprecated @Deprecated(since = "6.0")
default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> connect( default org.springframework.util.concurrent.ListenableFuture<WebSocketSession> connect(
TransportRequest request, WebSocketHandler webSocketHandler) { TransportRequest request, WebSocketHandler webSocketHandler) {
return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>( return new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/WebSocketClientSockJsSession.java
View File

@ -46,7 +46,7 @@ public class WebSocketClientSockJsSession extends AbstractClientSockJsSession im
* Create a new {@code WebSocketClientSockJsSession}. * Create a new {@code WebSocketClientSockJsSession}.
* @deprecated as of 6.0, in favor of {@link #WebSocketClientSockJsSession(TransportRequest, WebSocketHandler, CompletableFuture)} * @deprecated as of 6.0, in favor of {@link #WebSocketClientSockJsSession(TransportRequest, WebSocketHandler, CompletableFuture)}
*/ */
@Deprecated @Deprecated(since = "6.0")
public WebSocketClientSockJsSession(TransportRequest request, WebSocketHandler handler, public WebSocketClientSockJsSession(TransportRequest request, WebSocketHandler handler,
org.springframework.util.concurrent.SettableListenableFuture<WebSocketSession> connectFuture) { org.springframework.util.concurrent.SettableListenableFuture<WebSocketSession> connectFuture) {

Some files were not shown because too many files have changed in this diff Show More