Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setting the next release to be 6.4.x as part of #2880 #2881

Merged
merged 3 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>7.0.0.BUILD-SNAPSHOT</version>
<version>6.4.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Lettuce</name>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/lettuce/core/KillArgs.java
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public static KillArgs user(String username) {
*
* @return new {@link KillArgs} with {@literal MAXAGE} set.
* @see KillArgs#maxAge(Long)
* @since 7.0
* @since 6.4
*/
public static KillArgs maxAge(Long maxAge) {
return new KillArgs().maxAge(maxAge);
Expand Down Expand Up @@ -259,7 +259,7 @@ public KillArgs type(Type type) {
*
* @param maxAge must not be {@code null}.
* @return {@code this} {@link KillArgs}.
* @since 7.0
* @since 6.4
*/
public KillArgs maxAge(Long maxAge) {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/lettuce/core/ScanIterator.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V>
* @param <K> Key type.
* @param <V> Value type.
* @return a new {@link ScanIterator}.
* @since 7.0
* @since 6.4
*/
public static <K, V> ScanIterator<K> hscanNovalues(RedisHashCommands<K, V> commands, K key) {
return hscanNovalues(commands, key, Optional.empty());
Expand Down Expand Up @@ -147,7 +147,7 @@ public static <K, V> ScanIterator<KeyValue<K, V>> hscan(RedisHashCommands<K, V>
* @param <K> Key type.
* @param <V> Value type.
* @return a new {@link ScanIterator}.
* @since 7.0
* @since 6.4
*/
public static <K, V> ScanIterator<K> hscanNovalues(RedisHashCommands<K, V> commands, K key, ScanArgs scanArgs) {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/lettuce/core/ScanStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V>
* @param <K> Key type.
* @param <V> Value type.
* @return a new {@link Flux}.
* @since 7.0
* @since 6.4
*/
public static <K, V> Flux<K> hscanNovalues(RedisHashReactiveCommands<K, V> commands, K key) {
return hscanNovalues(commands, key, Optional.empty());
Expand Down Expand Up @@ -148,7 +148,7 @@ public static <K, V> Flux<KeyValue<K, V>> hscan(RedisHashReactiveCommands<K, V>
* @param <K> Key type.
* @param <V> Value type.
* @return a new {@link Flux}.
* @since 7.0
* @since 6.4
*/
public static <K, V> Flux<K> hscanNovalues(RedisHashReactiveCommands<K, V> commands, K key, ScanArgs scanArgs) {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/lettuce/core/XReadArgs.java
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public static <K> StreamOffset<K> latest(K name) {
*
* @param name must not be {@code null}.
* @return the {@link StreamOffset} object without a specific offset.
* @since 7.0
* @since 6.4
*/
public static <K> StreamOffset<K> last(K name) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public interface BaseRedisAsyncCommands<K, V> {
*
* @param shardChannels channel keys.
* @return array-reply a list of channels and number of subscribers for every channel.
* @since 7.0
* @since 6.4
*/
RedisFuture<Map<K, Long>> pubsubShardNumsub(K... shardChannels);

Expand All @@ -108,7 +108,7 @@ public interface BaseRedisAsyncCommands<K, V> {
* @param shardChannel the shard channel type: key.
* @param message the message type: value.
* @return Long integer-reply the number of clients that received the message.
* @since 7.0
* @since 6.4
*/
RedisFuture<Long> spublish(K shardChannel, V message);

Expand Down
156 changes: 78 additions & 78 deletions src/main/java/io/lettuce/core/api/async/RedisHashAsyncCommands.java

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/main/java/io/lettuce/core/api/async/RedisKeyAsyncCommands.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param seconds the seconds type: long.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set.
* @since 6.2
Expand All @@ -130,7 +130,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param seconds the seconds.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set.
* @since 6.2
Expand All @@ -152,7 +152,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand All @@ -174,7 +174,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand All @@ -197,7 +197,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand Down Expand Up @@ -324,7 +324,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param milliseconds the milliseconds type: long.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return integer-reply, specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not exist or
* the timeout could not be set.
* @since 6.2
Expand All @@ -347,7 +347,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param milliseconds the milliseconds.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return integer-reply, specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not exist or
* the timeout could not be set.
* @since 6.2
Expand All @@ -369,7 +369,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the milliseconds-timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand All @@ -391,7 +391,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the milliseconds-timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand All @@ -413,7 +413,7 @@ public interface RedisKeyAsyncCommands<K, V> {
*
* @param key the key.
* @param timestamp the milliseconds-timestamp type: posix time.
* @param expireArgs the expire arguments.
* @param expireArgs the expiry arguments.
* @return Boolean integer-reply specifically: {@code true} if the timeout was set. {@code false} if {@code key} does not
* exist or the timeout could not be set (see: {@code EXPIRE}).
* @since 6.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public interface RedisScriptingAsyncCommands<K, V> {
* @param values the values.
* @param <T> expected return type.
* @return script result.
* @since 7.0
* @since 6.4
*/
<T> RedisFuture<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public interface BaseRedisReactiveCommands<K, V> {
*
* @param shardChannels channel keys.
* @return array-reply a list of channels and number of subscribers for every channel.
* @since 7.0
* @since 6.4
*/
Mono<Map<K, Long>> pubsubShardNumsub(K... shardChannels);

Expand All @@ -108,7 +108,7 @@ public interface BaseRedisReactiveCommands<K, V> {
* @param shardChannel the shard channel type: key.
* @param message the message type: value.
* @return Long integer-reply the number of clients that received the message.
* @since 7.0
* @since 6.4
*/
Mono<Long> spublish(K shardChannel, V message);

Expand Down
Loading
Loading