Fix missing "since" attributes for Deprecated code

bclozel · bclozel · commit 5fbb81de100f · 2025-06-05T09:25:10.000+02:00
See gh-34989
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
@@ -616,14 +616,14 @@ public BeanContextMatcher(String expression) {
 
 		@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
@@ -319,7 +319,7 @@ public int getLine() {
 		}
 
 		@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
@@ -44,7 +44,7 @@
  * @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
@@ -43,7 +43,7 @@
  * @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
@@ -34,7 +34,7 @@
  * @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
@@ -85,13 +85,13 @@ public int capacity() {
 	}
 
 	@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 DataBuffer write(CharSequence charSequence,
 	}
 
 	@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 DataBuffer split(int index) {
 	}
 
 	@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
@@ -180,7 +180,7 @@ public int capacity() {
 	}
 
 	@Override
-	@Deprecated
+	@Deprecated(since = "6.0")
 	public DataBuffer capacity(int capacity) {
 		setCapacity(capacity);
 		return this;
@@ -340,7 +340,7 @@ private void write(ByteBuffer source) {
 	}
 
 	@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 DefaultDataBuffer split(int index) {
 	}
 
 	@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 ByteBuffer asByteBuffer(int index, int length) {
 	}
 
 	@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
@@ -85,7 +85,7 @@ public DefaultDataBufferFactory(boolean preferDirect, int defaultInitialCapacity
 
 
 	@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
@@ -138,7 +138,7 @@ public int capacity() {
 	}
 
 	@Override
-	@Deprecated
+	@Deprecated(since = "6.0")
 	public DataBuffer capacity(int capacity) {
 		this.delegate.capacity(capacity);
 		return this;
@@ -225,7 +225,7 @@ public DataBuffer write(ByteBuffer... buffers) {
 	}
 
 	@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 DataBuffer split(int index) {
 	}
 
 	@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
@@ -65,7 +65,7 @@ public JettyDataBufferFactory(boolean preferDirect, int defaultInitialCapacity)
 
 
 	@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
@@ -135,7 +135,7 @@ public int capacity() {
 	}
 
 	@Override
-	@Deprecated
+	@Deprecated(since = "6.0")
 	public NettyDataBuffer capacity(int capacity) {
 		this.byteBuf.capacity(capacity);
 		return this;
@@ -255,14 +255,14 @@ else if (StandardCharsets.US_ASCII.equals(charset)) {
 	}
 
 	@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 NettyDataBuffer split(int index) {
 	}
 
 	@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
@@ -61,7 +61,7 @@ public ByteBufAllocator getByteBufAllocator() {
 	}
 
 	@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
@@ -162,7 +162,7 @@ public int capacity() {
 		}
 
 		@Override
-		@Deprecated
+		@Deprecated(since = "6.0")
 		public DataBuffer capacity(int capacity) {
 			this.delegate.capacity(capacity);
 			return this;
@@ -249,7 +249,7 @@ public DataBuffer write(ByteBuffer... buffers) {
 		}
 
 		@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 DataBuffer split(int index) {
 		}
 
 		@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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ public int getLine() {`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`@Override`
`322`		`- @Deprecated`
	`322`	`+ @Deprecated(since = "4.0") // deprecated by AspectJ`
`323`	`323`	`public int getColumn() {`
`324`	`324`	`throw new UnsupportedOperationException();`
`325`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,13 @@ public int capacity() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`@Override`
`88`		`- @Deprecated`
	`88`	`+ @Deprecated(since = "6.0")`
`89`	`89`	`public DataBuffer capacity(int capacity) {`
`90`	`90`	`return this.delegate.capacity(capacity);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`		`- @Deprecated`
	`94`	`+ @Deprecated(since = "6.0")`
`95`	`95`	`public DataBuffer ensureCapacity(int capacity) {`
`96`	`96`	`return this.delegate.ensureCapacity(capacity);`
`97`	`97`	`}`
`@@ -173,13 +173,13 @@ public DataBuffer write(CharSequence charSequence,`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`@Override`
`176`		`- @Deprecated`
	`176`	`+ @Deprecated(since = "6.0")`
`177`	`177`	`public DataBuffer slice(int index, int length) {`
`178`	`178`	`return this.delegate.slice(index, length);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Override`
`182`		`- @Deprecated`
	`182`	`+ @Deprecated(since = "6.0")`
`183`	`183`	`public DataBuffer retainedSlice(int index, int length) {`
`184`	`184`	`return this.delegate.retainedSlice(index, length);`
`185`	`185`	`}`
`@@ -190,25 +190,25 @@ public DataBuffer split(int index) {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`@Override`
`193`		`- @Deprecated`
	`193`	`+ @Deprecated(since = "6.0")`
`194`	`194`	`public ByteBuffer asByteBuffer() {`
`195`	`195`	`return this.delegate.asByteBuffer();`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`@Override`
`199`		`- @Deprecated`
	`199`	`+ @Deprecated(since = "6.0")`
`200`	`200`	`public ByteBuffer asByteBuffer(int index, int length) {`
`201`	`201`	`return this.delegate.asByteBuffer(index, length);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`@Override`
`205`		`- @Deprecated`
	`205`	`+ @Deprecated(since = "6.0.5")`
`206`	`206`	`public ByteBuffer toByteBuffer() {`
`207`	`207`	`return this.delegate.toByteBuffer();`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`@Override`
`211`		`- @Deprecated`
	`211`	`+ @Deprecated(since = "6.0.5")`
`212`	`212`	`public ByteBuffer toByteBuffer(int index, int length) {`
`213`	`213`	`return this.delegate.toByteBuffer(index, length);`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public DefaultDataBufferFactory(boolean preferDirect, int defaultInitialCapacity`
`85`	`85`
`86`	`86`
`87`	`87`	`@Override`
`88`		`- @Deprecated`
	`88`	`+ @Deprecated(since = "6.0")`
`89`	`89`	`public DefaultDataBuffer allocateBuffer() {`
`90`	`90`	`return allocateBuffer(this.defaultInitialCapacity);`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public int capacity() {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@Override`
`141`		`- @Deprecated`
	`141`	`+ @Deprecated(since = "6.0")`
`142`	`142`	`public DataBuffer capacity(int capacity) {`
`143`	`143`	`this.delegate.capacity(capacity);`
`144`	`144`	`return this;`
`@@ -225,7 +225,7 @@ public DataBuffer write(ByteBuffer... buffers) {`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`@Override`
`228`		`- @Deprecated`
	`228`	`+ @Deprecated(since = "6.0")`
`229`	`229`	`public DataBuffer slice(int index, int length) {`
`230`	`230`	`DefaultDataBuffer delegateSlice = this.delegate.slice(index, length);`
`231`	`231`	`if (this.chunk != null) {`
`@@ -250,19 +250,19 @@ public DataBuffer split(int index) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`@Override`
`253`		`- @Deprecated`
	`253`	`+ @Deprecated(since = "6.0")`
`254`	`254`	`public ByteBuffer asByteBuffer() {`
`255`	`255`	`return this.delegate.asByteBuffer();`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`@Override`
`259`		`- @Deprecated`
	`259`	`+ @Deprecated(since = "6.0")`
`260`	`260`	`public ByteBuffer asByteBuffer(int index, int length) {`
`261`	`261`	`return this.delegate.asByteBuffer(index, length);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`@Override`
`265`		`- @Deprecated`
	`265`	`+ @Deprecated(since = "6.0.5")`
`266`	`266`	`public ByteBuffer toByteBuffer(int index, int length) {`
`267`	`267`	`return this.delegate.toByteBuffer(index, length);`
`268`	`268`	`}`