diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index b9c657af0d5..f409f90ee7a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -616,14 +616,14 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut @Override @SuppressWarnings("rawtypes") - @Deprecated + @Deprecated(since = "4.0") // deprecated by AspectJ public boolean couldMatchJoinPointsInType(Class someClass) { return (contextMatch(someClass) == FuzzyBoolean.YES); } @Override @SuppressWarnings("rawtypes") - @Deprecated + @Deprecated(since = "4.0") // deprecated by AspectJ public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) { return (contextMatch(someClass) == FuzzyBoolean.YES); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java index 0b2eb35584c..d65035de7c0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java @@ -319,7 +319,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override - @Deprecated + @Deprecated(since = "4.0") // deprecated by AspectJ public int getColumn() { throw new UnsupportedOperationException(); } diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java index ac2b890ad94..d734e817e7a 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java @@ -44,7 +44,7 @@ import org.jspecify.annotations.Nullable; * @deprecated This class should only be used by the runtime-hints agent when instrumenting bytecode * and is not considered public API. */ -@Deprecated +@Deprecated(since = "6.0") public abstract class InstrumentedBridgeMethods { private InstrumentedBridgeMethods() { diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java b/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java index 1d1cf826a1b..3ea8f86a246 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/RuntimeHintsAgent.java @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; * @deprecated as of 7.0 in favor of the {@code -XX:MissingRegistrationReportingMode=Warn} and * {@code -XX:MissingRegistrationReportingMode=Exit} JVM flags with GraalVM. */ -@Deprecated(forRemoval = true) +@Deprecated(since = "7.0", forRemoval = true) public final class RuntimeHintsAgent { private static boolean loaded = false; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java b/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java index b6471174ffc..7184c9f9086 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/agent/RuntimeHintsRecorder.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; * @deprecated as of 7.0 in favor of the {@code -XX:MissingRegistrationReportingMode=Warn} and * {@code -XX:MissingRegistrationReportingMode=Exit} JVM flags with GraalVM. */ -@Deprecated(forRemoval = true) +@Deprecated(since = "7.0", forRemoval = true) @SuppressWarnings("removal") public final class RuntimeHintsRecorder { diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferWrapper.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferWrapper.java index 1de857f6293..cfba5927323 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferWrapper.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferWrapper.java @@ -85,13 +85,13 @@ public class DataBufferWrapper implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer capacity(int capacity) { return this.delegate.capacity(capacity); } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer ensureCapacity(int capacity) { return this.delegate.ensureCapacity(capacity); } @@ -173,13 +173,13 @@ public class DataBufferWrapper implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer slice(int index, int length) { return this.delegate.slice(index, length); } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer retainedSlice(int index, int length) { return this.delegate.retainedSlice(index, length); } @@ -190,25 +190,25 @@ public class DataBufferWrapper implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer() { return this.delegate.asByteBuffer(); } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer(int index, int length) { return this.delegate.asByteBuffer(index, length); } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer() { return this.delegate.toByteBuffer(); } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer(int index, int length) { return this.delegate.toByteBuffer(index, length); } diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java index fa05dd6ae1d..ece053d4b7f 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java @@ -180,7 +180,7 @@ public class DefaultDataBuffer implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer capacity(int capacity) { setCapacity(capacity); return this; @@ -340,7 +340,7 @@ public class DefaultDataBuffer implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DefaultDataBuffer slice(int index, int length) { checkIndex(index, length); int oldPosition = this.byteBuffer.position(); @@ -380,13 +380,13 @@ public class DefaultDataBuffer implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer() { return asByteBuffer(this.readPosition, readableByteCount()); } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer(int index, int length) { checkIndex(index, length); @@ -397,7 +397,7 @@ public class DefaultDataBuffer implements DataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer(int index, int length) { checkIndex(index, length); diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java index 81ed6242bdf..5572f29c07a 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java @@ -85,7 +85,7 @@ public class DefaultDataBufferFactory implements DataBufferFactory { @Override - @Deprecated + @Deprecated(since = "6.0") public DefaultDataBuffer allocateBuffer() { return allocateBuffer(this.defaultInitialCapacity); } diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java index 3ce726369bb..5d1c73aa954 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java @@ -138,7 +138,7 @@ public final class JettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer capacity(int capacity) { this.delegate.capacity(capacity); return this; @@ -225,7 +225,7 @@ public final class JettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer slice(int index, int length) { DefaultDataBuffer delegateSlice = this.delegate.slice(index, length); if (this.chunk != null) { @@ -250,19 +250,19 @@ public final class JettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer() { return this.delegate.asByteBuffer(); } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer(int index, int length) { return this.delegate.asByteBuffer(index, length); } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer(int index, int length) { return this.delegate.toByteBuffer(index, length); } diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBufferFactory.java b/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBufferFactory.java index 02a78c02745..c22fed6a1ba 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBufferFactory.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBufferFactory.java @@ -65,7 +65,7 @@ public class JettyDataBufferFactory implements DataBufferFactory { @Override - @Deprecated + @Deprecated(since = "6.0") public JettyDataBuffer allocateBuffer() { DefaultDataBuffer delegate = this.delegate.allocateBuffer(); return new JettyDataBuffer(this, delegate); diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java index 9c7d22e15b7..ec695cbb79f 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java @@ -135,7 +135,7 @@ public class NettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public NettyDataBuffer capacity(int capacity) { this.byteBuf.capacity(capacity); return this; @@ -255,14 +255,14 @@ public class NettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public NettyDataBuffer slice(int index, int length) { ByteBuf slice = this.byteBuf.slice(index, length); return new NettyDataBuffer(slice, this.dataBufferFactory); } @Override - @Deprecated + @Deprecated(since = "6.0") public NettyDataBuffer retainedSlice(int index, int length) { ByteBuf slice = this.byteBuf.retainedSlice(index, length); return new NettyDataBuffer(slice, this.dataBufferFactory); @@ -285,19 +285,19 @@ public class NettyDataBuffer implements PooledDataBuffer { } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer() { return this.byteBuf.nioBuffer(); } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer(int index, int length) { return this.byteBuf.nioBuffer(index, length); } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer(int index, int length) { ByteBuffer result = this.byteBuf.isDirect() ? ByteBuffer.allocateDirect(length) : diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBufferFactory.java b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBufferFactory.java index 40082b43712..2f1ff84ec0e 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBufferFactory.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBufferFactory.java @@ -61,7 +61,7 @@ public class NettyDataBufferFactory implements DataBufferFactory { } @Override - @Deprecated + @Deprecated(since = "6.0") public NettyDataBuffer allocateBuffer() { ByteBuf byteBuf = this.byteBufAllocator.buffer(); return new NettyDataBuffer(byteBuf, this); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java index 9a915d333aa..5fe7b09221f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java @@ -162,7 +162,7 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer capacity(int capacity) { this.delegate.capacity(capacity); return this; @@ -249,7 +249,7 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { } @Override - @Deprecated + @Deprecated(since = "6.0") public DataBuffer slice(int index, int length) { DataBuffer delegateSlice = this.delegate.slice(index, length); return new JettyCallbackDataBuffer(delegateSlice, this.callback); @@ -262,19 +262,19 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer() { return this.delegate.asByteBuffer(); } @Override - @Deprecated + @Deprecated(since = "6.0") public ByteBuffer asByteBuffer(int index, int length) { return this.delegate.asByteBuffer(index, length); } @Override - @Deprecated + @Deprecated(since = "6.0.5") public ByteBuffer toByteBuffer(int index, int length) { return this.delegate.toByteBuffer(index, length); }