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
Expand Up @@ -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);
}
}

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

Expand Down Expand Up @@ -78,5 +78,4 @@ public MqttAsyncMessageSendingResult deleteAllAsync(OnboardingResponse onboardin
createMessageParametersToDeleteAllMessages(onboardingResponse);
return sendAsync(deleteMessageParameters);
}

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

Expand Down Expand Up @@ -70,5 +72,4 @@ public HttpAsyncMessageSendingResult deleteAllAsync(OnboardingResponse onboardin
createMessageParametersToDeleteAllMessages(onboardingResponse);
return sendAsync(deleteMessageParameters);
}

}