Skip to content

Commit ca0dbbe

Browse files
committed
Fixed checkstyle
1 parent 38f9266 commit ca0dbbe

File tree

7 files changed

+21
-51
lines changed

7 files changed

+21
-51
lines changed

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AddCompletion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import io.netty.util.Recycler;
2525
import org.apache.bookkeeper.client.BKException;
26+
import org.apache.bookkeeper.common.util.MathUtils;
2627
import org.apache.bookkeeper.net.BookieId;
2728
import org.slf4j.MDC;
2829

@@ -88,8 +89,7 @@ public void writeComplete(int rc, long ledgerId, long entryId,
8889

8990
@Override
9091
boolean maybeTimeout() {
91-
if (org.apache.bookkeeper.common.util.MathUtils.elapsedNanos(startTime) >=
92-
perChannelBookieClient.addEntryTimeoutNanos) {
92+
if (MathUtils.elapsedNanos(startTime) >= perChannelBookieClient.addEntryTimeoutNanos) {
9393
timeout();
9494
return true;
9595
} else {

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BatchedReadCompletion.java

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121

2222
package org.apache.bookkeeper.proto;
2323

24+
import static org.apache.bookkeeper.client.LedgerHandle.INVALID_ENTRY_ID;
2425
import org.apache.bookkeeper.client.BKException;
2526
import org.apache.bookkeeper.util.ByteBufList;
2627

27-
import static org.apache.bookkeeper.client.LedgerHandle.INVALID_ENTRY_ID;
28-
2928
class BatchedReadCompletion extends CompletionValue {
3029

3130
final BookkeeperInternalCallbacks.BatchedReadEntryCallback cb;
@@ -38,20 +37,12 @@ public BatchedReadCompletion(final CompletionKey key,
3837
super("BatchedRead", originalCtx, ledgerId, entryId, perChannelBookieClient);
3938
this.opLogger = perChannelBookieClient.readEntryOpLogger;
4039
this.timeoutOpLogger = perChannelBookieClient.readTimeoutOpLogger;
41-
this.cb = new BookkeeperInternalCallbacks.BatchedReadEntryCallback() {
42-
43-
@Override
44-
public void readEntriesComplete(int rc,
45-
long ledgerId,
46-
long startEntryId,
47-
ByteBufList bufList,
48-
Object ctx) {
49-
logOpResult(rc);
50-
originalCallback.readEntriesComplete(rc,
51-
ledgerId, entryId,
52-
bufList, originalCtx);
53-
key.release();
54-
}
40+
this.cb = (rc, ledgerId1, startEntryId, bufList, ctx) -> {
41+
logOpResult(rc);
42+
originalCallback.readEntriesComplete(rc,
43+
ledgerId1, entryId,
44+
bufList, originalCtx);
45+
key.release();
5546
};
5647
}
5748

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/CompletionValue.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import com.google.common.base.Joiner;
2525
import io.netty.channel.Channel;
26+
import java.util.Map;
27+
import java.util.concurrent.TimeUnit;
2628
import org.apache.bookkeeper.client.BKException;
2729
import org.apache.bookkeeper.common.util.MathUtils;
2830
import org.apache.bookkeeper.common.util.MdcUtils;
@@ -31,9 +33,6 @@
3133
import org.slf4j.LoggerFactory;
3234
import org.slf4j.MDC;
3335

34-
import java.util.Map;
35-
import java.util.concurrent.TimeUnit;
36-
3736
abstract class CompletionValue {
3837
private final String operationName;
3938
protected Object ctx;

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ForceLedgerCompletion.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package org.apache.bookkeeper.proto;
2323

2424
import org.apache.bookkeeper.client.BKException;
25-
import org.apache.bookkeeper.net.BookieId;
2625

2726
class ForceLedgerCompletion extends CompletionValue {
2827
final BookkeeperInternalCallbacks.ForceLedgerCallback cb;

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/GetListOfEntriesOfLedgerCompletion.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
package org.apache.bookkeeper.proto;
2323

24+
import static org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GetListOfEntriesOfLedgerCallback;
2425
import io.netty.buffer.ByteBuf;
2526
import io.netty.buffer.Unpooled;
2627
import org.apache.bookkeeper.client.BKException;
@@ -30,20 +31,16 @@ class GetListOfEntriesOfLedgerCompletion extends CompletionValue {
3031
final BookkeeperInternalCallbacks.GetListOfEntriesOfLedgerCallback cb;
3132

3233
public GetListOfEntriesOfLedgerCompletion(final CompletionKey key,
33-
final BookkeeperInternalCallbacks.GetListOfEntriesOfLedgerCallback origCallback,
34+
final GetListOfEntriesOfLedgerCallback origCallback,
3435
final long ledgerId,
3536
PerChannelBookieClient perChannelBookieClient) {
3637
super("GetListOfEntriesOfLedger", null, ledgerId, 0L, perChannelBookieClient);
3738
this.opLogger = perChannelBookieClient.getListOfEntriesOfLedgerCompletionOpLogger;
3839
this.timeoutOpLogger = perChannelBookieClient.getListOfEntriesOfLedgerCompletionTimeoutOpLogger;
39-
this.cb = new BookkeeperInternalCallbacks.GetListOfEntriesOfLedgerCallback() {
40-
@Override
41-
public void getListOfEntriesOfLedgerComplete(int rc, long ledgerId,
42-
AvailabilityOfEntriesOfLedger availabilityOfEntriesOfLedger) {
43-
logOpResult(rc);
44-
origCallback.getListOfEntriesOfLedgerComplete(rc, ledgerId, availabilityOfEntriesOfLedger);
45-
key.release();
46-
}
40+
this.cb = (rc, ledgerId1, availabilityOfEntriesOfLedger) -> {
41+
logOpResult(rc);
42+
origCallback.getListOfEntriesOfLedgerComplete(rc, ledgerId1, availabilityOfEntriesOfLedger);
43+
key.release();
4744
};
4845
}
4946

@@ -62,8 +59,9 @@ public void handleV3Response(BookkeeperProtocol.Response response) {
6259
BookkeeperProtocol.GetListOfEntriesOfLedgerResponse getListOfEntriesOfLedgerResponse = response
6360
.getGetListOfEntriesOfLedgerResponse();
6461
ByteBuf availabilityOfEntriesOfLedgerBuffer = Unpooled.EMPTY_BUFFER;
65-
BookkeeperProtocol.StatusCode status = response.getStatus() == BookkeeperProtocol.StatusCode.EOK ? getListOfEntriesOfLedgerResponse.getStatus()
66-
: response.getStatus();
62+
BookkeeperProtocol.StatusCode status =
63+
response.getStatus() == BookkeeperProtocol.StatusCode.EOK ? getListOfEntriesOfLedgerResponse.getStatus()
64+
: response.getStatus();
6765

6866
if (getListOfEntriesOfLedgerResponse.hasAvailabilityOfEntriesOfLedger()) {
6967
availabilityOfEntriesOfLedgerBuffer = Unpooled.wrappedBuffer(

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@
1818
*/
1919
package org.apache.bookkeeper.proto;
2020

21-
import static org.apache.bookkeeper.client.LedgerHandle.INVALID_ENTRY_ID;
22-
23-
import com.google.common.base.Joiner;
2421
import com.google.common.collect.Sets;
2522
import com.google.protobuf.ByteString;
2623
import com.google.protobuf.ExtensionRegistry;
2724
import com.google.protobuf.UnsafeByteOperations;
2825
import io.netty.bootstrap.Bootstrap;
2926
import io.netty.buffer.ByteBuf;
3027
import io.netty.buffer.ByteBufAllocator;
31-
import io.netty.buffer.Unpooled;
3228
import io.netty.buffer.UnpooledByteBufAllocator;
3329
import io.netty.channel.Channel;
3430
import io.netty.channel.ChannelFuture;
@@ -61,7 +57,6 @@
6157
import io.netty.incubator.channel.uring.IOUringSocketChannel;
6258
import io.netty.util.Recycler;
6359
import io.netty.util.Recycler.Handle;
64-
import io.netty.util.ReferenceCountUtil;
6560
import io.netty.util.ReferenceCounted;
6661
import io.netty.util.concurrent.Future;
6762
import io.netty.util.concurrent.GenericFutureListener;
@@ -95,7 +90,6 @@
9590
import org.apache.bookkeeper.auth.ClientAuthProvider;
9691
import org.apache.bookkeeper.client.BKException;
9792
import org.apache.bookkeeper.client.BookKeeperClientStats;
98-
import org.apache.bookkeeper.client.BookieInfoReader.BookieInfo;
9993
import org.apache.bookkeeper.client.api.WriteFlag;
10094
import org.apache.bookkeeper.common.util.MathUtils;
10195
import org.apache.bookkeeper.common.util.MdcUtils;
@@ -109,31 +103,22 @@
109103
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GetBookieInfoCallback;
110104
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GetListOfEntriesOfLedgerCallback;
111105
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.ReadEntryCallback;
112-
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.ReadEntryCallbackCtx;
113106
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.ReadLacCallback;
114-
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.StartTLSCallback;
115107
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
116108
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteLacCallback;
117109
import org.apache.bookkeeper.proto.BookkeeperProtocol.AddRequest;
118-
import org.apache.bookkeeper.proto.BookkeeperProtocol.AddResponse;
119110
import org.apache.bookkeeper.proto.BookkeeperProtocol.BKPacketHeader;
120111
import org.apache.bookkeeper.proto.BookkeeperProtocol.ForceLedgerRequest;
121-
import org.apache.bookkeeper.proto.BookkeeperProtocol.ForceLedgerResponse;
122112
import org.apache.bookkeeper.proto.BookkeeperProtocol.GetBookieInfoRequest;
123-
import org.apache.bookkeeper.proto.BookkeeperProtocol.GetBookieInfoResponse;
124113
import org.apache.bookkeeper.proto.BookkeeperProtocol.GetListOfEntriesOfLedgerRequest;
125-
import org.apache.bookkeeper.proto.BookkeeperProtocol.GetListOfEntriesOfLedgerResponse;
126114
import org.apache.bookkeeper.proto.BookkeeperProtocol.OperationType;
127115
import org.apache.bookkeeper.proto.BookkeeperProtocol.ProtocolVersion;
128116
import org.apache.bookkeeper.proto.BookkeeperProtocol.ReadLacRequest;
129-
import org.apache.bookkeeper.proto.BookkeeperProtocol.ReadLacResponse;
130117
import org.apache.bookkeeper.proto.BookkeeperProtocol.ReadRequest;
131-
import org.apache.bookkeeper.proto.BookkeeperProtocol.ReadResponse;
132118
import org.apache.bookkeeper.proto.BookkeeperProtocol.Request;
133119
import org.apache.bookkeeper.proto.BookkeeperProtocol.Response;
134120
import org.apache.bookkeeper.proto.BookkeeperProtocol.StatusCode;
135121
import org.apache.bookkeeper.proto.BookkeeperProtocol.WriteLacRequest;
136-
import org.apache.bookkeeper.proto.BookkeeperProtocol.WriteLacResponse;
137122
import org.apache.bookkeeper.stats.Counter;
138123
import org.apache.bookkeeper.stats.NullStatsLogger;
139124
import org.apache.bookkeeper.stats.OpStatsLogger;
@@ -142,7 +127,6 @@
142127
import org.apache.bookkeeper.tls.SecurityException;
143128
import org.apache.bookkeeper.tls.SecurityHandlerFactory;
144129
import org.apache.bookkeeper.tls.SecurityHandlerFactory.NodeType;
145-
import org.apache.bookkeeper.util.AvailabilityOfEntriesOfLedger;
146130
import org.apache.bookkeeper.util.ByteBufList;
147131
import org.apache.bookkeeper.util.StringUtils;
148132
import org.apache.bookkeeper.util.collections.ConcurrentOpenHashMap;

bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadCompletion.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121

2222
package org.apache.bookkeeper.proto;
2323

24+
import static org.apache.bookkeeper.client.LedgerHandle.INVALID_ENTRY_ID;
2425
import io.netty.buffer.ByteBuf;
2526
import io.netty.buffer.Unpooled;
2627
import io.netty.util.ReferenceCountUtil;
2728
import org.apache.bookkeeper.client.BKException;
2829

29-
import static org.apache.bookkeeper.client.LedgerHandle.INVALID_ENTRY_ID;
30-
3130
class ReadCompletion extends CompletionValue {
3231
final BookkeeperInternalCallbacks.ReadEntryCallback cb;
3332

0 commit comments

Comments
 (0)