Skip to content

Uniform code style config #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
public class FluxWithSingleMap<F, S, FM, SM> extends FluxWithSingleOperator<F, S, FM, SM> {

public static <F, S, FM, SM> @NotNull FluxWithSingleMap<F, S, FM, SM> mapBoth(
final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull FluxWithSingle<F, S> source,
final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull Function<? super S, ? extends SM> singleMapper) {

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

private FluxWithSingleMap(
final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull FluxWithSingle<F, S> source,
final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull Function<? super S, ? extends SM> singleMapper) {

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

MapSubscriber(
final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull T subscriber,
final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull Function<? super S, ? extends SM> singleMapper) {

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

Conditional(
final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull T subscriber,
final @Nullable Function<? super F, ? extends FM> fluxMapper,
final @NotNull Function<? super S, ? extends SM> singleMapper) {

super(subscriber, fluxMapper, singleMapper);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public class FluxWithSinglePublishOn<F, S> extends FluxWithSingleOperator<F, S,
private final int prefetch;

public FluxWithSinglePublishOn(
final @NotNull FluxWithSingle<F, S> source, final @NotNull Scheduler scheduler, final boolean delayError,
final @NotNull FluxWithSingle<F, S> source,
final @NotNull Scheduler scheduler,
final boolean delayError,
final int prefetch) {

super(source);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
* @see #subscribe(Consumer, Consumer, Runnable)
*/
public final @NotNull CompletableFuture<S> subscribeSingleFuture(
final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
final @NotNull Consumer<? super F> consumer,
final @NotNull Consumer<? super Throwable> errorConsumer,
final @NotNull Runnable completeConsumer) {

final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
Expand Down Expand Up @@ -284,8 +285,10 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
* @see #subscribe(Consumer, Consumer, Runnable, Context)
*/
public final @NotNull CompletableFuture<S> subscribeSingleFuture(
final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
final @NotNull Runnable completeConsumer, final @NotNull Context initialContext) {
final @NotNull Consumer<? super F> consumer,
final @NotNull Consumer<? super Throwable> errorConsumer,
final @NotNull Runnable completeConsumer,
final @NotNull Context initialContext) {

final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
final CompletableFuture<S> future = singleFutureSubscriber.getFutureBeforeSubscribe();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ private static class SingleItemSubscriber<F, S> implements CoreSubscriber<F>, Su
private @Nullable Subscription subscription;

SingleItemSubscriber(
final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber, final @NotNull S single,
final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber,
final @NotNull S single,
final int index) {

this.subscriber = subscriber;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ private static class SplitSubscriber<U, F, S> implements Subscriber<U>, Subscrip
private @Nullable Subscription subscription;

SplitSubscriber(
final @NotNull Subscriber<? super F> subscriber, final @NotNull Class<F> flowableClass,
final @NotNull Subscriber<? super F> subscriber,
final @NotNull Class<F> flowableClass,
final @NotNull Class<S> singleClass) {

this.subscriber = subscriber;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,9 +799,12 @@ public void onError(final @NotNull Throwable t) {}
}

private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
final @NotNull AtomicInteger onCompleteCounter, final @NotNull CountDownLatch latch) {
final int args,
final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
final @NotNull AtomicInteger onNextCounter,
final @NotNull AtomicInteger onErrorCounter,
final @NotNull AtomicInteger onCompleteCounter,
final @NotNull CountDownLatch latch) {

switch (args) {
case 0:
Expand Down Expand Up @@ -863,8 +866,10 @@ public void onError(final @NotNull Throwable t) {
}

private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
final int args,
final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
final @NotNull AtomicInteger onNextCounter,
final @NotNull AtomicInteger onErrorCounter,
final @NotNull AtomicInteger onCompleteCounter) {

return subscribeSingleFuture(
Expand Down
24 changes: 16 additions & 8 deletions src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,17 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {

@Override
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Mqtt5Subscribe subscribe,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor) {

return subscribe(subscribe, callback, executor, false);
}

@Override
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Mqtt5Subscribe subscribe,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final boolean manualAcknowledgement) {

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

@Override
public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor, final boolean manualAcknowledgement) {
final @Nullable Mqtt5Subscribe subscribe,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor,
final boolean manualAcknowledgement) {

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

@Override
public void publishes(
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable MqttGlobalPublishFilter filter,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor) {

publishes(filter, callback, executor, false);
}

@Override
public void publishes(
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable MqttGlobalPublishFilter filter,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final boolean manualAcknowledgement) {

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

@Override
public void publishes(
final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor, final boolean manualAcknowledgement) {
final @Nullable MqttGlobalPublishFilter filter,
final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
final @Nullable Executor executor,
final boolean manualAcknowledgement) {

Checks.notNull(filter, "Global publish filter");
Checks.notNull(callback, "Callback");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
private boolean republishIfSessionExpired;

public MqttClientConfig(
final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientIdentifierImpl clientIdentifier,
final @NotNull MqttVersion mqttVersion,
final @NotNull MqttClientIdentifierImpl clientIdentifier,
final @NotNull MqttClientTransportConfigImpl transportConfig,
final @NotNull MqttClientExecutorConfigImpl executorConfig,
final @NotNull MqttClientAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults,
final @NotNull MqttClientAdvancedConfig advancedConfig,
final @NotNull ConnectDefaults connectDefaults,
final @NotNull ImmutableList<MqttClientConnectedListener> connectedListeners,
final @NotNull ImmutableList<MqttClientDisconnectedListener> disconnectedListeners) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public class MqttClientConnectionConfig
private final @NotNull Channel channel;
private final int flags;

// @formatter:off
public MqttClientConnectionConfig(
final @NotNull MqttClientTransportConfigImpl transportConfig,
final int keepAlive,
Expand All @@ -86,7 +85,6 @@ public MqttClientConnectionConfig(
final boolean sharedSubscriptionAvailable,
final boolean subscriptionIdentifiersAvailable,
final @NotNull Channel channel) {
// @formatter:on

this.transportConfig = transportConfig;
this.keepAlive = (short) keepAlive;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public class MqttClientExecutorConfigImpl implements MqttClientExecutorConfig {
private final @NotNull Scheduler applicationScheduler;

MqttClientExecutorConfigImpl(
final @Nullable Executor nettyExecutor, final int nettyThreads,
final @Nullable Executor nettyExecutor,
final int nettyThreads,
final @NotNull Scheduler applicationScheduler) {

this.nettyExecutor = nettyExecutor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ public class MqttClientSslConfigImpl implements MqttClientSslConfig {

MqttClientSslConfigImpl(
final @Nullable KeyManagerFactory keyManagerFactory,
final @Nullable TrustManagerFactory trustManagerFactory, final @Nullable ImmutableList<String> cipherSuites,
final @Nullable ImmutableList<String> protocols, final int handshakeTimeoutMs,
final @Nullable TrustManagerFactory trustManagerFactory,
final @Nullable ImmutableList<String> cipherSuites,
final @Nullable ImmutableList<String> protocols,
final int handshakeTimeoutMs,
final @Nullable HostnameVerifier hostnameVerifier) {

this.keyManagerFactory = keyManagerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig
private final int mqttConnectTimeoutMs;

MqttClientTransportConfigImpl(
final @NotNull InetSocketAddress serverAddress, final @Nullable InetSocketAddress localAddress,
final @Nullable MqttClientSslConfigImpl sslConfig, final @Nullable MqttWebSocketConfigImpl webSocketConfig,
final @Nullable MqttProxyConfigImpl proxyConfig, final int socketConnectTimeoutMs,
final @NotNull InetSocketAddress serverAddress,
final @Nullable InetSocketAddress localAddress,
final @Nullable MqttClientSslConfigImpl sslConfig,
final @Nullable MqttWebSocketConfigImpl webSocketConfig,
final @Nullable MqttProxyConfigImpl proxyConfig,
final int socketConnectTimeoutMs,
final int mqttConnectTimeoutMs) {

this.serverAddress = serverAddress;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ public class MqttProxyConfigImpl implements MqttProxyConfig {
private final int handshakeTimeoutMs;

MqttProxyConfigImpl(
final @NotNull MqttProxyProtocol protocol, final @NotNull InetSocketAddress address,
final @Nullable String username, final @Nullable String password, final int handshakeTimeoutMs) {
final @NotNull MqttProxyProtocol protocol,
final @NotNull InetSocketAddress address,
final @Nullable String username,
final @Nullable String password,
final int handshakeTimeoutMs) {

this.protocol = protocol;
this.address = address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
}

protected @NotNull MqttClientConfig buildClientConfig(
final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientAdvancedConfig advancedConfig,
final @NotNull MqttVersion mqttVersion,
final @NotNull MqttClientAdvancedConfig advancedConfig,
final @NotNull MqttClientConfig.ConnectDefaults connectDefaults) {

return new MqttClientConfig(mqttVersion, identifier, buildTransportConfig(), executorConfig, advancedConfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ public class MqttWebSocketConfigImpl implements MqttWebSocketConfig {
private final int handshakeTimeoutMs;

MqttWebSocketConfigImpl(
final @NotNull String serverPath, final @NotNull String queryString, final @NotNull String subprotocol,
final @NotNull String serverPath,
final @NotNull String queryString,
final @NotNull String subprotocol,
final int handshakeTimeoutMs) {

this.serverPath = serverPath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public class MqttClientAdvancedConfig implements Mqtt5ClientAdvancedConfig {
private final @Nullable MqttClientInterceptors interceptors;

MqttClientAdvancedConfig(
final boolean allowServerReAuth, final boolean validatePayloadFormat,
final boolean allowServerReAuth,
final boolean validatePayloadFormat,
final @Nullable MqttClientInterceptors interceptors) {

this.allowServerReAuth = allowServerReAuth;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public class MqttDecoder extends ByteToMessageDecoder {

@Inject
MqttDecoder(
final @NotNull MqttMessageDecoders decoders, final @NotNull MqttClientConfig clientConfig,
final @NotNull MqttMessageDecoders decoders,
final @NotNull MqttClientConfig clientConfig,
final @NotNull MqttConnect connect) {

this.decoders = decoders;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ public class MqttDecoderContext {
private final boolean directBufferCorrelationData;

MqttDecoderContext(
final int maximumPacketSize, final int topicAliasMaximum, final boolean problemInformationRequested,
final boolean responseInformationRequested, final boolean validatePayloadFormat,
final boolean directBufferPayload, final boolean directBufferAuth,
final int maximumPacketSize,
final int topicAliasMaximum,
final boolean problemInformationRequested,
final boolean responseInformationRequested,
final boolean validatePayloadFormat,
final boolean directBufferPayload,
final boolean directBufferAuth,
final boolean directBufferCorrelationData) {

this.maximumPacketSize = maximumPacketSize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@ public class Mqtt3ClientMessageDecoders extends MqttMessageDecoders {

@Inject
Mqtt3ClientMessageDecoders(
final @NotNull Mqtt3ConnAckDecoder connAckDecoder, final @NotNull Mqtt3PublishDecoder publishDecoder,
final @NotNull Mqtt3PubAckDecoder pubAckDecoder, final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
final @NotNull Mqtt3PubRelDecoder pubRelDecoder, final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
final @NotNull Mqtt3SubAckDecoder subAckDecoder, final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
final @NotNull Mqtt3ConnAckDecoder connAckDecoder,
final @NotNull Mqtt3PublishDecoder publishDecoder,
final @NotNull Mqtt3PubAckDecoder pubAckDecoder,
final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
final @NotNull Mqtt3PubRelDecoder pubRelDecoder,
final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
final @NotNull Mqtt3SubAckDecoder subAckDecoder,
final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
final @NotNull MqttPingRespDecoder pingRespDecoder) {

decoders[Mqtt3MessageType.CONNACK.getCode()] = connAckDecoder;
Expand Down
Loading