Applying code formatter each time we run a Maven build (#2841)

* Let's try this again * Add tests and templates * Merge formatting issues + formatter using wrong configuration
redis · May 2, 2024 · 0364c29 · 0364c29
1 parent dfbdddc
commit 0364c29
Show file tree

Hide file tree

Showing 409 changed files with 1,869 additions and 1,199 deletions.
diff --git a/pom.xml b/pom.xml
@@ -841,6 +841,27 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+                <version>2.16.0</version>
+                <configuration>
+                    <directories>
+                        <directory>${project.build.sourceDirectory}</directory>
+                        <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>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>

diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -305,9 +305,8 @@ protected void channelType(ConnectionBuilder connectionBuilder, ConnectionPoint
         LettuceAssert.notNull(connectionPoint, "ConnectionPoint must not be null");
 
         boolean domainSocket = LettuceStrings.isNotEmpty(connectionPoint.getSocket());
-        connectionBuilder.bootstrap().group(
-                getEventLoopGroup(
-                        domainSocket ? NativeTransports.eventLoopGroupClass(true) : Transports.eventLoopGroupClass()));
+        connectionBuilder.bootstrap().group(getEventLoopGroup(
+                domainSocket ? NativeTransports.eventLoopGroupClass(true) : Transports.eventLoopGroupClass()));
 
         if (connectionPoint.getSocket() != null) {
             NativeTransports.assertDomainSocketAvailable();

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -1357,7 +1357,7 @@ public Mono<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K ke
 
     @Override
     public Mono<StreamScanCursor> hscanNovalues(KeyStreamingChannel<K> channel, K key, ScanCursor scanCursor,
-                                                ScanArgs scanArgs) {
+            ScanArgs scanArgs) {
         return createMono(() -> commandBuilder.hscanNoValuesStreaming(channel, key, scanCursor, scanArgs));
     }
 
@@ -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/ChannelGroupListener.java b/src/main/java/io/lettuce/core/ChannelGroupListener.java
@@ -67,4 +67,5 @@ private static String getRedisUri(Channel channel) {
     private static CommandHandler getCommandHandler(ChannelHandlerContext ctx) {
         return ctx.pipeline().get(CommandHandler.class);
     }
+
 }
diff --git a/src/main/java/io/lettuce/core/ClientOptions.java b/src/main/java/io/lettuce/core/ClientOptions.java
@@ -97,7 +97,6 @@ public class ClientOptions implements Serializable {
 
     private final TimeoutOptions timeoutOptions;
 
-
     protected ClientOptions(Builder builder) {
         this.autoReconnect = builder.autoReconnect;
         this.cancelCommandsOnReconnectFailure = builder.cancelCommandsOnReconnectFailure;
@@ -448,11 +447,11 @@ public ClientOptions.Builder mutate() {
 
         builder.autoReconnect(isAutoReconnect()).cancelCommandsOnReconnectFailure(isCancelCommandsOnReconnectFailure())
                 .decodeBufferPolicy(getDecodeBufferPolicy()).disconnectedBehavior(getDisconnectedBehavior())
-                .readOnlyCommands(getReadOnlyCommands())
-                .publishOnScheduler(isPublishOnScheduler()).pingBeforeActivateConnection(isPingBeforeActivateConnection())
-                .protocolVersion(getConfiguredProtocolVersion()).requestQueueSize(getRequestQueueSize())
-                .scriptCharset(getScriptCharset()).socketOptions(getSocketOptions()).sslOptions(getSslOptions())
-                .suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure()).timeoutOptions(getTimeoutOptions());
+                .readOnlyCommands(getReadOnlyCommands()).publishOnScheduler(isPublishOnScheduler())
+                .pingBeforeActivateConnection(isPingBeforeActivateConnection()).protocolVersion(getConfiguredProtocolVersion())
+                .requestQueueSize(getRequestQueueSize()).scriptCharset(getScriptCharset()).socketOptions(getSocketOptions())
+                .sslOptions(getSslOptions()).suspendReconnectOnProtocolFailure(isSuspendReconnectOnProtocolFailure())
+                .timeoutOptions(getTimeoutOptions());
 
         return builder;
     }

diff --git a/src/main/java/io/lettuce/core/CopyArgs.java b/src/main/java/io/lettuce/core/CopyArgs.java
@@ -33,75 +33,75 @@
  */
 public class CopyArgs implements CompositeArgument {
 
-	private Long destinationDb;
+    private Long destinationDb;
 
     private boolean replace;
 
-	/**
-	 * Builder entry points for {@link CopyArgs}.
-	 */
-	public static class Builder {
-
-		/**
-		 * Utility constructor.
-		 */
-		private Builder() {
-		}
-
-		/**
-		 * Creates new {@link CopyArgs} and sets {@literal DB}.
-		 *
-		 * @return new {@link CopyArgs} with {@literal DB} set.
-		 */
-		public static CopyArgs destinationDb(long destinationDb) {
-			return new CopyArgs().destinationDb(destinationDb);
-		}
-
-		/**
-		 * Creates new {@link CopyArgs} and sets {@literal REPLACE}.
-		 *
-		 * @return new {@link CopyArgs} with {@literal REPLACE} set.
-		 */
-		public static CopyArgs replace(boolean replace) {
-			return new CopyArgs().replace(replace);
-		}
-
-	}
-
-	/**
-	 * Specify an alternative logical database index for the destination key.
-	 *
-	 * @param destinationDb logical database index to apply for {@literal DB}.
-	 * @return {@code this}.
-	 */
-	public CopyArgs destinationDb(long destinationDb) {
-
-		this.destinationDb = destinationDb;
-		return this;
-	}
-
-	/**
-	 * Hint redis to remove the destination key before copying the value to it.
-	 *
-	 * @param replace remove destination key before copying the value {@literal REPLACE}.
-	 * @return {@code this}.
-	 */
-	public CopyArgs replace(boolean replace) {
-
-		this.replace = replace;
-		return this;
-	}
+    /**
+     * Builder entry points for {@link CopyArgs}.
+     */
+    public static class Builder {
+
+        /**
+         * Utility constructor.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Creates new {@link CopyArgs} and sets {@literal DB}.
+         *
+         * @return new {@link CopyArgs} with {@literal DB} set.
+         */
+        public static CopyArgs destinationDb(long destinationDb) {
+            return new CopyArgs().destinationDb(destinationDb);
+        }
+
+        /**
+         * Creates new {@link CopyArgs} and sets {@literal REPLACE}.
+         *
+         * @return new {@link CopyArgs} with {@literal REPLACE} set.
+         */
+        public static CopyArgs replace(boolean replace) {
+            return new CopyArgs().replace(replace);
+        }
+
+    }
+
+    /**
+     * Specify an alternative logical database index for the destination key.
+     *
+     * @param destinationDb logical database index to apply for {@literal DB}.
+     * @return {@code this}.
+     */
+    public CopyArgs destinationDb(long destinationDb) {
+
+        this.destinationDb = destinationDb;
+        return this;
+    }
+
+    /**
+     * Hint redis to remove the destination key before copying the value to it.
+     *
+     * @param replace remove destination key before copying the value {@literal REPLACE}.
+     * @return {@code this}.
+     */
+    public CopyArgs replace(boolean replace) {
+
+        this.replace = replace;
+        return this;
+    }
 
     @Override
-	public <K, V> void build(CommandArgs<K, V> args) {
+    public <K, V> void build(CommandArgs<K, V> args) {
 
-		if (destinationDb != null) {
-			args.add(CommandKeyword.DB).add(destinationDb);
-		}
+        if (destinationDb != null) {
+            args.add(CommandKeyword.DB).add(destinationDb);
+        }
 
         if (replace) {
-			args.add(CommandKeyword.REPLACE);
-		}
-	}
+            args.add(CommandKeyword.REPLACE);
+        }
+    }
 
 }
diff --git a/src/main/java/io/lettuce/core/FlushMode.java b/src/main/java/io/lettuce/core/FlushMode.java
@@ -51,4 +51,5 @@ public enum FlushMode implements ProtocolKeyword {
     public byte[] getBytes() {
         return bytes;
     }
+
 }
diff --git a/src/main/java/io/lettuce/core/GeoArgs.java b/src/main/java/io/lettuce/core/GeoArgs.java
@@ -266,6 +266,7 @@ public enum Unit implements ProtocolKeyword {
         public byte[] getBytes() {
             return asBytes;
         }
+
     }
 
     public <K, V> void build(CommandArgs<K, V> args) {

diff --git a/src/main/java/io/lettuce/core/KillArgs.java b/src/main/java/io/lettuce/core/KillArgs.java
@@ -27,8 +27,8 @@
 
 /**
  *
- * Argument list builder for the Redis <a href="https://redis.io/commands/client-kill">CLIENT KILL</a> command. Static import the
- * methods from {@link Builder} and chain the method calls: {@code id(1).skipme()}.
+ * Argument list builder for the Redis <a href="https://redis.io/commands/client-kill">CLIENT KILL</a> command. Static import
+ * the methods from {@link Builder} and chain the method calls: {@code id(1).skipme()}.
  * <p>
  * {@link KillArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *
@@ -159,6 +159,7 @@ public static KillArgs typeSlave() {
         public static KillArgs user(String username) {
             return new KillArgs().user(username);
         }
+
     }
 
     /**

diff --git a/src/main/java/io/lettuce/core/LMoveArgs.java b/src/main/java/io/lettuce/core/LMoveArgs.java
@@ -89,10 +89,12 @@ public static LMoveArgs rightLeft() {
         public static LMoveArgs rightRight() {
             return new LMoveArgs(CommandKeyword.RIGHT, CommandKeyword.RIGHT);
         }
+
     }
 
     @Override
     public <K, V> void build(CommandArgs<K, V> args) {
         args.add(source).add(destination);
     }
+
 }
diff --git a/src/main/java/io/lettuce/core/MigrateArgs.java b/src/main/java/io/lettuce/core/MigrateArgs.java
@@ -29,8 +29,8 @@
 import io.lettuce.core.protocol.CommandType;
 
 /**
- * Argument list builder for the Redis <a href="https://redis.io/commands/migrate">MIGRATE</a> command. Static import the methods
- * from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
+ * Argument list builder for the Redis <a href="https://redis.io/commands/migrate">MIGRATE</a> command. Static import the
+ * methods from {@link Builder} and chain the method calls: {@code copy().auth("foobar")}.
  * <p>
  * {@link MigrateArgs} is a mutable object and instances should be used only once to avoid shared mutable state.
  *

diff --git a/src/main/java/io/lettuce/core/Range.java b/src/main/java/io/lettuce/core/Range.java
@@ -261,7 +261,6 @@ public int hashCode() {
             return Objects.hash(value, including);
         }
 
-
         @Override
         public String toString() {
 

diff --git a/src/main/java/io/lettuce/core/ReadFromImpl.java b/src/main/java/io/lettuce/core/ReadFromImpl.java
@@ -62,6 +62,7 @@ public List<RedisNodeDescription> select(Nodes nodes) {
 
             return Collections.emptyList();
         }
+
     }
 
     /**

diff --git a/src/main/java/io/lettuce/core/RedisChannelWriter.java b/src/main/java/io/lettuce/core/RedisChannelWriter.java
@@ -69,8 +69,8 @@ public interface RedisChannelWriter extends Closeable, AsyncCloseable {
     void setConnectionFacade(ConnectionFacade connection);
 
     /**
-     * Disable or enable auto-flush behavior. Default is {@code true}. If autoFlushCommands is disabled, multiple commands
-     * can be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
+     * Disable or enable auto-flush behavior. Default is {@code true}. If autoFlushCommands is disabled, multiple commands can
+     * be issued without writing them actually to the transport. Commands are buffered until a {@link #flushCommands()} is
      * issued. After calling {@link #flushCommands()} commands are sent to the transport and executed by Redis.
      *
      * @param autoFlush state of autoFlush.

diff --git a/src/main/java/io/lettuce/core/RedisClient.java b/src/main/java/io/lettuce/core/RedisClient.java
@@ -744,28 +744,28 @@ private Mono<SocketAddress> lookupRedis(RedisURI sentinelUri) {
         return Mono.usingWhen(
                 Mono.fromCompletionStage(() -> connectSentinelAsync(newStringStringCodec(), sentinelUri, timeout)), c -> {
 
-            String sentinelMasterId = sentinelUri.getSentinelMasterId();
-            return c.reactive().getMasterAddrByName(sentinelMasterId).map(it -> {
+                    String sentinelMasterId = sentinelUri.getSentinelMasterId();
+                    return c.reactive().getMasterAddrByName(sentinelMasterId).map(it -> {
 
-                if (it instanceof InetSocketAddress) {
+                        if (it instanceof InetSocketAddress) {
 
-                    InetSocketAddress isa = (InetSocketAddress) it;
-                    SocketAddress resolved = getResources().socketAddressResolver()
-                            .resolve(RedisURI.create(isa.getHostString(), isa.getPort()));
+                            InetSocketAddress isa = (InetSocketAddress) it;
+                            SocketAddress resolved = getResources().socketAddressResolver()
+                                    .resolve(RedisURI.create(isa.getHostString(), isa.getPort()));
 
-                    logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
-                            isa.getPort(), resolved);
+                            logger.debug("Resolved Master {} SocketAddress {}:{} to {}", sentinelMasterId, isa.getHostString(),
+                                    isa.getPort(), resolved);
 
-                    return resolved;
-                }
+                            return resolved;
+                        }
 
-                return it;
-            }).timeout(timeout) //
+                        return it;
+                    }).timeout(timeout) //
                             .onErrorMap(e -> {
 
-                        RedisCommandTimeoutException ex = ExceptionFactory
-                                .createTimeoutException("Cannot obtain master using SENTINEL MASTER", timeout);
-                        ex.addSuppressed(e);
+                                RedisCommandTimeoutException ex = ExceptionFactory
+                                        .createTimeoutException("Cannot obtain master using SENTINEL MASTER", timeout);
+                                ex.addSuppressed(e);
 
                                 return ex;
                             });

diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -1689,7 +1689,7 @@ Command<K, V, StreamScanCursor> hscanStreaming(KeyValueStreamingChannel<K, V> ch
     }
 
     Command<K, V, StreamScanCursor> hscanNoValuesStreaming(KeyStreamingChannel<K> channel, K key, ScanCursor scanCursor,
-                                                           ScanArgs scanArgs) {
+            ScanArgs scanArgs) {
         notNullKey(key);
         notNull(channel);
 

diff --git a/src/main/java/io/lettuce/core/RedisHandshake.java b/src/main/java/io/lettuce/core/RedisHandshake.java
@@ -283,13 +283,11 @@ private CompletableFuture<Void> applyConnectionMetadata(Channel channel) {
         }
 
         if (LettuceStrings.isNotEmpty(metadata.getLibraryName())) {
-            postHandshake.add(
-                    new AsyncCommand<>(this.commandBuilder.clientSetinfo("lib-name", metadata.getLibraryName())));
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.clientSetinfo("lib-name", metadata.getLibraryName())));
         }
 
         if (LettuceStrings.isNotEmpty(metadata.getLibraryVersion())) {
-            postHandshake.add(
-                    new AsyncCommand<>(this.commandBuilder.clientSetinfo("lib-ver", metadata.getLibraryVersion())));
+            postHandshake.add(new AsyncCommand<>(this.commandBuilder.clientSetinfo("lib-ver", metadata.getLibraryVersion())));
         }
 
         if (postHandshake.isEmpty()) {

diff --git a/src/main/java/io/lettuce/core/RedisPublisher.java b/src/main/java/io/lettuce/core/RedisPublisher.java
@@ -414,7 +414,8 @@ void potentiallyReadMore() {
 
             /*
              * getDemand() maybe is Long.MAX_VALUE，because MonoNext.NextSubscriber#request(long n) inner use the Long.MAX_VALUE,
-             * so maybe "getDemand() + 1" will be overflow，we use "getDemand() > data.size() - 1" replace the "(getDemand() + 1) > data.size()"
+             * so maybe "getDemand() + 1" will be overflow，we use "getDemand() > data.size() - 1" replace the
+             * "(getDemand() + 1) > data.size()"
              */
             if (getDemand() > data.size() - 1) {
                 state().readData(this);