X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fvesagent%2Fmapper%2FMapperRequestSender.java;h=fa66da9bfcaba4e96c5828519e02b9e66dec340e;hb=76744e810f35c84ecbd1d9998e361052466e9483;hp=37d8729b412d922a4231c3129ada938bdfebedce;hpb=ce4e2d38e3d42725f61c39dd172325d2def4bc44;p=oam%2Ftr069-adapter.git diff --git a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/mapper/MapperRequestSender.java b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/mapper/MapperRequestSender.java index 37d8729..fa66da9 100644 --- a/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/mapper/MapperRequestSender.java +++ b/ves-agent/src/main/java/org/commscope/tr069adapter/vesagent/mapper/MapperRequestSender.java @@ -16,49 +16,44 @@ * ===============LICENSE_END======================================================================= */ -package org.commscope.tr069adapter.vesagent.mapper; - -import java.util.concurrent.Future; - -import org.commscope.tr069adapter.acs.common.DeviceRPCRequest; -import org.commscope.tr069adapter.acs.common.DeviceRPCResponse; -import org.commscope.tr069adapter.vesagent.VesConfiguration; -import org.commscope.tr069adapter.vesagent.async.WaitForNotifications; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.AsyncResult; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -@Component -// @EnableAsync -public class MapperRequestSender { - private static final Logger LOG = LoggerFactory.getLogger(MapperRequestSender.class); - private RestTemplate restTemplate = new RestTemplate(); - - @Autowired - VesConfiguration config; - - @Autowired - WaitForNotifications waitForNotifications; - - // public DeviceRPCResponse sendRequest(DeviceRPCRequest deviceRPCRequest) { - // return restTemplate.postForObject(config.getMapperPath(), deviceRPCRequest, - // DeviceRPCResponse.class); - // } - - @Async("threadPoolTaskExecutor2") - public Future sendRequest(DeviceRPCRequest deviceRPCRequest) { - LOG.info("Sending device connectivity request to ACS for device {}", - deviceRPCRequest.getDeviceDetails().getDeviceId()); - DeviceRPCResponse response = restTemplate.postForObject(config.getMapperPath(), - deviceRPCRequest, DeviceRPCResponse.class); - - waitForNotifications.notifyResult(response); - - return new AsyncResult<>(response); - } - -} +package org.commscope.tr069adapter.vesagent.mapper; + +import java.util.concurrent.Future; + +import org.commscope.tr069adapter.acs.common.DeviceRPCRequest; +import org.commscope.tr069adapter.acs.common.DeviceRPCResponse; +import org.commscope.tr069adapter.vesagent.VesConfiguration; +import org.commscope.tr069adapter.vesagent.async.WaitForNotifications; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.AsyncResult; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +@Component +// @EnableAsync +public class MapperRequestSender { + private static final Logger LOG = LoggerFactory.getLogger(MapperRequestSender.class); + private RestTemplate restTemplate = new RestTemplate(); + + @Autowired + VesConfiguration config; + + @Autowired + WaitForNotifications waitForNotifications; + + @Async("threadPoolTaskExecutor2") + public Future sendRequest(DeviceRPCRequest deviceRPCRequest) { + LOG.info("Sending device connectivity request to ACS for device {}", + deviceRPCRequest.getDeviceDetails().getDeviceId()); + DeviceRPCResponse response = restTemplate.postForObject(config.getMapperPath(), + deviceRPCRequest, DeviceRPCResponse.class); + + waitForNotifications.notifyResult(response); + + return new AsyncResult<>(response); + } + +}