Skip to content

Commit 2314e6f

Browse files
committed
Code cleanup
1 parent f7c42f9 commit 2314e6f

File tree

23 files changed

+32
-222
lines changed

23 files changed

+32
-222
lines changed

bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClientBuilder.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@
2424
import lombok.Setter;
2525
import lombok.experimental.Accessors;
2626

27+
/**
28+
* The builder for building Dist Client.
29+
*/
2730
@NoArgsConstructor(access = AccessLevel.PACKAGE)
2831
@Accessors(fluent = true)
2932
@Setter
30-
public final class DistClientBuilder implements IDistClientBuilder {
33+
public final class DistClientBuilder {
3134
IRPCServiceTrafficService trafficService;
3235
EventLoopGroup eventLoopGroup;
3336
SslContext sslContext;
3437
int workerThreads = 0;
3538

36-
@Override
3739
public IDistClient build() {
3840
return new DistClient(IRPCClient.newBuilder()
3941
.bluePrint(RPCBluePrint.INSTANCE)

bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/IDistClientBuilder.java

-18
This file was deleted.

bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServerBuilder.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import lombok.experimental.Accessors;
2929

3030
/**
31-
* The builder for building dist server.
31+
* The builder for building Dist Server.
3232
*/
3333
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3434
@Accessors(fluent = true)
3535
@Setter
36-
public class DistServerBuilder implements IDistServerBuilder {
36+
public class DistServerBuilder {
3737
RPCServerBuilder rpcServerBuilder;
3838
IBaseKVStoreClient distWorkerClient;
3939
ISettingProvider settingProvider;
@@ -42,7 +42,6 @@ public class DistServerBuilder implements IDistServerBuilder {
4242
Set<String> defaultGroupTags = new HashSet<>();
4343
int workerThreads = 0;
4444

45-
@Override
4645
public IDistServer build() {
4746
Preconditions.checkNotNull(rpcServerBuilder, "RPC Server Builder is null");
4847
return new DistServer(this);

bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/IDistServerBuilder.java

-18
This file was deleted.

bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private enum Status {
4343
private final AtomicReference<Status> status = new AtomicReference<>(Status.INIT);
4444
private final KVStoreBalanceController storeBalanceController;
4545
private final List<IDistWorkerBalancerFactory> effectiveBalancerFactories = new LinkedList<>();
46-
protected final DistWorkerCoProcFactory coProcFactory;
46+
private final DistWorkerCoProcFactory coProcFactory;
4747

4848
public DistWorker(DistWorkerBuilder builder) {
4949
this.clusterId = builder.clusterId;

bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerBuilder.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import lombok.experimental.Accessors;
3434

3535
/**
36-
* The builder for building dist worker.
36+
* The builder for building Dist Worker.
3737
*/
3838
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3939
@Accessors(fluent = true)
4040
@Setter
41-
public class DistWorkerBuilder implements IDistWorkerBuilder {
41+
public class DistWorkerBuilder {
4242
String clusterId = IDistWorker.CLUSTER_NAME;
4343
RPCServerBuilder rpcServerBuilder;
4444
IAgentHost agentHost;
@@ -57,7 +57,6 @@ public class DistWorkerBuilder implements IDistWorkerBuilder {
5757
Duration loadEstimateWindow = Duration.ofSeconds(5);
5858
Map<String, String> attributes = new HashMap<>();
5959

60-
@Override
6160
public IDistWorker build() {
6261
return new DistWorker(this);
6362
}

bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDistWorkerBuilder.java

-18
This file was deleted.

bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/IInboxClientBuilder.java

-18
This file was deleted.

bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClientBuilder.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
import lombok.Setter;
2424
import lombok.experimental.Accessors;
2525

26+
/**
27+
* The builder for building Inbox Client.
28+
*/
2629
@NoArgsConstructor(access = AccessLevel.PACKAGE)
2730
@Accessors(fluent = true)
2831
@Setter
29-
public final class InboxClientBuilder implements IInboxClientBuilder {
32+
public final class InboxClientBuilder {
3033
IRPCServiceTrafficService trafficService;
3134
EventLoopGroup eventLoopGroup;
3235
SslContext sslContext;

bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxServerBuilder.java

-18
This file was deleted.

bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServerBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import lombok.experimental.Accessors;
3333

3434
/**
35-
* The builder for building inbox server.
35+
* The builder for building Inbox Server.
3636
*/
3737
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3838
@Accessors(fluent = true)
3939
@Setter
40-
public class InboxServerBuilder implements IInboxServerBuilder {
40+
public class InboxServerBuilder {
4141
RPCServerBuilder rpcServerBuilder;
4242
IEventCollector eventCollector;
4343
IResourceThrottler resourceThrottler;

bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStoreBuilder.java

-18
This file was deleted.

bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreBuilder.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import lombok.experimental.Accessors;
3333

3434
/**
35-
* The builder for building inbox store.
35+
* The builder for building Inbox Store.
3636
*/
3737
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3838
@Accessors(fluent = true)
3939
@Setter
40-
public class InboxStoreBuilder implements IInboxStoreBuilder {
40+
public class InboxStoreBuilder {
4141
String clusterId = IInboxStore.CLUSTER_NAME;
4242
RPCServerBuilder rpcServerBuilder;
4343
IAgentHost agentHost;
@@ -56,7 +56,6 @@ public class InboxStoreBuilder implements IInboxStoreBuilder {
5656
Duration gcInterval = Duration.ofMinutes(5);
5757
Map<String, String> attributes = new HashMap<>();
5858

59-
@Override
6059
public IInboxStore build() {
6160
return new InboxStore(this);
6261
}

bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/IRetainClientBuilder.java

-18
This file was deleted.

bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClientBuilder.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
import lombok.Setter;
2424
import lombok.experimental.Accessors;
2525

26+
/**
27+
* The builder for building Retain Client.
28+
*/
2629
@NoArgsConstructor(access = AccessLevel.PACKAGE)
2730
@Accessors(fluent = true)
2831
@Setter
29-
public final class RetainClientBuilder implements IRetainClientBuilder {
32+
public final class RetainClientBuilder {
3033
IRPCServiceTrafficService trafficService;
3134
EventLoopGroup eventLoopGroup;
3235
SslContext sslContext;

bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/IRetainServerBuilder.java

-18
This file was deleted.

bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServerBuilder.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import lombok.experimental.Accessors;
2929

3030
/**
31-
* The builder for building retain server.
31+
* The builder for building Retain Server.
3232
*/
3333
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3434
@Accessors(fluent = true)
3535
@Setter
36-
public class RetainServerBuilder implements IRetainServerBuilder {
36+
public class RetainServerBuilder {
3737
RPCServerBuilder rpcServerBuilder;
3838
ISettingProvider settingProvider;
3939
ISubBrokerManager subBrokerManager;
@@ -42,7 +42,6 @@ public class RetainServerBuilder implements IRetainServerBuilder {
4242
Set<String> defaultGroupTags = new HashSet<>();
4343
int workerThreads = 0;
4444

45-
@Override
4645
public IRetainServer build() {
4746
Preconditions.checkNotNull(rpcServerBuilder, "RPC Server Builder is null");
4847
return new RetainServer(this);

bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/IRetainStoreBuilder.java

-18
This file was deleted.

bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@NoArgsConstructor(access = AccessLevel.PACKAGE)
3535
@Accessors(fluent = true)
3636
@Setter
37-
public class RetainStoreBuilder implements IRetainStoreBuilder {
37+
public class RetainStoreBuilder {
3838
String clusterId = IRetainStore.CLUSTER_NAME;
3939
RPCServerBuilder rpcServerBuilder;
4040
IAgentHost agentHost;

bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionDictClientBuilder.java

-18
This file was deleted.

bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClientBuilder.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@
2323
import lombok.Setter;
2424
import lombok.experimental.Accessors;
2525

26+
/**
27+
* The builder for building Session Dict Client.
28+
*/
2629
@NoArgsConstructor(access = AccessLevel.PACKAGE)
2730
@Accessors(fluent = true)
2831
@Setter
29-
public final class SessionDictClientBuilder implements ISessionDictClientBuilder {
32+
public final class SessionDictClientBuilder {
3033
private IRPCServiceTrafficService trafficService;
3134
private EventLoopGroup eventLoopGroup;
3235
private SslContext sslContext;
3336
private int workerThreads;
3437

35-
@Override
3638
public ISessionDictClient build() {
3739
return new SessionDictClient(IRPCClient.newBuilder()
3840
.bluePrint(RPCBluePrint.INSTANCE)

0 commit comments

Comments
 (0)