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 3deab657..fc189e3c 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 @@ -6,20 +6,36 @@ import com.dke.data.agrirouter.api.service.messaging.http.SetCapabilityService; import com.dke.data.agrirouter.api.service.parameters.SendMessageParameters; import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters; -import com.dke.data.agrirouter.impl.EnvironmentalService; import com.dke.data.agrirouter.impl.messaging.MessageEncoder; import com.dke.data.agrirouter.impl.messaging.encoding.EncodeMessageServiceImpl; import com.dke.data.agrirouter.impl.validation.ResponseValidator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collections; -public class SetCapabilityServiceImpl extends EnvironmentalService +public class SetCapabilityServiceImpl implements SetCapabilityService, MessageSender, MessageEncoder, ResponseValidator { + private static final Logger LOGGER = LoggerFactory.getLogger(SetCapabilityServiceImpl.class); + private final EncodeMessageService encodeMessageService; - public SetCapabilityServiceImpl(Environment environment) { - super(environment); + /** + * Implements the SetCapabilityService interface and provides methods for sending + * capability data to the agrirouter. + * + * @deprecated This class is deprecated since version 3.1.0 and will be removed in a future release. + * The environment parameter is no longer necessary to use the service. + * Please use the default constructor instead. + */ + @Deprecated(since = "3.1.0", forRemoval = true) + public SetCapabilityServiceImpl(Environment ignoredEnvironment) { + LOGGER.warn("This constructor is deprecated. The environment is not necessary to use the service. Within the next major release this constructor will be removed."); + this.encodeMessageService = new EncodeMessageServiceImpl(); + } + + public SetCapabilityServiceImpl() { this.encodeMessageService = new EncodeMessageServiceImpl(); } 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 e9b2264d..39492310 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 @@ -62,8 +62,7 @@ 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(); final SetCapabilitiesParameters setCapabilitiesParameters = new SetCapabilitiesParameters(); setCapabilitiesParameters.setApplicationId(communicationUnit.getApplicationId()); setCapabilitiesParameters.setCertificationVersionId( diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java index 8f5820f5..e0bea72f 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java @@ -4,7 +4,6 @@ import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken; import com.dke.data.agrirouter.api.enums.ContentMessageType; import com.dke.data.agrirouter.api.enums.SystemMessageType; -import com.dke.data.agrirouter.api.env.QA; import com.dke.data.agrirouter.api.service.messaging.encoding.DecodeMessageService; import com.dke.data.agrirouter.api.service.messaging.http.FetchMessageService; import com.dke.data.agrirouter.api.service.messaging.http.SetCapabilityService; @@ -32,8 +31,7 @@ class SetCapabilityServiceTest extends AbstractIntegrationTest { @Test void givenValidEndpointWhenSendingCapabilitiesTheCapabilityMessageShouldBeAccepted() throws Throwable { - SetCapabilityService setCapabilityService = new SetCapabilityServiceImpl(new QA() { - }); + SetCapabilityService setCapabilityService = new SetCapabilityServiceImpl(); var parameters = new SetCapabilitiesParameters(); parameters.setApplicationId(farmingSoftware.getApplicationId()); @@ -76,8 +74,7 @@ void givenValidEndpointWhenSendingCapabilitiesTheCapabilityMessageShouldBeAccept @Test void givenValidEndpointWhenSendingInvalidCapabilitiesTheCapabilityMessageShouldNotBeAccepted() throws Throwable { - SetCapabilityService setCapabilityService = new SetCapabilityServiceImpl(new QA() { - }); + SetCapabilityService setCapabilityService = new SetCapabilityServiceImpl(); var parameters = new SetCapabilitiesParameters(); parameters.setApplicationId(farmingSoftware.getApplicationId());