From cdc88187d3401ff07168810063f5cb13bc5c569c Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 23 Dec 2020 10:29:32 +0100 Subject: [PATCH 1/6] Add asynchronous implementation for message sending. --- .../messaging/CloudOffboardingService.java | 4 +- .../messaging/CloudOnboardingService.java | 3 +- .../messaging/DeleteMessageService.java | 3 +- .../messaging/FetchMessageService.java | 1 + .../messaging/ListEndpointsService.java | 3 +- .../messaging/MessageConfirmationService.java | 3 +- .../messaging/MessageHeaderQueryService.java | 3 +- .../messaging/MessageQueryService.java | 3 +- .../service/messaging/MessagingService.java | 20 ++++- .../service/messaging/SendMessageService.java | 12 ++- .../messaging/SetCapabilityService.java | 6 +- .../messaging/SetSubscriptionService.java | 3 +- .../messaging/AsyncMessageSendingResult.kt | 12 +++ .../HttpAsyncMessageSendingResult.kt | 13 +++ .../api/messaging/MessageSendingResponse.kt | 8 ++ .../api/messaging/MessageSendingResult.kt | 3 + .../MqttAsyncMessageSendingResult.kt | 10 +++ .../helper/MessageQueryHelperService.java | 28 +++++- .../mqtt/CloudOffboardingServiceImpl.java | 89 +++++++++++-------- .../mqtt/CloudOnboardingServiceImpl.java | 14 ++- .../mqtt/DeleteMessageServiceImpl.java | 14 ++- .../mqtt/ListEndpointsServiceImpl.java | 15 +++- .../mqtt/MessageConfirmationServiceImpl.java | 13 ++- .../mqtt/MessageHeaderQueryServiceImpl.java | 8 ++ .../mqtt/MessageQueryServiceImpl.java | 8 ++ .../mqtt/SendMessageServiceImpl.java | 23 +++-- .../mqtt/SetCapabilityServiceImpl.java | 13 ++- .../mqtt/SetSubscriptionServiceImpl.java | 17 +++- .../rest/CloudOffboardingServiceImpl.java | 24 +++-- .../rest/CloudOnboardingServiceImpl.java | 24 +++-- .../rest/DeleteMessageServiceImpl.java | 18 +++- .../rest/ListEndpointsServiceImpl.java | 17 +++- .../rest/MessageConfirmationServiceImpl.java | 18 +++- .../rest/MessageHeaderQueryServiceImpl.java | 7 ++ .../rest/MessageQueryServiceImpl.java | 10 ++- .../impl/messaging/rest/MessageSender.java | 37 +++++--- .../rest/SendMessageServiceImpl.java | 22 ++++- .../rest/SetCapabilityServiceImpl.java | 16 +++- .../rest/SetSubscriptionServiceImpl.java | 16 +++- 39 files changed, 451 insertions(+), 110 deletions(-) create mode 100644 agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt create mode 100644 agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt create mode 100644 agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt create mode 100644 agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt create mode 100644 agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java index 185d7f13..57b0177c 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java @@ -1,5 +1,7 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; -public interface CloudOffboardingService extends MessagingService {} + +public interface CloudOffboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java index f2773ac8..a4418706 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; -public interface CloudOnboardingService extends MessagingService {} +public interface CloudOnboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java index 5004ffda..aea52169 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; -public interface DeleteMessageService extends MessagingService {} +public interface DeleteMessageService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java index 918ac75e..510019f6 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java @@ -3,6 +3,7 @@ import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.service.parameters.FetchMessageParameters; + import java.util.List; import java.util.Optional; diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java index 5b4ce4cb..b39a98c2 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; -public interface ListEndpointsService extends MessagingService {} +public interface ListEndpointsService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java index 70fad4f2..c8e1fe9e 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java @@ -1,6 +1,7 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; public interface MessageConfirmationService - extends MessagingService {} + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java index 9f3c2fc2..ab0f7122 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java @@ -1,9 +1,10 @@ package com.dke.data.agrirouter.api.service.messaging; import agrirouter.feed.response.FeedResponse; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; public interface MessageHeaderQueryService - extends MessagingService, + extends MessagingService, MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java index b208473e..458ced88 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java @@ -1,9 +1,10 @@ package com.dke.data.agrirouter.api.service.messaging; import agrirouter.feed.response.FeedResponse; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; public interface MessageQueryService - extends MessagingService, + extends MessagingService, MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java index ee0680a6..dda0ba0a 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java @@ -1,6 +1,24 @@ package com.dke.data.agrirouter.api.service.messaging; -public interface MessagingService { +/** + * Centralized service interface. + * @param The type of parameters needed to send messages. + * @param The type of result the asynchronous messaging will deliver. + */ +public interface MessagingService { + /** + * Send a synchronous message. + * @param parameters - + * @return The ID of the message. + */ String send(T parameters); + + /** + * Send a asynchronous message. + * @param parameters - + * @return The completable future containing the possible result. + */ + R sendAsync(T parameters); + } diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java index c46ebed5..144e1391 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java @@ -2,8 +2,10 @@ import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; +import java.util.concurrent.CompletableFuture; + /** Service for sending a message */ -public interface SendMessageService { +public interface SendMessageService { /** * Sending a message @@ -11,4 +13,12 @@ public interface SendMessageService { * @param sendMessageParameters - */ void send(SendMessageParameters sendMessageParameters); + + /** + * Sending a message + * + * @param sendMessageParameters - + * @return - + */ + CompletableFuture sendAsync(SendMessageParameters sendMessageParameters); } diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java index 4f47322a..aea705ac 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java @@ -1,5 +1,9 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; -public interface SetCapabilityService extends MessagingService {} +/** + * Service interface set capabilities. + */ +public interface SetCapabilityService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java index c16e1ec3..fa170d35 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java @@ -1,6 +1,7 @@ package com.dke.data.agrirouter.api.service.messaging; +import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; /** Service to set the subscriptions for an endpoint. */ -public interface SetSubscriptionService extends MessagingService {} +public interface SetSubscriptionService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt new file mode 100644 index 00000000..8825b22a --- /dev/null +++ b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt @@ -0,0 +1,12 @@ +package com.dke.data.agrirouter.api.messaging + +import java.util.concurrent.CompletableFuture + +/** + * Marker interface. + */ +interface AsyncMessageSendingResult { + + fun accessResult(): CompletableFuture + +} diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt new file mode 100644 index 00000000..5e759f1e --- /dev/null +++ b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt @@ -0,0 +1,13 @@ +package com.dke.data.agrirouter.api.messaging + +import java.util.concurrent.CompletableFuture + +class HttpAsyncMessageSendingResult( + val response: CompletableFuture, + val messageId: String +) : AsyncMessageSendingResult { + override fun accessResult(): CompletableFuture { + return response + } + +} \ No newline at end of file diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt new file mode 100644 index 00000000..98ebb187 --- /dev/null +++ b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt @@ -0,0 +1,8 @@ +package com.dke.data.agrirouter.api.messaging + +import javax.ws.rs.core.Response + +/** + * Wrapper for the response from the server. + */ +class MessageSendingResponse(val nativeResponse: Response) \ No newline at end of file diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt new file mode 100644 index 00000000..0f08ce91 --- /dev/null +++ b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt @@ -0,0 +1,3 @@ +package com.dke.data.agrirouter.api.messaging + +class MessageSendingResult(val messageSendingResponse: MessageSendingResponse, val messageId : String) \ No newline at end of file diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt new file mode 100644 index 00000000..05a1ab02 --- /dev/null +++ b/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt @@ -0,0 +1,10 @@ +package com.dke.data.agrirouter.api.messaging + +import java.util.concurrent.CompletableFuture + +class MqttAsyncMessageSendingResult(private val result: CompletableFuture) : AsyncMessageSendingResult { + override fun accessResult(): CompletableFuture { + return result + } + +} \ No newline at end of file diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java index 191a1507..4d977ee1 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java @@ -2,6 +2,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; @@ -9,7 +11,9 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; public class MessageQueryHelperService extends NonEnvironmentalService implements MessageSender, MessageEncoder, ResponseValidator { @@ -41,7 +45,7 @@ public String send(MessageQueryParameters parameters) { Collections.singletonList(encodedMessageResponse.getEncodedMessage())); this.getNativeLogger().trace("Send and fetch message response."); - MessageSender.MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.getNativeLogger().trace("Validate message response."); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); @@ -50,6 +54,28 @@ public String send(MessageQueryParameters parameters) { return encodedMessageResponse.getApplicationMessageID(); } + public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { + this.logMethodBegin(parameters); + + this.getNativeLogger().trace("Validate parameters."); + parameters.validate(); + + this.getNativeLogger().trace("Encode message."); + EncodedMessage encodedMessageResponse = this.encode(this.technicalMessageType, parameters); + + this.getNativeLogger().trace("Build message parameters."); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessageResponse.getEncodedMessage())); + + this.getNativeLogger().trace("Send and fetch message response."); + CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + + this.logMethodEnd(); + return new HttpAsyncMessageSendingResult(response, encodedMessageResponse.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index a28f716e..292d3ecd 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; @@ -10,50 +11,60 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; -/** Service implementation. */ +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + +/** + * Service implementation. + */ public class CloudOffboardingServiceImpl extends MqttService - implements CloudOffboardingService, MessageBodyCreator, MessageEncoder { - - private final EncodeMessageService encodeMessageService = new EncodeMessageServiceImpl(); - - public CloudOffboardingServiceImpl(IMqttClient mqttClient) { - super(mqttClient); - } - - /** - * Offboarding a virtual CU. Will deliver no result if the action was successful, if there's any - * error an exception will be thrown. - * - * @param parameters Parameters for offboarding. - */ - @Override - public String send(CloudOffboardingParameters parameters) { - parameters.validate(); - try { - EncodedMessage encodedMessage = this.encode(parameters); - SendMessageParameters sendMessageParameters = new SendMessageParameters(); - sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); - sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - String messageAsJson = this.createMessageBody(sendMessageParameters); - byte[] payload = messageAsJson.getBytes(); - this.getMqttClient() - .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), - new MqttMessage(payload)); - return encodedMessage.getApplicationMessageID(); - } catch (MqttException e) { - throw new CouldNotSendMqttMessageException(e); + implements CloudOffboardingService, MessageBodyCreator, MessageEncoder { + + private final EncodeMessageService encodeMessageService = new EncodeMessageServiceImpl(); + + public CloudOffboardingServiceImpl(IMqttClient mqttClient) { + super(mqttClient); } - } - @Override - public EncodeMessageService getEncodeMessageService() { - return this.encodeMessageService; - } + /** + * Offboarding a virtual CU. Will deliver no result if the action was successful, if there's any + * error an exception will be thrown. + * + * @param parameters Parameters for offboarding. + */ + @Override + public String send(CloudOffboardingParameters parameters) { + parameters.validate(); + try { + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + String messageAsJson = this.createMessageBody(sendMessageParameters); + byte[] payload = messageAsJson.getBytes(); + this.getMqttClient() + .publish( + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + new MqttMessage(payload)); + return encodedMessage.getApplicationMessageID(); + } catch (MqttException e) { + throw new CouldNotSendMqttMessageException(e); + } + } + + @Override + public MqttAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + + @Override + public EncodeMessageService getEncodeMessageService() { + return this.encodeMessageService; + } } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index d3436b0a..b42b46e9 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; @@ -10,11 +11,14 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class CloudOnboardingServiceImpl extends MqttService implements CloudOnboardingService, MessageBodyCreator, MessageEncoder { @@ -43,7 +47,7 @@ public String send(CloudOnboardingParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -51,6 +55,12 @@ public String send(CloudOnboardingParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(CloudOnboardingParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index c53c4c29..cdc70a81 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.DeleteMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; @@ -10,11 +11,14 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class DeleteMessageServiceImpl extends MqttService implements DeleteMessageService, MessageBodyCreator, MessageEncoder { @@ -37,7 +41,7 @@ public String send(DeleteMessageParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -45,6 +49,12 @@ public String send(DeleteMessageParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + + public EncodeMessageService getEncodeMessageService() { return encodeMessageService; } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index 8b59adb1..6f54bf85 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; @@ -10,15 +11,18 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class ListEndpointsServiceImpl extends MqttService implements ListEndpointsService, MessageBodyCreator, MessageEncoder { - private EncodeMessageService encodeMessageService; + private final EncodeMessageService encodeMessageService; public ListEndpointsServiceImpl(IMqttClient mqttClient) { super(mqttClient); @@ -38,7 +42,7 @@ public String send(ListEndpointsParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -46,6 +50,11 @@ public String send(ListEndpointsParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index 0b6882c3..3ca2cd57 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.MessageConfirmationService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; @@ -10,11 +11,14 @@ import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class MessageConfirmationServiceImpl extends MqttService implements MessageConfirmationService, MessageSender, MessageEncoder { @@ -38,7 +42,7 @@ public String send(MessageConfirmationParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -46,6 +50,11 @@ public String send(MessageConfirmationParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(MessageConfirmationParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java index 182c96d4..14560e0e 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java @@ -2,6 +2,7 @@ import agrirouter.feed.response.FeedResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.MessageHeaderQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.messaging.MqttService; @@ -12,6 +13,8 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.eclipse.paho.client.mqttv3.IMqttClient; +import java.util.concurrent.CompletableFuture; + public class MessageHeaderQueryServiceImpl extends MqttService implements MessageHeaderQueryService, MessageSender { @@ -29,6 +32,11 @@ public String send(MessageQueryParameters parameters) { return this.messageQueryHelperService.send(parameters); } + @Override + public MqttAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public FeedResponse.HeaderQueryResponse unsafeDecode(ByteString message) throws InvalidProtocolBufferException { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java index da0b9dd5..e4cd743a 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java @@ -2,6 +2,7 @@ import agrirouter.feed.response.FeedResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.messaging.MqttService; @@ -12,6 +13,8 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.eclipse.paho.client.mqttv3.IMqttClient; +import java.util.concurrent.CompletableFuture; + public class MessageQueryServiceImpl extends MqttService implements com.dke.data.agrirouter.api.service.messaging.MessageQueryService, MessageSender, @@ -33,6 +36,11 @@ public String send(MessageQueryParameters parameters) { return this.messageQueryHelperService.send(parameters); } + @Override + public MqttAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public FeedResponse.MessageQueryResponse unsafeDecode(ByteString message) throws InvalidProtocolBufferException { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java index acaecde3..00762389 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java @@ -3,34 +3,45 @@ import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.service.messaging.SendMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; +import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; import com.dke.data.agrirouter.impl.messaging.MqttService; -import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + /** * Sending messages via MQTT using the given MQTT client. The service itself can not access the * queue because connection handling should not be part of the API. */ public class SendMessageServiceImpl extends MqttService - implements SendMessageService, MessageSender { + implements SendMessageService, MessageBodyCreator { public SendMessageServiceImpl(IMqttClient mqttClient) { super(mqttClient); } - public void send(SendMessageParameters parameters) { - parameters.validate(); + /** + * Send message synchronous. + * @param sendMessageParameters Parameters to send the message. + */ + public void send(SendMessageParameters sendMessageParameters) { + sendMessageParameters.validate(); try { - String messageAsJson = this.createMessageBody(parameters); + String messageAsJson = this.createMessageBody(sendMessageParameters); byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(sendMessageParameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); } catch (MqttException e) { throw new CouldNotSendMqttMessageException(e); } } + + @Override + public CompletableFuture sendAsync(SendMessageParameters sendMessageParameters) { + return CompletableFuture.runAsync(() -> this.send(sendMessageParameters)); } } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index 24f334b9..d2585a1d 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -2,6 +2,7 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.SetCapabilityService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; @@ -11,11 +12,14 @@ import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.dke.data.agrirouter.impl.validation.ResponseValidator; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class SetCapabilityServiceImpl extends MqttService implements SetCapabilityService, MessageSender, MessageEncoder, ResponseValidator { @@ -39,7 +43,7 @@ public String send(SetCapabilitiesParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -47,6 +51,11 @@ public String send(SetCapabilitiesParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public EncodeMessageService getEncodeMessageService() { return encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index d7aa268d..3b15352b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -2,22 +2,26 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.SetSubscriptionService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; +import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.dke.data.agrirouter.impl.validation.ResponseValidator; -import java.util.Collections; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import java.util.Collections; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + public class SetSubscriptionServiceImpl extends MqttService - implements SetSubscriptionService, MessageSender, MessageEncoder, ResponseValidator { + implements SetSubscriptionService, MessageBodyCreator, MessageEncoder, ResponseValidator { private final EncodeMessageService encodeMessageService; public SetSubscriptionServiceImpl(IMqttClient mqttClient) { @@ -38,7 +42,7 @@ public String send(SetSubscriptionParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -46,6 +50,11 @@ public String send(SetSubscriptionParameters parameters) { } } + @Override + public MqttAsyncMessageSendingResult sendAsync(SetSubscriptionParameters parameters) { + return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + } + @Override public EncodeMessageService getEncodeMessageService() { return encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index 1150b03e..b37b17d3 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -1,6 +1,8 @@ package com.dke.data.agrirouter.impl.messaging.rest; import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; @@ -8,7 +10,9 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; /** Service implementation. */ public class CloudOffboardingServiceImpl @@ -20,12 +24,6 @@ public CloudOffboardingServiceImpl() { this.encodeMessageService = new EncodeMessageServiceImpl(); } - /** - * Offboarding a virtual CU. Will deliver no result if the action was successful, if there's any - * error an exception will be thrown. - * - * @param parameters Parameters for offboarding. - */ @Override public String send(CloudOffboardingParameters parameters) { parameters.validate(); @@ -34,11 +32,23 @@ public String send(CloudOffboardingParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsValid(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index 54c4a8bb..378ddf45 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -1,6 +1,8 @@ package com.dke.data.agrirouter.impl.messaging.rest; import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; @@ -8,7 +10,9 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; public class CloudOnboardingServiceImpl implements CloudOnboardingService, MessageSender, ResponseValidator, MessageEncoder { @@ -19,12 +23,6 @@ public CloudOnboardingServiceImpl() { this.encodeMessageService = new EncodeMessageServiceImpl(); } - /** - * Onboarding a virtual CU for an existing cloud application (incl. several checks). - * - * @param parameters Parameters for the onboarding. - * @return - - */ @Override public String send(CloudOnboardingParameters parameters) { parameters.validate(); @@ -33,11 +31,23 @@ public String send(CloudOnboardingParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsValid(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(CloudOnboardingParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response,encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index 9882fe87..8c13d18c 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -1,6 +1,8 @@ package com.dke.data.agrirouter.impl.messaging.rest; import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.DeleteMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; @@ -8,7 +10,9 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; public class DeleteMessageServiceImpl implements DeleteMessageService, MessageSender, ResponseValidator, MessageEncoder { @@ -27,11 +31,23 @@ public String send(DeleteMessageParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index 5417832e..cc5e2392 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -2,6 +2,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; @@ -10,12 +12,14 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; public class ListEndpointsServiceImpl extends EnvironmentalService implements ListEndpointsService, MessageSender, MessageEncoder, ResponseValidator { - private EncodeMessageService encodeMessageService; + private final EncodeMessageService encodeMessageService; public ListEndpointsServiceImpl(Environment environment) { super(environment); @@ -34,6 +38,17 @@ public String send(ListEndpointsParameters parameters) { return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + final CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID());} + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index 05123216..acd0e647 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -2,6 +2,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.MessageConfirmationService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; @@ -10,7 +12,9 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; +import java.util.concurrent.CompletableFuture; public class MessageConfirmationServiceImpl extends EnvironmentalService implements MessageConfirmationService, MessageSender, MessageEncoder, ResponseValidator { @@ -30,11 +34,23 @@ public String send(MessageConfirmationParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(MessageConfirmationParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response,encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java index 275ffb47..d69bee49 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java @@ -3,6 +3,7 @@ import agrirouter.feed.response.FeedResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.MessageHeaderQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; @@ -28,6 +29,12 @@ public String send(MessageQueryParameters parameters) { return this.messageQueryHelperService.send(parameters); } + + @Override + public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { + return messageQueryHelperService.sendAsync(parameters); + } + @Override public FeedResponse.HeaderQueryResponse unsafeDecode(ByteString message) throws InvalidProtocolBufferException { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java index de754b3e..ff324a60 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java @@ -3,6 +3,7 @@ import agrirouter.feed.response.FeedResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; @@ -20,14 +21,19 @@ public class MessageQueryServiceImpl extends EnvironmentalService public MessageQueryServiceImpl(Environment environment) { super(environment); - this.messageQueryHelperService = + messageQueryHelperService = new MessageQueryHelperService( new EncodeMessageServiceImpl(), TechnicalMessageType.DKE_FEED_MESSAGE_QUERY); } @Override public String send(MessageQueryParameters parameters) { - return this.messageQueryHelperService.send(parameters); + return messageQueryHelperService.send(parameters); + } + + @Override + public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { + return messageQueryHelperService.sendAsync(parameters); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java index ad94c00b..3acb6521 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java @@ -1,36 +1,47 @@ package com.dke.data.agrirouter.impl.messaging.rest; import com.dke.data.agrirouter.api.enums.CertificationType; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.RequestFactory; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; + import javax.ws.rs.client.Entity; import javax.ws.rs.core.Response; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +/** + * Default message sending interface. Used by all REST implementations to send messages to the AR. + * Provides methods to send messages synchronous and asynchronous. + */ public interface MessageSender extends MessageBodyCreator { - default MessageSenderResponse sendMessage(SendMessageParameters parameters) { + /** + * Synchronous messages sending. + * @param parameters Parameters to send messages. + * @return Response of the server. + */ + default MessageSendingResponse sendMessage(SendMessageParameters parameters) { Response response = RequestFactory.securedRequest( - parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), parameters.getOnboardingResponse().getAuthentication().getCertificate(), parameters.getOnboardingResponse().getAuthentication().getSecret(), CertificationType.valueOf( parameters.getOnboardingResponse().getAuthentication().getType())) .post(Entity.json(this.createSendMessageRequest(parameters))); - return new MessageSenderResponse(response); + return new MessageSendingResponse(response); } - class MessageSenderResponse { - - private final Response nativeResponse; + /** + * Synchronous messages sending. + * @param parameters Parameters to send messages. + * @return Response of the server, wrapped within a completable future. + */ + default CompletableFuture sendMessageAsync(SendMessageParameters parameters){ + return CompletableFuture.supplyAsync(() -> this.sendMessage(parameters)); + } - private MessageSenderResponse(Response nativeResponse) { - this.nativeResponse = nativeResponse; - } - public Response getNativeResponse() { - return nativeResponse; - } - } } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java index 52a9a286..13922b98 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java @@ -1,16 +1,30 @@ package com.dke.data.agrirouter.impl.messaging.rest; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.SendMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.validation.ResponseValidator; +import java.util.concurrent.CompletableFuture; + +/** + * Base class to send messages. + */ public class SendMessageServiceImpl - implements SendMessageService, ResponseValidator, MessageSender { + implements SendMessageService, ResponseValidator, MessageSender { @Override - public void send(SendMessageParameters parameters) { - parameters.validate(); - MessageSenderResponse response = this.sendMessage(parameters); + public void send(SendMessageParameters sendMessageParameters) { + sendMessageParameters.validate(); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); } + + @Override + public CompletableFuture sendAsync(SendMessageParameters sendMessageParameters) { + sendMessageParameters.validate(); + return this.sendMessageAsync(sendMessageParameters); + } + + } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index 05ad97b6..a7ac280b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -2,6 +2,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.SetCapabilityService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; @@ -10,6 +12,7 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; public class SetCapabilityServiceImpl extends EnvironmentalService @@ -30,11 +33,22 @@ public String send(SetCapabilitiesParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + return new HttpAsyncMessageSendingResult(this.sendMessageAsync(sendMessageParameters),encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index 932d0770..0108b134 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -2,6 +2,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.env.Environment; +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; +import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; import com.dke.data.agrirouter.api.service.messaging.SetSubscriptionService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; @@ -10,6 +12,7 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; + import java.util.Collections; public class SetSubscriptionServiceImpl extends EnvironmentalService @@ -30,11 +33,22 @@ public String send(SetSubscriptionParameters parameters) { sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - MessageSenderResponse response = this.sendMessage(sendMessageParameters); + MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); return encodedMessage.getApplicationMessageID(); } + @Override + public HttpAsyncMessageSendingResult sendAsync(SetSubscriptionParameters parameters) { + parameters.validate(); + EncodedMessage encodedMessage = this.encodeMessage(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + return new HttpAsyncMessageSendingResult(this.sendMessageAsync(sendMessageParameters), encodedMessage.getApplicationMessageID()); + } + @Override public EncodeMessageService getEncodeMessageService() { return encodeMessageService; From a1c27e421fa77b6fd72935901d9d935703508548 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 23 Dec 2020 19:41:15 +0100 Subject: [PATCH 2/6] Format. --- .../messaging/CloudOffboardingService.java | 4 +- .../messaging/CloudOnboardingService.java | 3 +- .../messaging/DeleteMessageService.java | 3 +- .../messaging/ListEndpointsService.java | 3 +- .../service/messaging/MessagingService.java | 6 +- .../messaging/SetCapabilityService.java | 7 +- .../messaging/SetSubscriptionService.java | 3 +- .../helper/MessageQueryHelperService.java | 6 +- .../mqtt/CloudOffboardingServiceImpl.java | 83 ++++++++++--------- .../mqtt/CloudOnboardingServiceImpl.java | 8 +- .../mqtt/DeleteMessageServiceImpl.java | 8 +- .../mqtt/ListEndpointsServiceImpl.java | 7 +- .../mqtt/MessageConfirmationServiceImpl.java | 7 +- .../mqtt/MessageHeaderQueryServiceImpl.java | 3 +- .../mqtt/MessageQueryServiceImpl.java | 3 +- .../mqtt/SendMessageServiceImpl.java | 8 +- .../mqtt/SetCapabilityServiceImpl.java | 7 +- .../mqtt/SetSubscriptionServiceImpl.java | 7 +- .../rest/CloudOffboardingServiceImpl.java | 5 +- .../rest/CloudOnboardingServiceImpl.java | 7 +- .../rest/DeleteMessageServiceImpl.java | 5 +- .../rest/ListEndpointsServiceImpl.java | 8 +- .../rest/MessageConfirmationServiceImpl.java | 7 +- .../rest/MessageHeaderQueryServiceImpl.java | 1 - .../impl/messaging/rest/MessageSender.java | 11 ++- .../rest/SendMessageServiceImpl.java | 9 +- .../rest/SetCapabilityServiceImpl.java | 5 +- .../rest/SetSubscriptionServiceImpl.java | 3 +- 28 files changed, 137 insertions(+), 100 deletions(-) diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java index 57b0177c..6fe703bf 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java @@ -3,5 +3,5 @@ import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; - -public interface CloudOffboardingService extends MessagingService {} +public interface CloudOffboardingService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java index a4418706..7c44996a 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java @@ -3,4 +3,5 @@ import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; -public interface CloudOnboardingService extends MessagingService {} +public interface CloudOnboardingService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java index aea52169..3d86e751 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java @@ -3,4 +3,5 @@ import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; -public interface DeleteMessageService extends MessagingService {} +public interface DeleteMessageService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java index b39a98c2..fa80f085 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java @@ -3,4 +3,5 @@ import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; -public interface ListEndpointsService extends MessagingService {} +public interface ListEndpointsService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java index dda0ba0a..ca68943e 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java @@ -2,13 +2,15 @@ /** * Centralized service interface. + * * @param The type of parameters needed to send messages. * @param The type of result the asynchronous messaging will deliver. */ -public interface MessagingService { +public interface MessagingService { /** * Send a synchronous message. + * * @param parameters - * @return The ID of the message. */ @@ -16,9 +18,9 @@ public interface MessagingService { /** * Send a asynchronous message. + * * @param parameters - * @return The completable future containing the possible result. */ R sendAsync(T parameters); - } diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java index aea705ac..7c2d92fb 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java @@ -3,7 +3,6 @@ import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; -/** - * Service interface set capabilities. - */ -public interface SetCapabilityService extends MessagingService {} +/** Service interface set capabilities. */ +public interface SetCapabilityService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java index fa170d35..0a361cfb 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java @@ -4,4 +4,5 @@ import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; /** Service to set the subscriptions for an endpoint. */ -public interface SetSubscriptionService extends MessagingService {} +public interface SetSubscriptionService + extends MessagingService {} diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java index 4d977ee1..4439a12b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java @@ -70,10 +70,12 @@ public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters Collections.singletonList(encodedMessageResponse.getEncodedMessage())); this.getNativeLogger().trace("Send and fetch message response."); - CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); this.logMethodEnd(); - return new HttpAsyncMessageSendingResult(response, encodedMessageResponse.getApplicationMessageID()); + return new HttpAsyncMessageSendingResult( + response, encodedMessageResponse.getApplicationMessageID()); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index 292d3ecd..448ad210 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -19,52 +19,53 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -/** - * Service implementation. - */ +/** Service implementation. */ public class CloudOffboardingServiceImpl extends MqttService - implements CloudOffboardingService, MessageBodyCreator, MessageEncoder { + implements CloudOffboardingService, MessageBodyCreator, MessageEncoder { - private final EncodeMessageService encodeMessageService = new EncodeMessageServiceImpl(); + private final EncodeMessageService encodeMessageService = new EncodeMessageServiceImpl(); - public CloudOffboardingServiceImpl(IMqttClient mqttClient) { - super(mqttClient); - } + public CloudOffboardingServiceImpl(IMqttClient mqttClient) { + super(mqttClient); + } - /** - * Offboarding a virtual CU. Will deliver no result if the action was successful, if there's any - * error an exception will be thrown. - * - * @param parameters Parameters for offboarding. - */ - @Override - public String send(CloudOffboardingParameters parameters) { - parameters.validate(); - try { - EncodedMessage encodedMessage = this.encode(parameters); - SendMessageParameters sendMessageParameters = new SendMessageParameters(); - sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); - sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - String messageAsJson = this.createMessageBody(sendMessageParameters); - byte[] payload = messageAsJson.getBytes(); - this.getMqttClient() - .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), - new MqttMessage(payload)); - return encodedMessage.getApplicationMessageID(); - } catch (MqttException e) { - throw new CouldNotSendMqttMessageException(e); - } + /** + * Offboarding a virtual CU. Will deliver no result if the action was successful, if there's any + * error an exception will be thrown. + * + * @param parameters Parameters for offboarding. + */ + @Override + public String send(CloudOffboardingParameters parameters) { + parameters.validate(); + try { + EncodedMessage encodedMessage = this.encode(parameters); + SendMessageParameters sendMessageParameters = new SendMessageParameters(); + sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); + sendMessageParameters.setEncodedMessages( + Collections.singletonList(encodedMessage.getEncodedMessage())); + String messageAsJson = this.createMessageBody(sendMessageParameters); + byte[] payload = messageAsJson.getBytes(); + this.getMqttClient() + .publish( + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), + new MqttMessage(payload)); + return encodedMessage.getApplicationMessageID(); + } catch (MqttException e) { + throw new CouldNotSendMqttMessageException(e); } + } - @Override - public MqttAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); - } + @Override + public MqttAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); + } - @Override - public EncodeMessageService getEncodeMessageService() { - return this.encodeMessageService; - } + @Override + public EncodeMessageService getEncodeMessageService() { + return this.encodeMessageService; + } } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index b42b46e9..d34465c9 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -47,7 +47,9 @@ public String send(CloudOnboardingParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -57,10 +59,10 @@ public String send(CloudOnboardingParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(CloudOnboardingParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } - @Override public EncodeMessageService getEncodeMessageService() { return this.encodeMessageService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index cdc70a81..469e4259 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -41,7 +41,9 @@ public String send(DeleteMessageParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -51,10 +53,10 @@ public String send(DeleteMessageParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } - public EncodeMessageService getEncodeMessageService() { return encodeMessageService; } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index 6f54bf85..f9460ddd 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -42,7 +42,9 @@ public String send(ListEndpointsParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -52,7 +54,8 @@ public String send(ListEndpointsParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index 3ca2cd57..ea938e2b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -42,7 +42,9 @@ public String send(MessageConfirmationParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -52,7 +54,8 @@ public String send(MessageConfirmationParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(MessageConfirmationParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java index 14560e0e..971cd616 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java @@ -34,7 +34,8 @@ public String send(MessageQueryParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java index e4cd743a..3dcc1fa7 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java @@ -38,7 +38,8 @@ public String send(MessageQueryParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java index 00762389..25674c82 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java @@ -25,6 +25,7 @@ public SendMessageServiceImpl(IMqttClient mqttClient) { /** * Send message synchronous. + * * @param sendMessageParameters Parameters to send the message. */ public void send(SendMessageParameters sendMessageParameters) { @@ -34,7 +35,9 @@ public void send(SendMessageParameters sendMessageParameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(sendMessageParameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(sendMessageParameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); } catch (MqttException e) { throw new CouldNotSendMqttMessageException(e); @@ -43,5 +46,6 @@ public void send(SendMessageParameters sendMessageParameters) { @Override public CompletableFuture sendAsync(SendMessageParameters sendMessageParameters) { - return CompletableFuture.runAsync(() -> this.send(sendMessageParameters)); } + return CompletableFuture.runAsync(() -> this.send(sendMessageParameters)); + } } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index d2585a1d..238946a8 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -43,7 +43,9 @@ public String send(SetCapabilitiesParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -53,7 +55,8 @@ public String send(SetCapabilitiesParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index 3b15352b..c5c13026 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -42,7 +42,9 @@ public String send(SetSubscriptionParameters parameters) { byte[] payload = messageAsJson.getBytes(); this.getMqttClient() .publish( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), new MqttMessage(payload)); return encodedMessage.getApplicationMessageID(); } catch (MqttException e) { @@ -52,7 +54,8 @@ public String send(SetSubscriptionParameters parameters) { @Override public MqttAsyncMessageSendingResult sendAsync(SetSubscriptionParameters parameters) { - return new MqttAsyncMessageSendingResult(CompletableFuture.supplyAsync(() -> this.send(parameters))); + return new MqttAsyncMessageSendingResult( + CompletableFuture.supplyAsync(() -> this.send(parameters))); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index b37b17d3..d32fddd0 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -44,8 +44,9 @@ public HttpAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parame SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index 378ddf45..ffb39f3d 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -43,9 +43,10 @@ public HttpAsyncMessageSendingResult sendAsync(CloudOnboardingParameters paramet SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - CompletableFuture response = this.sendMessageAsync(sendMessageParameters); - return new HttpAsyncMessageSendingResult(response,encodedMessage.getApplicationMessageID()); + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index 8c13d18c..6cc95c61 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -43,8 +43,9 @@ public HttpAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameter SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - CompletableFuture response = this.sendMessageAsync(sendMessageParameters); + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index cc5e2392..8bba2b0b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -45,9 +45,11 @@ public HttpAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameter SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - final CompletableFuture response = this.sendMessageAsync(sendMessageParameters); - return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID());} + Collections.singletonList(encodedMessage.getEncodedMessage())); + final CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); + } @Override public EncodeMessageService getEncodeMessageService() { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index acd0e647..2a30e026 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -46,9 +46,10 @@ public HttpAsyncMessageSendingResult sendAsync(MessageConfirmationParameters par SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - CompletableFuture response = this.sendMessageAsync(sendMessageParameters); - return new HttpAsyncMessageSendingResult(response,encodedMessage.getApplicationMessageID()); + Collections.singletonList(encodedMessage.getEncodedMessage())); + CompletableFuture response = + this.sendMessageAsync(sendMessageParameters); + return new HttpAsyncMessageSendingResult(response, encodedMessage.getApplicationMessageID()); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java index d69bee49..06c2e4ff 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java @@ -29,7 +29,6 @@ public String send(MessageQueryParameters parameters) { return this.messageQueryHelperService.send(parameters); } - @Override public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters) { return messageQueryHelperService.sendAsync(parameters); diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java index 3acb6521..d0752cb7 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java @@ -19,13 +19,16 @@ public interface MessageSender extends MessageBodyCreator { /** * Synchronous messages sending. + * * @param parameters Parameters to send messages. * @return Response of the server. */ default MessageSendingResponse sendMessage(SendMessageParameters parameters) { Response response = RequestFactory.securedRequest( - Objects.requireNonNull(parameters.getOnboardingResponse()).getConnectionCriteria().getMeasures(), + Objects.requireNonNull(parameters.getOnboardingResponse()) + .getConnectionCriteria() + .getMeasures(), parameters.getOnboardingResponse().getAuthentication().getCertificate(), parameters.getOnboardingResponse().getAuthentication().getSecret(), CertificationType.valueOf( @@ -36,12 +39,12 @@ default MessageSendingResponse sendMessage(SendMessageParameters parameters) { /** * Synchronous messages sending. + * * @param parameters Parameters to send messages. * @return Response of the server, wrapped within a completable future. */ - default CompletableFuture sendMessageAsync(SendMessageParameters parameters){ + default CompletableFuture sendMessageAsync( + SendMessageParameters parameters) { return CompletableFuture.supplyAsync(() -> this.sendMessage(parameters)); } - - } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java index 13922b98..8d84f0ed 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java @@ -7,9 +7,7 @@ import java.util.concurrent.CompletableFuture; -/** - * Base class to send messages. - */ +/** Base class to send messages. */ public class SendMessageServiceImpl implements SendMessageService, ResponseValidator, MessageSender { @@ -21,10 +19,9 @@ public void send(SendMessageParameters sendMessageParameters) { } @Override - public CompletableFuture sendAsync(SendMessageParameters sendMessageParameters) { + public CompletableFuture sendAsync( + SendMessageParameters sendMessageParameters) { sendMessageParameters.validate(); return this.sendMessageAsync(sendMessageParameters); } - - } diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index a7ac280b..9c4b24c0 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -45,8 +45,9 @@ public HttpAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters paramet SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( - Collections.singletonList(encodedMessage.getEncodedMessage())); - return new HttpAsyncMessageSendingResult(this.sendMessageAsync(sendMessageParameters),encodedMessage.getApplicationMessageID()); + Collections.singletonList(encodedMessage.getEncodedMessage())); + return new HttpAsyncMessageSendingResult( + this.sendMessageAsync(sendMessageParameters), encodedMessage.getApplicationMessageID()); } @Override diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index 0108b134..119749df 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -46,7 +46,8 @@ public HttpAsyncMessageSendingResult sendAsync(SetSubscriptionParameters paramet sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); sendMessageParameters.setEncodedMessages( Collections.singletonList(encodedMessage.getEncodedMessage())); - return new HttpAsyncMessageSendingResult(this.sendMessageAsync(sendMessageParameters), encodedMessage.getApplicationMessageID()); + return new HttpAsyncMessageSendingResult( + this.sendMessageAsync(sendMessageParameters), encodedMessage.getApplicationMessageID()); } @Override From 05b2bd0409659ed3059debfb0e31573628609c54 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 23 Dec 2020 19:43:56 +0100 Subject: [PATCH 3/6] Format. --- .../api/service/messaging/FetchMessageService.java | 1 - .../api/service/messaging/SendMessageService.java | 1 - .../impl/messaging/helper/MessageQueryHelperService.java | 1 - .../impl/messaging/mqtt/CloudOffboardingServiceImpl.java | 7 +++---- .../impl/messaging/mqtt/CloudOnboardingServiceImpl.java | 7 +++---- .../impl/messaging/mqtt/DeleteMessageServiceImpl.java | 7 +++---- .../impl/messaging/mqtt/ListEndpointsServiceImpl.java | 7 +++---- .../messaging/mqtt/MessageConfirmationServiceImpl.java | 7 +++---- .../impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java | 3 +-- .../impl/messaging/mqtt/MessageQueryServiceImpl.java | 3 +-- .../impl/messaging/mqtt/SendMessageServiceImpl.java | 5 ++--- .../impl/messaging/mqtt/SetCapabilityServiceImpl.java | 7 +++---- .../impl/messaging/mqtt/SetSubscriptionServiceImpl.java | 7 +++---- .../impl/messaging/rest/CloudOffboardingServiceImpl.java | 1 - .../impl/messaging/rest/CloudOnboardingServiceImpl.java | 1 - .../impl/messaging/rest/DeleteMessageServiceImpl.java | 1 - .../impl/messaging/rest/ListEndpointsServiceImpl.java | 1 - .../messaging/rest/MessageConfirmationServiceImpl.java | 1 - .../data/agrirouter/impl/messaging/rest/MessageSender.java | 5 ++--- .../impl/messaging/rest/SendMessageServiceImpl.java | 1 - .../impl/messaging/rest/SetCapabilityServiceImpl.java | 1 - .../impl/messaging/rest/SetSubscriptionServiceImpl.java | 1 - 22 files changed, 27 insertions(+), 49 deletions(-) diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java index 510019f6..918ac75e 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java @@ -3,7 +3,6 @@ import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.service.parameters.FetchMessageParameters; - import java.util.List; import java.util.Optional; diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java index 144e1391..51f2b717 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java @@ -1,7 +1,6 @@ package com.dke.data.agrirouter.api.service.messaging; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; - import java.util.concurrent.CompletableFuture; /** Service for sending a message */ diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java index 4439a12b..9195c065 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java @@ -11,7 +11,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index 448ad210..1b3959ff 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -11,13 +11,12 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; /** Service implementation. */ public class CloudOffboardingServiceImpl extends MqttService diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index d34465c9..7cf3349f 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -11,13 +11,12 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class CloudOnboardingServiceImpl extends MqttService implements CloudOnboardingService, MessageBodyCreator, MessageEncoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index 469e4259..ccf54fba 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -11,13 +11,12 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class DeleteMessageServiceImpl extends MqttService implements DeleteMessageService, MessageBodyCreator, MessageEncoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index f9460ddd..4598be0c 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -11,13 +11,12 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class ListEndpointsServiceImpl extends MqttService implements ListEndpointsService, MessageBodyCreator, MessageEncoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index ea938e2b..519e5149 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -11,13 +11,12 @@ import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class MessageConfirmationServiceImpl extends MqttService implements MessageConfirmationService, MessageSender, MessageEncoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java index 971cd616..9ad4fda7 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java @@ -11,9 +11,8 @@ import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.eclipse.paho.client.mqttv3.IMqttClient; - import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; public class MessageHeaderQueryServiceImpl extends MqttService implements MessageHeaderQueryService, MessageSender { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java index 3dcc1fa7..510e40d7 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java @@ -11,9 +11,8 @@ import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.eclipse.paho.client.mqttv3.IMqttClient; - import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; public class MessageQueryServiceImpl extends MqttService implements com.dke.data.agrirouter.api.service.messaging.MessageQueryService, diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java index 25674c82..c5db783a 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java @@ -5,13 +5,12 @@ import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; import com.dke.data.agrirouter.impl.messaging.MqttService; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; -import java.util.Objects; -import java.util.concurrent.CompletableFuture; - /** * Sending messages via MQTT using the given MQTT client. The service itself can not access the * queue because connection handling should not be part of the API. diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index 238946a8..51d4b89e 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -12,13 +12,12 @@ import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import com.dke.data.agrirouter.impl.validation.ResponseValidator; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class SetCapabilityServiceImpl extends MqttService implements SetCapabilityService, MessageSender, MessageEncoder, ResponseValidator { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index c5c13026..212d54dd 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -12,13 +12,12 @@ import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; - import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import org.eclipse.paho.client.mqttv3.IMqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; public class SetSubscriptionServiceImpl extends MqttService implements SetSubscriptionService, MessageBodyCreator, MessageEncoder, ResponseValidator { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index d32fddd0..61a8e7df 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -10,7 +10,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index ffb39f3d..cc7ee23e 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -10,7 +10,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index 6cc95c61..b2bed37f 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -10,7 +10,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index 8bba2b0b..88eb6655 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -12,7 +12,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index 2a30e026..606bf50c 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -12,7 +12,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java index d0752cb7..1970e68e 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java @@ -5,11 +5,10 @@ import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.RequestFactory; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Response; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Response; /** * Default message sending interface. Used by all REST implementations to send messages to the AR. diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java index 8d84f0ed..f96a5a05 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java @@ -4,7 +4,6 @@ import com.dke.data.agrirouter.api.service.messaging.SendMessageService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.concurrent.CompletableFuture; /** Base class to send messages. */ diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index 9c4b24c0..4bff3f8e 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -12,7 +12,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; public class SetCapabilityServiceImpl extends EnvironmentalService diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index 119749df..a2760c62 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -12,7 +12,6 @@ import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; - import java.util.Collections; public class SetSubscriptionServiceImpl extends EnvironmentalService From 0da1a07c16d82735f76a2b7c108c6393d2a513f5 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Mon, 18 Jan 2021 15:10:34 +0100 Subject: [PATCH 4/6] Fixed comment. --- .../dke/data/agrirouter/impl/messaging/rest/MessageSender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java index 2232888e..3b340f02 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java @@ -38,7 +38,7 @@ default MessageSendingResponse sendMessage(SendMessageParameters parameters) { } /** - * Synchronous messages sending. + * Asynchronous messages sending. * * @param parameters Parameters to send messages. * @return Response of the server, wrapped within a completable future. From 94ad7e6711dd5609365c8e77a29b4d02a5214b39 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 23 Jan 2021 20:34:23 +0100 Subject: [PATCH 5/6] Simplify implementation and remove additional type parameter. --- .../messaging/CloudOffboardingService.java | 7 ----- .../messaging/CloudOnboardingService.java | 7 ----- .../messaging/DeleteMessageService.java | 7 ----- .../messaging/ListEndpointsService.java | 7 ----- .../messaging/MessageConfirmationService.java | 7 ----- .../messaging/SetCapabilityService.java | 8 ------ .../messaging/SetSubscriptionService.java | 8 ------ .../http/CloudOffboardingService.java | 5 ++++ .../http/CloudOnboardingService.java | 5 ++++ .../messaging/http/DeleteMessageService.java | 5 ++++ .../{ => http}/FetchMessageService.java | 2 +- .../messaging/http/ListEndpointsService.java | 5 ++++ .../http/MessageConfirmationService.java | 6 +++++ .../{ => http}/MessageHeaderQueryService.java | 5 ++-- .../{ => http}/MessageQueryService.java | 5 ++-- .../{ => http}/MessagingService.java | 9 ++++--- .../messaging/http/SetCapabilityService.java | 6 +++++ .../http/SetSubscriptionService.java | 6 +++++ .../mqtt/CloudOffboardingService.java | 5 ++++ .../mqtt/CloudOnboardingService.java | 5 ++++ .../messaging/mqtt/DeleteMessageService.java | 5 ++++ .../messaging/mqtt/ListEndpointsService.java | 5 ++++ .../mqtt/MessageConfirmationService.java | 6 +++++ .../mqtt/MessageHeaderQueryService.java | 9 +++++++ .../messaging/mqtt/MessageQueryService.java | 9 +++++++ .../messaging/mqtt/MessagingService.java | 27 +++++++++++++++++++ .../messaging/mqtt/SetCapabilityService.java | 6 +++++ .../mqtt/SetSubscriptionService.java | 6 +++++ .../ListEndpointsFunctionsService.java | 2 +- .../ListEndpointsFunctionsService.java | 2 +- .../MessageConfirmationFunctionsService.java | 6 ++--- .../mqtt/CloudOffboardingServiceImpl.java | 2 +- .../mqtt/CloudOnboardingServiceImpl.java | 2 +- .../mqtt/DeleteMessageServiceImpl.java | 2 +- .../mqtt/ListEndpointsServiceImpl.java | 2 +- .../mqtt/MessageConfirmationServiceImpl.java | 2 +- .../mqtt/MessageHeaderQueryServiceImpl.java | 2 +- .../mqtt/MessageQueryServiceImpl.java | 3 ++- .../mqtt/SetCapabilityServiceImpl.java | 2 +- .../mqtt/SetSubscriptionServiceImpl.java | 2 +- .../rest/CloudOffboardingServiceImpl.java | 2 +- .../rest/CloudOnboardingServiceImpl.java | 2 +- .../rest/DeleteMessageServiceImpl.java | 2 +- .../rest/FetchMessageServiceImpl.java | 2 +- .../rest/ListEndpointsServiceImpl.java | 2 +- .../rest/MessageConfirmationServiceImpl.java | 2 +- .../rest/MessageHeaderQueryServiceImpl.java | 2 +- .../rest/MessageQueryServiceImpl.java | 3 ++- .../rest/SetCapabilityServiceImpl.java | 2 +- .../rest/SetSubscriptionServiceImpl.java | 2 +- .../rest/CancellationTokenPollingTest.java | 2 +- .../rest/CloudOffboardingServiceTest.java | 9 ++++--- .../rest/CloudOnboardingServiceTest.java | 9 ++++--- .../HealthCheckForEndpointsByPollingTest.java | 2 +- .../rest/SetCapabilityServiceTest.java | 7 ++--- .../rest/SetSubscriptionServiceTest.java | 7 ++--- 56 files changed, 177 insertions(+), 102 deletions(-) delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java delete mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java rename agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/{ => http}/FetchMessageService.java (96%) create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java rename agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/{ => http}/MessageHeaderQueryService.java (59%) rename agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/{ => http}/MessageQueryService.java (59%) rename agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/{ => http}/MessagingService.java (62%) create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java create mode 100644 agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java deleted file mode 100644 index 6fe703bf..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOffboardingService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; - -public interface CloudOffboardingService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java deleted file mode 100644 index 7c44996a..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/CloudOnboardingService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; - -public interface CloudOnboardingService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java deleted file mode 100644 index 3d86e751..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/DeleteMessageService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; - -public interface DeleteMessageService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java deleted file mode 100644 index fa80f085..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/ListEndpointsService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; - -public interface ListEndpointsService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java deleted file mode 100644 index c8e1fe9e..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageConfirmationService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; - -public interface MessageConfirmationService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java deleted file mode 100644 index 7c2d92fb..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetCapabilityService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; - -/** Service interface set capabilities. */ -public interface SetCapabilityService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java deleted file mode 100644 index 0a361cfb..00000000 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SetSubscriptionService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.dke.data.agrirouter.api.service.messaging; - -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; - -/** Service to set the subscriptions for an endpoint. */ -public interface SetSubscriptionService - extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java new file mode 100644 index 00000000..392e7c8c --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; + +public interface CloudOffboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java new file mode 100644 index 00000000..829d79de --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; + +public interface CloudOnboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java new file mode 100644 index 00000000..5d825078 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; + +public interface DeleteMessageService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java similarity index 96% rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java rename to agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java index 25fad28d..2220bea8 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/FetchMessageService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java @@ -1,4 +1,4 @@ -package com.dke.data.agrirouter.api.service.messaging; +package com.dke.data.agrirouter.api.service.messaging.http; import com.dke.data.agrirouter.api.cancellation.CancellationToken; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java new file mode 100644 index 00000000..845baebf --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; + +public interface ListEndpointsService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java new file mode 100644 index 00000000..88104c1a --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; + +public interface MessageConfirmationService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java similarity index 59% rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java rename to agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java index ab0f7122..1c1ffbdf 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageHeaderQueryService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java @@ -1,10 +1,9 @@ -package com.dke.data.agrirouter.api.service.messaging; +package com.dke.data.agrirouter.api.service.messaging.http; import agrirouter.feed.response.FeedResponse; -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; public interface MessageHeaderQueryService - extends MessagingService, + extends MessagingService, MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java similarity index 59% rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java rename to agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java index 458ced88..276a8fb6 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessageQueryService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java @@ -1,10 +1,9 @@ -package com.dke.data.agrirouter.api.service.messaging; +package com.dke.data.agrirouter.api.service.messaging.http; import agrirouter.feed.response.FeedResponse; -import com.dke.data.agrirouter.api.messaging.AsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; public interface MessageQueryService - extends MessagingService, + extends MessagingService, MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java similarity index 62% rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java rename to agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java index ca68943e..8d111a4a 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/MessagingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java @@ -1,12 +1,13 @@ -package com.dke.data.agrirouter.api.service.messaging; +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; /** * Centralized service interface. * * @param The type of parameters needed to send messages. - * @param The type of result the asynchronous messaging will deliver. */ -public interface MessagingService { +public interface MessagingService { /** * Send a synchronous message. @@ -22,5 +23,5 @@ public interface MessagingService { * @param parameters - * @return The completable future containing the possible result. */ - R sendAsync(T parameters); + HttpAsyncMessageSendingResult sendAsync(T parameters); } diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java new file mode 100644 index 00000000..a68ba1cb --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; + +/** Service interface set capabilities. */ +public interface SetCapabilityService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java new file mode 100644 index 00000000..c3fc1122 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.http; + +import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; + +/** Service to set the subscriptions for an endpoint. */ +public interface SetSubscriptionService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java new file mode 100644 index 00000000..ca816643 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; + +public interface CloudOffboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java new file mode 100644 index 00000000..85217000 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; + +public interface CloudOnboardingService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java new file mode 100644 index 00000000..43583dab --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; + +public interface DeleteMessageService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java new file mode 100644 index 00000000..bfdf5cf6 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java @@ -0,0 +1,5 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; + +public interface ListEndpointsService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java new file mode 100644 index 00000000..3c04238b --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; + +public interface MessageConfirmationService + extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java new file mode 100644 index 00000000..da50148e --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java @@ -0,0 +1,9 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import agrirouter.feed.response.FeedResponse; +import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; +import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; + +public interface MessageHeaderQueryService + extends MessagingService, + MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java new file mode 100644 index 00000000..e5875d33 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java @@ -0,0 +1,9 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import agrirouter.feed.response.FeedResponse; +import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; +import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; + +public interface MessageQueryService + extends MessagingService, + MessageDecoder {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java new file mode 100644 index 00000000..815b8e98 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java @@ -0,0 +1,27 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; + +/** + * Centralized service interface. + * + * @param The type of parameters needed to send messages. + */ +public interface MessagingService { + + /** + * Send a synchronous message. + * + * @param parameters - + * @return The ID of the message. + */ + String send(T parameters); + + /** + * Send a asynchronous message. + * + * @param parameters - + * @return The completable future containing the possible result. + */ + MqttAsyncMessageSendingResult sendAsync(T parameters); +} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java new file mode 100644 index 00000000..2a1010c7 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; + +/** Service interface set capabilities. */ +public interface SetCapabilityService extends MessagingService {} diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java new file mode 100644 index 00000000..e01c5698 --- /dev/null +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java @@ -0,0 +1,6 @@ +package com.dke.data.agrirouter.api.service.messaging.mqtt; + +import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; + +/** Service to set the subscriptions for an endpoint. */ +public interface SetSubscriptionService extends MessagingService {} diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java index e19146fb..3d01b99a 100644 --- a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java +++ b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java @@ -3,7 +3,7 @@ import agrirouter.request.payload.account.Endpoints; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; -import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.ListEndpointsService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; import com.dke.data.agrirouter.impl.messaging.mqtt.ListEndpointsServiceImpl; import org.eclipse.paho.client.mqttv3.IMqttClient; diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java index e3417178..8b267ab5 100644 --- a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java +++ b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java @@ -4,7 +4,7 @@ import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.Environment; -import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; +import com.dke.data.agrirouter.api.service.messaging.http.ListEndpointsService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; import com.dke.data.agrirouter.impl.messaging.rest.ListEndpointsServiceImpl; diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java index fc1a8b68..8ecf8422 100644 --- a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java +++ b/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java @@ -10,10 +10,10 @@ import com.dke.data.agrirouter.api.dto.encoding.DecodeMessageResponse; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.env.Environment; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; -import com.dke.data.agrirouter.api.service.messaging.MessageConfirmationService; -import com.dke.data.agrirouter.api.service.messaging.MessageQueryService; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.MessageConfirmationService; +import com.dke.data.agrirouter.api.service.messaging.http.MessageQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationForAllPendingMessagesParameters; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index 1b3959ff..7f500258 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.CloudOffboardingService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index 7cf3349f..5fc93219 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.CloudOnboardingService; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index ccf54fba..5b46e182 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.DeleteMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.DeleteMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index 4598be0c..427ce628 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.ListEndpointsService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index 519e5149..bbaff0dd 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.MessageConfirmationService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.MessageConfirmationService; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java index 9ad4fda7..a796514b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java @@ -3,7 +3,7 @@ import agrirouter.feed.response.FeedResponse; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.MessageHeaderQueryService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.MessageHeaderQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java index 510e40d7..ced90136 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java @@ -4,6 +4,7 @@ import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; +import com.dke.data.agrirouter.api.service.messaging.mqtt.MessageQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; @@ -15,7 +16,7 @@ import org.eclipse.paho.client.mqttv3.IMqttClient; public class MessageQueryServiceImpl extends MqttService - implements com.dke.data.agrirouter.api.service.messaging.MessageQueryService, + implements MessageQueryService, MessageSender, MessageDecoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index 51d4b89e..0c438038 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.SetCapabilityService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.SetCapabilityService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index 212d54dd..4f739a48 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.exception.CouldNotSendMqttMessageException; import com.dke.data.agrirouter.api.messaging.MqttAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.SetSubscriptionService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.mqtt.SetSubscriptionService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index 61a8e7df..73fa594f 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOffboardingService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index cc7ee23e..7fe38a2a 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOnboardingService; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index b2bed37f..1b7b909b 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -3,8 +3,8 @@ import com.dke.data.agrirouter.api.dto.encoding.EncodedMessage; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.DeleteMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.DeleteMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java index e583905a..52779670 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java @@ -4,7 +4,7 @@ import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.api.service.parameters.FetchMessageParameters; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index 88eb6655..fd42659c 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -4,8 +4,8 @@ import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.ListEndpointsService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.ListEndpointsService; import com.dke.data.agrirouter.api.service.parameters.ListEndpointsParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index 606bf50c..4f0a4112 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -4,8 +4,8 @@ import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.MessageConfirmationService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.MessageConfirmationService; import com.dke.data.agrirouter.api.service.parameters.MessageConfirmationParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java index 06c2e4ff..9a18d59f 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java @@ -4,7 +4,7 @@ import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; -import com.dke.data.agrirouter.api.service.messaging.MessageHeaderQueryService; +import com.dke.data.agrirouter.api.service.messaging.http.MessageHeaderQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java index ff324a60..6f89cbc1 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java @@ -5,6 +5,7 @@ import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.service.messaging.encoding.MessageDecoder; +import com.dke.data.agrirouter.api.service.messaging.http.MessageQueryService; import com.dke.data.agrirouter.api.service.parameters.MessageQueryParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; @@ -13,7 +14,7 @@ import com.google.protobuf.InvalidProtocolBufferException; public class MessageQueryServiceImpl extends EnvironmentalService - implements com.dke.data.agrirouter.api.service.messaging.MessageQueryService, + implements MessageQueryService, MessageSender, MessageDecoder { diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index 4bff3f8e..0f0124c9 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -4,8 +4,8 @@ import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.SetCapabilityService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.SetCapabilityService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index a2760c62..59dcc298 100644 --- a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -4,8 +4,8 @@ import com.dke.data.agrirouter.api.env.Environment; import com.dke.data.agrirouter.api.messaging.HttpAsyncMessageSendingResult; import com.dke.data.agrirouter.api.messaging.MessageSendingResponse; -import com.dke.data.agrirouter.api.service.messaging.SetSubscriptionService; import com.dke.data.agrirouter.api.service.messaging.encoding.EncodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.SetSubscriptionService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; import com.dke.data.agrirouter.impl.EnvironmentalService; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java index 4706c042..96a1da89 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java @@ -6,7 +6,7 @@ import com.dke.data.agrirouter.api.cancellation.CancellationToken; import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher; import com.dke.data.agrirouter.test.AbstractIntegrationTest; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java index c4d0d6c3..b44b0db4 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java @@ -2,17 +2,18 @@ import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.DEFAULT_INTERVAL; import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.MAX_TRIES_BEFORE_FAILURE; -import static com.dke.data.agrirouter.test.OnboardingResponseRepository.*; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.Identifier; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.read; import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.dto.encoding.DecodeMessageResponse; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.messaging.inner.Message; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; -import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; -import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOffboardingService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOnboardingService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; import com.dke.data.agrirouter.convenience.decode.DecodeCloudOnboardingResponsesService; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java index 984f69ce..01c70cca 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java @@ -2,17 +2,18 @@ import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.DEFAULT_INTERVAL; import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.MAX_TRIES_BEFORE_FAILURE; -import static com.dke.data.agrirouter.test.OnboardingResponseRepository.*; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.Identifier; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.read; import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.dto.encoding.DecodeMessageResponse; import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.messaging.inner.Message; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; -import com.dke.data.agrirouter.api.service.messaging.CloudOffboardingService; -import com.dke.data.agrirouter.api.service.messaging.CloudOnboardingService; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOffboardingService; +import com.dke.data.agrirouter.api.service.messaging.http.CloudOnboardingService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.api.service.parameters.CloudOffboardingParameters; import com.dke.data.agrirouter.api.service.parameters.CloudOnboardingParameters; import com.dke.data.agrirouter.convenience.decode.DecodeCloudOnboardingResponsesService; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java index 27befb90..1dad42fb 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java @@ -4,7 +4,7 @@ import com.dke.data.agrirouter.api.dto.messaging.FetchMessageResponse; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.exception.UnauthorizedRequestException; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher; import com.dke.data.agrirouter.test.AbstractIntegrationTest; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java index a597c47d..f94d72d9 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java @@ -2,7 +2,8 @@ import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.DEFAULT_INTERVAL; import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.MAX_TRIES_BEFORE_FAILURE; -import static com.dke.data.agrirouter.test.OnboardingResponseRepository.*; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.Identifier; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.read; import agrirouter.commons.MessageOuterClass; import agrirouter.request.payload.endpoint.Capabilities; @@ -12,9 +13,9 @@ import com.dke.data.agrirouter.api.dto.messaging.inner.Message; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.QA; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; -import com.dke.data.agrirouter.api.service.messaging.SetCapabilityService; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.SetCapabilityService; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; import com.dke.data.agrirouter.impl.messaging.encoding.DecodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl; diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java index c8487a99..f5308273 100644 --- a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java +++ b/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java @@ -2,7 +2,8 @@ import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.DEFAULT_INTERVAL; import static com.dke.data.agrirouter.impl.messaging.rest.MessageFetcher.MAX_TRIES_BEFORE_FAILURE; -import static com.dke.data.agrirouter.test.OnboardingResponseRepository.*; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.Identifier; +import static com.dke.data.agrirouter.test.OnboardingResponseRepository.read; import agrirouter.commons.MessageOuterClass; import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; @@ -11,9 +12,9 @@ import com.dke.data.agrirouter.api.dto.messaging.inner.Message; import com.dke.data.agrirouter.api.enums.TechnicalMessageType; import com.dke.data.agrirouter.api.env.QA; -import com.dke.data.agrirouter.api.service.messaging.FetchMessageService; -import com.dke.data.agrirouter.api.service.messaging.SetSubscriptionService; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; +import com.dke.data.agrirouter.api.service.messaging.http.SetSubscriptionService; import com.dke.data.agrirouter.api.service.parameters.SetSubscriptionParameters; import com.dke.data.agrirouter.impl.messaging.encoding.DecodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl; From fe5a04c7a653182cc09262c0be3fc60bb526d6a7 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sun, 7 Mar 2021 14:29:07 +0100 Subject: [PATCH 6/6] Fix typo in comment. --- .../agrirouter/api/service/messaging/http/MessagingService.java | 2 +- .../agrirouter/api/service/messaging/mqtt/MessagingService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java index 8d111a4a..8411554d 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java @@ -18,7 +18,7 @@ public interface MessagingService { String send(T parameters); /** - * Send a asynchronous message. + * Send an asynchronous message. * * @param parameters - * @return The completable future containing the possible result. diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java index 815b8e98..36300e66 100644 --- a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java +++ b/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java @@ -18,7 +18,7 @@ public interface MessagingService { String send(T parameters); /** - * Send a asynchronous message. + * Send an asynchronous message. * * @param parameters - * @return The completable future containing the possible result.