Merge formatting issues + formatter using wrong configuration

redis · May 2, 2024 · 6acfa37 · 6acfa37
1 parent 8af7392
commit 6acfa37
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -851,15 +851,13 @@
                         <directory>${project.build.testSourceDirectory}</directory>
                         <directory>${project.basedir}/src/main/templates</directory>
                     </directories>
+                    <configFile>formatting.xml</configFile>
                 </configuration>
                 <executions>
                     <execution>
                         <goals>
                             <goal>validate</goal>
                         </goals>
-                        <configuration>
-                            <configFile>formatting.xml</configFile>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -2151,7 +2151,7 @@ public Flux<V> spop(K key, long count) {
     public Mono<Long> spublish(K shardChannel, V message) {
         return createMono(() -> commandBuilder.spublish(shardChannel, message));
     }
-    
+
     @Override
     public Mono<V> srandmember(K key) {
         return createMono(() -> commandBuilder.srandmember(key));

diff --git a/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java b/src/main/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubListener.java
@@ -75,7 +75,7 @@ public interface RedisClusterPubSubListener<K, V> {
      * @param message Message.
      * @since 7.0
      */
-    default void smessage(RedisClusterNode node, K shardChannel, V message){
+    default void smessage(RedisClusterNode node, K shardChannel, V message) {
         message(node, shardChannel, message);
     }
 

diff --git a/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java b/src/main/java/io/lettuce/core/pubsub/PubSubCommandBuilder.java
@@ -102,15 +102,15 @@ Command<K, V, Long> spublish(K shardChannel, V message) {
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(shardChannel).addValue(message);
         return createCommand(SPUBLISH, new IntegerOutput<>(codec), args);
     }
-    
+
     @SafeVarargs
     final Command<K, V, V> ssubscribe(K... shardChannels) {
         LettuceAssert.notEmpty(shardChannels, "Shard channels " + MUST_NOT_BE_EMPTY);
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(shardChannels);
         return createCommand(SSUBSCRIBE, new PubSubOutput<>(codec), args);
     }
-    
+
     @SafeVarargs
     final Command<K, V, V> subscribe(K... channels) {
         LettuceAssert.notEmpty(channels, "Channels " + MUST_NOT_BE_EMPTY);

diff --git a/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java b/src/main/java/io/lettuce/core/pubsub/RedisPubSubAdapter.java
@@ -60,7 +60,7 @@ public void punsubscribed(K pattern, long count) {
     }
 
     @Override
-    public void smessage(K shardChannel, V message) {  
+    public void smessage(K shardChannel, V message) {
         // empty adapter method
     }
 

diff --git a/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java b/src/test/java/io/lettuce/core/RedisClientIntegrationTests.java
@@ -139,10 +139,8 @@ void shouldPropagateCommandTimeoutToCommandListener() throws InterruptedExceptio
         assertThat(commandListener.succeeded).isEmpty();
 
         Wait.untilTrue(() -> commandListener.failed.size() == 1);
-        Wait.untilTrue(() ->
-                commandListener.failed.stream().anyMatch(command ->
-                        command.getCommand().getType().equals(CommandType.BLPOP)));
-
+        Wait.untilTrue(() -> commandListener.failed.stream()
+                .anyMatch(command -> command.getCommand().getType().equals(CommandType.BLPOP)));
 
         FastShutdown.shutdown(client);
     }