Skip to content

Commit f653501

Browse files
SgtSilvioSgtSilvio
committed
Uniform code style config
1 parent 4d93537 commit f653501

File tree

120 files changed

+692
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+692
-313
lines changed

Diff for: ‎.idea/codeStyles/Project.xml

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
public class FluxWithSingleMap<F, S, FM, SM> extends FluxWithSingleOperator<F, S, FM, SM> {
3737

3838
public static <F, S, FM, SM> @NotNull FluxWithSingleMap<F, S, FM, SM> mapBoth(
39-
final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
39+
final @NotNull FluxWithSingle<F, S> source,
40+
final @Nullable Function<? super F, ? extends FM> fluxMapper,
4041
final @NotNull Function<? super S, ? extends SM> singleMapper) {
4142

4243
return new FluxWithSingleMap<>(source, fluxMapper, singleMapper);
@@ -52,7 +53,8 @@ public class FluxWithSingleMap<F, S, FM, SM> extends FluxWithSingleOperator<F, S
5253
private final @NotNull Function<? super S, ? extends SM> singleMapper;
5354

5455
private FluxWithSingleMap(
55-
final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
56+
final @NotNull FluxWithSingle<F, S> source,
57+
final @Nullable Function<? super F, ? extends FM> fluxMapper,
5658
final @NotNull Function<? super S, ? extends SM> singleMapper) {
5759

5860
super(source);
@@ -93,7 +95,8 @@ private static class MapSubscriber<F, S, FM, SM, T extends CoreSubscriber<? supe
9395
private @Nullable Subscription subscription;
9496

9597
MapSubscriber(
96-
final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
98+
final @NotNull T subscriber,
99+
final @Nullable Function<? super F, ? extends FM> fluxMapper,
97100
final @NotNull Function<? super S, ? extends SM> singleMapper) {
98101

99102
this.subscriber = subscriber;
@@ -177,7 +180,8 @@ private static class Conditional<F, S, FM, SM, T extends Fuseable.ConditionalSub
177180
implements CoreWithSingleConditionalSubscriber<F, S> {
178181

179182
Conditional(
180-
final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
183+
final @NotNull T subscriber,
184+
final @Nullable Function<? super F, ? extends FM> fluxMapper,
181185
final @NotNull Function<? super S, ? extends SM> singleMapper) {
182186

183187
super(subscriber, fluxMapper, singleMapper);

Diff for: ‎reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public class FluxWithSinglePublishOn<F, S> extends FluxWithSingleOperator<F, S,
3232
private final int prefetch;
3333

3434
public FluxWithSinglePublishOn(
35-
final @NotNull FluxWithSingle<F, S> source, final @NotNull Scheduler scheduler, final boolean delayError,
35+
final @NotNull FluxWithSingle<F, S> source,
36+
final @NotNull Scheduler scheduler,
37+
final boolean delayError,
3638
final int prefetch) {
3739

3840
super(source);

Diff for: ‎reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
254254
* @see #subscribe(Consumer, Consumer, Runnable)
255255
*/
256256
public final @NotNull CompletableFuture<S> subscribeSingleFuture(
257-
final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
257+
final @NotNull Consumer<? super F> consumer,
258+
final @NotNull Consumer<? super Throwable> errorConsumer,
258259
final @NotNull Runnable completeConsumer) {
259260

260261
final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
@@ -284,8 +285,10 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
284285
* @see #subscribe(Consumer, Consumer, Runnable, Context)
285286
*/
286287
public final @NotNull CompletableFuture<S> subscribeSingleFuture(
287-
final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
288-
final @NotNull Runnable completeConsumer, final @NotNull Context initialContext) {
288+
final @NotNull Consumer<? super F> consumer,
289+
final @NotNull Consumer<? super Throwable> errorConsumer,
290+
final @NotNull Runnable completeConsumer,
291+
final @NotNull Context initialContext) {
289292

290293
final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
291294
final CompletableFuture<S> future = singleFutureSubscriber.getFutureBeforeSubscribe();

Diff for: ‎reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ private static class SingleItemSubscriber<F, S> implements CoreSubscriber<F>, Su
5656
private @Nullable Subscription subscription;
5757

5858
SingleItemSubscriber(
59-
final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber, final @NotNull S single,
59+
final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber,
60+
final @NotNull S single,
6061
final int index) {
6162

6263
this.subscriber = subscriber;

Diff for: ‎reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ private static class SplitSubscriber<U, F, S> implements Subscriber<U>, Subscrip
5959
private @Nullable Subscription subscription;
6060

6161
SplitSubscriber(
62-
final @NotNull Subscriber<? super F> subscriber, final @NotNull Class<F> flowableClass,
62+
final @NotNull Subscriber<? super F> subscriber,
63+
final @NotNull Class<F> flowableClass,
6364
final @NotNull Class<S> singleClass) {
6465

6566
this.subscriber = subscriber;

Diff for: ‎reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java

+10-5
Original file line numberDiff line numberDiff line change
@@ -799,9 +799,12 @@ public void onError(final @NotNull Throwable t) {}
799799
}
800800

801801
private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
802-
final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
803-
final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
804-
final @NotNull AtomicInteger onCompleteCounter, final @NotNull CountDownLatch latch) {
802+
final int args,
803+
final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
804+
final @NotNull AtomicInteger onNextCounter,
805+
final @NotNull AtomicInteger onErrorCounter,
806+
final @NotNull AtomicInteger onCompleteCounter,
807+
final @NotNull CountDownLatch latch) {
805808

806809
switch (args) {
807810
case 0:
@@ -863,8 +866,10 @@ public void onError(final @NotNull Throwable t) {
863866
}
864867

865868
private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
866-
final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
867-
final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
869+
final int args,
870+
final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
871+
final @NotNull AtomicInteger onNextCounter,
872+
final @NotNull AtomicInteger onErrorCounter,
868873
final @NotNull AtomicInteger onCompleteCounter) {
869874

870875
return subscribeSingleFuture(

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java

+16-8
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,17 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
137137

138138
@Override
139139
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
140-
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
140+
final @Nullable Mqtt5Subscribe subscribe,
141+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
141142
final @Nullable Executor executor) {
142143

143144
return subscribe(subscribe, callback, executor, false);
144145
}
145146

146147
@Override
147148
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
148-
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
149+
final @Nullable Mqtt5Subscribe subscribe,
150+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
149151
final boolean manualAcknowledgement) {
150152

151153
final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
@@ -157,8 +159,10 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
157159

158160
@Override
159161
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
160-
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
161-
final @Nullable Executor executor, final boolean manualAcknowledgement) {
162+
final @Nullable Mqtt5Subscribe subscribe,
163+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
164+
final @Nullable Executor executor,
165+
final boolean manualAcknowledgement) {
162166

163167
final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
164168
Checks.notNull(callback, "Callback");
@@ -183,15 +187,17 @@ public void publishes(
183187

184188
@Override
185189
public void publishes(
186-
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
190+
final @Nullable MqttGlobalPublishFilter filter,
191+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
187192
final @Nullable Executor executor) {
188193

189194
publishes(filter, callback, executor, false);
190195
}
191196

192197
@Override
193198
public void publishes(
194-
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
199+
final @Nullable MqttGlobalPublishFilter filter,
200+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
195201
final boolean manualAcknowledgement) {
196202

197203
Checks.notNull(filter, "Global publish filter");
@@ -202,8 +208,10 @@ public void publishes(
202208

203209
@Override
204210
public void publishes(
205-
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
206-
final @Nullable Executor executor, final boolean manualAcknowledgement) {
211+
final @Nullable MqttGlobalPublishFilter filter,
212+
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
213+
final @Nullable Executor executor,
214+
final boolean manualAcknowledgement) {
207215

208216
Checks.notNull(filter, "Global publish filter");
209217
Checks.notNull(callback, "Callback");

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
7272
private boolean republishIfSessionExpired;
7373

7474
public MqttClientConfig(
75-
final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientIdentifierImpl clientIdentifier,
75+
final @NotNull MqttVersion mqttVersion,
76+
final @NotNull MqttClientIdentifierImpl clientIdentifier,
7677
final @NotNull MqttClientTransportConfigImpl transportConfig,
7778
final @NotNull MqttClientExecutorConfigImpl executorConfig,
78-
final @NotNull MqttClientAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults,
79+
final @NotNull MqttClientAdvancedConfig advancedConfig,
80+
final @NotNull ConnectDefaults connectDefaults,
7981
final @NotNull ImmutableList<MqttClientConnectedListener> connectedListeners,
8082
final @NotNull ImmutableList<MqttClientDisconnectedListener> disconnectedListeners) {
8183

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java

-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public class MqttClientConnectionConfig
6262
private final @NotNull Channel channel;
6363
private final int flags;
6464

65-
// @formatter:off
6665
public MqttClientConnectionConfig(
6766
final @NotNull MqttClientTransportConfigImpl transportConfig,
6867
final int keepAlive,
@@ -86,7 +85,6 @@ public MqttClientConnectionConfig(
8685
final boolean sharedSubscriptionAvailable,
8786
final boolean subscriptionIdentifiersAvailable,
8887
final @NotNull Channel channel) {
89-
// @formatter:on
9088

9189
this.transportConfig = transportConfig;
9290
this.keepAlive = (short) keepAlive;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public class MqttClientExecutorConfigImpl implements MqttClientExecutorConfig {
4040
private final @NotNull Scheduler applicationScheduler;
4141

4242
MqttClientExecutorConfigImpl(
43-
final @Nullable Executor nettyExecutor, final int nettyThreads,
43+
final @Nullable Executor nettyExecutor,
44+
final int nettyThreads,
4445
final @NotNull Scheduler applicationScheduler) {
4546

4647
this.nettyExecutor = nettyExecutor;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ public class MqttClientSslConfigImpl implements MqttClientSslConfig {
5757

5858
MqttClientSslConfigImpl(
5959
final @Nullable KeyManagerFactory keyManagerFactory,
60-
final @Nullable TrustManagerFactory trustManagerFactory, final @Nullable ImmutableList<String> cipherSuites,
61-
final @Nullable ImmutableList<String> protocols, final int handshakeTimeoutMs,
60+
final @Nullable TrustManagerFactory trustManagerFactory,
61+
final @Nullable ImmutableList<String> cipherSuites,
62+
final @Nullable ImmutableList<String> protocols,
63+
final int handshakeTimeoutMs,
6264
final @Nullable HostnameVerifier hostnameVerifier) {
6365

6466
this.keyManagerFactory = keyManagerFactory;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig
4343
private final int mqttConnectTimeoutMs;
4444

4545
MqttClientTransportConfigImpl(
46-
final @NotNull InetSocketAddress serverAddress, final @Nullable InetSocketAddress localAddress,
47-
final @Nullable MqttClientSslConfigImpl sslConfig, final @Nullable MqttWebSocketConfigImpl webSocketConfig,
48-
final @Nullable MqttProxyConfigImpl proxyConfig, final int socketConnectTimeoutMs,
46+
final @NotNull InetSocketAddress serverAddress,
47+
final @Nullable InetSocketAddress localAddress,
48+
final @Nullable MqttClientSslConfigImpl sslConfig,
49+
final @Nullable MqttWebSocketConfigImpl webSocketConfig,
50+
final @Nullable MqttProxyConfigImpl proxyConfig,
51+
final int socketConnectTimeoutMs,
4952
final int mqttConnectTimeoutMs) {
5053

5154
this.serverAddress = serverAddress;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ public class MqttProxyConfigImpl implements MqttProxyConfig {
3737
private final int handshakeTimeoutMs;
3838

3939
MqttProxyConfigImpl(
40-
final @NotNull MqttProxyProtocol protocol, final @NotNull InetSocketAddress address,
41-
final @Nullable String username, final @Nullable String password, final int handshakeTimeoutMs) {
40+
final @NotNull MqttProxyProtocol protocol,
41+
final @NotNull InetSocketAddress address,
42+
final @Nullable String username,
43+
final @Nullable String password,
44+
final int handshakeTimeoutMs) {
4245

4346
this.protocol = protocol;
4447
this.address = address;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
205205
}
206206

207207
protected @NotNull MqttClientConfig buildClientConfig(
208-
final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientAdvancedConfig advancedConfig,
208+
final @NotNull MqttVersion mqttVersion,
209+
final @NotNull MqttClientAdvancedConfig advancedConfig,
209210
final @NotNull MqttClientConfig.ConnectDefaults connectDefaults) {
210211

211212
return new MqttClientConfig(mqttVersion, identifier, buildTransportConfig(), executorConfig, advancedConfig,

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public class MqttWebSocketConfigImpl implements MqttWebSocketConfig {
3636
private final int handshakeTimeoutMs;
3737

3838
MqttWebSocketConfigImpl(
39-
final @NotNull String serverPath, final @NotNull String queryString, final @NotNull String subprotocol,
39+
final @NotNull String serverPath,
40+
final @NotNull String queryString,
41+
final @NotNull String subprotocol,
4042
final int handshakeTimeoutMs) {
4143

4244
this.serverPath = serverPath;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class MqttClientAdvancedConfig implements Mqtt5ClientAdvancedConfig {
3535
private final @Nullable MqttClientInterceptors interceptors;
3636

3737
MqttClientAdvancedConfig(
38-
final boolean allowServerReAuth, final boolean validatePayloadFormat,
38+
final boolean allowServerReAuth,
39+
final boolean validatePayloadFormat,
3940
final @Nullable MqttClientInterceptors interceptors) {
4041

4142
this.allowServerReAuth = allowServerReAuth;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public class MqttDecoder extends ByteToMessageDecoder {
5050

5151
@Inject
5252
MqttDecoder(
53-
final @NotNull MqttMessageDecoders decoders, final @NotNull MqttClientConfig clientConfig,
53+
final @NotNull MqttMessageDecoders decoders,
54+
final @NotNull MqttClientConfig clientConfig,
5455
final @NotNull MqttConnect connect) {
5556

5657
this.decoders = decoders;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,13 @@ public class MqttDecoderContext {
3434
private final boolean directBufferCorrelationData;
3535

3636
MqttDecoderContext(
37-
final int maximumPacketSize, final int topicAliasMaximum, final boolean problemInformationRequested,
38-
final boolean responseInformationRequested, final boolean validatePayloadFormat,
39-
final boolean directBufferPayload, final boolean directBufferAuth,
37+
final int maximumPacketSize,
38+
final int topicAliasMaximum,
39+
final boolean problemInformationRequested,
40+
final boolean responseInformationRequested,
41+
final boolean validatePayloadFormat,
42+
final boolean directBufferPayload,
43+
final boolean directBufferAuth,
4044
final boolean directBufferCorrelationData) {
4145

4246
this.maximumPacketSize = maximumPacketSize;

Diff for: ‎src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ public class Mqtt3ClientMessageDecoders extends MqttMessageDecoders {
3434

3535
@Inject
3636
Mqtt3ClientMessageDecoders(
37-
final @NotNull Mqtt3ConnAckDecoder connAckDecoder, final @NotNull Mqtt3PublishDecoder publishDecoder,
38-
final @NotNull Mqtt3PubAckDecoder pubAckDecoder, final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
39-
final @NotNull Mqtt3PubRelDecoder pubRelDecoder, final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
40-
final @NotNull Mqtt3SubAckDecoder subAckDecoder, final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
37+
final @NotNull Mqtt3ConnAckDecoder connAckDecoder,
38+
final @NotNull Mqtt3PublishDecoder publishDecoder,
39+
final @NotNull Mqtt3PubAckDecoder pubAckDecoder,
40+
final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
41+
final @NotNull Mqtt3PubRelDecoder pubRelDecoder,
42+
final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
43+
final @NotNull Mqtt3SubAckDecoder subAckDecoder,
44+
final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
4145
final @NotNull MqttPingRespDecoder pingRespDecoder) {
4246

4347
decoders[Mqtt3MessageType.CONNACK.getCode()] = connAckDecoder;

0 commit comments

Comments
 (0)