From 02283dc57c18a25950b43a6ed12af48749ff25e8 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 23 Dec 2021 08:55:52 +0100 Subject: [PATCH 1/8] Add specific interface for parameter trimming. Enhance validation method to trim the parameters as well. Rename parameter validation. --- .../api/service/ParameterTrimming.java | 12 +++++++++ .../api/service/ParameterValidation.java | 6 +++-- .../agrirouter/api/enums/ApplicationType.kt | 2 +- .../data/agrirouter/api/enums/Direction.kt | 1 + .../data/agrirouter/api/enums/EncodingType.kt | 1 + .../AuthorizationRequestParameters.kt | 11 ++++++-- .../parameters/CloudOffboardingParameters.kt | 11 +++++--- .../parameters/CloudOnboardingParameters.kt | 21 ++++++++++----- .../parameters/DeleteMessageParameters.kt | 6 +++++ .../parameters/FetchMessageParameters.kt | 6 ++++- .../parameters/ListEndpointsParameters.kt | 11 +++++--- ...irmationForAllPendingMessagesParameters.kt | 6 ++++- .../MessageConfirmationParameters.kt | 9 +++++-- .../parameters/MessageHeaderParameters.kt | 15 ++++++++--- .../parameters/MessageQueryParameters.kt | 6 +++++ .../parameters/OnboardingParameters.kt | 23 +++++++++++----- .../service/parameters/PayloadParameters.kt | 9 +++++-- .../service/parameters/RevokeParameters.kt | 23 +++++++++++----- .../parameters/SecuredOnboardingParameters.kt | 27 +++++++++++++------ .../parameters/SendMessageParameters.kt | 11 +++++--- .../parameters/SetCapabilitiesParameters.kt | 24 ++++++++++++----- .../parameters/SetSubscriptionParameters.kt | 13 +++++++-- .../parameters/base/AbstractParameterBase.kt | 16 ++++++++--- .../impl/messaging/MessageBodyCreator.java | 14 +++++----- .../encoding/EncodeMessageServiceImpl.java | 8 +++--- .../helper/MessageQueryHelperService.java | 4 +-- .../mqtt/MessageQueryHelperService.java | 6 +++-- .../mqtt/CloudOffboardingServiceImpl.java | 2 +- .../mqtt/CloudOnboardingServiceImpl.java | 2 +- .../mqtt/DeleteMessageServiceImpl.java | 2 +- .../mqtt/ListEndpointsServiceImpl.java | 2 +- .../mqtt/MessageConfirmationServiceImpl.java | 2 +- .../mqtt/SendMessageServiceImpl.java | 2 +- .../mqtt/SetCapabilityServiceImpl.java | 2 +- .../mqtt/SetSubscriptionServiceImpl.java | 2 +- .../rest/CloudOffboardingServiceImpl.java | 4 +-- .../rest/CloudOnboardingServiceImpl.java | 4 +-- .../rest/DeleteMessageServiceImpl.java | 4 +-- .../rest/FetchMessageServiceImpl.java | 4 +-- .../rest/ListEndpointsServiceImpl.java | 4 +-- .../rest/MessageConfirmationServiceImpl.java | 4 +-- .../impl/messaging/rest/MessageFetcher.java | 2 +- .../rest/SendMessageServiceImpl.java | 4 +-- .../rest/SetCapabilityServiceImpl.java | 4 +-- .../rest/SetSubscriptionServiceImpl.java | 4 +-- .../impl/onboard/OnboardingServiceImpl.java | 2 +- .../AuthorizationRequestServiceImpl.java | 2 +- .../secured/OnboardingServiceImpl.java | 4 +-- .../impl/revoke/RevokingServiceImpl.java | 13 ++++----- 49 files changed, 261 insertions(+), 116 deletions(-) create mode 100644 agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java new file mode 100644 index 00000000..7aa71daf --- /dev/null +++ b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java @@ -0,0 +1,12 @@ +package com.dke.data.agrirouter.api.service; + +/** + * Interface to trim the parameters before the validation and later the usage of the values starts. + */ +public interface ParameterTrimming { + + /** + * Trim all parameters to remove whitespaces and avoid problems during sending messages. + */ + void trim(); +} diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java index 67798f88..baf0d6ab 100644 --- a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java +++ b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java @@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger; /** Parameter validation using bean validation. */ -public interface ParameterValidation { +public interface ParameterValidation extends ParameterTrimming { Logger LOGGER = LogManager.getLogger(); @@ -17,8 +17,10 @@ public interface ParameterValidation { * * @throws IllegalParameterDefinitionException - */ - default void validate() { + default void trimAndValidate() { LOGGER.debug("Validating parameters."); + LOGGER.trace("Trim the values."); + this.trim(); LOGGER.trace("Technical validation."); this.technicalValidation(); LOGGER.trace("Business validation."); diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt index c7c2959d..956c3529 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt @@ -10,7 +10,7 @@ enum class ApplicationType(val key: String) { companion object { fun of(key: String): Optional? { - return Arrays.stream(ApplicationType.values()).filter { a -> a.key.contentEquals(key) }.findFirst() + return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst() } } diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt index 3f3946ac..a2c822da 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.enums +@Suppress("unused") enum class Direction(val key: Int) { SEND(0), diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt index a1b67deb..bd52cae1 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.enums +@Suppress("unused") enum class EncodingType(var key: String) { BASE_64("base64"); } diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt index 6e89233a..c0f22a40 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt @@ -9,7 +9,7 @@ import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase */ class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidation { - var applicationId : String = "" + var applicationId: String = "" var redirectUri: String = "" @@ -18,7 +18,14 @@ class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidat var responseType: SecuredOnboardingResponseType = SecuredOnboardingResponseType.ONBOARD override fun technicalValidation() { - isBlank("applicationId",applicationId) + isBlank("applicationId", applicationId) + } + + override fun trim() { + trimParameterBase() + applicationId = applicationId.trim() + redirectUri = redirectUri.trim() + state = state.trim() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt index 250afc43..de3bc8bc 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt @@ -14,12 +14,17 @@ class CloudOffboardingParameters : AbstractParameterBase(), ParameterValidation var endpointIds: List? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - nullCheck("endpointIds",endpointIds) + nullCheck("onboardingResponse", onboardingResponse) + nullCheck("endpointIds", endpointIds) } override fun businessValidation() { - nullOrEmpty("endpointIds",endpointIds) + nullOrEmpty("endpointIds", endpointIds) + } + + override fun trim() { + trimParameterBase() + endpointIds = endpointIds?.map { endpointId -> endpointId.trim() } } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt index 6be3305a..a1bbdc20 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt @@ -14,14 +14,14 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation { var endpointDetails: List? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - nullCheck("endpointDetails",endpointDetails) + nullCheck("onboardingResponse", onboardingResponse) + nullCheck("endpointDetails", endpointDetails) } override fun businessValidation() { - nullOrEmpty("endpointDetails",endpointDetails) + nullOrEmpty("endpointDetails", endpointDetails) endpointDetails?.forEach { - it.validate() + it.trimAndValidate() } } @@ -32,10 +32,19 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation { var endpointName: String? = null override fun technicalValidation() { - isBlank("endpointId",endpointId) - isBlank("endpointName",endpointName) + isBlank("endpointId", endpointId) + isBlank("endpointName", endpointName) } + override fun trim() { + endpointId = endpointId?.trim() + endpointName = endpointName?.trim() + } + + } + + override fun trim() { + trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt index a64483d1..dd6538c0 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt @@ -29,4 +29,10 @@ class DeleteMessageParameters : AbstractParameterBase(), ParameterValidation { } } + override fun trim() { + trimParameterBase() + messageIds = messageIds?.map { messageId -> messageId.trim() } + senderIds = senderIds?.map { senderId -> senderId.trim() } + } + } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt index 911d61a4..dd70dddd 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt @@ -12,7 +12,11 @@ open class FetchMessageParameters : AbstractParameterBase(), ParameterValidation var onboardingResponse: OnboardingResponse? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) + nullCheck("onboardingResponse", onboardingResponse) + } + + override fun trim() { + trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt index a6731d23..750cef92 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt @@ -10,7 +10,6 @@ import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase */ class ListEndpointsParameters : AbstractParameterBase(), ParameterValidation { - var onboardingResponse: OnboardingResponse? = null var technicalMessageType: TechnicalMessageType? = null @@ -20,9 +19,13 @@ class ListEndpointsParameters : AbstractParameterBase(), ParameterValidation { var unfilteredList: Boolean = false override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - nullCheck("technicalMessageType",technicalMessageType) - nullCheck("direction",direction) + nullCheck("onboardingResponse", onboardingResponse) + nullCheck("technicalMessageType", technicalMessageType) + nullCheck("direction", direction) + } + + override fun trim() { + trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt index 37c82538..e1cbe7f9 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt @@ -12,7 +12,11 @@ class MessageConfirmationForAllPendingMessagesParameters : AbstractParameterBase var onboardingResponse: OnboardingResponse? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) + nullCheck("onboardingResponse", onboardingResponse) + } + + override fun trim() { + trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt index 88502407..55e70f21 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt @@ -14,8 +14,13 @@ class MessageConfirmationParameters : AbstractParameterBase(), ParameterValidati var messageIds: List? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - nullCheck("messageIds",messageIds) + nullCheck("onboardingResponse", onboardingResponse) + nullCheck("messageIds", messageIds) + } + + override fun trim() { + trimParameterBase() + messageIds = messageIds?.map { messageId -> messageId.trim() } } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt index 47cd46bb..f5415023 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt @@ -29,15 +29,16 @@ class MessageHeaderParameters : ParameterValidation { var metadata: MessageOuterClass.Metadata? = null override fun technicalValidation() { - isBlank("applicationMessageId",applicationMessageId) - nullCheck("technicalMessageType",technicalMessageType) - nullCheck("mode",mode) + isBlank("applicationMessageId", applicationMessageId) + nullCheck("technicalMessageType", technicalMessageType) + nullCheck("mode", mode) } /** * Copy the content of the message header parameters into this class. */ fun copy(messageHeaderParameters: MessageHeaderParameters) { + messageHeaderParameters.trimAndValidate() applicationMessageId = messageHeaderParameters.applicationMessageId applicationMessageSeqNo = messageHeaderParameters.applicationMessageSeqNo technicalMessageType = messageHeaderParameters.technicalMessageType @@ -48,4 +49,12 @@ class MessageHeaderParameters : ParameterValidation { metadata = messageHeaderParameters.metadata } + + override fun trim() { + applicationMessageId = applicationMessageId?.trim() + teamSetContextId = teamSetContextId?.trim() + recipients = recipients.map { recipient -> recipient.trim() } + } + + } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt index f3777b63..9197ca65 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt @@ -29,4 +29,10 @@ class MessageQueryParameters : AbstractParameterBase(), ParameterValidation { } } + override fun trim() { + trimParameterBase() + messageIds?.map { messageId -> messageId.trim() } + senderIds?.map { senderId -> senderId.trim() } + } + } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt index 58aa8a04..dfe1298a 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt @@ -25,12 +25,21 @@ class OnboardingParameters : AbstractParameterBase(), ParameterValidation { var registrationCode: String? = null override fun technicalValidation() { - isBlank("applicationId",applicationId) - isBlank("uuid",uuid) - isBlank("certificationVersionId",certificationVersionId) - isBlank("gatewayId",gatewayId) - nullCheck("certificationType",certificationType) - nullCheck("applicationType",applicationType) - isBlank("registrationCode",registrationCode) + isBlank("applicationId", applicationId) + isBlank("uuid", uuid) + isBlank("certificationVersionId", certificationVersionId) + isBlank("gatewayId", gatewayId) + nullCheck("certificationType", certificationType) + nullCheck("applicationType", applicationType) + isBlank("registrationCode", registrationCode) + } + + override fun trim() { + trimParameterBase() + applicationId = applicationId?.trim() + uuid = uuid?.trim() + certificationVersionId = certificationVersionId?.trim() + gatewayId = gatewayId?.trim() + registrationCode = registrationCode?.trim() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt index 093cac6d..a137312b 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt @@ -25,8 +25,8 @@ class PayloadParameters : AbstractParameterBase(), ParameterValidation { var value: ByteString? = null override fun technicalValidation() { - nullCheck("typeUrl",typeUrl) - nullCheck("value",value) + nullCheck("typeUrl", typeUrl) + nullCheck("value", value) } /** @@ -51,4 +51,9 @@ class PayloadParameters : AbstractParameterBase(), ParameterValidation { value = payload.value } + override fun trim() { + trimParameterBase() + typeUrl = typeUrl.trim() + } + } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt index 468e8e62..7351e01c 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt @@ -18,14 +18,25 @@ class RevokeParameters : ParameterValidation { var publicKey: String? = null override fun technicalValidation() { - isBlank("applicationId",applicationId) - isBlank("accountId",accountId) - isBlank("privateKey",privateKey) - isBlank("publicKey",publicKey) - nullCheck("endpointIds",endpointIds) + isBlank("applicationId", applicationId) + isBlank("accountId", accountId) + isBlank("privateKey", privateKey) + isBlank("publicKey", publicKey) + nullCheck("endpointIds", endpointIds) } override fun businessValidation() { - nullOrEmpty("endpointIds",endpointIds) + nullOrEmpty("endpointIds", endpointIds) } + + + override fun trim() { + applicationId = applicationId?.trim() + accountId = accountId?.trim() + endpointIds = endpointIds?.map { endpointId -> endpointId.trim() } + privateKey = privateKey?.trim() + privateKey = privateKey?.trim() + publicKey = publicKey?.trim() + } + } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt index 1c711345..ed637ebf 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt @@ -26,14 +26,25 @@ class SecuredOnboardingParameters : AbstractParameterBase(), ParameterValidation var registrationCode: String? = null override fun technicalValidation() { - isBlank("applicationId",applicationId) - isBlank("privateKey",privateKey) - isBlank("publicKey",publicKey) - isBlank("uuid",uuid) - isBlank("certificationVersionId",certificationVersionId) - isBlank("gatewayId",gatewayId) - isBlank("registrationCode",registrationCode) - nullCheck("certificationType",certificationType) + isBlank("applicationId", applicationId) + isBlank("privateKey", privateKey) + isBlank("publicKey", publicKey) + isBlank("uuid", uuid) + isBlank("certificationVersionId", certificationVersionId) + isBlank("gatewayId", gatewayId) + isBlank("registrationCode", registrationCode) + nullCheck("certificationType", certificationType) + } + + override fun trim() { + trimParameterBase() + applicationId = applicationId?.trim() + privateKey = privateKey?.trim() + publicKey = publicKey?.trim() + uuid = uuid?.trim() + certificationVersionId = certificationVersionId?.trim() + gatewayId = gatewayId?.trim() + registrationCode = registrationCode?.trim() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt index 4d4deeaa..89969992 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt @@ -14,12 +14,17 @@ open class SendMessageParameters : AbstractParameterBase(), ParameterValidation var encodedMessages: List? = null override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - nullCheck("encodedMessages",encodedMessages) + nullCheck("onboardingResponse", onboardingResponse) + nullCheck("encodedMessages", encodedMessages) } override fun businessValidation() { - nullOrEmpty("encodedMessages",encodedMessages) + nullOrEmpty("encodedMessages", encodedMessages) + } + + override fun trim() { + trimParameterBase() + encodedMessages = encodedMessages?.map { encodedMessage -> encodedMessage.trim() } } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt index d7a7e478..ba9ae537 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt @@ -28,18 +28,28 @@ class SetCapabilitiesParameters : AbstractParameterBase(), ParameterValidation { var direction: Capabilities.CapabilitySpecification.Direction? = null override fun technicalValidation() { - nullCheck("technicalMessageType",technicalMessageType) - nullCheck("direction",direction) + nullCheck("technicalMessageType", technicalMessageType) + nullCheck("direction", direction) + } + + override fun trim() { + // No trim needed. } } override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) - isBlank("applicationId",applicationId) - isBlank("certificationVersionId",certificationVersionId) - nullCheck("capabilitiesParameters",capabilitiesParameters) - capabilitiesParameters?.forEach { c -> c.validate() } + nullCheck("onboardingResponse", onboardingResponse) + isBlank("applicationId", applicationId) + isBlank("certificationVersionId", certificationVersionId) + nullCheck("capabilitiesParameters", capabilitiesParameters) + capabilitiesParameters?.forEach { c -> c.trimAndValidate() } + } + + override fun trim() { + trimParameterBase() + applicationId = applicationId?.trim() + certificationVersionId = certificationVersionId?.trim() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt index 6663da44..ee5e7cac 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt @@ -21,14 +21,23 @@ class SetSubscriptionParameters : AbstractParameterBase(), ParameterValidation { var position: Boolean = false override fun technicalValidation() { - nullCheck("technicalMessageType",technicalMessageType) + nullCheck("technicalMessageType", technicalMessageType) } + + override fun trim() { + // No trim needed. + } + } var subscriptions: List = ArrayList() override fun technicalValidation() { - nullCheck("onboardingResponse",onboardingResponse) + nullCheck("onboardingResponse", onboardingResponse) + } + + override fun trim() { + trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt index 32f9b4ae..498aab86 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt @@ -1,11 +1,19 @@ package com.dke.data.agrirouter.api.service.parameters.base -open class AbstractParameterBase : DynamicAttributesStorage() { +abstract class AbstractParameterBase : DynamicAttributesStorage() { - var applicationMessageId : String? = null + var applicationMessageId: String? = null - var teamsetContextId : String? = null + var teamsetContextId: String? = null - var sequenceNumber : Int = 1 + var sequenceNumber: Int = 1 + + /** + * Trim the parameters to remove whitespaces and avoid problems. + */ + fun trimParameterBase() { + applicationMessageId = applicationMessageId?.trim() + teamsetContextId = teamsetContextId?.trim() + } } \ No newline at end of file diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java index 5c0b7938..67b6b62b 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java @@ -8,27 +8,27 @@ import com.google.gson.GsonBuilder; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public interface MessageBodyCreator { default String createMessageBody(SendMessageParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.registerTypeAdapter(Message.class, new MessageTypeAdapter()); - String json = gsonBuilder.create().toJson(this.createSendMessageRequest(parameters)); - return json; + return gsonBuilder.create().toJson(this.createSendMessageRequest(parameters)); } default SendMessageRequest createSendMessageRequest(SendMessageParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); SendMessageRequest sendMessageRequest = new SendMessageRequest(); sendMessageRequest.setSensorAlternateId( - parameters.getOnboardingResponse().getSensorAlternateId()); + Objects.requireNonNull(parameters.getOnboardingResponse()).getSensorAlternateId()); sendMessageRequest.setCapabilityAlternateId( parameters.getOnboardingResponse().getCapabilityAlternateId()); List messages = new ArrayList<>(); - parameters - .getEncodedMessages() + Objects.requireNonNull(parameters + .getEncodedMessages()) .forEach( messageToSend -> { Message message = new Message(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java index 9c4abf35..57ca7a56 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java @@ -46,8 +46,8 @@ public String encode( if (null == messageHeaderParameters || null == payloadParameters) { throw new IllegalArgumentException("Parameters cannot be NULL"); } - messageHeaderParameters.validate(); - payloadParameters.validate(); + messageHeaderParameters.trimAndValidate(); + payloadParameters.trimAndValidate(); try (ByteArrayOutputStream streamedMessage = new ByteArrayOutputStream()) { @@ -103,8 +103,8 @@ public List chunkAndEncode( || null == onboardingResponse) { throw new IllegalArgumentException("Parameters cannot be NULL"); } - messageHeaderParameters.validate(); - payloadParameters.validate(); + messageHeaderParameters.trimAndValidate(); + payloadParameters.trimAndValidate(); if (messageHeaderParameters.getTechnicalMessageType().getNeedsChunking()) { if (payloadParameters.shouldBeChunked()) { diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java index 9195c065..c6fadc4a 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java @@ -32,7 +32,7 @@ public String send(MessageQueryParameters parameters) { this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.validate(); + parameters.trimAndValidate(); this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessageResponse = this.encode(this.technicalMessageType, parameters); @@ -57,7 +57,7 @@ public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.validate(); + parameters.trimAndValidate(); this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessageResponse = this.encode(this.technicalMessageType, parameters); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java index fec48ad2..fe1dd617 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java @@ -10,6 +10,8 @@ import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.rest.MessageSender; import java.util.Collections; +import java.util.Objects; + import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; @@ -35,7 +37,7 @@ public String send(MessageQueryParameters parameters) { this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.validate(); + parameters.trimAndValidate(); try { this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessage = this.encode(this.technicalMessageType, parameters); @@ -51,7 +53,7 @@ public String send(MessageQueryParameters 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) { diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index 7f500258..9defe07c 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -36,7 +36,7 @@ public CloudOffboardingServiceImpl(IMqttClient mqttClient) { */ @Override public String send(CloudOffboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index 5fc93219..001ce027 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -35,7 +35,7 @@ public CloudOnboardingServiceImpl(IMqttClient mqttClient) { */ @Override public String send(CloudOnboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index 5b46e182..d41e9db3 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -29,7 +29,7 @@ public DeleteMessageServiceImpl(IMqttClient mqttClient) { @Override public String send(DeleteMessageParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index 427ce628..a34b91fd 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -30,7 +30,7 @@ public ListEndpointsServiceImpl(IMqttClient mqttClient) { @Override public String send(ListEndpointsParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index bbaff0dd..7ee56a17 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -30,7 +30,7 @@ public MessageConfirmationServiceImpl(IMqttClient mqttClient) { @Override public String send(MessageConfirmationParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java index c5db783a..e633b6f2 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java @@ -28,7 +28,7 @@ public SendMessageServiceImpl(IMqttClient mqttClient) { * @param sendMessageParameters Parameters to send the message. */ public void send(SendMessageParameters sendMessageParameters) { - sendMessageParameters.validate(); + sendMessageParameters.trimAndValidate(); try { String messageAsJson = this.createMessageBody(sendMessageParameters); byte[] payload = messageAsJson.getBytes(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index 0c438038..b8d53c12 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -31,7 +31,7 @@ public SetCapabilityServiceImpl(IMqttClient mqttClient) { @Override public String send(SetCapabilitiesParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index 4f739a48..b74f54a8 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -30,7 +30,7 @@ public SetSubscriptionServiceImpl(IMqttClient mqttClient) { @Override public String send(SetSubscriptionParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); try { EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index 73fa594f..9ef58641 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -25,7 +25,7 @@ public CloudOffboardingServiceImpl() { @Override public String send(CloudOffboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -38,7 +38,7 @@ public String send(CloudOffboardingParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index 7fe38a2a..46659eb4 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -24,7 +24,7 @@ public CloudOnboardingServiceImpl() { @Override public String send(CloudOnboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -37,7 +37,7 @@ public String send(CloudOnboardingParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(CloudOnboardingParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index 1b7b909b..e789897c 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -24,7 +24,7 @@ public DeleteMessageServiceImpl() { @Override public String send(DeleteMessageParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -37,7 +37,7 @@ public String send(DeleteMessageParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java index 52779670..3cea34c1 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java @@ -25,7 +25,7 @@ public Optional> fetch( @Override public Optional> fetch( FetchMessageParameters fetchMessageParameters, int maxTries, long interval) { - fetchMessageParameters.validate(); + fetchMessageParameters.trimAndValidate(); Optional response = poll(fetchMessageParameters, new DefaultCancellationToken(maxTries, interval)); return response.map(this::parseJson); @@ -42,7 +42,7 @@ public Optional> fetch( @Override public Optional> fetch( FetchMessageParameters fetchMessageParameters, CancellationToken cancellationToken) { - fetchMessageParameters.validate(); + fetchMessageParameters.trimAndValidate(); Optional response = poll(fetchMessageParameters, cancellationToken); return response.map(this::parseJson); } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index fd42659c..b96447b6 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -27,7 +27,7 @@ public ListEndpointsServiceImpl(Environment environment) { @Override public String send(ListEndpointsParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(ListEndpointsParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index 4f0a4112..dd7b53ac 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -27,7 +27,7 @@ public MessageConfirmationServiceImpl(Environment environment) { @Override public String send(MessageConfirmationParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -40,7 +40,7 @@ public String send(MessageConfirmationParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(MessageConfirmationParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java index bad0eb38..b580b2fe 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java @@ -31,7 +31,7 @@ public interface MessageFetcher extends ResponseValidator { */ default Optional poll( FetchMessageParameters fetchMessageParameters, CancellationToken cancellationToken) { - fetchMessageParameters.validate(); + fetchMessageParameters.trimAndValidate(); int nrOfTries = 1; while (cancellationToken.isNotCancelled()) { LOGGER.debug( diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java index f96a5a05..a6da7262 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java @@ -12,7 +12,7 @@ public class SendMessageServiceImpl @Override public void send(SendMessageParameters sendMessageParameters) { - sendMessageParameters.validate(); + sendMessageParameters.trimAndValidate(); MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); } @@ -20,7 +20,7 @@ public void send(SendMessageParameters sendMessageParameters) { @Override public CompletableFuture sendAsync( SendMessageParameters sendMessageParameters) { - sendMessageParameters.validate(); + sendMessageParameters.trimAndValidate(); return this.sendMessageAsync(sendMessageParameters); } } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index 0f0124c9..4a942d37 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -26,7 +26,7 @@ public SetCapabilityServiceImpl(Environment environment) { @Override public String send(SetCapabilitiesParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(SetCapabilitiesParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index 59dcc298..e765613e 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -26,7 +26,7 @@ public SetSubscriptionServiceImpl(Environment environment) { @Override public String send(SetSubscriptionParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(SetSubscriptionParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(SetSubscriptionParameters parameters) { - parameters.validate(); + parameters.trimAndValidate(); EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java index e83bb4d7..be74c575 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java @@ -24,7 +24,7 @@ public OnboardingServiceImpl(Environment environment) { @Override public OnboardingResponse onboard(OnboardingParameters parameters) { this.getNativeLogger().info("BEGIN | Onboarding process. | '{}'.", parameters); - parameters.validate(); + parameters.trimAndValidate(); this.getNativeLogger().debug("Onboard device."); OnboardingResponse onboardingResponse = diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java index e74c413e..8c1a501c 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java @@ -47,7 +47,7 @@ public AuthorizationRequestServiceImpl(Environment environment) { */ public String getAuthorizationRequestURL( AuthorizationRequestParameters authorizationRequestParameters) { - authorizationRequestParameters.validate(); + authorizationRequestParameters.trimAndValidate(); if (StringUtils.isBlank(authorizationRequestParameters.getState())) { authorizationRequestParameters.setState(StateIdService.generateState()); } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java index 38a7a514..ba82dc33 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java @@ -40,14 +40,14 @@ public OnboardingServiceImpl(Environment environment) { @Override public OnboardingResponse onboard(SecuredOnboardingParameters securedOnboardingParameters) { - securedOnboardingParameters.validate(); + securedOnboardingParameters.trimAndValidate(); return this.onboard( securedOnboardingParameters, this.createOnboardingRequestBody(securedOnboardingParameters)); } @Override public void verify(SecuredOnboardingParameters securedOnboardingParameters) { - securedOnboardingParameters.validate(); + securedOnboardingParameters.trimAndValidate(); this.verify( securedOnboardingParameters, this.createOnboardingRequestBody(securedOnboardingParameters)); } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java index f78f9d27..7f4107c6 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java @@ -12,6 +12,8 @@ import com.dke.data.agrirouter.impl.SignatureService; import com.dke.data.agrirouter.impl.common.UtcTimeService; import com.google.gson.Gson; + +import java.util.Objects; import java.util.Optional; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; @@ -28,7 +30,7 @@ public RevokingServiceImpl(Environment environment) { @Override public RevokeResponse revoke(RevokeParameters revokeParameters) { - revokeParameters.validate(); + revokeParameters.trimAndValidate(); Response response = null; RevokeRequest revokeRequest = createRevokeRequestBody(revokeParameters); Gson gson = new Gson(); @@ -45,7 +47,7 @@ public RevokeResponse revoke(RevokeParameters revokeParameters) { response.bufferEntity(); RevokeResponse result = RevokeResponse.Filter.valueOf(response.getStatus()); - if (result.getKey() == RevokeResponse.SUCCESS.getKey()) { + if (Objects.requireNonNull(result).getKey() == RevokeResponse.SUCCESS.getKey()) { return result; } else { throw new RevokingException(getLastRevokingError(response.readEntity(String.class))); @@ -59,15 +61,14 @@ public RevokeResponse revoke(RevokeParameters revokeParameters) { private String createSignature(RevokeParameters revokeParameters, String jsonBody) { byte[] signature = this.createSignature(jsonBody, revokeParameters.getPrivateKey()); - String encodedSignature = Hex.encodeHexString(signature); - return encodedSignature; + return Hex.encodeHexString(signature); } private RevokeRequest createRevokeRequestBody(RevokeParameters parameters) { this.getNativeLogger().info("BEGIN | Create revoking request. | '{}'.", parameters); RevokeRequest revokeRequest = new RevokeRequest(); - revokeRequest.setAccountId(parameters.getAccountId()); - revokeRequest.setEndpointIds(parameters.getEndpointIds().toArray(new String[] {})); + revokeRequest.setAccountId(Objects.requireNonNull(parameters.getAccountId())); + revokeRequest.setEndpointIds(Objects.requireNonNull(parameters.getEndpointIds()).toArray(new String[] {})); revokeRequest.setUTCTimestamp(UtcTimeService.inThePast(10).toString()); revokeRequest.setTimeZone(UtcTimeService.offset()); this.getNativeLogger().info("END | Create revoking request. | '{}'.", parameters); From 172a809f45de343d97c5e61a04f5718bcf4bd0fa Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 23 Dec 2021 08:58:05 +0100 Subject: [PATCH 2/8] Suppress unused warning, since the enums are part of the API. --- .../main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt | 3 ++- .../src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt index 9f7fb2df..a12ff046 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt @@ -2,6 +2,7 @@ package com.dke.data.agrirouter.api.enums import java.util.* +@Suppress("unused") enum class Gateway(val key: String) { REST("3"), @@ -10,7 +11,7 @@ enum class Gateway(val key: String) { companion object { fun of(key: String): Optional? { - return Arrays.stream(Gateway.values()).filter { a -> a.key.contentEquals(key) }.findFirst() + return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst() } } diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt index 72087df9..d6fd8560 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt @@ -1,5 +1,6 @@ package com.dke.data.agrirouter.api.enums +@Suppress("unused") enum class Mode(val key: String) { ZERO("0") From c737ea7d037be157a39e4661fb4176a5408c6583 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Mon, 27 Dec 2021 13:36:04 +0100 Subject: [PATCH 3/8] Remove unused classes. --- .../agrirouter/api/dto/xsuaa/XsuaaResponse.kt | 25 ------------------- .../agrirouter/api/dto/xsuaa/inner/ExtAttr.kt | 8 ------ .../RegistrationCodeRequestParameters.kt | 19 -------------- 3 files changed, 52 deletions(-) delete mode 100644 agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt delete mode 100644 agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt delete mode 100644 agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt deleted file mode 100644 index 83226c21..00000000 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.dke.data.agrirouter.api.dto.xsuaa - -import com.dke.data.agrirouter.api.dto.xsuaa.inner.ExtAttr -import com.fasterxml.jackson.annotation.JsonIgnoreProperties -import com.fasterxml.jackson.annotation.JsonProperty - -@JsonIgnoreProperties(ignoreUnknown = true) -class XsuaaResponse { - - @JsonProperty("access_token") - lateinit var accessToken: String - - @JsonProperty("token_type") - lateinit var tokenType: String - - @JsonProperty("expires_in") - lateinit var expiresIn: String - - lateinit var scope: String - - @JsonProperty("ext_attr") - lateinit var extAttr: ExtAttr - - -} diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt deleted file mode 100644 index 3c5d0c25..00000000 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.dke.data.agrirouter.api.dto.xsuaa.inner - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties - -@JsonIgnoreProperties(ignoreUnknown = true) -class ExtAttr { - lateinit var enhancer: String -} diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt deleted file mode 100644 index e6b45b7c..00000000 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.dke.data.agrirouter.api.service.parameters - -import com.dke.data.agrirouter.api.service.ParameterValidation -import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase - -/** - * Parameters class. Encapsulation for the services. - */ -class RegistrationCodeRequestParameters : AbstractParameterBase(), ParameterValidation { - - lateinit var applicationId: String - - override fun technicalValidation() { - isBlank("applicationId",applicationId) - } - - - -} From c877f672c6b3c6c877b125cdcd5320ffb26fc535 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 29 Dec 2021 14:11:33 +0100 Subject: [PATCH 4/8] Add dedicated recipient for the test case. Add communication unit as fixture. Fix test case. --- .../communication-unit.json | 1 + .../test/AbstractIntegrationTest.java | 13 ++++ .../test/OnboardingResponseRepository.java | 3 +- .../fixture/CommunicationUnitFixture.java | 76 +++++++++++++++++++ .../rest/SendChunkedMessageTest.java | 5 +- 5 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json create mode 100644 agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java diff --git a/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json b/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json new file mode 100644 index 00000000..1d271fc7 --- /dev/null +++ b/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json @@ -0,0 +1 @@ +{"deviceAlternateId":"2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"59c3c127-da76-437e-94df-067a0ae3275b","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c"},"authentication":{"type":"P12","secret":"828v3rR8GMYLOHp2e0kXTb!U3Y0RL3yI?Xk#","certificate":"MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCBAAwgDCABgkqhkiG9w0BBwGggCSABIIEADCCBRowggUWBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQIta+6al4xYlYCAgfQBIIEyN2y+jNUvRA2QQRSt/QdfTqgd32T9wKaG0kNTExt1V5e43tYxjeY5qAAXc09vOn019nKjWKM5Pdi1xFAUGYH7QEoQ/uar8vrdX5w1qlRLhzNIB2/ZQJyK4mXOALPywsQAldVg7xocn/nf1uWQpAWwv3vb+tUCuoTrCRbbm3wJ1Y3rHRygX1tHp9h8ccO5FgG9mXZu4D2dKM34kakC+t9QuSSuRKMV0OQp2+5c+wD7jLtcFl/KMhwUxSRcczY08eBUxuEy9oKX8Wrj+2cdrVEnWJea+gEIZuOm1Rh89Rwk5qdZAB0T4V0HPRemJJ7rackxq3/AsYb9V6nenayFG/Wg7dR8ylN7I+vA30753tfFPRjKwFDib2FahF2PMokdIzw3Fuxi49Y05kL2wNNM0ojgaFAyWyj71kA4aoZOuBzy09OqUeVhxbd1PA/0evHz3JFrMCOyZScjEr4anD4edYSv94ksm4c58tmyFVsrOCFKkobXnkG25xzwPrF/2LSzOokPwgQXV69d5+lAaT9LOxk5bvR38+vNRxgqMNZnOzXZ0Ze9ISudi9yAzLZHP2oXXq3ujJu+0syW/bGNCAGU8LfyNNx5QAMMicZ4rjAdeVkOpA/MWBzPoQFVXLfP0CQcLVKo/9FATfVO/6gkb3jE1xUXGlMSLUggOVQTH6EFHYYFIItHrstCAmuCRVYlNIBRtEyYHox+7LyTIqEvCnZqvwjqjQTsxJKjCy57Uq7AkW/h/W270RMhXx5b8iEgF1w+CrRGIgd/g3F8o024Yes798ZfXKMKfGlY8O69YyM1fU9K0q/rX5SgkCJ74R1zsa19ohQFTUE9z/hdDcMC7OBIjIKlDT7N0WK9bqW1zkejI9WZBll1Fq5nu8HGzweJQWk7Uj2GJa2aDDSqpx3lcIZNHSRVZ1gbTMM0udxQRg5wUpckpBC7jpmGr5kQ+lMMVFWpgnFEzj7DPTM54F0xpyHZXMAo0h88RqCMZT0WAKotPNc1ghArqbkrk9KWQOxWtMB0EOT2XqSJpap+eRlobP0ENCn9T3aAKkyWI6Ju3jUOd/fWH0HfltR1kLcZyOioqoOo+12xu4dlObnOpYb1+LwNAYXV5IY4gvz/cY+lu429YAe56MEBYpQJM3dzcyR+8Gf1QPyyprKNW5IzJdhipoZfxpsLMK646aJ8DZZAHJPthPa36Dan7zaoHAZHGEFF63y0UWdh66cbXbyMK++mILp+o+jPpR/7iTOoaz6ibo7BIIEAFGYa+RvYxnBhCFD6Qssk7aaQxbngnlmBIIBHshIDznDOVv8yDKsipBNsxRwNFpiJnW3kbcIgSUQgdx+b1i+KVGOwWKFlBIqPNc0qO1FxpuQj+xPA+si8JcOZTEKVSo7nKrSNOG+1KSxK/orgBmRt7R54nH5+z8n4nEldDfGcysKM/yWdK1IjJxnIDAJ4MJqPoQJxmfp5Kxq2U8q1kYVk/3QyhrJh7vfUfCbbmMl3FXuM/MpB8mb+zUAGrPi882MUlId5xmF9ZNSAcBuuLhClHhycg79XBvGMS067RdcKs+C8LehOQLCUciy+yI7lHBo0Ht9uGEWI1K/0cQHy36XZtPb/82k8JbSgdTOE2P2fpaVo1m3MMjP2NzR4tKx3r+eFzetMRUwEwYJKoZIhvcNAQkVMQYEBAEAAAAAAAAAAAAwgAYJKoZIhvcNAQcGoIAwgAIBADCABgkqhkiG9w0BBwEwHAYKKoZIhvcNAQwBBjAOBAimJKi5Q/I/CgICB9CggASCBLhrp1bbvKqCf+226AR5lAmCtFHCsCtpQ8nvcGbqfOh7y+ofh0nA1EPDyIlmewwvLT1WTU06igGXEu3Pk7T/NMiFhU/Cvn4ITYtJMAWYXN0Cz6ppUtoRCWBsTcOv8C8aFJMt6OPZxiialVf+zMHaH7Clu8lFzXiqRf3z10HNmhGa0AgkRhmxGMWFYiBwGIvG+a9DPxQzWmPDJd38LNBxLQMSLX15pKikNAWVCifabBBDeF8TG+vtuBip4nyRWHhyxOMeYmhh/gbMsKmfzWdgTS+nv+a3j4A2eIrVbbEIl3gcOTodt+n/xbhk5ubyqxM7xG8DNtTw6cMjQ6af7rDXP/dBlxcQ6s7DwdvkC1zxG63e2GWcv5qyyg4nayhHn5gy/sysz+g/kxMQ9no0edDS3LDl67ta4PKFFSXZiZ4elHKH+1GRZeNWlAJ3HU4WXUdkZ0D3oHq6uP5QAkOsqzP59WI8sX2GpggPpOJCq7TVFV111fb3ucfX1lrECASoeFsB1i7DQPiQ/t2oPDN/drCCRG21VbhVqmkvIPHIXutS0QS2iPI5dCO/uO9Nq5fAmGdGvogTg18i9WimLQXQgicpWmchnpqk//sYBG3z5yHRGh7o28nAIvNsAUcyx54EV1kq4EC4I4e9G2Ke0LS7tVSl5NAWdc6QyONjP7+BUoHj7HUkjNNK6/410HJYm+K6JeTpF7OfDQO6B47/2TrEuqPPMKFUFG8Or9OHlVnktW93n2EHIQ8IS5BNPfqeZJIy6hgB0HKM9Br/l0yumtT/CaJT1+kJ1rbiY43WFY0NbhmTO+7yk4q/bakoQFqnXQXtUIDkKbafb6YHNrjuBAIhZkQEggJI36oQxnPbHPbPl11BYuWfUPusr7vlp/edArxgbOBVd+/YNkjypEiJ5MEfUq4eWRC4Y106N/ZvaPLy11lF6v47eu+XTHbcKBt1pP9cGS1hZ4VSUrkdEJZNvXs+6aZRP7AIQs96q6ZBIfLgtpWabdq3IH66fzOBtKAopznWx5ArMCb1G01C8urCha5KWjHh2m/oNzIlZRZEy9NY/UeJ66IkAU0ZPprJ/qFGN+SYWJtNITqBniJJVhpGnRo+cjSbS41l0W1hK/aVVPpn6Za9tHGPN2JrNDFsmYOXBpqHXxjyWeGmWcTQEsOBwWbk3V2ant98CEEF5Nfs0mBlI0LW2NPN9fRvaFbMeGu/1pgnC4J/MhtZ9s8sgeb7lrSHMjgFEZ0162tnFC+RlFlXMV33Uwa9KOP8m2nk77y0wFQ6/cIi7eWwV1Cm5KqXLR3f6QnuJKLW0rFBHxn3RnkPMm3dUqZ3Z5bMpPLr5Jsa8Z0QMwg+2vkH9uqxK4yCMG7IZyMAsRWVN+KIzB8HNHzmUjiowJ9OeSwwcduDOgZlttkahROTSpZYbRBZQFRbzh+rRvzkiu+WTm5eansCZYUBpadEWHXaOZTCLjg/oOHvM4zaTjMm7vpwg3Lh3EYsYiSx9z484QjIVsH2D8vatwQe/kltasuyr8iMXvM0KdJRQ53IUbwsIEgtassI5JDjkvp7LROMmzjzx79hkE/HlYOkuxWw8/uRwGPdhEP4Yw8xyaKiGQJwei1Di9sDgDu9YzMaL/AAAAAAAAAAAAAAAAAAAAAAAAAwMTAhMAkGBSsOAwIaBQAEFFZG6LRq53mUbm0VC8yNymiJ2emTBAiLi/FYdCtSZgICB9AAAA\u003d\u003d"}} \ No newline at end of file diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java index deda31e1..45e427e3 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java @@ -34,6 +34,19 @@ protected void waitForTheAgrirouterToProcessMultipleMessages() throws Interrupte Thread.sleep(TimeUnit.SECONDS.toMillis(60)); } + /** Communication unit for integration testing. */ + protected Application communicationUnit = new Application() { + @Override + public String getApplicationId() { + return "434989e2-b4be-4cfd-8e40-f5b89d83458d"; + } + + @Override + public String getCertificationVersionId() { + return "f491d487-f913-4732-8be4-c2eacff21816"; + } + }; + /** Farming software for integration testing. */ protected Application farmingSoftware = new Application() { diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java index b7441dfc..7a12d3db 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java @@ -48,7 +48,8 @@ public enum Identifier { FARMING_SOFTWARE_DEACTIVATED("farming-software-deactivated"), TELEMETRY_PLATFORM("telemetry-platform"), TELEMETRY_PLATFORM_REMOVED("telemetry-platform-removed"), - TELEMETRY_PLATFORM_DEACTIVATED("telemetry-platform-deactivated"); + TELEMETRY_PLATFORM_DEACTIVATED("telemetry-platform-deactivated"), + COMMUNICATION_UNIT("communication-unit"); private final String fileName; diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java new file mode 100644 index 00000000..1d768c82 --- /dev/null +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java @@ -0,0 +1,76 @@ +package com.dke.data.agrirouter.test.fixture; + +import agrirouter.request.payload.endpoint.Capabilities; +import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; +import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; +import com.dke.data.agrirouter.api.enums.ApplicationType; +import com.dke.data.agrirouter.api.enums.CertificationType; +import com.dke.data.agrirouter.api.enums.ContentMessageType; +import com.dke.data.agrirouter.api.enums.Gateway; +import com.dke.data.agrirouter.api.env.QA; +import com.dke.data.agrirouter.api.service.onboard.OnboardingService; +import com.dke.data.agrirouter.api.service.parameters.OnboardingParameters; +import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; +import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl; +import com.dke.data.agrirouter.impl.messaging.rest.SetCapabilityServiceImpl; +import com.dke.data.agrirouter.impl.onboard.OnboardingServiceImpl; +import com.dke.data.agrirouter.test.AbstractIntegrationTest; +import com.dke.data.agrirouter.test.OnboardingResponseRepository; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Collections; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + + +/** Class to onboard endpoints for different reasons. */ +@SuppressWarnings("ALL") +class CommunicationUnitFixture extends AbstractIntegrationTest { + + /** + * Create a new registration token by using the agrirouter UI and select the integration test application for CUs. + */ + @Test + //@Disabled("Please replace the placeholder for the registration code to run the test case.") + void onboardCommunicationUnitAndSaveToFile() throws IOException { + OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {}); + OnboardingParameters onboardingParameters = new OnboardingParameters(); + onboardingParameters.setRegistrationCode("06535d66c2"); + onboardingParameters.setApplicationId(communicationUnit.getApplicationId()); + onboardingParameters.setCertificationVersionId(communicationUnit.getCertificationVersionId()); + onboardingParameters.setCertificationType(CertificationType.P12); + onboardingParameters.setGatewayId(Gateway.REST.getKey()); + onboardingParameters.setApplicationType(ApplicationType.APPLICATION); + onboardingParameters.setUuid(UUID.randomUUID().toString()); + final OnboardingResponse onboardingResponse = onboardingService.onboard(onboardingParameters); + assertNotNull(onboardingResponse); + assertNotNull(onboardingResponse.getCapabilityAlternateId()); + assertNotNull(onboardingResponse.getDeviceAlternateId()); + assertNotNull(onboardingResponse.getSensorAlternateId()); + assertNotNull(onboardingResponse.getAuthentication()); + assertNotNull(onboardingResponse.getAuthentication().getCertificate()); + assertNotNull(onboardingResponse.getAuthentication().getSecret()); + assertNotNull(onboardingResponse.getAuthentication().getType()); + assertNotNull(onboardingResponse.getConnectionCriteria()); + assertNotNull(onboardingResponse.getConnectionCriteria().getMeasures()); + assertNotNull(onboardingResponse.getConnectionCriteria().getCommands()); + OnboardingResponseRepository.save( + OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT, onboardingResponse); + final SetCapabilityServiceImpl setCapabilityService = new SetCapabilityServiceImpl(new QA() { + }); + final SetCapabilitiesParameters setCapabilitiesParameters = new SetCapabilitiesParameters(); + setCapabilitiesParameters.setApplicationId(communicationUnit.getApplicationId()); + setCapabilitiesParameters.setCertificationVersionId(communicationUnit.getCertificationVersionId()); + setCapabilitiesParameters.setOnboardingResponse(onboardingResponse); + final SetCapabilitiesParameters.CapabilityParameters capabilityParameters = new SetCapabilitiesParameters.CapabilityParameters(); + capabilityParameters.setDirection(Capabilities.CapabilitySpecification.Direction.SEND_RECEIVE); + capabilityParameters.setTechnicalMessageType(ContentMessageType.ISO_11783_TASKDATA_ZIP); + setCapabilitiesParameters.setCapabilitiesParameters(Collections.singletonList(capabilityParameters)); + setCapabilityService.send(setCapabilitiesParameters); + final FetchMessageServiceImpl fetchMessageService = new FetchMessageServiceImpl(); + fetchMessageService.fetch(onboardingResponse,new DefaultCancellationToken(MAX_TRIES_BEFORE_FAILURE, DEFAULT_INTERVAL)); + } + +} diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java index 0253ed02..7114a62f 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java @@ -53,7 +53,8 @@ class SendChunkedMessageTest extends AbstractIntegrationTest { messageHeaderParameters.setApplicationMessageId(MessageIdService.generateMessageId()); messageHeaderParameters.setApplicationMessageSeqNo( SequenceNumberService.generateSequenceNumberForEndpoint(onboardingResponse)); - messageHeaderParameters.setMode(Request.RequestEnvelope.Mode.PUBLISH); + messageHeaderParameters.setMode(Request.RequestEnvelope.Mode.DIRECT); + messageHeaderParameters.setRecipients(Collections.singletonList(OnboardingResponseRepository.read(OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT).getSensorAlternateId())); PayloadParameters payloadParameters = new PayloadParameters(); payloadParameters.setValue(messageContent); @@ -98,7 +99,7 @@ class SendChunkedMessageTest extends AbstractIntegrationTest { Assertions.assertNotNull(message); decodeMessageResponse.set(decodeMessageService.decode(message.getMessage())); - Assertions.assertMatchesAny( + Assertions.assertMatchesAny( Arrays.asList(HttpStatus.SC_OK, HttpStatus.SC_CREATED, HttpStatus.SC_NO_CONTENT), decodeMessageResponse.get().getResponseEnvelope().getResponseCode()); }); From c6538a98509327314f1594454bb4ebb15832437a Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 29 Dec 2021 15:10:16 +0100 Subject: [PATCH 5/8] Format. --- .../test/AbstractIntegrationTest.java | 17 ++++++----- .../fixture/CommunicationUnitFixture.java | 30 ++++++++++--------- .../rest/SendChunkedMessageTest.java | 8 +++-- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java index 45e427e3..d59df475 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java @@ -35,17 +35,18 @@ protected void waitForTheAgrirouterToProcessMultipleMessages() throws Interrupte } /** Communication unit for integration testing. */ - protected Application communicationUnit = new Application() { - @Override - public String getApplicationId() { + protected Application communicationUnit = + new Application() { + @Override + public String getApplicationId() { return "434989e2-b4be-4cfd-8e40-f5b89d83458d"; - } + } - @Override - public String getCertificationVersionId() { + @Override + public String getCertificationVersionId() { return "f491d487-f913-4732-8be4-c2eacff21816"; - } - }; + } + }; /** Farming software for integration testing. */ protected Application farmingSoftware = diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java index 1d768c82..9f22a6fe 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java @@ -1,5 +1,7 @@ package com.dke.data.agrirouter.test.fixture; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import agrirouter.request.payload.endpoint.Capabilities; import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; @@ -16,24 +18,21 @@ import com.dke.data.agrirouter.impl.onboard.OnboardingServiceImpl; import com.dke.data.agrirouter.test.AbstractIntegrationTest; import com.dke.data.agrirouter.test.OnboardingResponseRepository; -import org.junit.jupiter.api.Test; - import java.io.IOException; import java.util.Collections; import java.util.UUID; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - +import org.junit.jupiter.api.Test; /** Class to onboard endpoints for different reasons. */ @SuppressWarnings("ALL") class CommunicationUnitFixture extends AbstractIntegrationTest { /** - * Create a new registration token by using the agrirouter UI and select the integration test application for CUs. + * Create a new registration token by using the agrirouter UI and select the integration test + * application for CUs. */ @Test - //@Disabled("Please replace the placeholder for the registration code to run the test case.") + // @Disabled("Please replace the placeholder for the registration code to run the test case.") void onboardCommunicationUnitAndSaveToFile() throws IOException { OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {}); OnboardingParameters onboardingParameters = new OnboardingParameters(); @@ -58,19 +57,22 @@ void onboardCommunicationUnitAndSaveToFile() throws IOException { assertNotNull(onboardingResponse.getConnectionCriteria().getCommands()); OnboardingResponseRepository.save( OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT, onboardingResponse); - final SetCapabilityServiceImpl setCapabilityService = new SetCapabilityServiceImpl(new QA() { - }); + final SetCapabilityServiceImpl setCapabilityService = new SetCapabilityServiceImpl(new QA() {}); final SetCapabilitiesParameters setCapabilitiesParameters = new SetCapabilitiesParameters(); setCapabilitiesParameters.setApplicationId(communicationUnit.getApplicationId()); - setCapabilitiesParameters.setCertificationVersionId(communicationUnit.getCertificationVersionId()); + setCapabilitiesParameters.setCertificationVersionId( + communicationUnit.getCertificationVersionId()); setCapabilitiesParameters.setOnboardingResponse(onboardingResponse); - final SetCapabilitiesParameters.CapabilityParameters capabilityParameters = new SetCapabilitiesParameters.CapabilityParameters(); + final SetCapabilitiesParameters.CapabilityParameters capabilityParameters = + new SetCapabilitiesParameters.CapabilityParameters(); capabilityParameters.setDirection(Capabilities.CapabilitySpecification.Direction.SEND_RECEIVE); capabilityParameters.setTechnicalMessageType(ContentMessageType.ISO_11783_TASKDATA_ZIP); - setCapabilitiesParameters.setCapabilitiesParameters(Collections.singletonList(capabilityParameters)); + setCapabilitiesParameters.setCapabilitiesParameters( + Collections.singletonList(capabilityParameters)); setCapabilityService.send(setCapabilitiesParameters); final FetchMessageServiceImpl fetchMessageService = new FetchMessageServiceImpl(); - fetchMessageService.fetch(onboardingResponse,new DefaultCancellationToken(MAX_TRIES_BEFORE_FAILURE, DEFAULT_INTERVAL)); + fetchMessageService.fetch( + onboardingResponse, + new DefaultCancellationToken(MAX_TRIES_BEFORE_FAILURE, DEFAULT_INTERVAL)); } - } diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java index 7114a62f..16234127 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java @@ -54,7 +54,11 @@ class SendChunkedMessageTest extends AbstractIntegrationTest { messageHeaderParameters.setApplicationMessageSeqNo( SequenceNumberService.generateSequenceNumberForEndpoint(onboardingResponse)); messageHeaderParameters.setMode(Request.RequestEnvelope.Mode.DIRECT); - messageHeaderParameters.setRecipients(Collections.singletonList(OnboardingResponseRepository.read(OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT).getSensorAlternateId())); + messageHeaderParameters.setRecipients( + Collections.singletonList( + OnboardingResponseRepository.read( + OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT) + .getSensorAlternateId())); PayloadParameters payloadParameters = new PayloadParameters(); payloadParameters.setValue(messageContent); @@ -99,7 +103,7 @@ class SendChunkedMessageTest extends AbstractIntegrationTest { Assertions.assertNotNull(message); decodeMessageResponse.set(decodeMessageService.decode(message.getMessage())); - Assertions.assertMatchesAny( + Assertions.assertMatchesAny( Arrays.asList(HttpStatus.SC_OK, HttpStatus.SC_CREATED, HttpStatus.SC_NO_CONTENT), decodeMessageResponse.get().getResponseEnvelope().getResponseCode()); }); From 4b68b16cd26d46e85c9c3e8d178e4ec153ef9f6f Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 12 Jan 2022 11:46:21 +0100 Subject: [PATCH 6/8] Remove `trim` and keep certificate changes. --- .../agrirouter/api/service/ParameterTrimming.java | 10 ---------- .../agrirouter/api/service/ParameterValidation.java | 4 +--- .../parameters/AuthorizationRequestParameters.kt | 7 ------- .../service/parameters/CloudOffboardingParameters.kt | 5 ----- .../service/parameters/CloudOnboardingParameters.kt | 9 --------- .../api/service/parameters/DeleteMessageParameters.kt | 6 ------ .../api/service/parameters/FetchMessageParameters.kt | 4 ---- .../api/service/parameters/ListEndpointsParameters.kt | 4 ---- ...sageConfirmationForAllPendingMessagesParameters.kt | 4 ---- .../parameters/MessageConfirmationParameters.kt | 5 ----- .../api/service/parameters/MessageHeaderParameters.kt | 8 -------- .../api/service/parameters/MessageQueryParameters.kt | 6 ------ .../api/service/parameters/OnboardingParameters.kt | 8 -------- .../api/service/parameters/PayloadParameters.kt | 5 ----- .../api/service/parameters/RevokeParameters.kt | 10 ---------- .../service/parameters/SecuredOnboardingParameters.kt | 11 ----------- .../api/service/parameters/SendMessageParameters.kt | 5 ----- .../service/parameters/SetCapabilitiesParameters.kt | 10 ---------- .../service/parameters/SetSubscriptionParameters.kt | 8 -------- 19 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java deleted file mode 100644 index 93f6a733..00000000 --- a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterTrimming.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dke.data.agrirouter.api.service; - -/** - * Interface to trim the parameters before the validation and later the usage of the values starts. - */ -public interface ParameterTrimming { - - /** Trim all parameters to remove whitespaces and avoid problems during sending messages. */ - void trim(); -} diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java index c322ac54..2be01f42 100644 --- a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java +++ b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; /** Parameter validation using bean validation. */ -public interface ParameterValidation extends HasLogger, ParameterTrimming { +public interface ParameterValidation extends HasLogger { /** * Validation of the parameters. If there are any constraint violations, there will be a @@ -15,8 +15,6 @@ public interface ParameterValidation extends HasLogger, ParameterTrimming { */ default void trimAndValidate() { getNativeLogger().debug("Validating parameters."); - getNativeLogger().trace("Trim the values."); - this.trim(); getNativeLogger().trace("Technical validation."); this.technicalValidation(); getNativeLogger().trace("Business validation."); diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt index c0f22a40..3b5d5cef 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt @@ -21,11 +21,4 @@ class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidat isBlank("applicationId", applicationId) } - override fun trim() { - trimParameterBase() - applicationId = applicationId.trim() - redirectUri = redirectUri.trim() - state = state.trim() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt index de3bc8bc..46662160 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt @@ -22,9 +22,4 @@ class CloudOffboardingParameters : AbstractParameterBase(), ParameterValidation nullOrEmpty("endpointIds", endpointIds) } - override fun trim() { - trimParameterBase() - endpointIds = endpointIds?.map { endpointId -> endpointId.trim() } - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt index a1bbdc20..2609782a 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt @@ -36,15 +36,6 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation { isBlank("endpointName", endpointName) } - override fun trim() { - endpointId = endpointId?.trim() - endpointName = endpointName?.trim() - } - - } - - override fun trim() { - trimParameterBase() } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt index dd6538c0..a64483d1 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt @@ -29,10 +29,4 @@ class DeleteMessageParameters : AbstractParameterBase(), ParameterValidation { } } - override fun trim() { - trimParameterBase() - messageIds = messageIds?.map { messageId -> messageId.trim() } - senderIds = senderIds?.map { senderId -> senderId.trim() } - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt index dd70dddd..632388f8 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt @@ -15,8 +15,4 @@ open class FetchMessageParameters : AbstractParameterBase(), ParameterValidation nullCheck("onboardingResponse", onboardingResponse) } - override fun trim() { - trimParameterBase() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt index 750cef92..d7e25b80 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt @@ -24,8 +24,4 @@ class ListEndpointsParameters : AbstractParameterBase(), ParameterValidation { nullCheck("direction", direction) } - override fun trim() { - trimParameterBase() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt index e1cbe7f9..a5061be0 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt @@ -15,8 +15,4 @@ class MessageConfirmationForAllPendingMessagesParameters : AbstractParameterBase nullCheck("onboardingResponse", onboardingResponse) } - override fun trim() { - trimParameterBase() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt index 55e70f21..fd139840 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt @@ -18,9 +18,4 @@ class MessageConfirmationParameters : AbstractParameterBase(), ParameterValidati nullCheck("messageIds", messageIds) } - override fun trim() { - trimParameterBase() - messageIds = messageIds?.map { messageId -> messageId.trim() } - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt index f5415023..587f3372 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt @@ -49,12 +49,4 @@ class MessageHeaderParameters : ParameterValidation { metadata = messageHeaderParameters.metadata } - - override fun trim() { - applicationMessageId = applicationMessageId?.trim() - teamSetContextId = teamSetContextId?.trim() - recipients = recipients.map { recipient -> recipient.trim() } - } - - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt index 9197ca65..f3777b63 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt @@ -29,10 +29,4 @@ class MessageQueryParameters : AbstractParameterBase(), ParameterValidation { } } - override fun trim() { - trimParameterBase() - messageIds?.map { messageId -> messageId.trim() } - senderIds?.map { senderId -> senderId.trim() } - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt index dfe1298a..58003ecc 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt @@ -34,12 +34,4 @@ class OnboardingParameters : AbstractParameterBase(), ParameterValidation { isBlank("registrationCode", registrationCode) } - override fun trim() { - trimParameterBase() - applicationId = applicationId?.trim() - uuid = uuid?.trim() - certificationVersionId = certificationVersionId?.trim() - gatewayId = gatewayId?.trim() - registrationCode = registrationCode?.trim() - } } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt index a137312b..88498160 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt @@ -51,9 +51,4 @@ class PayloadParameters : AbstractParameterBase(), ParameterValidation { value = payload.value } - override fun trim() { - trimParameterBase() - typeUrl = typeUrl.trim() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt index 7351e01c..eb81877a 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt @@ -29,14 +29,4 @@ class RevokeParameters : ParameterValidation { nullOrEmpty("endpointIds", endpointIds) } - - override fun trim() { - applicationId = applicationId?.trim() - accountId = accountId?.trim() - endpointIds = endpointIds?.map { endpointId -> endpointId.trim() } - privateKey = privateKey?.trim() - privateKey = privateKey?.trim() - publicKey = publicKey?.trim() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt index ed637ebf..b4441203 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt @@ -36,15 +36,4 @@ class SecuredOnboardingParameters : AbstractParameterBase(), ParameterValidation nullCheck("certificationType", certificationType) } - override fun trim() { - trimParameterBase() - applicationId = applicationId?.trim() - privateKey = privateKey?.trim() - publicKey = publicKey?.trim() - uuid = uuid?.trim() - certificationVersionId = certificationVersionId?.trim() - gatewayId = gatewayId?.trim() - registrationCode = registrationCode?.trim() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt index 89969992..30ca0226 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt @@ -22,9 +22,4 @@ open class SendMessageParameters : AbstractParameterBase(), ParameterValidation nullOrEmpty("encodedMessages", encodedMessages) } - override fun trim() { - trimParameterBase() - encodedMessages = encodedMessages?.map { encodedMessage -> encodedMessage.trim() } - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt index ba9ae537..fc1df306 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt @@ -32,10 +32,6 @@ class SetCapabilitiesParameters : AbstractParameterBase(), ParameterValidation { nullCheck("direction", direction) } - override fun trim() { - // No trim needed. - } - } override fun technicalValidation() { @@ -46,10 +42,4 @@ class SetCapabilitiesParameters : AbstractParameterBase(), ParameterValidation { capabilitiesParameters?.forEach { c -> c.trimAndValidate() } } - override fun trim() { - trimParameterBase() - applicationId = applicationId?.trim() - certificationVersionId = certificationVersionId?.trim() - } - } \ No newline at end of file diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt index ee5e7cac..f2a27796 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt @@ -24,10 +24,6 @@ class SetSubscriptionParameters : AbstractParameterBase(), ParameterValidation { nullCheck("technicalMessageType", technicalMessageType) } - override fun trim() { - // No trim needed. - } - } var subscriptions: List = ArrayList() @@ -36,8 +32,4 @@ class SetSubscriptionParameters : AbstractParameterBase(), ParameterValidation { nullCheck("onboardingResponse", onboardingResponse) } - override fun trim() { - trimParameterBase() - } - } \ No newline at end of file From 0fd4777f7c0cadf60ffb83af5c9eb3056bf9273e Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 12 Jan 2022 11:48:16 +0100 Subject: [PATCH 7/8] Rename method call. --- .../data/agrirouter/api/service/ParameterValidation.java | 2 +- .../api/service/parameters/CloudOnboardingParameters.kt | 2 +- .../api/service/parameters/MessageHeaderParameters.kt | 2 +- .../api/service/parameters/SetCapabilitiesParameters.kt | 2 +- .../agrirouter/impl/messaging/MessageBodyCreator.java | 4 ++-- .../impl/messaging/encoding/EncodeMessageServiceImpl.java | 8 ++++---- .../impl/messaging/helper/MessageQueryHelperService.java | 4 ++-- .../messaging/helper/mqtt/MessageQueryHelperService.java | 2 +- .../impl/messaging/mqtt/CloudOffboardingServiceImpl.java | 2 +- .../impl/messaging/mqtt/CloudOnboardingServiceImpl.java | 2 +- .../impl/messaging/mqtt/DeleteMessageServiceImpl.java | 2 +- .../impl/messaging/mqtt/ListEndpointsServiceImpl.java | 2 +- .../messaging/mqtt/MessageConfirmationServiceImpl.java | 2 +- .../impl/messaging/mqtt/SendMessageServiceImpl.java | 2 +- .../impl/messaging/mqtt/SetCapabilityServiceImpl.java | 2 +- .../impl/messaging/mqtt/SetSubscriptionServiceImpl.java | 2 +- .../impl/messaging/rest/CloudOffboardingServiceImpl.java | 4 ++-- .../impl/messaging/rest/CloudOnboardingServiceImpl.java | 4 ++-- .../impl/messaging/rest/DeleteMessageServiceImpl.java | 4 ++-- .../impl/messaging/rest/FetchMessageServiceImpl.java | 4 ++-- .../impl/messaging/rest/ListEndpointsServiceImpl.java | 4 ++-- .../messaging/rest/MessageConfirmationServiceImpl.java | 4 ++-- .../agrirouter/impl/messaging/rest/MessageFetcher.java | 2 +- .../impl/messaging/rest/SendMessageServiceImpl.java | 4 ++-- .../impl/messaging/rest/SetCapabilityServiceImpl.java | 4 ++-- .../impl/messaging/rest/SetSubscriptionServiceImpl.java | 4 ++-- .../agrirouter/impl/onboard/OnboardingServiceImpl.java | 5 +++-- .../onboard/secured/AuthorizationRequestServiceImpl.java | 2 +- .../impl/onboard/secured/OnboardingServiceImpl.java | 7 ++++--- .../data/agrirouter/impl/revoke/RevokingServiceImpl.java | 2 +- 30 files changed, 49 insertions(+), 47 deletions(-) diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java index 2be01f42..66dcabe4 100644 --- a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java +++ b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java @@ -13,7 +13,7 @@ public interface ParameterValidation extends HasLogger { * * @throws IllegalParameterDefinitionException - */ - default void trimAndValidate() { + default void validate() { getNativeLogger().debug("Validating parameters."); getNativeLogger().trace("Technical validation."); this.technicalValidation(); diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt index 2609782a..323c57f3 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt @@ -21,7 +21,7 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation { override fun businessValidation() { nullOrEmpty("endpointDetails", endpointDetails) endpointDetails?.forEach { - it.trimAndValidate() + it.validate() } } diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt index 587f3372..a93265c9 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt @@ -38,7 +38,7 @@ class MessageHeaderParameters : ParameterValidation { * Copy the content of the message header parameters into this class. */ fun copy(messageHeaderParameters: MessageHeaderParameters) { - messageHeaderParameters.trimAndValidate() + messageHeaderParameters.validate() applicationMessageId = messageHeaderParameters.applicationMessageId applicationMessageSeqNo = messageHeaderParameters.applicationMessageSeqNo technicalMessageType = messageHeaderParameters.technicalMessageType diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt index fc1df306..0855def7 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt @@ -39,7 +39,7 @@ class SetCapabilitiesParameters : AbstractParameterBase(), ParameterValidation { isBlank("applicationId", applicationId) isBlank("certificationVersionId", certificationVersionId) nullCheck("capabilitiesParameters", capabilitiesParameters) - capabilitiesParameters?.forEach { c -> c.trimAndValidate() } + capabilitiesParameters?.forEach { c -> c.validate() } } } \ No newline at end of file diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java index 8e400b25..05f0d86f 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java @@ -13,14 +13,14 @@ public interface MessageBodyCreator { default String createMessageBody(SendMessageParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.registerTypeAdapter(Message.class, new MessageTypeAdapter()); return gsonBuilder.create().toJson(this.createSendMessageRequest(parameters)); } default SendMessageRequest createSendMessageRequest(SendMessageParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); SendMessageRequest sendMessageRequest = new SendMessageRequest(); sendMessageRequest.setSensorAlternateId( Objects.requireNonNull(parameters.getOnboardingResponse()).getSensorAlternateId()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java index 7a1975ef..4c0f89d2 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java @@ -46,8 +46,8 @@ public String encode( if (null == messageHeaderParameters || null == payloadParameters) { throw new IllegalArgumentException("Parameters cannot be NULL"); } - messageHeaderParameters.trimAndValidate(); - payloadParameters.trimAndValidate(); + messageHeaderParameters.validate(); + payloadParameters.validate(); try (ByteArrayOutputStream streamedMessage = new ByteArrayOutputStream()) { @@ -103,8 +103,8 @@ public List chunkAndEncode( || null == onboardingResponse) { throw new IllegalArgumentException("Parameters cannot be NULL"); } - messageHeaderParameters.trimAndValidate(); - payloadParameters.trimAndValidate(); + messageHeaderParameters.validate(); + payloadParameters.validate(); if (messageHeaderParameters.getTechnicalMessageType().getNeedsChunking()) { if (payloadParameters.shouldBeChunked()) { diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java index c6fadc4a..9195c065 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java @@ -32,7 +32,7 @@ public String send(MessageQueryParameters parameters) { this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.trimAndValidate(); + parameters.validate(); this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessageResponse = this.encode(this.technicalMessageType, parameters); @@ -57,7 +57,7 @@ public HttpAsyncMessageSendingResult sendAsync(MessageQueryParameters parameters this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.trimAndValidate(); + parameters.validate(); this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessageResponse = this.encode(this.technicalMessageType, parameters); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java index 62aee4c7..846e50da 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java @@ -36,7 +36,7 @@ public String send(MessageQueryParameters parameters) { this.logMethodBegin(parameters); this.getNativeLogger().trace("Validate parameters."); - parameters.trimAndValidate(); + parameters.validate(); try { this.getNativeLogger().trace("Encode message."); EncodedMessage encodedMessage = this.encode(this.technicalMessageType, parameters); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java index 9defe07c..7f500258 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java @@ -36,7 +36,7 @@ public CloudOffboardingServiceImpl(IMqttClient mqttClient) { */ @Override public String send(CloudOffboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java index 001ce027..5fc93219 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java @@ -35,7 +35,7 @@ public CloudOnboardingServiceImpl(IMqttClient mqttClient) { */ @Override public String send(CloudOnboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java index d41e9db3..5b46e182 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java @@ -29,7 +29,7 @@ public DeleteMessageServiceImpl(IMqttClient mqttClient) { @Override public String send(DeleteMessageParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java index a34b91fd..427ce628 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java @@ -30,7 +30,7 @@ public ListEndpointsServiceImpl(IMqttClient mqttClient) { @Override public String send(ListEndpointsParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java index 7ee56a17..bbaff0dd 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java @@ -30,7 +30,7 @@ public MessageConfirmationServiceImpl(IMqttClient mqttClient) { @Override public String send(MessageConfirmationParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java index e633b6f2..c5db783a 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java @@ -28,7 +28,7 @@ public SendMessageServiceImpl(IMqttClient mqttClient) { * @param sendMessageParameters Parameters to send the message. */ public void send(SendMessageParameters sendMessageParameters) { - sendMessageParameters.trimAndValidate(); + sendMessageParameters.validate(); try { String messageAsJson = this.createMessageBody(sendMessageParameters); byte[] payload = messageAsJson.getBytes(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java index b8d53c12..0c438038 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java @@ -31,7 +31,7 @@ public SetCapabilityServiceImpl(IMqttClient mqttClient) { @Override public String send(SetCapabilitiesParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java index b74f54a8..4f739a48 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java @@ -30,7 +30,7 @@ public SetSubscriptionServiceImpl(IMqttClient mqttClient) { @Override public String send(SetSubscriptionParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); try { EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java index 9ef58641..73fa594f 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java @@ -25,7 +25,7 @@ public CloudOffboardingServiceImpl() { @Override public String send(CloudOffboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -38,7 +38,7 @@ public String send(CloudOffboardingParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(CloudOffboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java index 46659eb4..7fe38a2a 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java @@ -24,7 +24,7 @@ public CloudOnboardingServiceImpl() { @Override public String send(CloudOnboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -37,7 +37,7 @@ public String send(CloudOnboardingParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(CloudOnboardingParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java index e789897c..1b7b909b 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java @@ -24,7 +24,7 @@ public DeleteMessageServiceImpl() { @Override public String send(DeleteMessageParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -37,7 +37,7 @@ public String send(DeleteMessageParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(DeleteMessageParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java index 3cea34c1..52779670 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java @@ -25,7 +25,7 @@ public Optional> fetch( @Override public Optional> fetch( FetchMessageParameters fetchMessageParameters, int maxTries, long interval) { - fetchMessageParameters.trimAndValidate(); + fetchMessageParameters.validate(); Optional response = poll(fetchMessageParameters, new DefaultCancellationToken(maxTries, interval)); return response.map(this::parseJson); @@ -42,7 +42,7 @@ public Optional> fetch( @Override public Optional> fetch( FetchMessageParameters fetchMessageParameters, CancellationToken cancellationToken) { - fetchMessageParameters.trimAndValidate(); + fetchMessageParameters.validate(); Optional response = poll(fetchMessageParameters, cancellationToken); return response.map(this::parseJson); } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java index b96447b6..fd42659c 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java @@ -27,7 +27,7 @@ public ListEndpointsServiceImpl(Environment environment) { @Override public String send(ListEndpointsParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(ListEndpointsParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(ListEndpointsParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java index dd7b53ac..4f0a4112 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java @@ -27,7 +27,7 @@ public MessageConfirmationServiceImpl(Environment environment) { @Override public String send(MessageConfirmationParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -40,7 +40,7 @@ public String send(MessageConfirmationParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(MessageConfirmationParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java index e21a4df8..8cbcea4a 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java @@ -28,7 +28,7 @@ public interface MessageFetcher extends ResponseValidator, HasLogger { */ default Optional poll( FetchMessageParameters fetchMessageParameters, CancellationToken cancellationToken) { - fetchMessageParameters.trimAndValidate(); + fetchMessageParameters.validate(); int nrOfTries = 1; while (cancellationToken.isNotCancelled()) { getNativeLogger() diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java index a6da7262..f96a5a05 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java @@ -12,7 +12,7 @@ public class SendMessageServiceImpl @Override public void send(SendMessageParameters sendMessageParameters) { - sendMessageParameters.trimAndValidate(); + sendMessageParameters.validate(); MessageSendingResponse response = this.sendMessage(sendMessageParameters); this.assertStatusCodeIsOk(response.getNativeResponse().getStatus()); } @@ -20,7 +20,7 @@ public void send(SendMessageParameters sendMessageParameters) { @Override public CompletableFuture sendAsync( SendMessageParameters sendMessageParameters) { - sendMessageParameters.trimAndValidate(); + sendMessageParameters.validate(); return this.sendMessageAsync(sendMessageParameters); } } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java index 4a942d37..0f0124c9 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java @@ -26,7 +26,7 @@ public SetCapabilityServiceImpl(Environment environment) { @Override public String send(SetCapabilitiesParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(SetCapabilitiesParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(SetCapabilitiesParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encode(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java index e765613e..59dcc298 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java @@ -26,7 +26,7 @@ public SetSubscriptionServiceImpl(Environment environment) { @Override public String send(SetSubscriptionParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); @@ -39,7 +39,7 @@ public String send(SetSubscriptionParameters parameters) { @Override public HttpAsyncMessageSendingResult sendAsync(SetSubscriptionParameters parameters) { - parameters.trimAndValidate(); + parameters.validate(); EncodedMessage encodedMessage = this.encodeMessage(parameters); SendMessageParameters sendMessageParameters = new SendMessageParameters(); sendMessageParameters.setOnboardingResponse(parameters.getOnboardingResponse()); diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java index be74c575..d04e2cf6 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java @@ -9,6 +9,7 @@ import com.dke.data.agrirouter.api.service.parameters.OnboardingParameters; import com.dke.data.agrirouter.impl.RequestFactory; import com.dke.data.agrirouter.impl.validation.ResponseValidator; +import java.util.Objects; import java.util.Optional; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Response; @@ -24,7 +25,7 @@ public OnboardingServiceImpl(Environment environment) { @Override public OnboardingResponse onboard(OnboardingParameters parameters) { this.getNativeLogger().info("BEGIN | Onboarding process. | '{}'.", parameters); - parameters.trimAndValidate(); + parameters.validate(); this.getNativeLogger().debug("Onboard device."); OnboardingResponse onboardingResponse = @@ -48,7 +49,7 @@ private OnboardingRequest createOnboardingRequestBody(OnboardingParameters param parameters.getApplicationId(), parameters.getCertificationVersionId(), parameters.getGatewayId(), - parameters.getCertificationType()); + Objects.requireNonNull(parameters.getCertificationType())); this.getNativeLogger().info("END | Create onboarding request. | '{}'.", parameters); return onboardRequest; } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java index 8c1a501c..e74c413e 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java @@ -47,7 +47,7 @@ public AuthorizationRequestServiceImpl(Environment environment) { */ public String getAuthorizationRequestURL( AuthorizationRequestParameters authorizationRequestParameters) { - authorizationRequestParameters.trimAndValidate(); + authorizationRequestParameters.validate(); if (StringUtils.isBlank(authorizationRequestParameters.getState())) { authorizationRequestParameters.setState(StateIdService.generateState()); } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java index ba82dc33..b9d916ce 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java @@ -21,6 +21,7 @@ import java.security.NoSuchAlgorithmException; import java.security.Signature; import java.security.SignatureException; +import java.util.Objects; import java.util.Optional; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; @@ -40,14 +41,14 @@ public OnboardingServiceImpl(Environment environment) { @Override public OnboardingResponse onboard(SecuredOnboardingParameters securedOnboardingParameters) { - securedOnboardingParameters.trimAndValidate(); + securedOnboardingParameters.validate(); return this.onboard( securedOnboardingParameters, this.createOnboardingRequestBody(securedOnboardingParameters)); } @Override public void verify(SecuredOnboardingParameters securedOnboardingParameters) { - securedOnboardingParameters.trimAndValidate(); + securedOnboardingParameters.validate(); this.verify( securedOnboardingParameters, this.createOnboardingRequestBody(securedOnboardingParameters)); } @@ -63,7 +64,7 @@ private OnboardingRequest createOnboardingRequestBody(SecuredOnboardingParameter parameters.getApplicationId(), parameters.getCertificationVersionId(), parameters.getGatewayId(), - parameters.getCertificationType()); + Objects.requireNonNull(parameters.getCertificationType())); } private OnboardingResponse onboard( diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java index dbe84be9..9eb5de01 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java @@ -29,7 +29,7 @@ public RevokingServiceImpl(Environment environment) { @Override public RevokeResponse revoke(RevokeParameters revokeParameters) { - revokeParameters.trimAndValidate(); + revokeParameters.validate(); Response response = null; RevokeRequest revokeRequest = createRevokeRequestBody(revokeParameters); Gson gson = new Gson(); From 7ffe52575a16466404ef58e8128e898f2c447065 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Tue, 25 Jan 2022 16:27:13 +0100 Subject: [PATCH 8/8] Rename method call. --- .../api/service/parameters/base/AbstractParameterBase.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt index 498aab86..ec100702 100644 --- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt +++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt @@ -8,12 +8,4 @@ abstract class AbstractParameterBase : DynamicAttributesStorage() { var sequenceNumber: Int = 1 - /** - * Trim the parameters to remove whitespaces and avoid problems. - */ - fun trimParameterBase() { - applicationMessageId = applicationMessageId?.trim() - teamsetContextId = teamsetContextId?.trim() - } - } \ No newline at end of file