diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java index 83c979967..51285c91b 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java @@ -10,18 +10,18 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.request.company.CompaniesRequest; +import ru.spcex.clearing.gatewayapi.controller.request.limit.LimitRequest; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.MMListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.response.CommonResponse; import ru.spcex.clearing.gatewayapi.exception.GatewayException; -import ru.spcex.clearing.gatewayapi.logic.CompanyProcessor; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Processor; import ru.spcex.clearing.gatewayapi.logic.listings_fond.FondListingsRequestParam; import ru.spcex.clearing.gatewayapi.logic.listings_mm.MMListingsRequestParam; -import ru.spcex.clearing.gatewayapi.request.CommonRequest; -import ru.spcex.clearing.gatewayapi.request.company.CompaniesRequest; -import ru.spcex.clearing.gatewayapi.request.limit.LimitRequest; -import ru.spcex.clearing.gatewayapi.request.listing.fond.FondListingsRequest; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.MMListingsRequest; -import ru.spcex.clearing.gatewayapi.response.CommonResponse; +import ru.spcex.clearing.gatewayapi.service.CompanyProcessor; import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.IMessageResolver; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/CommonRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java similarity index 98% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/CommonRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java index cce0123b0..16eb19087 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/CommonRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request; +package ru.spcex.clearing.gatewayapi.controller.request; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/OutboundRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/OutboundRequest.java similarity index 98% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/OutboundRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/OutboundRequest.java index b16c1bbf2..09986358a 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/OutboundRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/OutboundRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request; +package ru.spcex.clearing.gatewayapi.controller.request; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithCompanyId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithCompanyId.java similarity index 59% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithCompanyId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithCompanyId.java index 498d8694d..04a810875 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithCompanyId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithCompanyId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request; +package ru.spcex.clearing.gatewayapi.controller.request; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithMapId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithMapId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java index fff013689..37a912087 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/WithMapId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request; +package ru.spcex.clearing.gatewayapi.controller.request; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Client.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java similarity index 91% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Client.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java index ea56c7f08..2634958ea 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Client.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompaniesRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompaniesRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java index 68486c42a..f358e1bf8 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompaniesRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Company.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Company.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java index 103e7872a..0ffad9f2a 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Company.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyClearingCategory.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyClearingCategory.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java index ef9e0963d..dfcedfd86 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyClearingCategory.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyInfo.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyInfo.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java index f717582b8..0cc04335f 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanyInfo.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanySymbols.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java similarity index 93% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanySymbols.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java index cbf2b4411..e49573c86 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/CompanySymbols.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Contact.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java similarity index 89% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Contact.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java index 0722c24ec..0ab5ba6c2 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/Contact.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/ProfileDocument.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/ProfileDocument.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java index 502a0503f..44c3fc3a2 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/company/ProfileDocument.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.request.company; +package ru.spcex.clearing.gatewayapi.controller.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.time.LocalDate; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/limit/LimitRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/limit/LimitRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java index 8c471ef3b..6cb98ae75 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/limit/LimitRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.limit; +package ru.spcex.clearing.gatewayapi.controller.request.limit; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/CouponSchedule.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/CouponSchedule.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java index f98cbc415..d16e15be1 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/CouponSchedule.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Currency.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Currency.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java index f1f203d3a..b4e7e0946 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Currency.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondListingsRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondListingsRequest.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondListingsRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondListingsRequest.java index 1199a34a0..ca9583239 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondListingsRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondListingsRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondSecurity.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java similarity index 98% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondSecurity.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java index d6a49bc79..14b40d581 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/FondSecurity.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IncomeListing.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IncomeListing.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java index 83987cd32..5762f16cb 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IncomeListing.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompany.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompany.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java index 2dc198bd4..9c7f9e63b 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompany.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanyInfo.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanyInfo.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java index 516568318..5069b79b1 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanyInfo.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanySymbols.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanySymbols.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java index 8643e12cc..6cbf7b160 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerCompanySymbols.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerContact.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerContact.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java index bc8b66332..15ebab821 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/IssuerContact.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Nominal.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Nominal.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java index ce6c6175a..55aba7bcf 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/fond/Nominal.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirAuctionBiddingType.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirAuctionBiddingType.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java index 89c007a09..49dc7ef4c 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirAuctionBiddingType.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirCurrencyCode.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirCurrencyCode.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirCurrencyCode.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirCurrencyCode.java index 6401dff7f..8be356f03 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirCurrencyCode.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirCurrencyCode.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirTradingModeMkr.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirTradingModeMkr.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirTradingModeMkr.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirTradingModeMkr.java index 4beb95260..c16665c7c 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/DirTradingModeMkr.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirTradingModeMkr.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/ExchangeInstrument.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java similarity index 99% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/ExchangeInstrument.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java index 3e324c024..5d2fdb756 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/ExchangeInstrument.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.config.deserializers.LocalDateDeserializer; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/MMListingsRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/MMListingsRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java index 0c5d7f6c7..fead7c883 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/MMListingsRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/TradingMode.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/TradingMode.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java index 49a095200..8bb385a2e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/request/listing/mkr/TradingMode.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/response/CommonResponse.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/response/CommonResponse.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java index 8b63e4a8f..63fd4e0f4 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/response/CommonResponse.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.response; +package ru.spcex.clearing.gatewayapi.controller.response; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestType.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/enums/OutboundRequestType.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestType.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/enums/OutboundRequestType.java index e78cfee17..fb1f01acc 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestType.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/enums/OutboundRequestType.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.service; +package ru.spcex.clearing.gatewayapi.enums; import ru.spcex.platform.utils.enumeration.IEnumKey; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/exception/GatewayException.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/exception/GatewayException.java index 902d1dc17..65219bc20 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/exception/GatewayException.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/exception/GatewayException.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.gatewayapi.exception; +import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; import ru.spcex.clearing.gatewayapi.errors.GatewayError; -import ru.spcex.clearing.gatewayapi.request.CommonRequest; public class GatewayException extends RuntimeException { private final CommonRequest incomeRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/FondListingsRequestParam.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/FondListingsRequestParam.java index 18b14c8c2..90ba814ff 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/FondListingsRequestParam.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/FondListingsRequestParam.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.gatewayapi.logic.listings_fond; -import ru.spcex.clearing.gatewayapi.request.listing.fond.FondListingsRequest; -import ru.spcex.clearing.gatewayapi.request.listing.fond.FondSecurity; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IssuerCompany; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondSecurity; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerCompany; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIncomeSecurities.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIncomeSecurities.java index 07844031d..90012f58c 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIncomeSecurities.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIncomeSecurities.java @@ -2,10 +2,10 @@ package ru.spcex.clearing.gatewayapi.logic.listings_fond; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.*; import ru.spcex.clearing.gatewayapi.errors.GatewayError; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.fond.*; import java.util.HashMap; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIssuerCompanies.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIssuerCompanies.java index bb158ec69..10a6c51f0 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIssuerCompanies.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIssuerCompanies.java @@ -2,9 +2,9 @@ package ru.spcex.clearing.gatewayapi.logic.listings_fond; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.*; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.fond.*; import java.util.HashMap; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToCompanyServiceWithIssuerCompanies.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToCompanyServiceWithIssuerCompanies.java index d0e58b49c..d43764167 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToCompanyServiceWithIssuerCompanies.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToCompanyServiceWithIssuerCompanies.java @@ -3,12 +3,12 @@ package ru.spcex.clearing.gatewayapi.logic.listings_fond; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.clearing.classes.statics.data.company.Company; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerCompany; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerCompanyInfo; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerCompanySymbols; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerContact; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IssuerCompany; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IssuerCompanyInfo; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IssuerCompanySymbols; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IssuerContact; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.company.*; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java index a81043726..235048727 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java @@ -6,12 +6,12 @@ import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity; import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.CouponSchedule; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondSecurity; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IncomeListing; +import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.Nominal; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.fond.CouponSchedule; -import ru.spcex.clearing.gatewayapi.request.listing.fond.FondSecurity; -import ru.spcex.clearing.gatewayapi.request.listing.fond.IncomeListing; -import ru.spcex.clearing.gatewayapi.request.listing.fond.Nominal; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.*; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/MMListingsRequestParam.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/MMListingsRequestParam.java index fec6081ac..b04b797b0 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/MMListingsRequestParam.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/MMListingsRequestParam.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.gatewayapi.logic.listings_mm; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.ExchangeInstrument; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.MMListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.ExchangeInstrument; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.MMListingsRequest; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/PrepareExchangeInstruments.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/PrepareExchangeInstruments.java index 23d49c977..1bd30ae07 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/PrepareExchangeInstruments.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/PrepareExchangeInstruments.java @@ -2,13 +2,13 @@ package ru.spcex.clearing.gatewayapi.logic.listings_mm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.DirAuctionBiddingType; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.DirTradingModeMkr; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.ExchangeInstrument; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.TradingMode; import ru.spcex.clearing.gatewayapi.errors.GatewayError; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.DirAuctionBiddingType; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.DirTradingModeMkr; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.ExchangeInstrument; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.TradingMode; import java.util.HashMap; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/SendMessageToSecurityServiceWithMMSecurities.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/SendMessageToSecurityServiceWithMMSecurities.java index 3fbad94c6..34f8ddc7e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/SendMessageToSecurityServiceWithMMSecurities.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_mm/SendMessageToSecurityServiceWithMMSecurities.java @@ -1,8 +1,8 @@ package ru.spcex.clearing.gatewayapi.logic.listings_mm; +import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.ExchangeInstrument; import ru.spcex.clearing.gatewayapi.logic.ProcessResult; import ru.spcex.clearing.gatewayapi.logic.Stage; -import ru.spcex.clearing.gatewayapi.request.listing.mkr.ExchangeInstrument; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityUpdateRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/CompanyProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/CompanyProcessor.java similarity index 93% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/CompanyProcessor.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/CompanyProcessor.java index 08767360d..fe07899a9 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/CompanyProcessor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/CompanyProcessor.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.logic; +package ru.spcex.clearing.gatewayapi.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.logic.adapter.CompanyRequestAdapter; -import ru.spcex.clearing.gatewayapi.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.request.company.*; +import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.request.company.*; +import ru.spcex.clearing.gatewayapi.service.adapter.CompanyRequestAdapter; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyGatewayRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index 421bde173..e2223e9d5 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -11,7 +11,9 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import ru.spcex.clearing.gatewayapi.config.GatewayApiSettings; import ru.spcex.clearing.gatewayapi.config.InboundServerSettings; -import ru.spcex.clearing.gatewayapi.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.controller.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.enums.OutboundRequestType; +import ru.spcex.clearing.gatewayapi.service.builders.OutboundRequestBuilder; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/adapter/CompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/adapter/CompanyRequestAdapter.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java index 3504519c4..4791ea2cc 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/adapter/CompanyRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java @@ -1,7 +1,7 @@ -package ru.spcex.clearing.gatewayapi.logic.adapter; +package ru.spcex.clearing.gatewayapi.service.adapter; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.request.company.*; +import ru.spcex.clearing.gatewayapi.controller.request.company.*; import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.*; import ru.spcex.platform.enumeration.CompanySymbol; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestBuilder.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java similarity index 85% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestBuilder.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java index 3dc13f35a..533416775 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OutboundRequestBuilder.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java @@ -1,6 +1,7 @@ -package ru.spcex.clearing.gatewayapi.service; +package ru.spcex.clearing.gatewayapi.service.builders; -import ru.spcex.clearing.gatewayapi.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.controller.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.enums.OutboundRequestType; import java.time.Instant; import java.util.Map;