From d0da9289b7fc3a74a2bb49faa667d0d8429d76a9 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Wed, 23 Feb 2022 18:44:49 +0100 Subject: [PATCH] Fix invalid log messages. Fix format for several classes. --- .../api/service/ParameterValidation.java | 13 ++++-- .../DeleteAllMessagesParameterCreator.java | 44 +++++++++---------- .../mqtt/DeleteMessageServiceImpl.java | 11 +++-- .../rest/DeleteMessageServiceImpl.java | 9 ++-- 4 files changed, 40 insertions(+), 37 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 66dcabe4..5959b4b0 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 @@ -52,7 +52,10 @@ default void rise(String message, String... parameterNames) { default void nullCheck(String parameterName, Object o) { if (null == o) { this.rise( - "The parameter '%s' should not have been null, please check your values.", parameterName); + String.format( + "The parameter '%s' should not have been null, please check your values.", + parameterName), + parameterName); } } @@ -64,7 +67,9 @@ default void nullCheck(String parameterName, Object o) { default void isBlank(String parameterName, String s) { if (StringUtils.isBlank(s)) { this.rise( - "The parameter '%s' should not have been blank, please check your values.", + String.format( + "The parameter '%s' should not have been blank, please check your values.", + parameterName), parameterName); } } @@ -78,7 +83,9 @@ default void nullOrEmpty(String parameterName, Collection c) { nullCheck(parameterName, c); if (c.isEmpty()) { this.rise( - "The parameter '%s' should not have been empty, please check your values.", + String.format( + "The parameter '%s' should not have been empty, please check your values.", + parameterName), parameterName); } } diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/DeleteAllMessagesParameterCreator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/DeleteAllMessagesParameterCreator.java index c760b993..94ff87c4 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/DeleteAllMessagesParameterCreator.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/DeleteAllMessagesParameterCreator.java @@ -3,32 +3,28 @@ import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; import com.dke.data.agrirouter.impl.common.UtcTimeService; -import org.jetbrains.annotations.NotNull; - import java.util.Collections; +import org.jetbrains.annotations.NotNull; -/** - * Interface to avaoid duplicate parameter creation. - */ +/** Interface to avaoid duplicate parameter creation. */ public interface DeleteAllMessagesParameterCreator { - /** - * Create message parameters to delete all messages. - * - * @param onboardingResponse - - * @return - - */ - @NotNull - default DeleteMessageParameters createMessageParametersToDeleteAllMessages( - OnboardingResponse onboardingResponse) { - final DeleteMessageParameters deleteMessageParameters = new DeleteMessageParameters(); - deleteMessageParameters.setOnboardingResponse(onboardingResponse); - deleteMessageParameters.setMessageIds(Collections.emptyList()); - deleteMessageParameters.setSenderIds(Collections.emptyList()); - deleteMessageParameters.setSentFromInSeconds( - UtcTimeService.inThePast(UtcTimeService.FOUR_WEEKS_AGO).toEpochSecond()); - deleteMessageParameters.setSentToInSeconds(UtcTimeService.now().toEpochSecond()); - return deleteMessageParameters; - } - + /** + * Create message parameters to delete all messages. + * + * @param onboardingResponse - + * @return - + */ + @NotNull + default DeleteMessageParameters createMessageParametersToDeleteAllMessages( + OnboardingResponse onboardingResponse) { + final DeleteMessageParameters deleteMessageParameters = new DeleteMessageParameters(); + deleteMessageParameters.setOnboardingResponse(onboardingResponse); + deleteMessageParameters.setMessageIds(Collections.emptyList()); + deleteMessageParameters.setSenderIds(Collections.emptyList()); + deleteMessageParameters.setSentFromInSeconds( + UtcTimeService.inThePast(UtcTimeService.FOUR_WEEKS_AGO).toEpochSecond()); + deleteMessageParameters.setSentToInSeconds(UtcTimeService.now().toEpochSecond()); + return deleteMessageParameters; + } } 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 94300f68..3baf0d82 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 @@ -8,23 +8,23 @@ import com.dke.data.agrirouter.api.service.messaging.mqtt.DeleteMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; -import com.dke.data.agrirouter.impl.common.UtcTimeService; import com.dke.data.agrirouter.impl.messaging.MessageBodyCreator; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.MqttService; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; +import com.dke.data.agrirouter.impl.messaging.helper.DeleteAllMessagesParameterCreator; import java.util.Collections; import java.util.Objects; import java.util.concurrent.CompletableFuture; - -import com.dke.data.agrirouter.impl.messaging.helper.DeleteAllMessagesParameterCreator; import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; -import org.jetbrains.annotations.NotNull; public class DeleteMessageServiceImpl extends MqttService - implements DeleteMessageService, MessageBodyCreator, MessageEncoder, DeleteAllMessagesParameterCreator { + implements DeleteMessageService, + MessageBodyCreator, + MessageEncoder, + DeleteAllMessagesParameterCreator { private final EncodeMessageService encodeMessageService = new EncodeMessageServiceImpl(); @@ -78,5 +78,4 @@ public MqttAsyncMessageSendingResult deleteAllAsync(OnboardingResponse onboardin createMessageParametersToDeleteAllMessages(onboardingResponse); return sendAsync(deleteMessageParameters); } - } 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 901f6d24..71ad921f 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 @@ -8,17 +8,19 @@ import com.dke.data.agrirouter.api.service.messaging.http.DeleteMessageService; import com.dke.data.agrirouter.api.service.parameters.DeleteMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; -import com.dke.data.agrirouter.impl.common.UtcTimeService; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.messaging.helper.DeleteAllMessagesParameterCreator; import com.dke.data.agrirouter.impl.validation.ResponseValidator; import java.util.Collections; import java.util.concurrent.CompletableFuture; -import org.jetbrains.annotations.NotNull; public class DeleteMessageServiceImpl - implements DeleteMessageService, MessageSender, ResponseValidator, MessageEncoder, DeleteAllMessagesParameterCreator { + implements DeleteMessageService, + MessageSender, + ResponseValidator, + MessageEncoder, + DeleteAllMessagesParameterCreator { private final EncodeMessageService encodeMessageService; @@ -70,5 +72,4 @@ public HttpAsyncMessageSendingResult deleteAllAsync(OnboardingResponse onboardin createMessageParametersToDeleteAllMessages(onboardingResponse); return sendAsync(deleteMessageParameters); } - }