diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/HistController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/HistController.java index dc0bb84f6..4af1fc7fa 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/HistController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/HistController.java @@ -4,9 +4,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,11 +19,8 @@ import ru.spcex.clearing.backendapi.errors.ActionValidationException; import ru.spcex.clearing.backendapi.errors.BackEndError; import ru.spcex.clearing.backendapi.meta.GetResponseFactory; import ru.spcex.clearing.backendapi.service.IStateLoader; -import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.utils.enumeration.EnumMessage; import java.time.LocalDate; @@ -35,36 +30,20 @@ import java.util.Optional; @Controller @RequestMapping("/history") -public class HistController implements InitializingBean { - private final ImdgProvider imdgProviderHist; - private final ImdgProvider imdgProvider; +public class HistController { private final GetResponseFactory responseFactory; private final IStateLoader stateLoader; - private final ImdgPredicateBuilder pb; private final ConditionProvider conditionProvider; @Autowired - public HistController(@Qualifier("imdgProviderHist") ImdgProvider imdgProviderHist, - @Qualifier("imdgProvider") ImdgProvider imdgProvider, - GetResponseFactory responseFactory, - IStateLoader stateLoader, ConditionProvider conditionProvider) { - this.imdgProviderHist = imdgProviderHist; - this.imdgProvider = imdgProvider; + public HistController(GetResponseFactory responseFactory, + IStateLoader stateLoader, + ConditionProvider conditionProvider) { this.responseFactory = responseFactory; this.stateLoader = stateLoader; - this.pb = imdgProviderHist - .getImdg(IMDGDistributedNames.Map_SearchMoneyBalanceRegister, SpcexObjectBase.class) - .predicateBuilder(); this.conditionProvider = conditionProvider; } - @Override - public void afterPropertiesSet() throws Exception { - //will stuck of not provided - imdgProviderHist.waitAvailable(); - imdgProvider.waitAvailable(); - } - @ApiOperation(value = "Get history") @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) @RequestMapping(path = "/all", method = RequestMethod.POST)