From 1fcbf637d05a58a7012f6560a46117aac8a30e12 Mon Sep 17 00:00:00 2001 From: Trust Ratchasan Date: Thu, 6 Jan 2022 15:05:20 +0100 Subject: [PATCH] Convert to restro stream APIs --- build.gradle.kts | 2 + examples/build.gradle.kts | 2 + .../mqtt/examples/ReconnectStrategy.java | 2 +- .../reactor/operators/FluxWithSingleMap.java | 2 +- .../client/rx/reactor/FluxWithSingle.java | 4 +- .../client/rx/reactor/FluxWithSingleTest.java | 2 +- .../restrictions/Mqtt3SendMaximumIT.java | 128 ------------------ .../client/internal/mqtt/MqttAsyncClient.java | 4 +- .../internal/mqtt/MqttBlockingClient.java | 2 +- .../internal/mqtt/MqttClientConfig.java | 2 +- .../mqtt/MqttClientConnectionConfig.java | 2 +- .../mqtt/MqttClientExecutorConfigImpl.java | 6 +- .../MqttClientExecutorConfigImplBuilder.java | 2 +- .../mqtt/MqttClientSslConfigImpl.java | 16 ++- .../mqtt/MqttClientSslConfigImplBuilder.java | 2 +- .../mqtt/MqttClientTransportConfigImpl.java | 16 ++- .../MqttClientTransportConfigImplBuilder.java | 2 +- .../internal/mqtt/MqttProxyConfigImpl.java | 10 +- .../mqtt/MqttProxyConfigImplBuilder.java | 2 +- .../mqtt/MqttWebSocketConfigImpl.java | 4 +- .../mqtt/MqttWebSocketConfigImplBuilder.java | 2 +- .../advanced/MqttClientAdvancedConfig.java | 2 +- .../MqttClientAdvancedConfigBuilder.java | 2 +- .../interceptor/MqttClientInterceptors.java | 8 +- .../MqttClientInterceptorsBuilder.java | 2 +- .../datatypes/MqttTopicFilterImplBuilder.java | 2 +- .../mqtt/datatypes/MqttTopicImplBuilder.java | 2 +- .../MqttUserPropertiesImplBuilder.java | 8 +- .../mqtt3/Mqtt3ExceptionFactory.java | 2 +- .../handler/auth/AbstractMqttAuthHandler.java | 8 +- .../proxy/MqttProxyAdapterHandler.java | 4 +- .../handler/proxy/MqttProxyInitializer.java | 4 +- .../MqttSubscribedPublishFlowTree.java | 7 +- .../publish/outgoing/MqttPubRelWithFlow.java | 2 +- .../handler/ssl/MqttSslAdapterHandler.java | 4 +- .../mqtt/handler/ssl/MqttSslInitializer.java | 4 +- .../subscribe/MqttSubscriptionHandler.java | 7 +- .../websocket/MqttWebSocketInitializer.java | 4 +- .../MqttWebsocketHandshakeHandler.java | 4 +- .../MqttClientAutoReconnectImpl.java | 2 +- .../MqttClientAutoReconnectImplBuilder.java | 2 +- .../mqtt/lifecycle/MqttClientReconnector.java | 4 +- .../mqtt3/Mqtt3ClientReconnectorView.java | 4 +- .../MqttMessageWithUserProperties.java | 5 +- .../internal/mqtt/message/auth/MqttAuth.java | 5 +- .../mqtt/message/auth/MqttEnhancedAuth.java | 4 +- .../mqtt/message/auth/MqttSimpleAuth.java | 6 +- .../message/auth/MqttSimpleAuthBuilder.java | 2 +- .../auth/mqtt3/Mqtt3SimpleAuthView.java | 2 +- .../mqtt3/Mqtt3SimpleAuthViewBuilder.java | 2 +- .../mqtt/message/connect/MqttConnect.java | 12 +- .../message/connect/MqttConnectBuilder.java | 2 +- .../MqttConnectRestrictionsBuilder.java | 2 +- .../message/connect/connack/MqttConnAck.java | 18 +-- .../connect/mqtt3/Mqtt3ConnectView.java | 2 +- .../mqtt3/Mqtt3ConnectViewBuilder.java | 2 +- .../message/disconnect/MqttDisconnect.java | 10 +- .../disconnect/MqttDisconnectBuilder.java | 4 +- .../mqtt/message/publish/MqttPublish.java | 20 +-- .../message/publish/MqttPublishBuilder.java | 2 +- .../message/publish/MqttPublishResult.java | 6 +- .../mqtt/message/publish/MqttWillPublish.java | 4 +- .../publish/mqtt3/Mqtt3PublishResultView.java | 2 +- .../publish/mqtt3/Mqtt3PublishView.java | 4 +- .../mqtt3/Mqtt3PublishViewBuilder.java | 4 +- .../subscribe/MqttSubscribeBuilder.java | 9 +- .../subscribe/MqttSubscriptionBuilder.java | 2 +- .../mqtt3/Mqtt3SubscribeViewBuilder.java | 4 +- .../mqtt3/Mqtt3SubscriptionViewBuilder.java | 2 +- .../unsubscribe/MqttUnsubscribeBuilder.java | 8 +- .../mqtt3/Mqtt3UnsubscribeViewBuilder.java | 10 +- .../mqtt/mqtt3/Mqtt3AsyncClientView.java | 4 +- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 2 +- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 2 +- .../netty/NettyEventLoopProvider.java | 2 +- .../client/internal/rx/RxFutureConverter.java | 6 +- .../client/internal/util/ByteBufferUtil.java | 2 +- .../internal/util/collections/Index.java | 4 +- .../internal/util/collections/IntIndex.java | 4 +- .../hivemq/client/mqtt/MqttClientConfig.java | 2 +- .../client/mqtt/MqttClientExecutorConfig.java | 4 +- .../client/mqtt/MqttClientSslConfig.java | 2 +- .../mqtt/MqttClientTransportConfig.java | 2 +- .../hivemq/client/mqtt/MqttProxyConfig.java | 2 +- .../mqtt/lifecycle/MqttClientReconnector.java | 4 +- .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 4 +- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 2 +- .../client/mqtt/mqtt3/Mqtt3ClientConfig.java | 2 +- .../lifecycle/Mqtt3ClientReconnector.java | 4 +- .../mqtt3/message/auth/Mqtt3SimpleAuth.java | 2 +- .../mqtt3/message/connect/Mqtt3Connect.java | 2 +- .../mqtt3/message/publish/Mqtt3Publish.java | 3 +- .../message/publish/Mqtt3PublishResult.java | 2 +- .../subscribe/Mqtt3SubscribeBuilderBase.java | 2 +- .../Mqtt3UnsubscribeBuilderBase.java | 2 +- .../client/mqtt/mqtt5/Mqtt5AsyncClient.java | 4 +- .../mqtt/mqtt5/Mqtt5BlockingClient.java | 2 +- .../client/mqtt/mqtt5/Mqtt5ClientConfig.java | 2 +- .../mqtt5/Mqtt5ClientConnectionConfig.java | 2 +- .../auth/Mqtt5EnhancedAuthMechanism.java | 2 +- .../Mqtt5UserPropertiesBuilderBase.java | 2 +- .../lifecycle/Mqtt5ClientReconnector.java | 4 +- .../mqtt/mqtt5/message/auth/Mqtt5Auth.java | 2 +- .../mqtt5/message/auth/Mqtt5EnhancedAuth.java | 2 +- .../mqtt5/message/auth/Mqtt5SimpleAuth.java | 2 +- .../mqtt5/message/connect/Mqtt5Connect.java | 2 +- .../message/connect/connack/Mqtt5ConnAck.java | 6 +- .../message/disconnect/Mqtt5Disconnect.java | 4 +- .../mqtt5/message/publish/Mqtt5Publish.java | 4 +- .../message/publish/Mqtt5PublishResult.java | 2 +- .../message/publish/puback/Mqtt5PubAck.java | 2 +- .../message/publish/pubcomp/Mqtt5PubComp.java | 2 +- .../message/publish/pubrec/Mqtt5PubRec.java | 2 +- .../message/publish/pubrel/Mqtt5PubRel.java | 2 +- .../subscribe/Mqtt5SubscribeBuilderBase.java | 2 +- .../message/subscribe/suback/Mqtt5SubAck.java | 2 +- .../Mqtt5UnsubscribeBuilderBase.java | 2 +- .../unsubscribe/unsuback/Mqtt5UnsubAck.java | 2 +- .../hivemq/client/rx/FlowableWithSingle.java | 2 +- .../com/hivemq/client/util/TypeSwitch.java | 2 +- .../mqtt5/Mqtt5UnsubAckDecoderTest.java | 2 +- .../mqtt5/Mqtt5ConnectEncoderTest.java | 2 +- .../datatypes/MqttTopicFilterImplTest.java | 4 +- .../mqtt/datatypes/MqttTopicImplTest.java | 4 +- .../MqttUserPropertiesImplBuilderTest.java | 5 +- .../MqttSubscribedPublishFlowsTest.java | 2 +- .../mqtt/message/publish/MqttPublishTest.java | 14 -- .../subscribe/MqttSubscribeBuilderTest.java | 5 +- .../mqtt3/Mqtt3SubscribeViewBuilderTest.java | 5 +- .../MqttUnsubscribeBuilderTest.java | 18 +-- .../Mqtt3UnsubscribeViewBuilderTest.java | 5 +- .../internal/rx/RxFutureConverterTest.java | 3 +- .../internal/util/ByteBufferUtilTest.java | 2 +- .../collections/ImmutableIntListTest.java | 2 +- .../util/collections/ImmutableListTest.java | 2 +- .../message/auth/Mqtt5AuthReasonCodeTest.java | 2 +- .../connack/Mqtt5ConnAckReasonCodeTest.java | 2 +- .../puback/Mqtt5PubAckReasonCodeTest.java | 2 +- .../pubcomp/Mqtt5PubCompReasonCodeTest.java | 2 +- .../pubrec/Mqtt5PubRecReasonCodeTest.java | 2 +- .../pubrel/Mqtt5PubRelReasonCodeTest.java | 2 +- .../suback/Mqtt5SubAckReasonCodeTest.java | 2 +- .../unsuback/Mqtt5UnsubAckReasonCodeTest.java | 2 +- .../client/rx/FlowableWithSingleTest.java | 32 +++-- 144 files changed, 300 insertions(+), 409 deletions(-) delete mode 100644 src/integrationTest/java/com/hivemq/client/restrictions/Mqtt3SendMaximumIT.java diff --git a/build.gradle.kts b/build.gradle.kts index fa58ceb0c..11da61f5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,6 +77,8 @@ dependencies { implementation("org.jctools:jctools-core:${property("jctools.version")}") implementation("org.jetbrains:annotations:${property("annotations.version")}") implementation("com.google.dagger:dagger:${property("dagger.version")}") + implementation ("net.sourceforge.streamsupport:android-retrostreams:1.7.4") + implementation ("net.sourceforge.streamsupport:android-retrofuture:1.7.4") compileOnly("org.slf4j:slf4j-api:${property("slf4j.version")}") diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 1805aa5e1..70e16a894 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -17,4 +17,6 @@ metadata { dependencies { implementation(rootProject) + implementation ("net.sourceforge.streamsupport:android-retrostreams:1.7.4") + implementation ("net.sourceforge.streamsupport:android-retrofuture:1.7.4") } diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java index dfd65fb26..012cd95c4 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java @@ -21,7 +21,7 @@ import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientDisconnectedContext; import java.time.LocalTime; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; /** diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java index 897fa6569..601a043e5 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java +++ b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java @@ -28,7 +28,7 @@ import reactor.core.Fuseable; import reactor.util.context.Context; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java b/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java index 3a598770b..5e63d4d87 100644 --- a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java +++ b/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java @@ -36,8 +36,8 @@ import java.util.NoSuchElementException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import java.util.function.Function; +import java9.util.function.Consumer; +import java9.util.function.Function; /** * A {@link Flux} which emits a flow of items of type F and a single item of type S. diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java index 0872ecae9..899c53969 100644 --- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java +++ b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/integrationTest/java/com/hivemq/client/restrictions/Mqtt3SendMaximumIT.java b/src/integrationTest/java/com/hivemq/client/restrictions/Mqtt3SendMaximumIT.java deleted file mode 100644 index 7c587315f..000000000 --- a/src/integrationTest/java/com/hivemq/client/restrictions/Mqtt3SendMaximumIT.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.hivemq.client.restrictions; - -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.extension.sdk.api.ExtensionMain; -import com.hivemq.extension.sdk.api.client.ClientContext; -import com.hivemq.extension.sdk.api.client.parameter.InitializerInput; -import com.hivemq.extension.sdk.api.interceptor.puback.PubackOutboundInterceptor; -import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackOutboundInput; -import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackOutboundOutput; -import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput; -import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput; -import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput; -import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput; -import com.hivemq.extension.sdk.api.services.Services; -import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer; -import com.hivemq.testcontainer.core.HiveMQExtension; -import com.hivemq.testcontainer.junit5.HiveMQTestContainerExtension; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.testcontainers.utility.MountableFile; - -import java.time.Duration; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author Yannick Weber - */ -public class Mqtt3SendMaximumIT { - - public static final int RECEIVE_MAXIMUM = 10; - public static final @NotNull HiveMQExtension NO_PUBACK_EXTENSION = HiveMQExtension.builder() - .version("1.0.0") - .priority(100) - .name("No PUBACK Extension") - .id("no-puback-extension") - .mainClass(NoPubackExtension.class) - .build(); - - @RegisterExtension - public final @NotNull HiveMQTestContainerExtension hivemq = - new HiveMQTestContainerExtension().withExtension(NO_PUBACK_EXTENSION) - .withHiveMQConfig(MountableFile.forClasspathResource("/config.xml")); - - @Test - void mqtt3_sendMaximum_applied() throws InterruptedException { - - final Mqtt3Client publisher = Mqtt3Client.builder().serverPort(hivemq.getMqttPort()).build(); - publisher.toBlocking().connectWith().restrictions().sendMaximum(RECEIVE_MAXIMUM).applyRestrictions().send(); - - final ConcurrentLinkedQueue publishes = new ConcurrentLinkedQueue<>(); - final Mqtt5BlockingClient subscriber = Mqtt5Client.builder().serverPort(hivemq.getMqttPort()).buildBlocking(); - subscriber.connect(); - subscriber.toAsync().publishes(MqttGlobalPublishFilter.ALL, publishes::add); - subscriber.subscribeWith().topicFilter("#").send(); - - for (int i = 0; i < 12; i++) { - publisher.toAsync().publishWith().topic("test").qos(MqttQos.AT_LEAST_ONCE).send(); - } - - await().until(() -> publishes.size() == RECEIVE_MAXIMUM); - - TimeUnit.SECONDS.sleep(2); - - assertEquals(RECEIVE_MAXIMUM, publishes.size()); - } - - public static class NoPubackExtension implements ExtensionMain { - - @Override - public void extensionStart( - final @NotNull ExtensionStartInput extensionStartInput, - final @NotNull ExtensionStartOutput extensionStartOutput) { - Services.initializerRegistry().setClientInitializer(new MyClientInitializer()); - } - - @Override - public void extensionStop( - final @NotNull ExtensionStopInput extensionStopInput, - final @NotNull ExtensionStopOutput extensionStopOutput) { - - } - } - - public static class MyClientInitializer implements ClientInitializer { - - @Override - public void initialize( - final @NotNull InitializerInput initializerInput, final @NotNull ClientContext clientContext) { - clientContext.addPubackOutboundInterceptor(new NoPubackInterceptorHandler()); - } - } - - public static class NoPubackInterceptorHandler implements PubackOutboundInterceptor { - - @Override - public void onOutboundPuback( - final @NotNull PubackOutboundInput pubackOutboundInput, - final @NotNull PubackOutboundOutput pubackOutboundOutput) { - pubackOutboundOutput.async(Duration.ofHours(1)); - } - } - -} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java index e9c768431..84f4493d2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java @@ -46,9 +46,9 @@ import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import java.util.function.Consumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java index 2103c73da..eb7af945c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java @@ -52,7 +52,7 @@ import org.reactivestreams.Subscription; import java.util.LinkedList; -import java.util.Optional; +import java9.util.Optional; import java.util.concurrent.CancellationException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index 5c291f44b..08a93db3e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -41,7 +41,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; +import java9.util.Optional; import java.util.concurrent.atomic.AtomicReference; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java index b48f1c175..90c4d9a25 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java index 4f1b290f9..2703a17d6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; -import java.util.OptionalInt; +import java9.util.Optional; +import java9.util.OptionalInt; import java.util.concurrent.Executor; /** @@ -93,7 +93,7 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { - int result = Objects.hashCode(nettyExecutor); + int result = java9.util.Objects.hashCode(nettyExecutor); result = 31 * result + nettyThreads; result = 31 * result + applicationScheduler.hashCode(); return result; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java index 6c68726af..bbddfabe7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; import java.util.concurrent.Executor; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java index d0f02d20a..cd5ab9424 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java @@ -24,7 +24,9 @@ import javax.net.ssl.*; import java.util.List; import java.util.Objects; -import java.util.Optional; + +import java9.lang.Integers; +import java9.util.Optional; /** * @author David Katz @@ -145,12 +147,12 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { - int result = Objects.hashCode(keyManagerFactory); - result = 31 * result + Objects.hashCode(trustManagerFactory); - result = 31 * result + Objects.hashCode(cipherSuites); - result = 31 * result + Objects.hashCode(protocols); - result = 31 * result + Integer.hashCode(handshakeTimeoutMs); - result = 31 * result + Objects.hashCode(hostnameVerifier); + int result = java9.util.Objects.hashCode(keyManagerFactory); + result = 31 * result + java9.util.Objects.hashCode(trustManagerFactory); + result = 31 * result + java9.util.Objects.hashCode(cipherSuites); + result = 31 * result + java9.util.Objects.hashCode(protocols); + result = 31 * result + Integers.hashCode(handshakeTimeoutMs); + result = 31 * result + java9.util.Objects.hashCode(hostnameVerifier); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java index f5fa63816..22aa9851b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java @@ -27,7 +27,7 @@ import javax.net.ssl.TrustManagerFactory; import java.util.Collection; import java.util.concurrent.TimeUnit; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java index fa2489853..8e97d319b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java @@ -23,7 +23,9 @@ import java.net.InetSocketAddress; import java.util.Objects; -import java.util.Optional; + +import java9.lang.Integers; +import java9.util.Optional; /** * @author Silvio Giebl @@ -140,12 +142,12 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { int result = serverAddress.hashCode(); - result = 31 * result + Objects.hashCode(localAddress); - result = 31 * result + Objects.hashCode(sslConfig); - result = 31 * result + Objects.hashCode(webSocketConfig); - result = 31 * result + Objects.hashCode(proxyConfig); - result = 31 * result + Integer.hashCode(socketConnectTimeoutMs); - result = 31 * result + Integer.hashCode(mqttConnectTimeoutMs); + result = 31 * result + java9.util.Objects.hashCode(localAddress); + result = 31 * result + java9.util.Objects.hashCode(sslConfig); + result = 31 * result + java9.util.Objects.hashCode(webSocketConfig); + result = 31 * result + java9.util.Objects.hashCode(proxyConfig); + result = 31 * result + Integers.hashCode(socketConnectTimeoutMs); + result = 31 * result + Integers.hashCode(mqttConnectTimeoutMs); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java index 69aa1186d..95ac3d5aa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java @@ -28,7 +28,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; -import java.util.function.Function; +import java9.util.function.Function; import static com.hivemq.client.mqtt.MqttClient.*; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java index 080c3fb0f..013796375 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java @@ -23,7 +23,9 @@ import java.net.InetSocketAddress; import java.util.Objects; -import java.util.Optional; + +import java9.lang.Integers; +import java9.util.Optional; /** * @author Silvio Giebl @@ -106,9 +108,9 @@ public boolean equals(final @Nullable Object o) { public int hashCode() { int result = protocol.hashCode(); result = 31 * result + address.hashCode(); - result = 31 * result + Objects.hashCode(username); - result = 31 * result + Objects.hashCode(password); - result = 31 * result + Integer.hashCode(handshakeTimeoutMs); + result = 31 * result + java9.util.Objects.hashCode(username); + result = 31 * result + java9.util.Objects.hashCode(password); + result = 31 * result + Integers.hashCode(handshakeTimeoutMs); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java index d074c9e06..6cfb66a6d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java @@ -26,7 +26,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java index b2a08a16f..9eb798651 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java @@ -20,6 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java9.lang.Integers; + /** * @author David Katz * @author Christian Hoff @@ -91,7 +93,7 @@ public int hashCode() { int result = serverPath.hashCode(); result = 31 * result + queryString.hashCode(); result = 31 * result + subprotocol.hashCode(); - result = 31 * result + Integer.hashCode(handshakeTimeoutMs); + result = 31 * result + Integers.hashCode(handshakeTimeoutMs); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java index 808207498..1d23f3a3f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import java.util.concurrent.TimeUnit; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java index 45e6e4729..996b8338c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java @@ -82,7 +82,7 @@ public boolean equals(final @Nullable Object o) { public int hashCode() { int result = Boolean.hashCode(allowServerReAuth); result = 31 * result + Boolean.hashCode(validatePayloadFormat); - result = 31 * result + Objects.hashCode(interceptors); + result = 31 * result + java9.util.Objects.hashCode(interceptors); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java index 0b243925d..2c27d457a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java index d2f857942..96e3e8a1b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java @@ -91,10 +91,10 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { - int result = Objects.hashCode(incomingQos1Interceptor); - result = 31 * result + Objects.hashCode(outgoingQos1Interceptor); - result = 31 * result + Objects.hashCode(incomingQos2Interceptor); - result = 31 * result + Objects.hashCode(outgoingQos2Interceptor); + int result = java9.util.Objects.hashCode(incomingQos1Interceptor); + result = 31 * result + java9.util.Objects.hashCode(outgoingQos1Interceptor); + result = 31 * result + java9.util.Objects.hashCode(incomingQos2Interceptor); + result = 31 * result + java9.util.Objects.hashCode(outgoingQos2Interceptor); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java index a308c02f0..8e1525a81 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java index c28b618c4..c8a61a6bc 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java index 2a1c3238d..fbcc8f06d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java index 2c5cb44cc..15129dfa1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java @@ -26,8 +26,10 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Function; -import java.util.stream.Stream; + +import java9.lang.Iterables; +import java9.util.function.Function; +import java9.util.stream.Stream; /** * @author Silvio Giebl @@ -75,7 +77,7 @@ public abstract class MqttUserPropertiesImplBuilder userProperties) { Checks.notNull(userProperties, "User Properties"); listBuilder.ensureFree(userProperties.size()); - userProperties.forEach(this::add); + Iterables.forEach(userProperties, this::add); return self(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java index 6c3083380..0823037f0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java @@ -34,7 +34,7 @@ public final class Mqtt3ExceptionFactory { public static final @NotNull Function MAPPER = Mqtt3ExceptionFactory::map; - public static final @NotNull java.util.function.Function MAPPER_JAVA = + public static final @NotNull java9.util.function.Function MAPPER_JAVA = Mqtt3ExceptionFactory::map; public static @NotNull Throwable map(final @NotNull Throwable throwable) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java index b7155f92a..0ebe77e87 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java @@ -35,11 +35,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; +import java9.util.function.Supplier; import static com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.CONTINUE_AUTHENTICATION; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java index b58b0ccd1..7ff8dcd7c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java @@ -30,8 +30,8 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.NoSuchElementException; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java index 83be60cfc..7ba3df7e3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java @@ -21,8 +21,8 @@ import io.netty.channel.Channel; import org.jetbrains.annotations.NotNull; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java index 8309955da..a0af5eaa7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java @@ -32,6 +32,9 @@ import java.util.*; +import java9.util.Comparators; +import java9.util.Maps; + /** * @author Silvio Giebl */ @@ -113,7 +116,7 @@ public void clear(final @NotNull Throwable cause) { @Override public @NotNull Map<@NotNull Integer, @NotNull List<@NotNull MqttSubscription>> getSubscriptions() { // we sort in reverse order of subscription identifiers so that newer subscriptions are first - final Map> map = new TreeMap<>(Comparator.reverseOrder()); + final Map> map = new TreeMap<>(Comparators.reverseOrder()); if (rootNode != null) { final Queue nodes = new LinkedList<>(); nodes.add(new IteratorNode(rootNode, null)); @@ -579,7 +582,7 @@ private static void getSubscriptions( MqttSubscription.decodeRetainAsPublished(entry.subscriptionOptions); final MqttSubscription subscription = new MqttSubscription(topicFilter, qos, noLocal, retainHandling, retainAsPublished); - map.computeIfAbsent(entry.subscriptionIdentifier, k -> new LinkedList<>()).add(subscription); + Maps.computeIfAbsent(map, entry.subscriptionIdentifier, k -> new LinkedList<>()).add(subscription); } } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java index b3c8c6504..a9a445dfa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java @@ -21,7 +21,7 @@ import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; import org.jetbrains.annotations.NotNull; -import java.util.function.BooleanSupplier; +import java9.util.function.BooleanSupplier; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java index 143e8b95f..8ceacf8ff 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java @@ -26,8 +26,8 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLHandshakeException; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java index dfdd808b6..0fd1a27e8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java @@ -30,8 +30,8 @@ import javax.net.ssl.SSLException; import javax.net.ssl.SSLParameters; import java.net.InetSocketAddress; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Christoph Schäbel diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java index 3e2ca8cad..36a97d3d7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java @@ -31,6 +31,7 @@ import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; @@ -49,11 +50,15 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; +import java9.util.Maps; +import java9.util.function.BiConsumer; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.inject.Inject; import java.io.IOException; +import java.util.List; /** * @author Silvio Giebl @@ -101,7 +106,7 @@ public void onSessionStartOrResume( subscriptionIdentifiersAvailable = connectionConfig.areSubscriptionIdentifiersAvailable(); if (!hasSession) { - incomingPublishFlows.getSubscriptions().forEach((subscriptionIdentifier, subscriptions) -> { + Maps.forEach(incomingPublishFlows.getSubscriptions(), (subscriptionIdentifier, subscriptions) -> { final MqttSubscribe subscribe = new MqttSubscribe(ImmutableList.copyOf(subscriptions), MqttUserPropertiesImpl.NO_USER_PROPERTIES); pending.addFirst(new MqttSubscribeWithFlow(subscribe, subscriptionIdentifier, null)); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java index ed1c4c3f4..2c2ceec19 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java @@ -33,8 +33,8 @@ import java.net.InetSocketAddress; import java.net.URI; import java.net.URISyntaxException; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java index dcde3a0ad..931d8a534 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.Nullable; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.Consumer; +import java9.util.function.BiConsumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java index 28be4ecdd..f55e35a3e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java @@ -22,7 +22,7 @@ import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.ThreadLocalRandom; +import java9.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java index dc7e866b6..d7b3bfec8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import java.util.concurrent.TimeUnit; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java index 48ee6b414..ecea2d92d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java @@ -29,9 +29,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java index d56bf3763..f6bd88b5f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java @@ -28,9 +28,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java index 897a88879..c0d0f7fa0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java @@ -26,7 +26,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; + +import java9.util.Optional; /** * Base class for MQTT messages with optional User Properties. @@ -89,7 +90,7 @@ protected boolean partialEquals(final @NotNull WithReason that) { } protected int partialHashCode() { - return 31 * super.partialHashCode() + Objects.hashCode(reasonString); + return 31 * super.partialHashCode() + java9.util.Objects.hashCode(reasonString); } /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java index 7d7a44cad..a421a999e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java @@ -29,7 +29,8 @@ import java.nio.ByteBuffer; import java.util.Objects; -import java.util.Optional; + +import java9.util.Optional; /** * @author Silvio Giebl @@ -96,7 +97,7 @@ public boolean equals(final @Nullable Object o) { public int hashCode() { int result = partialHashCode(); result = 31 * result + method.hashCode(); - result = 31 * result + Objects.hashCode(data); + result = 31 * result + java9.util.Objects.hashCode(data); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java index a5bf5ad82..7e2b7938a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java @@ -25,7 +25,7 @@ import java.nio.ByteBuffer; import java.util.Objects; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl @@ -80,7 +80,7 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { int result = method.hashCode(); - result = 31 * result + Objects.hashCode(data); + result = 31 * result + java9.util.Objects.hashCode(data); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java index 3a2f46d1c..65163aa7a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Objects; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl @@ -85,8 +85,8 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { - int result = Objects.hashCode(username); - result = 31 * result + Objects.hashCode(password); + int result = java9.util.Objects.hashCode(username); + result = 31 * result + java9.util.Objects.hashCode(password); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java index f75f3984a..6c02f35fd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java index 2b13c3b6c..8a664a4c0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java index 208858663..3cd884b5e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java index 1933a069b..0c14afc33 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java @@ -33,7 +33,9 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; + +import java9.lang.Longs; +import java9.util.Optional; /** * @author Silvio Giebl @@ -186,11 +188,11 @@ public int hashCode() { int result = partialHashCode(); result = 31 * result + keepAlive; result = 31 * result + Boolean.hashCode(cleanStart); - result = 31 * result + Long.hashCode(sessionExpiryInterval); + result = 31 * result + Longs.hashCode(sessionExpiryInterval); result = 31 * result + restrictions.hashCode(); - result = 31 * result + Objects.hashCode(simpleAuth); - result = 31 * result + Objects.hashCode(enhancedAuthMechanism); - result = 31 * result + Objects.hashCode(willPublish); + result = 31 * result + java9.util.Objects.hashCode(simpleAuth); + result = 31 * result + java9.util.Objects.hashCode(enhancedAuthMechanism); + result = 31 * result + java9.util.Objects.hashCode(willPublish); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java index 884c9b242..a2c02530b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java index 8d35bcd44..717e9744f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java @@ -22,7 +22,7 @@ import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictionsBuilder; import org.jetbrains.annotations.NotNull; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java index 582e38938..533945263 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java @@ -31,9 +31,11 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.OptionalLong; + +import java9.lang.Longs; +import java9.util.Optional; +import java9.util.OptionalInt; +import java9.util.OptionalLong; /** * @author Silvio Giebl @@ -177,13 +179,13 @@ public boolean equals(final @Nullable Object o) { public int hashCode() { int result = partialHashCode(); result = 31 * result + Boolean.hashCode(sessionPresent); - result = 31 * result + Long.hashCode(sessionExpiryInterval); + result = 31 * result + Longs.hashCode(sessionExpiryInterval); result = 31 * result + serverKeepAlive; - result = 31 * result + Objects.hashCode(assignedClientIdentifier); - result = 31 * result + Objects.hashCode(enhancedAuth); + result = 31 * result + java9.util.Objects.hashCode(assignedClientIdentifier); + result = 31 * result + java9.util.Objects.hashCode(enhancedAuth); result = 31 * result + restrictions.hashCode(); - result = 31 * result + Objects.hashCode(responseInformation); - result = 31 * result + Objects.hashCode(serverReference); + result = 31 * result + java9.util.Objects.hashCode(responseInformation); + result = 31 * result + java9.util.Objects.hashCode(serverReference); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java index 10c2f6335..aeb438d28 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java index ff4024512..110b9f552 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java index 0805c82d0..bb01d9b6c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java @@ -28,8 +28,10 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; -import java.util.OptionalLong; + +import java9.lang.Longs; +import java9.util.Optional; +import java9.util.OptionalLong; /** * @author Silvio Giebl @@ -112,8 +114,8 @@ public boolean equals(final @Nullable Object o) { @Override public int hashCode() { int result = partialHashCode(); - result = 31 * result + Long.hashCode(sessionExpiryInterval); - result = 31 * result + Objects.hashCode(serverReference); + result = 31 * result + Longs.hashCode(sessionExpiryInterval); + result = 31 * result + java9.util.Objects.hashCode(serverReference); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java index 16beb24ac..f4e1fdadd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java @@ -29,8 +29,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Consumer; -import java.util.function.Function; +import java9.util.function.Consumer; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java index 385079152..264f779b4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java @@ -35,9 +35,11 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.Objects; -import java.util.Optional; -import java.util.OptionalLong; + +import java9.lang.Longs; +import java9.util.Objects; +import java9.util.Optional; +import java9.util.OptionalLong; import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_SUBSCRIPTION_IDENTIFIERS; import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; @@ -250,14 +252,14 @@ protected boolean canEqual(final @Nullable Object o) { public int hashCode() { int result = partialHashCode(); result = 31 * result + topic.hashCode(); - result = 31 * result + Objects.hashCode(payload); + result = 31 * result + java9.util.Objects.hashCode(payload); result = 31 * result + qos.hashCode(); result = 31 * result + Boolean.hashCode(retain); - result = 31 * result + Long.hashCode(messageExpiryInterval); - result = 31 * result + Objects.hashCode(payloadFormatIndicator); - result = 31 * result + Objects.hashCode(contentType); - result = 31 * result + Objects.hashCode(responseTopic); - result = 31 * result + Objects.hashCode(correlationData); + result = 31 * result + Longs.hashCode(messageExpiryInterval); + result = 31 * result + java9.util.Objects.hashCode(payloadFormatIndicator); + result = 31 * result + java9.util.Objects.hashCode(contentType); + result = 31 * result + java9.util.Objects.hashCode(responseTopic); + result = 31 * result + java9.util.Objects.hashCode(correlationData); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java index fe603468a..673929ff2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java index 86b387deb..9f51cacb4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java @@ -25,8 +25,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; -import java.util.Optional; -import java.util.function.BooleanSupplier; +import java9.util.Optional; +import java9.util.function.BooleanSupplier; /** * @author Silvio Giebl @@ -83,7 +83,7 @@ protected boolean canEqual(final @Nullable Object o) { @Override public int hashCode() { int result = publish.hashCode(); - result = 31 * result + Objects.hashCode(error); + result = 31 * result + java9.util.Objects.hashCode(error); return result; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java index b767658dd..8577fe5e1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java @@ -28,6 +28,8 @@ import java.nio.ByteBuffer; +import java9.lang.Longs; + /** * @author Silvio Giebl */ @@ -100,7 +102,7 @@ protected boolean canEqual(final @Nullable Object o) { @Override public int hashCode() { int result = super.hashCode(); - result = 31 * result + Long.hashCode(delayInterval); + result = 31 * result + Longs.hashCode(delayInterval); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java index 938ccaa22..5441912c0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java index e5861a92a..7f36045b5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl @@ -41,7 +41,7 @@ public class Mqtt3PublishView implements Mqtt3Publish { public static final @NotNull Function MAPPER = Mqtt3PublishView::of; - public static final @NotNull java.util.function.Function JAVA_MAPPER = + public static final @NotNull java9.util.function.Function JAVA_MAPPER = Mqtt3PublishView::of; public static @NotNull MqttPublish delegate( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java index ef68aa515..c005d624f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java @@ -31,8 +31,8 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.function.Consumer; -import java.util.function.Function; +import java9.util.function.Consumer; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java index 0bff4c02a..1943fb647 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java @@ -32,8 +32,10 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Function; -import java.util.stream.Stream; + +import java9.lang.Iterables; +import java9.util.function.Function; +import java9.util.stream.Stream; /** * @author Silvio Giebl @@ -83,7 +85,7 @@ protected MqttSubscribeBuilder() { Checks.notNull(subscriptions, "Subscriptions"); buildFirstSubscription(); subscriptionsBuilder.ensureFree(subscriptions.size()); - subscriptions.forEach(this::addSubscription); + Iterables.forEach(subscriptions, this::addSubscription); ensureAtLeastOneSubscription(); return self(); } @@ -200,6 +202,7 @@ public Nested(final @NotNull Function parentConsumer) public static class Send

extends MqttSubscribeBuilder> implements Mqtt5SubscribeBuilder.Send.Start.Complete

{ + private final @NotNull Function parentConsumer; public Send(final @NotNull Function parentConsumer) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java index 176bdadd1..55cd15a31 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java index 818f2fbf9..1aac788f1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Function; -import java.util.stream.Stream; +import java9.util.function.Function; +import java9.util.stream.Stream; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java index 495c11fc3..07225dccd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java index 42a0529cf..d0c6edb19 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java @@ -32,8 +32,10 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Function; -import java.util.stream.Stream; + +import java9.lang.Iterables; +import java9.util.function.Function; +import java9.util.stream.Stream; /** * @author Silvio Giebl @@ -82,7 +84,7 @@ public abstract class MqttUnsubscribeBuilder public @NotNull B addTopicFilters(final @Nullable Collection<@Nullable ? extends MqttTopicFilter> topicFilters) { Checks.notNull(topicFilters, "Topic Filters"); topicFiltersBuilder.ensureFree(topicFilters.size()); - topicFilters.forEach(this::addTopicFilter); + Iterables.forEach(topicFilters, this::addTopicFilter); ensureAtLeastOneSubscription(); return self(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java index 29e98aa8a..1a208f961 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java @@ -29,9 +29,11 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Stream; + +import java9.lang.Iterables; +import java9.util.function.Consumer; +import java9.util.function.Function; +import java9.util.stream.Stream; /** * @author Silvio Giebl @@ -79,7 +81,7 @@ public abstract class Mqtt3UnsubscribeViewBuilder topicFilters) { Checks.notNull(topicFilters, "Topic Filters"); topicFiltersBuilder.ensureFree(topicFilters.size()); - topicFilters.forEach(this::addTopicFilter); + Iterables.forEach(topicFilters, this::addTopicFilter); ensureAtLeastOneSubscription(); return self(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index 33359785b..defe53dd5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -49,9 +49,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import java.util.function.Consumer; +import java9.util.function.Consumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index 2b732b470..d53d531c8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -49,7 +49,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; +import java9.util.Optional; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index 1002e1516..1841d7f33 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java b/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java index 5ef5044c4..a3290be78 100644 --- a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java +++ b/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import java.util.function.BiFunction; +import java9.util.function.BiFunction; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java b/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java index fa15aff6d..8aefb3cb7 100644 --- a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java +++ b/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java @@ -21,10 +21,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; +import java9.util.Optional; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java b/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java index e3832e276..dc923eee0 100644 --- a/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java +++ b/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/util/collections/Index.java b/src/main/java/com/hivemq/client/internal/util/collections/Index.java index 269150a3e..860ddd515 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/Index.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/Index.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.NoSuchElementException; -import java.util.function.Consumer; -import java.util.function.Function; +import java9.util.function.Consumer; +import java9.util.function.Function; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java b/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java index 50d5de0f3..0e40bb92e 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; -import java.util.function.Consumer; -import java.util.function.ToIntFunction; +import java9.util.function.Consumer; +import java9.util.function.ToIntFunction; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index f7b8c58ff..37c319f66 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -26,7 +26,7 @@ import java.net.InetSocketAddress; import java.util.List; -import java.util.Optional; +import java9.util.Optional; /** * Configuration of an {@link MqttClient}. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java index 5b98e764f..c70e5cb89 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java @@ -22,8 +22,8 @@ import io.reactivex.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; -import java.util.Optional; -import java.util.OptionalInt; +import java9.util.Optional; +import java9.util.OptionalInt; import java.util.concurrent.Executor; /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java index 8aa5f67a8..a0c1d17dc 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java @@ -25,7 +25,7 @@ import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManagerFactory; import java.util.List; -import java.util.Optional; +import java9.util.Optional; /** * Configuration for a secure transport to use by {@link MqttClient MQTT clients}. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java index f2e2a8233..ada15fb26 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; -import java.util.Optional; +import java9.util.Optional; /** * Configuration for a transport to use by {@link MqttClient MQTT clients}. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java index 0ff13b44e..2d67d1421 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; -import java.util.Optional; +import java9.util.Optional; /** * Configuration for a proxy to use by {@link MqttClient MQTT clients}. diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java index 584471935..860ebb3d4 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java @@ -23,9 +23,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * A reconnector is supplied by a {@link MqttClientDisconnectedContext} and can be used for reconnecting. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 28b12ef90..5bea0e4de 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -31,9 +31,9 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import java.util.function.Consumer; +import java9.util.function.Consumer; /** * Asynchronous API of an {@link Mqtt3Client} based on futures and callbacks. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index 3dd6ddc81..42347b405 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -31,7 +31,7 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java index c0ff11d0a..375b227eb 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java @@ -22,7 +22,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * Configuration of an {@link Mqtt3Client}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java index 13dd93324..997704d90 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java @@ -26,9 +26,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * A {@link MqttClientReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java index 1ca47e1b1..00665f077 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * Simple authentication and/or authorization related data in an {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java index 8f0403634..69f11c6c0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java @@ -24,7 +24,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 3 Connect message. This message is translated from and to an MQTT 3 CONNECT packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java index be7b4bb39..f5b549684 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java @@ -25,7 +25,8 @@ import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; -import java.util.Optional; + +import java9.util.Optional; /** * MQTT 3 Publish message. This message is translated from and to an MQTT 3 PUBLISH packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java index 0ccaaf31f..e5159f839 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java @@ -19,7 +19,7 @@ import com.hivemq.client.annotations.DoNotImplement; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * Result for an {@link Mqtt3Publish MQTT 3 Publish message} sent by the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 224a9891f..d5c01956a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.stream.Stream; +import java9.util.stream.Stream; /** * Builder base for a {@link Mqtt3Subscribe}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index 17f751dae..814151fae 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.stream.Stream; +import java9.util.stream.Stream; /** * Builder base for a {@link Mqtt3Unsubscribe}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java index 5e77444de..83cce2f6c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -35,9 +35,9 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import java.util.function.Consumer; +import java9.util.function.Consumer; /** * Asynchronous API of an {@link Mqtt5Client} based on futures and callbacks. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java index 50e228347..71593dc38 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -35,7 +35,7 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java index 3839aafe5..592db465c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java @@ -24,7 +24,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * Configuration of an {@link Mqtt5Client}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java index e9080c915..5b24de00e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java @@ -22,7 +22,7 @@ import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * Connection configuration of an {@link Mqtt5Client}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java index d8fc531b4..fa118a6ac 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java @@ -26,7 +26,7 @@ import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; /** * Interface for enhanced authentication and/or authorization (auth) mechanisms. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java index d146ac004..abc65b4be 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.stream.Stream; +import java9.util.stream.Stream; /** * Builder base for {@link Mqtt5UserProperties}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java index 46de2ac1b..40e277813 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java @@ -26,9 +26,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; +import java9.util.function.BiConsumer; /** * A {@link MqttClientReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java index 90cd0623a..9ce16e8f5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 Auth message. This message is translated from and to an MQTT 5 AUTH packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java index e4744084a..b41f0015d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * Data for enhanced authentication and/or authorization. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java index 3f5fbe6d8..f8de89f4e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; -import java.util.Optional; +import java9.util.Optional; /** * Simple authentication and/or authorization related data in an {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java index d1572f2d8..49b317e1a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java @@ -27,7 +27,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 Connect message. This message is translated from and to an MQTT 5 CONNECT packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java index af537b401..be03a8717 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java @@ -25,9 +25,9 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import org.jetbrains.annotations.NotNull; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.OptionalLong; +import java9.util.Optional; +import java9.util.OptionalInt; +import java9.util.OptionalLong; /** * MQTT 5 ConnAck packet. This message is translated from and to an MQTT 5 CONNACK packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java index 6afc5a82f..31f19d96b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java @@ -24,8 +24,8 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; -import java.util.OptionalLong; +import java9.util.Optional; +import java9.util.OptionalLong; /** * MQTT 5 Disconnect message. This message is translated from and to an MQTT 5 DISCONNECT packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java index 9d24b1bc3..863292f66 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; -import java.util.Optional; -import java.util.OptionalLong; +import java9.util.Optional; +import java9.util.OptionalLong; /** * MQTT 5 Publish message. This message is translated from and to an MQTT 5 PUBLISH packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java index 92d275e39..aeec91f86 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * Result for an {@link Mqtt5Publish MQTT 5 Publish message} sent by the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java index 2227ad0af..53fb67f5f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 PubAck message. This message is translated from and to an MQTT 5 PUBACK packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java index 1cef4f907..c88f61d9a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 PubComp message. This message is translated from and to an MQTT 5 PUBCOMP packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java index 8e2aa05a7..baf08a032 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 PubRec message. This message is translated from and to an MQTT 5 PUBREC packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java index 7d84c6d27..5cb8d2146 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 PubRel message. This message is translated from and to an MQTT 5 PUBREL packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java index 677ff3a9a..7db56ab03 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.stream.Stream; +import java9.util.stream.Stream; /** * Builder base for a {@link Mqtt5Subscribe}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java index 55b8d8de0..e87c6c8d8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 SubAck message. This message is translated from and to an MQTT 5 SUBACK packet. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java index 4b79645de..8d5d90575 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.stream.Stream; +import java9.util.stream.Stream; /** * Builder base for a {@link Mqtt5Unsubscribe}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java index 7c442bfed..03285bd2b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -import java.util.Optional; +import java9.util.Optional; /** * MQTT 5 UnsubAck message. This message is translated from and to an MQTT 5 UNSUBACK packet. diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java index 5eb5de2be..d7e1b920b 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java @@ -38,7 +38,7 @@ import org.reactivestreams.Subscription; import java.util.NoSuchElementException; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; /** diff --git a/src/main/java/com/hivemq/client/util/TypeSwitch.java b/src/main/java/com/hivemq/client/util/TypeSwitch.java index c72c60c05..e229435f9 100644 --- a/src/main/java/com/hivemq/client/util/TypeSwitch.java +++ b/src/main/java/com/hivemq/client/util/TypeSwitch.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Consumer; +import java9.util.function.Consumer; /** * Util to enable switching over types. diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java index cf00ae19e..cbb75abdd 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.params.provider.EnumSource; import java.util.List; -import java.util.Optional; +import java9.util.Optional; import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java index bb0b0089e..69997cc45 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java @@ -46,7 +46,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.concurrent.CompletableFuture; +import java9.util.concurrent.CompletableFuture; import static com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions.DEFAULT; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java index 41b3ea98e..44da2d53d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java @@ -31,8 +31,8 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import java.util.function.Function; -import java.util.stream.Stream; +import java9.util.function.Function; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java index 2aa9cb718..9832f6426 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java @@ -27,8 +27,8 @@ import org.junit.jupiter.params.provider.MethodSource; import java.nio.charset.StandardCharsets; -import java.util.function.Function; -import java.util.stream.Stream; +import java9.util.function.Function; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java index 27681e7f2..7801d364f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java @@ -24,7 +24,8 @@ import org.junit.jupiter.api.Test; import java.util.*; -import java.util.stream.Stream; +import java9.util.stream.Stream; +import java9.util.stream.StreamSupport; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; @@ -164,7 +165,7 @@ void addAll_correct_use_and_correct_order_stream() { userProperties.add(userProperty2); userProperties.add(userProperty3); - final Mqtt5UserProperties properties = Mqtt5UserProperties.builder().addAll(userProperties.stream()).build(); + final Mqtt5UserProperties properties = Mqtt5UserProperties.builder().addAll(StreamSupport.stream(userProperties)).build(); final List mqtt5UserProperties = properties.asList(); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java index 163645bff..c25bb2a76 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; +import java9.util.function.Supplier; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java index e7476e828..d4695158f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java @@ -19,9 +19,6 @@ import nl.jqno.equalsverifier.EqualsVerifier; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; - -import java.util.stream.IntStream; import static org.junit.jupiter.api.Assertions.*; @@ -55,15 +52,4 @@ void getPayloadAsBytes_payloadIsNull() { assertEquals(0, publish.getPayloadAsBytes().length); } - @Test - void getPayloadAsBytes_concurrent() { - final byte[] payload = new byte[1_000_000]; - final MqttPublish publish = new MqttPublishBuilder.Default().topic("topic").payload(payload).build(); - final Executable executable = () -> { - for (int i = 0; i < 100; i++) { - assertArrayEquals(payload, publish.getPayloadAsBytes()); - } - }; - assertAll(IntStream.range(0, 16).mapToObj(i -> executable).parallel()); - } } diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java index f17efb344..2b7d627c9 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java @@ -26,7 +26,8 @@ import org.junit.jupiter.api.Test; import java.util.*; -import java.util.stream.Stream; +import java9.util.stream.Stream; +import java9.util.stream.StreamSupport; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; @@ -281,7 +282,7 @@ void addSubscriptions_correct_use_stream() { subscriptions.add("subscriptions"); final Mqtt5Subscribe subscribe = Mqtt5Subscribe.builder() - .addSubscriptions(subscriptions.stream() + .addSubscriptions(StreamSupport.stream(subscriptions) .map(topicFilter -> Mqtt5Subscription.builder() .topicFilter(topicFilter) .qos(MqttQos.AT_LEAST_ONCE) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java index c2e1ffae3..5ee702eda 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.Test; import java.util.*; -import java.util.stream.Stream; +import java9.util.stream.Stream; +import java9.util.stream.StreamSupport; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; @@ -265,7 +266,7 @@ void addSubscriptions_correct_use_stream() { subscriptions.add("subscriptions"); final Mqtt3Subscribe subscribe = Mqtt3Subscribe.builder() - .addSubscriptions(subscriptions.stream() + .addSubscriptions(StreamSupport.stream(subscriptions) .map(topicFilter -> Mqtt3Subscription.builder() .topicFilter(topicFilter) .qos(MqttQos.AT_LEAST_ONCE) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java index c04731cd2..939f42c6d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -282,22 +282,6 @@ void addTopicFilters_correct_use_varargs() { assertEquals("element", unsubscribeTopics.get(2).toString()); } - @Test - void addTopicFilters_correct_use_stream() { - - final ImmutableList topics = ImmutableList.of("test", "list", "element"); - - final Mqtt5Unsubscribe subscribe = - Mqtt5Unsubscribe.builder().addTopicFilters(topics.stream().map(MqttTopicFilter::of)).build(); - - final List unsubscribeTopics = subscribe.getTopicFilters(); - assertEquals(3, unsubscribeTopics.size()); - - assertEquals("test", unsubscribeTopics.get(0).toString()); - assertEquals("list", unsubscribeTopics.get(1).toString()); - assertEquals("element", unsubscribeTopics.get(2).toString()); - } - @Test void addTopicFilters_fluent_topic_is_finished_if_addTopicFilters_is_used() { diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java index b59475d83..f96dd8650 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java @@ -23,7 +23,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Stream; +import java9.util.stream.Stream; +import java9.util.stream.StreamSupport; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -288,7 +289,7 @@ void addTopicFilters_correct_use_stream() { final ImmutableList topics = ImmutableList.of("test", "list", "element"); final Mqtt3Unsubscribe subscribe = - Mqtt3Unsubscribe.builder().addTopicFilters(topics.stream().map(MqttTopicFilter::of)).build(); + Mqtt3Unsubscribe.builder().addTopicFilters(StreamSupport.stream(topics).map(MqttTopicFilter::of)).build(); final List unsubscribeTopics = subscribe.getTopicFilters(); assertEquals(3, unsubscribeTopics.size()); diff --git a/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java b/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java index 7c9b0df71..181d6be19 100644 --- a/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java +++ b/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java @@ -23,7 +23,8 @@ import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.Test; -import java.util.Optional; +import java9.util.Optional; +import java9.util.concurrent.CompletableFuture; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java b/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java index 4f14038f3..466b7f6b5 100644 --- a/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java +++ b/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.Optional; +import java9.util.Optional; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java b/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java index 26060539c..864288996 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java +++ b/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java b/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java index 7be22bdca..84dceb1e8 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java +++ b/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java @@ -23,7 +23,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java index 55aa73f87..16adb5f4f 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java index 35316e51f..32c518cdd 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java index 1a9bf4c03..3fa159c9b 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java index 2361b727d..894042c8f 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java index ff18d134d..2a8d2b572 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java index a8bab3ae0..dc22cc458 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java index 461e346a9..a5a7abf78 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java index 1ed77b632..ef2c08c91 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java index 1ea70e94d..9bb3548f5 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java @@ -36,7 +36,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Stream; + +import java9.util.concurrent.CompletableFuture; +import java9.util.stream.Stream; import static org.junit.jupiter.api.Assertions.*; @@ -469,7 +471,7 @@ void subscribeSingleFuture_immediate_single_in_between(final int args) final AtomicInteger onNextCounter = new AtomicInteger(); final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter); assertTrue(future.isDone()); assertFalse(future.isCancelled()); @@ -499,7 +501,7 @@ void subscribeSingleFuture_immediate_no_single(final int args) { final AtomicInteger onNextCounter = new AtomicInteger(); final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter); assertTrue(future.isDone()); assertFalse(future.isCancelled()); @@ -530,7 +532,7 @@ void subscribeSingleFuture_immediate_error(final int args) { final AtomicInteger onNextCounter = new AtomicInteger(); final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter); assertTrue(future.isDone()); assertFalse(future.isCancelled()); @@ -564,7 +566,7 @@ void subscribeSingleFuture(final int args) throws InterruptedException { final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch(3 + ((args >= 3) ? 1 : 0)); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter, latch); assertTimeout(Duration.ofMillis(100), () -> assertEquals("single", future.get().toString())); @@ -600,7 +602,7 @@ void subscribeSingleFuture_single_in_between(final int args) throws InterruptedE final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch(3 + ((args >= 3) ? 1 : 0)); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter, latch); assertTimeout(Duration.ofMillis(100), () -> assertEquals("single", future.get().toString())); @@ -635,7 +637,7 @@ void subscribeSingleFuture_no_single(final int args) throws InterruptedException final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch(3 + ((args >= 3) ? 1 : 0)); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter, latch); final ExecutionException executionException = assertThrows(ExecutionException.class, @@ -672,7 +674,7 @@ void subscribeSingleFuture_error(final int args) throws InterruptedException { final AtomicInteger onErrorCounter = new AtomicInteger(); final AtomicInteger onCompleteCounter = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch((args >= 2) ? 1 : 0); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = subscribeSingleFuture(args, flowableWithSingle, onNextCounter, onErrorCounter, onCompleteCounter, latch); final ExecutionException executionException = assertThrows(ExecutionException.class, @@ -716,7 +718,7 @@ void subscribeSingleFuture_cancel() throws InterruptedException { final FlowableWithSingle flowableWithSingle = new FlowableWithSingleSplit<>(flowable, String.class, StringBuilder.class); - final CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); + final java9.util.concurrent.CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); assertTrue(subscribeLatch.await(100, TimeUnit.MILLISECONDS)); future.cancel(false); cancelLatch.countDown(); @@ -744,7 +746,7 @@ void subscribeSingleFuture_cancel_after_single() throws InterruptedException { final FlowableWithSingle flowableWithSingle = new FlowableWithSingleSplit<>(flowable, String.class, StringBuilder.class); - final CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); + final java9.util.concurrent.CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); assertTimeout(Duration.ofMillis(100), () -> assertEquals("single", future.get().toString())); future.cancel(false); cancelLatch.countDown(); @@ -774,7 +776,7 @@ void subscribeSingleFuture_cancel_after_next() throws InterruptedException { new FlowableWithSingleSplit<>(flowable, String.class, StringBuilder.class); final CountDownLatch onNextLatch = new CountDownLatch(1); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = flowableWithSingle.subscribeSingleFuture(s -> onNextLatch.countDown()); assertTimeout(Duration.ofMillis(100), () -> assertEquals("single", future.get().toString())); assertTrue(onNextLatch.await(100, TimeUnit.MILLISECONDS)); @@ -812,7 +814,7 @@ protected void subscribeActual(final @NotNull Subscriber s final FlowableWithSingle flowableWithSingle = new FlowableWithSingleSplit<>(flowable, String.class, StringBuilder.class); - final CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); + final java9.util.concurrent.CompletableFuture future = flowableWithSingle.subscribeSingleFuture(); future.cancel(false); cancelLatch.countDown(); assertTrue(completeLatch.await(100, TimeUnit.MILLISECONDS)); @@ -841,7 +843,7 @@ protected void subscribeActual(final @NotNull Subscriber s final FlowableWithSingle flowableWithSingle = new FlowableWithSingleSplit<>(flowable, String.class, StringBuilder.class); - final CompletableFuture future = + final java9.util.concurrent.CompletableFuture future = flowableWithSingle.subscribeSingleFuture(new Subscriber() { @Override public void onSubscribe(final @NotNull Subscription s) { @@ -864,7 +866,7 @@ public void onError(final @NotNull Throwable t) {} assertThrows(CancellationException.class, future::get); } - private @NotNull CompletableFuture subscribeSingleFuture( + private @NotNull java9.util.concurrent.CompletableFuture subscribeSingleFuture( final int args, final @NotNull FlowableWithSingle flowableWithSingle, final @NotNull AtomicInteger onNextCounter, @@ -931,7 +933,7 @@ public void onError(final @NotNull Throwable t) { } } - private @NotNull CompletableFuture subscribeSingleFuture( + private @NotNull java9.util.concurrent.CompletableFuture subscribeSingleFuture( final int args, final @NotNull FlowableWithSingle flowableWithSingle, final @NotNull AtomicInteger onNextCounter,