Update deprecation warnings and method visibility.

Author: christophstrobl

src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java

@@ -176,7 +176,14 @@ public static byte[] toBytes(Number source) {
 		return toBytes(String.valueOf(source));
 	}
 
-	public static byte[] toBytes(Cursor.CursorId source) {
+	/**
+	 * Convert the given {@link org.springframework.data.redis.core.Cursor.CursorId} into its binary representation.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @return the binary representation.
+	 * @since 3.3
+	 */
+	static byte[] toBytes(Cursor.CursorId source) {
 		return toBytes(source.getCursorId());
 	}
 

src/main/java/org/springframework/data/redis/core/Cursor.java

@@ -49,9 +49,9 @@ public interface Cursor<T> extends CloseableIterator<T> {
 	 * <strong>NOTE:</strong> the id might change while iterating items.
 	 *
 	 * @return
-	 * @deprecated since 3.2.1, use {@link #getId()} instead as the cursorId can exceed {@link Long#MAX_VALUE}.
+	 * @deprecated since 3.3.0, use {@link #getId()} instead as the cursorId can exceed {@link Long#MAX_VALUE}.
 	 */
-	@Deprecated(since = "3.2.1")
+	@Deprecated(since = "3.3.0")
 	long getCursorId();
 
 	/**

src/main/java/org/springframework/data/redis/core/KeyBoundCursor.java

@@ -31,7 +31,9 @@ public abstract class KeyBoundCursor<T> extends ScanCursor<T> {
 	 *
 	 * @param cursorId
 	 * @param options Defaulted to {@link ScanOptions#NONE} if nulled.
+	 * @deprecated since 3.3.0 - Use {@link KeyBoundCursor#KeyBoundCursor(byte[], CursorId, ScanOptions)} instead.
 	 */
+	@Deprecated(since = "3.3.0")
 	public KeyBoundCursor(byte[] key, long cursorId, @Nullable ScanOptions options) {
 		super(cursorId, options != null ? options : ScanOptions.NONE);
 		this.key = key;
@@ -42,6 +44,7 @@ public KeyBoundCursor(byte[] key, long cursorId, @Nullable ScanOptions options)
 	 *
 	 * @param cursorId
 	 * @param options Defaulted to {@link ScanOptions#NONE} if nulled.
+	 * @since 3.3.0
 	 */
 	public KeyBoundCursor(byte[] key, CursorId cursorId, @Nullable ScanOptions options) {
 		super(cursorId, options != null ? options : ScanOptions.NONE);

src/main/java/org/springframework/data/redis/core/ScanCursor.java

@@ -65,9 +65,9 @@ public ScanCursor(ScanOptions options) {
 	 * Crates new {@link ScanCursor} with {@link ScanOptions#NONE}
 	 *
 	 * @param cursorId the cursor Id.
-	 * @deprecated since 3.2.1
+	 * @deprecated since 3.3.0 - Use {@link ScanCursor#ScanCursor(CursorId)} instead.
 	 */
-	@Deprecated
+	@Deprecated(since = "3.3.0")
 	public ScanCursor(long cursorId) {
 		this(cursorId, ScanOptions.NONE);
 	}
@@ -76,7 +76,7 @@ public ScanCursor(long cursorId) {
 	 * Crates new {@link ScanCursor} with {@link ScanOptions#NONE}
 	 *
 	 * @param cursorId the cursor Id.
-	 * @since 3.2.1
+	 * @since 3.3.0
 	 */
 	public ScanCursor(CursorId cursorId) {
 		this(cursorId, ScanOptions.NONE);
@@ -87,9 +87,9 @@ public ScanCursor(CursorId cursorId) {
 	 *
 	 * @param cursorId the cursor Id.
 	 * @param options Defaulted to {@link ScanOptions#NONE} if {@code null}.
-	 * @deprecated since 3.2.1
+	 * @deprecated since 3.3.0 - Use {@link ScanCursor#ScanCursor(CursorId, ScanOptions)} instead.
 	 */
-	@Deprecated
+	@Deprecated(since = "3.3.0")
 	public ScanCursor(long cursorId, @Nullable ScanOptions options) {
 		this(CursorId.of(cursorId), options);
 	}
@@ -99,7 +99,7 @@ public ScanCursor(long cursorId, @Nullable ScanOptions options) {
 	 *
 	 * @param cursorId the cursor Id.
 	 * @param options Defaulted to {@link ScanOptions#NONE} if {@code null}.
-	 * @since 3.2.1
+	 * @since 3.3.0
 	 */
 	public ScanCursor(CursorId cursorId, @Nullable ScanOptions options) {
 
@@ -130,9 +130,9 @@ private void scan(CursorId cursorId) {
 	 * @param cursorId
 	 * @param options
 	 * @return
-	 * @deprecated since 3.2.1, cursorId, can exceed {@link Long#MAX_VALUE}.
+	 * @deprecated since 3.3.0, cursorId, can exceed {@link Long#MAX_VALUE}.
 	 */
-	@Deprecated(since = "3.2.1")
+	@Deprecated(since = "3.3.0")
 	protected ScanIteration<T> doScan(long cursorId, ScanOptions options) {
 		return doScan(CursorId.of(cursorId), scanOptions);
 	}
@@ -144,7 +144,7 @@ protected ScanIteration<T> doScan(long cursorId, ScanOptions options) {
 	 * @param cursorId
 	 * @param options
 	 * @return
-	 * @since 3.2.1
+	 * @since 3.3.0
 	 */
 	protected ScanIteration<T> doScan(CursorId cursorId, ScanOptions options) {
 		return doScan(Long.parseLong(cursorId.getCursorId()), scanOptions);
@@ -169,9 +169,9 @@ public final ScanCursor<T> open() {
 	 * Customization hook when calling {@link #open()}.
 	 *
 	 * @param cursorId
-	 * @deprecated since 3.2.1, use {@link #doOpen(CursorId)} instead.
+	 * @deprecated since 3.3.0, use {@link #doOpen(CursorId)} instead.
 	 */
-	@Deprecated(since = "3.2.1", forRemoval = true)
+	@Deprecated(since = "3.3.0", forRemoval = true)
 	protected void doOpen(long cursorId) {
 		doOpen(CursorId.of(cursorId));
 	}
@@ -207,7 +207,7 @@ private void processScanResult(ScanIteration<T> result) {
 	 * @return {@literal true} if the cursor is considered finished, {@literal false} otherwise.s
 	 * @since 2.1
 	 */
-	@Deprecated(since = "3.2.1", forRemoval = true)
+	@Deprecated(since = "3.3.0", forRemoval = true)
 	protected boolean isFinished(long cursorId) {
 		return cursorId == 0;
 	}
@@ -217,7 +217,7 @@ protected boolean isFinished(long cursorId) {
 	 *
 	 * @param cursorId the cursor Id
 	 * @return {@literal true} if the cursor is considered finished, {@literal false} otherwise.s
-	 * @since 2.1
+	 * @since 3.3.0
 	 */
 	protected boolean isFinished(CursorId cursorId) {
 		return CursorId.isInitial(cursorId.getCursorId());

src/main/java/org/springframework/data/redis/core/ScanIteration.java

@@ -40,17 +40,18 @@ public class ScanIteration<T> implements Iterable<T> {
 	/**
 	 * @param cursorId
 	 * @param items
-	 * @deprecated since 3.2.1, use {@link ScanIteration#ScanIteration(String, Collection)} instead as {@code cursorId}
+	 * @deprecated since 3.3.0, use {@link ScanIteration#ScanIteration(CursorId, Collection)} instead as {@code cursorId}
 	 *             can exceed {@link Long#MAX_VALUE}.
 	 */
-	@Deprecated(since = "3.2.1")
+	@Deprecated(since = "3.3.0")
 	public ScanIteration(long cursorId, @Nullable Collection<T> items) {
 		this(CursorId.of(cursorId), items);
 	}
 
 	/**
-	 * @param rawCursorId
+	 * @param cursorId
 	 * @param items
+	 * @since 3.3.0
 	 */
 	public ScanIteration(CursorId cursorId, @Nullable Collection<T> items) {
 
@@ -62,9 +63,9 @@ public ScanIteration(CursorId cursorId, @Nullable Collection<T> items) {
 	 * The cursor id to be used for subsequent requests.
 	 *
 	 * @return
-	 * @deprecated since 3.2.1, use {@link #getId()} instead as the cursorId can exceed {@link Long#MAX_VALUE}.
+	 * @deprecated since 3.3.0, use {@link #getId()} instead as the cursorId can exceed {@link Long#MAX_VALUE}.
 	 */
-	@Deprecated
+	@Deprecated(since="3.3.3")
 	public long getCursorId() {
 		return Long.parseLong(getId().getCursorId());
 	}
@@ -73,6 +74,7 @@ public long getCursorId() {
 	 * The cursor id to be used for subsequent requests.
 	 *
 	 * @return
+	 * @since 3.3.0
 	 */
 	public CursorId getId() {
 		return cursorId;