From 28326682e7246f3709a5903d12fc352c2c070c1b Mon Sep 17 00:00:00 2001 From: RagnarW Date: Mon, 3 Sep 2018 14:42:34 +0200 Subject: [PATCH] Formatting Resolve review comments regarding formating --- .../protocol/v2/RaftProtocolClientInstallerV2.java | 1 - .../messaging/marshalling/ByteBufChunkHandler.java | 6 ++---- .../messaging/marshalling/ByteBufMarshal.java | 2 +- .../marshalling/v2/decoding/ContentTypeDispatcher.java | 4 ++-- ...TermsSerialize.java => RaftLogEntryTermsSerializer.java} | 2 +- .../marshalling/v2/encoding/RaftMessageContentEncoder.java | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) rename enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/{RaftLogEntryTermsSerialize.java => RaftLogEntryTermsSerializer.java} (97%) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java index 3ab3f880a65f7..af0657b988808 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java @@ -31,7 +31,6 @@ import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.ContentTypeEncoder; -import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermsSerialize; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftMessageContentEncoder; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftMessageEncoder; import org.neo4j.causalclustering.protocol.ModifierProtocolInstaller; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufChunkHandler.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufChunkHandler.java index b96388267ff37..852ef0da815d2 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufChunkHandler.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufChunkHandler.java @@ -28,6 +28,7 @@ import org.neo4j.causalclustering.core.replication.ReplicatedContent; import org.neo4j.causalclustering.messaging.MessageTooBigException; +import org.neo4j.util.Preconditions; import static java.lang.String.format; import static org.neo4j.io.ByteUnit.gibiBytes; @@ -67,10 +68,7 @@ class MaxTotalSize implements ByteBufChunkHandler MaxTotalSize( long maxSize ) { - if ( maxSize < 0 ) - { - throw new IllegalArgumentException( "Max size cannot be less than 0. Got " + maxSize ); - } + Preconditions.requirePositive( maxSize ); this.maxSize = maxSize; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufMarshal.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufMarshal.java index a35ff005700a0..6815780246ac1 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufMarshal.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufMarshal.java @@ -55,7 +55,7 @@ public void marshal( WritableChannel channel ) throws IOException ByteBufInputStream byteBufInputStream = new ByteBufInputStream( content() ); byte[] bytes = new byte[CHUNK_SIZE]; int read; - while ( (read = byteBufInputStream.read( bytes )) != -1 ) + while ( ( read = byteBufInputStream.read( bytes ) ) != -1 ) { channel.put( bytes, read ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ContentTypeDispatcher.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ContentTypeDispatcher.java index 37f161723c788..6122f5502f864 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ContentTypeDispatcher.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ContentTypeDispatcher.java @@ -54,8 +54,8 @@ public void channelRead( ChannelHandlerContext ctx, Object msg ) } } - ctx.fireChannelRead( msg ); - } + ctx.fireChannelRead( msg ); + } private ContentType getContentType( byte messageCode ) { diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerialize.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerializer.java similarity index 97% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerialize.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerializer.java index 3141cda1e7972..db5b8a819b05b 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerialize.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftLogEntryTermsSerializer.java @@ -30,7 +30,7 @@ import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; import org.neo4j.causalclustering.messaging.marshalling.v2.ContentType; -public class RaftLogEntryTermsSerialize +class RaftLogEntryTermsSerializer { static ByteBuf serializeTerms( RaftLogEntry[] raftLogEntries, ByteBufAllocator byteBufAllocator ) { diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java index 8d61a78634e43..ecb70328b2592 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java @@ -34,7 +34,7 @@ import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.messaging.marshalling.v2.ContentType; -import static org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermsSerialize.serializeTerms; +import static org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermsSerializer.serializeTerms; /** * Serializes a raft messages content in the order Message, RaftLogTerms, ReplicatedContent.