Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.dke.data.agrirouter.api.service;

import static java.lang.String.valueOf;

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -8,8 +10,6 @@
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;

import static java.lang.String.valueOf;

/**
* Interface to encapsulate logging capabilities. Logging will be done using LOG4J2, ruleset should
* be:
Expand Down Expand Up @@ -43,9 +43,7 @@ default Logger getNativeLogger() {
return loggerCache.get(this.getClass().getName());
}

/**
* Log method begin. Will log all given parameters as well.
*/
/** Log method begin. Will log all given parameters as well. */
default void logMethodBegin(Object... objects) {
getNativeLogger().debug(METHOD_BEGIN, "BEGIN | Start of method.");
Arrays.stream(objects).forEach(o -> getNativeLogger().trace(valueOf(o)));
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ enum class ApplicationType(val key: String) {

companion object {
fun of(key: String): Optional<ApplicationType>? {
return Arrays.stream(ApplicationType.values()).filter { a -> a.key.contentEquals(key) }.findFirst()
return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst()
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dke.data.agrirouter.api.enums

@Suppress("unused")
enum class Direction(val key: Int) {

SEND(0),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dke.data.agrirouter.api.enums

@Suppress("unused")
enum class EncodingType(var key: String) {
BASE_64("base64");
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.dke.data.agrirouter.api.enums

import java.util.*

@Suppress("unused")
enum class Gateway(val key: String) {

REST("3"),
Expand All @@ -10,7 +11,7 @@ enum class Gateway(val key: String) {

companion object {
fun of(key: String): Optional<Gateway>? {
return Arrays.stream(Gateway.values()).filter { a -> a.key.contentEquals(key) }.findFirst()
return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst()
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dke.data.agrirouter.api.enums

@Suppress("unused")
enum class Mode(val key: String) {

ZERO("0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand All @@ -18,7 +18,7 @@ class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidat
var responseType: SecuredOnboardingResponseType = SecuredOnboardingResponseType.ONBOARD

override fun technicalValidation() {
isBlank("applicationId",applicationId)
isBlank("applicationId", applicationId)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ class CloudOffboardingParameters : AbstractParameterBase(), ParameterValidation
var endpointIds: List<String>? = 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation {
var endpointDetails: List<EndpointDetailsParameters>? = 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()
}
Expand All @@ -32,8 +32,8 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation {
var endpointName: String? = null

override fun technicalValidation() {
isBlank("endpointId",endpointId)
isBlank("endpointName",endpointName)
isBlank("endpointId", endpointId)
isBlank("endpointName", endpointName)
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ open class FetchMessageParameters : AbstractParameterBase(), ParameterValidation
var onboardingResponse: OnboardingResponse? = null

override fun technicalValidation() {
nullCheck("onboardingResponse",onboardingResponse)
nullCheck("onboardingResponse", onboardingResponse)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,9 +19,9 @@ 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MessageConfirmationForAllPendingMessagesParameters : AbstractParameterBase
var onboardingResponse: OnboardingResponse? = null

override fun technicalValidation() {
nullCheck("onboardingResponse",onboardingResponse)
nullCheck("onboardingResponse", onboardingResponse)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class MessageConfirmationParameters : AbstractParameterBase(), ParameterValidati
var messageIds: List<String>? = null

override fun technicalValidation() {
nullCheck("onboardingResponse",onboardingResponse)
nullCheck("messageIds",messageIds)
nullCheck("onboardingResponse", onboardingResponse)
nullCheck("messageIds", messageIds)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.validate()
applicationMessageId = messageHeaderParameters.applicationMessageId
applicationMessageSeqNo = messageHeaderParameters.applicationMessageSeqNo
technicalMessageType = messageHeaderParameters.technicalMessageType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/**
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ open class SendMessageParameters : AbstractParameterBase(), ParameterValidation
var encodedMessages: List<String>? = 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)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ 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 technicalValidation() {
nullCheck("onboardingResponse",onboardingResponse)
isBlank("applicationId",applicationId)
isBlank("certificationVersionId",certificationVersionId)
nullCheck("capabilitiesParameters",capabilitiesParameters)
nullCheck("onboardingResponse", onboardingResponse)
isBlank("applicationId", applicationId)
isBlank("certificationVersionId", certificationVersionId)
nullCheck("capabilitiesParameters", capabilitiesParameters)
capabilitiesParameters?.forEach { c -> c.validate() }
}

Expand Down
Loading