diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/BeanConfiguration.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/BeanConfiguration.java index edd2cde73..0a228687e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/BeanConfiguration.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/BeanConfiguration.java @@ -1,10 +1,12 @@ package ru.spcex.clearing.gatewayapi.config; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; -import ru.spcex.clearing.gatewayapi.controller.request.operations.SentAsset; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.operations.SentAsset; import ru.spcex.clearing.gatewayapi.errors.GatewayError; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.services.IMDGMessageResolver; @@ -41,4 +43,12 @@ public class BeanConfiguration { public Map> sentAssets() { return new ConcurrentHashMap<>(); } + + @Bean + public ObjectMapper objectMapper() { + return new ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + } + + } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java index d89e04bff..9d4d75f0d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java @@ -6,10 +6,8 @@ import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.util.StreamUtils; import java.io.IOException; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; public class LoggingInterceptor implements ClientHttpRequestInterceptor { @@ -23,9 +21,6 @@ public class LoggingInterceptor implements ClientHttpRequestInterceptor { log.info("Request URI: {}, Request method: {} , Request headers: {}", request.getURI(), request.getMethod(), request.getHeaders()); log.info("Request body: " + new String(body, StandardCharsets.UTF_8)); - ClientHttpResponse response = execution.execute(request, body); - log.info("Response status code: " + response.getStatusCode()); - log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset())); - return response; + return execution.execute(request, body); } } \ No newline at end of file diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java index f92c5ab3f..675ce2e1d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java @@ -19,12 +19,13 @@ public class RestTemplateConfig { } @Bean("rest-template") - public RestTemplate restTemplate() { + public RestTemplate restTemplate(RestTemplateErrorHandler restTemplateErrorHandler) { RestTemplate restTemplate = builder .setConnectTimeout(Duration.ofMillis(10000)) .setReadTimeout(Duration.ofMillis(40000)) .build(); restTemplate.setInterceptors(Collections.singletonList(new LoggingInterceptor())); + restTemplate.setErrorHandler(restTemplateErrorHandler); return restTemplate; } } \ No newline at end of file diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java new file mode 100644 index 000000000..76df0fb33 --- /dev/null +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.gatewayapi.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.util.StreamUtils; +import org.springframework.web.client.ResponseErrorHandler; +import ru.spcex.clearing.gatewayapi.controller.outbound.response.ErrorResponse; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest; +import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.ObjectType; +import ru.spcex.platform.enumeration.Priority; + +import java.io.IOException; +import java.nio.charset.Charset; + +@Component +public class RestTemplateErrorHandler implements ResponseErrorHandler { + private final Logger log = LoggerFactory.getLogger(getClass()); + private final KafkaSender kafaSender; + private final ObjectMapper objectMapper; + + public RestTemplateErrorHandler(KafkaSender kafaSender, + ObjectMapper objectMapper) { + this.kafaSender = kafaSender; + this.objectMapper = objectMapper; + } + + @Override + public boolean hasError(ClientHttpResponse response) throws IOException { + return response.getStatusCode().is4xxClientError() || response.getStatusCode().is5xxServerError(); + } + + @Override + public void handleError(ClientHttpResponse response) throws IOException { + String responseErrorBody = StreamUtils.copyToString(response.getBody(), Charset.defaultCharset()); + log.info("Response error status code: " + response.getStatusCode()); + log.info("Response error body: " + responseErrorBody); + ErrorResponse errorResponse = objectMapper.readValue(responseErrorBody, ErrorResponse.class); + String errorMessage; + if (StringUtils.isEmpty(errorResponse.getMessage())) { + String error = (String) errorResponse.getUnknownProperties().get("error"); + errorMessage = String.format("Error: %s", error); + } else { + errorMessage = errorResponse.getMessage(); + } + NotificationNewRequest notificationNewRequest = createNotification(errorMessage); + kafaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, notificationNewRequest); + } + + private NotificationNewRequest createNotification(String message) { + NotificationNewRequest request = new NotificationNewRequest(); + request.setObjectType(ObjectType.gateway.getKey()); + request.setPriority(Priority.LOW.getKey()); + request.setComment(String.format("Ошибка : %s", message)); + return request; + } +} 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 866476cc9..39d5e65f0 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,13 +10,13 @@ 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.request.operations.OperationsRequest; -import ru.spcex.clearing.gatewayapi.controller.response.CommonResponse; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.company.CompaniesRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.limit.LimitRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.FondListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr.MMListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.operations.OperationsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.response.CommonResponse; import ru.spcex.clearing.gatewayapi.exception.GatewayException; import ru.spcex.clearing.gatewayapi.service.OperationService; import ru.spcex.clearing.gatewayapi.service.processor.CompanyProcessor; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/CommonRequest.java similarity index 98% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/CommonRequest.java index 9a9ef6c35..f48e95a1c 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/CommonRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/CommonRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/WithCompanyId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithCompanyId.java similarity index 56% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithCompanyId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithCompanyId.java index 04a810875..7d3ab7808 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithCompanyId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithCompanyId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.inbound.request; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithIssuerId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithIssuerId.java similarity index 56% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithIssuerId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithIssuerId.java index 80c5e0eaa..706bdfda7 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithIssuerId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithIssuerId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.inbound.request; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithMapId.java similarity index 93% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithMapId.java index 37a912087..8a91122fa 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithMapId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithMapId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/WithSecurityId.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithSecurityId.java similarity index 57% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithSecurityId.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithSecurityId.java index 410c67378..ddf023e42 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/WithSecurityId.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/WithSecurityId.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.inbound.request; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Client.java similarity index 90% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Client.java index 2634958ea..e8bfade05 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Client.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Client.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompaniesRequest.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompaniesRequest.java index f358e1bf8..2a2bab549 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompaniesRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompaniesRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Company.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Company.java index 3f4774c68..87caa4036 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Company.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Company.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyClearingCategory.java similarity index 91% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyClearingCategory.java index dfcedfd86..3a3fe5a8d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyClearingCategory.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyClearingCategory.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java index 0cc04335f..c56a76148 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanyInfo.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanyInfo.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanySymbols.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanySymbols.java index e49573c86..b06d23877 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/CompanySymbols.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/CompanySymbols.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Contact.java similarity index 88% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Contact.java index 0ab5ba6c2..f8e23732d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/Contact.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/Contact.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/ProfileDocument.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/ProfileDocument.java index 44c3fc3a2..6c9d927bb 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/company/ProfileDocument.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/company/ProfileDocument.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.controller.request.company; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.time.LocalDate; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/limit/LimitRequest.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/limit/LimitRequest.java index 6cb98ae75..81905185d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/limit/LimitRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/limit/LimitRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.limit; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.limit; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/CouponSchedule.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/CouponSchedule.java index 5a4ad2505..095af098a 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/CouponSchedule.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/CouponSchedule.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithMapId; -import ru.spcex.clearing.gatewayapi.controller.request.WithSecurityId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithSecurityId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Currency.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Currency.java index b4e7e0946..7a96f45ec 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Currency.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Currency.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/listing/fond/FondListingsRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondListingsRequest.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondListingsRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondListingsRequest.java index ca9583239..078ae9c48 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondListingsRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondListingsRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondSecurity.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondSecurity.java index 63821798f..6d6ceab13 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/FondSecurity.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithIssuerId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithIssuerId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IncomeListing.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IncomeListing.java index 96c2625de..440c2906d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IncomeListing.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IncomeListing.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithMapId; -import ru.spcex.clearing.gatewayapi.controller.request.WithSecurityId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithSecurityId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompany.java similarity index 93% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompany.java index 818de629a..7b7705dac 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompany.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompanySymbols.java similarity index 91% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompanySymbols.java index fd28e8538..60e7b2d62 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanySymbols.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerCompanySymbols.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerContact.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerContact.java index e604a8d8e..5d934c253 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerContact.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/IssuerContact.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Nominal.java similarity index 91% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Nominal.java index 851e2616b..c4c205515 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/Nominal.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/fond/Nominal.java @@ -1,12 +1,12 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithMapId; -import ru.spcex.clearing.gatewayapi.controller.request.WithSecurityId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithSecurityId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirAuctionBiddingType.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirAuctionBiddingType.java index 49dc7ef4c..a52d91520 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirAuctionBiddingType.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirAuctionBiddingType.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/listing/mkr/DirCurrencyCode.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirCurrencyCode.java similarity index 91% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirCurrencyCode.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirCurrencyCode.java index 8be356f03..584b92593 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirCurrencyCode.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirCurrencyCode.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/listing/mkr/DirTradingModeMkr.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirTradingModeMkr.java similarity index 96% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirTradingModeMkr.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirTradingModeMkr.java index c16665c7c..d6fc84eed 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/DirTradingModeMkr.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/DirTradingModeMkr.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/listing/mkr/ExchangeInstrument.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/ExchangeInstrument.java similarity index 98% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/ExchangeInstrument.java index 1833a9ccc..5a9975273 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/ExchangeInstrument.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr; 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.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/MMListingsRequest.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/MMListingsRequest.java index fead7c883..7220a311c 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/MMListingsRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/MMListingsRequest.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.CommonRequest; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/TradingMode.java similarity index 94% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/TradingMode.java index 8bb385a2e..25050df2b 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/TradingMode.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/listing/mkr/TradingMode.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; +package ru.spcex.clearing.gatewayapi.controller.inbound.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.controller.request.WithMapId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithMapId; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/OperationsRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/OperationsRequest.java similarity index 90% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/OperationsRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/OperationsRequest.java index 01d412d9e..41a9a3d24 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/OperationsRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/OperationsRequest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.operations; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.operations; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/SentAsset.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java similarity index 92% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/SentAsset.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java index d98d7c74c..43750f486 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/operations/SentAsset.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.request.operations; +package ru.spcex.clearing.gatewayapi.controller.inbound.request.operations; import java.util.UUID; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/response/CommonResponse.java similarity index 97% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/response/CommonResponse.java index 63fd4e0f4..612300408 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/response/CommonResponse.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/response/CommonResponse.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.gatewayapi.controller.response; +package ru.spcex.clearing.gatewayapi.controller.inbound.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/controller/request/OutboundRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/request/OutboundRequest.java similarity index 95% rename from clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/OutboundRequest.java rename to clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/request/OutboundRequest.java index 09986358a..f32281507 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/OutboundRequest.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/request/OutboundRequest.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.gatewayapi.controller.request; +package ru.spcex.clearing.gatewayapi.controller.outbound.request; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.gatewayapi.config.deserializers.InstantDeserializer; +import ru.spcex.clearing.gatewayapi.config.deserializers.InstantWithMillisDeserializer; import ru.spcex.clearing.gatewayapi.config.serializers.InstantWithMillisSerializer; import java.time.Instant; @@ -34,7 +34,7 @@ public class OutboundRequest { private String type; @JsonProperty("datetime") - @JsonDeserialize(using = InstantDeserializer.class) + @JsonDeserialize(using = InstantWithMillisDeserializer.class) @JsonSerialize(using = InstantWithMillisSerializer.class) @ApiModelProperty( value = "Передавать дату и время формирования JSON объекта в формате «ДД.ММ.ГГГГ ЧЧ:ММ:СС:ссс».", diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/ErrorResponse.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/ErrorResponse.java new file mode 100644 index 000000000..ab67bbe2a --- /dev/null +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/ErrorResponse.java @@ -0,0 +1,52 @@ +package ru.spcex.clearing.gatewayapi.controller.outbound.response; + +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class ErrorResponse { + @JsonProperty("id") + private UUID id; + @JsonProperty("message") + private String message; + + @JsonIgnore + private final Map unknownProperties = new HashMap<>(); + + @JsonAnySetter + public void add(String key, Object value) { + unknownProperties.put(key, value); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Map getUnknownProperties() { + return unknownProperties; + } + + @Override + public String toString() { + return "ErrorResponse{" + + "id=" + id + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/SuccessResponse.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/SuccessResponse.java new file mode 100644 index 000000000..fa37b912a --- /dev/null +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/outbound/response/SuccessResponse.java @@ -0,0 +1,74 @@ +package ru.spcex.clearing.gatewayapi.controller.outbound.response; + +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import ru.spcex.clearing.gatewayapi.config.deserializers.InstantWithMillisDeserializer; + +import java.time.Instant; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class SuccessResponse { + @JsonProperty("id") + private UUID id; + @JsonProperty("datetime") + @JsonDeserialize(using = InstantWithMillisDeserializer.class) + private Instant datetime; + @JsonProperty("section") + private String section; + @JsonProperty("type") + private String type; + @JsonIgnore + private final Map unknownProperties = new HashMap<>(); + + @JsonAnySetter + public void add(String key, Object value) { + unknownProperties.put(key, value); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Instant getDatetime() { + return datetime; + } + + public void setDatetime(Instant datetime) { + this.datetime = datetime; + } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + + @Override + public String toString() { + return "SuccessResponse{" + + "id=" + id + + ", datetime=" + datetime + + ", section='" + section + '\'' + + ", type='" + type + '\'' + + ", unknownProperties=" + unknownProperties + + '}'; + } +} diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java deleted file mode 100644 index 374da281b..000000000 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompanyInfo.java +++ /dev/null @@ -1,116 +0,0 @@ -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.controller.request.WithCompanyId; - -import java.util.UUID; - - -@ApiModel("Профиль компании эмитента") -public class IssuerCompanyInfo implements WithCompanyId { - @JsonProperty("company_id") - @ApiModelProperty( - value = "Ссылка на company", - example = "ef47f76c-bcea-11ed-afa1-0242ac120003" - ) - private UUID companyId; - - @JsonProperty("country_code") - @ApiModelProperty(value = "RUS", example = "RUS") - private String countryCode; - - @JsonProperty("legal_kind") - @ApiModelProperty(value = "JURD", example = "JURD") - private String legalKind; - - @JsonProperty("organization_type") - @ApiModelProperty( - value = """ - «CRED», если Основные сведения\\Кредитная организация = true - «NCRD», если Основные сведения\\Кредитная организация = false - """, - example = "CRED" - ) - private String organizationType; - - @JsonProperty("residence") - @ApiModelProperty( - value = "Резиденция. Трехсимвольный код страны из классификатора ОКСМ.", - example = "RUS" - ) - private String residence; - - @JsonProperty("short_name_eng") - @ApiModelProperty( - value = "Основные сведения\\Сокращенное наименование на английском языке", - example = "VTB (PJSC)" - ) - private String shortNameEng; - - @JsonProperty("full_name_eng") - @ApiModelProperty( - value = "Основные сведения\\Полное наименование на английском языке", - example = "VTB (public joint stock company)" - ) - private String fullNameEng; - - @Override - public UUID getCompanyId() { - return companyId; - } - - public void setCompanyId(UUID companyId) { - this.companyId = companyId; - } - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public String getLegalKind() { - return legalKind; - } - - public void setLegalKind(String legalKind) { - this.legalKind = legalKind; - } - - public String getOrganizationType() { - return organizationType; - } - - public void setOrganizationType(String organizationType) { - this.organizationType = organizationType; - } - - public String getResidence() { - return residence; - } - - public void setResidence(String residence) { - this.residence = residence; - } - - public String getShortNameEng() { - return shortNameEng; - } - - public void setShortNameEng(String shortNameEng) { - this.shortNameEng = shortNameEng; - } - - public String getFullNameEng() { - return fullNameEng; - } - - public void setFullNameEng(String fullNameEng) { - this.fullNameEng = fullNameEng; - } - -} 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 65219bc20..1a1297f7d 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,7 +1,7 @@ package ru.spcex.clearing.gatewayapi.exception; -import ru.spcex.clearing.gatewayapi.controller.request.CommonRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.CommonRequest; import ru.spcex.clearing.gatewayapi.errors.GatewayError; public class GatewayException extends RuntimeException { 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 d723eb82d..c9f6deb84 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 @@ -9,12 +9,12 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.*; import org.springframework.stereotype.Service; -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.controller.request.OutboundRequest; -import ru.spcex.clearing.gatewayapi.controller.request.operations.SentAsset; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.operations.SentAsset; +import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.controller.outbound.response.SuccessResponse; import ru.spcex.clearing.gatewayapi.enums.OutboundRequestType; import ru.spcex.clearing.gatewayapi.service.builders.OutboundRequestBuilder; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -88,9 +88,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean { .build(); HttpEntity request = makeDefaultRequest(outboundFondRequest); - ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, Map.class); - Map bodyResponse = response.getBody(); - log.debug("LOCM task complete, response from : {}", bodyResponse); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class); + SuccessResponse bodyResponse = response.getBody(); + log.debug("LOCM task complete, success response : {}", bodyResponse); } public void requestOnLimit(BaseRequest userRequest) { @@ -106,14 +106,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean { .build(); HttpEntity request = makeDefaultRequest(outboundFondRequest); - try { - ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, Map.class); - Map bodyResponse = response.getBody(); - log.debug("Limit request complete, response: {}", bodyResponse); - } catch (HttpClientErrorException httpClientErrorException) { - //ignore -// log.warn(""); - } + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class); + SuccessResponse bodyResponse = response.getBody(); + log.debug("Limit request complete, success response: {}", bodyResponse); } public void requestOnDemandSecurity(BaseRequest userRequest) { @@ -139,12 +134,12 @@ public class GatewayService extends QueueConsumer implements InitializingBean { HttpEntity requestFond = makeDefaultRequest(outboundFondRequest); HttpEntity requestMKR = makeDefaultRequest(outboundMkrRequest); - ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, requestFond, Map.class); - Map bodyResponse = response.getBody(); - log.debug("LOSC task 1/2 complete (FOND section), response: {}", bodyResponse); - response = restTemplate.exchange(url, HttpMethod.POST, requestMKR, Map.class); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, requestFond, SuccessResponse.class); + SuccessResponse bodyResponse = response.getBody(); + log.debug("LOSC task 1/2 complete (FOND section), success response: {}", bodyResponse); + response = restTemplate.exchange(url, HttpMethod.POST, requestMKR, SuccessResponse.class); bodyResponse = response.getBody(); - log.debug("LOSC task 2/2 complete (MKR section), response: {}", bodyResponse); + log.debug("LOSC task 2/2 complete (MKR section), success response: {}", bodyResponse); } public void requestOnAsset(BaseRequest request) { diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/IssueCompanyService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/IssueCompanyService.java index 462cd0de3..91e4070d8 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/IssueCompanyService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/IssueCompanyService.java @@ -3,11 +3,11 @@ package ru.spcex.clearing.gatewayapi.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondListingsRequest; -import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.IssuerCompany; -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.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.FondListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerCompany; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerCompanySymbols; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerContact; import ru.spcex.clearing.gatewayapi.service.adapter.IssuerCompanyRequestAdapter; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.ContactNewRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java index 5de2e4f3e..ac9af505d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java @@ -2,8 +2,8 @@ package ru.spcex.clearing.gatewayapi.service; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.operations.OperationsRequest; -import ru.spcex.clearing.gatewayapi.controller.request.operations.SentAsset; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.operations.OperationsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.operations.SentAsset; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.gateway.AssetOperationApprovalRequest; import ru.spcex.clearing.platform.messaging.domain.cud.gateway.SingleAssetResponse; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/SecurityService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/SecurityService.java index 251889646..9b3902494 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/SecurityService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/SecurityService.java @@ -3,8 +3,8 @@ package ru.spcex.clearing.gatewayapi.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.WithSecurityId; -import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.*; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithSecurityId; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.*; import ru.spcex.clearing.gatewayapi.service.adapter.SecurityRequestAdapter; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.company.EquitySecurityGatewayRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/CompanyRequestAdapter.java index 4791ea2cc..f49255a17 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/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.service.adapter; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.company.*; +import ru.spcex.clearing.gatewayapi.controller.inbound.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/adapter/IssuerCompanyRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/IssuerCompanyRequestAdapter.java index 5a893b42b..39a74cffc 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/IssuerCompanyRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/IssuerCompanyRequestAdapter.java @@ -1,10 +1,10 @@ package ru.spcex.clearing.gatewayapi.service.adapter; import org.springframework.stereotype.Service; -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.controller.inbound.request.listing.fond.IssuerCompany; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerCompanyInfo; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerCompanySymbols; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IssuerContact; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java index 8c84cbf4c..e7c31701d 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/MoneyMarketSecurityRequestAdapter.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.gatewayapi.service.adapter; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.ExchangeInstrument; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr.ExchangeInstrument; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest; import ru.spcex.platform.enumeration.InstrumentType; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java index 85d398cef..2cbc428f3 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/SecurityRequestAdapter.java @@ -1,10 +1,10 @@ package ru.spcex.clearing.gatewayapi.service.adapter; import org.springframework.stereotype.Service; -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.controller.inbound.request.listing.fond.CouponSchedule; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.FondSecurity; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.IncomeListing; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.Nominal; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.*; @Service diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java index 8a15a5ac9..6d7c1f853 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java @@ -1,6 +1,6 @@ package ru.spcex.clearing.gatewayapi.service.builders; -import ru.spcex.clearing.gatewayapi.controller.request.OutboundRequest; +import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest; import ru.spcex.clearing.gatewayapi.enums.OutboundRequestType; import java.time.Instant; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java index 2b01e083b..823ae9bd8 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java @@ -3,8 +3,8 @@ package ru.spcex.clearing.gatewayapi.service.processor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.WithCompanyId; -import ru.spcex.clearing.gatewayapi.controller.request.company.*; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.WithCompanyId; +import ru.spcex.clearing.gatewayapi.controller.inbound.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; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingFondProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingFondProcessor.java index f33211bd0..73fac2122 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingFondProcessor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingFondProcessor.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.gatewayapi.service.processor; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.listing.fond.FondListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.fond.FondListingsRequest; import ru.spcex.clearing.gatewayapi.service.IssueCompanyService; import ru.spcex.clearing.gatewayapi.service.SecurityService; diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java index e11370aee..46310e0a6 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/ListingMMProcessor.java @@ -3,8 +3,8 @@ package ru.spcex.clearing.gatewayapi.service.processor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.ExchangeInstrument; -import ru.spcex.clearing.gatewayapi.controller.request.listing.mkr.MMListingsRequest; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr.ExchangeInstrument; +import ru.spcex.clearing.gatewayapi.controller.inbound.request.listing.mkr.MMListingsRequest; import ru.spcex.clearing.gatewayapi.service.adapter.MoneyMarketSecurityRequestAdapter; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest; diff --git a/clearing-parent/gateway-api/src/main/resources/application.properties b/clearing-parent/gateway-api/src/main/resources/application.properties index 0b44aca31..758d6cd26 100644 --- a/clearing-parent/gateway-api/src/main/resources/application.properties +++ b/clearing-parent/gateway-api/src/main/resources/application.properties @@ -6,18 +6,18 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=DEBUG spring.main.web-application-type=servlet gateway-api.example-setting=test -gateway-api.hazelcast.cluster-members=127.0.0.1:5701 +gateway-api.hazelcast.cluster-members=10.200.200.183:5701 gateway-api.hazelcast.login=dev gateway-api.hazelcast.password=dev-pass -gateway-api.kafka-producer.bootstrap-servers=localhost:9092 +gateway-api.kafka-producer.bootstrap-servers=127.0.0.1:9092 gateway-api.kafka-producer.acks=all gateway-api.kafka-producer.retries=0 gateway-api.kafka-producer.batch-size=16384 gateway-api.kafka-producer.linger-ms=1 gateway-api.kafka-producer.buffer-memory=33554432 -gateway-api.kafka-consumer.bootstrap-servers=localhost:9092 +gateway-api.kafka-consumer.bootstrap-servers=127.0.0.1:9092 gateway-api.kafka-consumer.group-id=dev-group-gateway-api gateway-api.kafka-consumer.enable-auto-commit=true gateway-api.kafka-consumer.session-timeout-ms=30000 @@ -26,7 +26,7 @@ gateway-api.kafka-consumer.linger-ms=1 gateway-api.kafka-consumer.buffer-memory=33554432 gateway-api.inbound-server.enable-ssl=false -gateway-api.inbound-server.host=localhost -gateway-api.inbound-server.port=8080 -gateway-api.inbound-server.pathLOCM=test_tomcat9/p1 -gateway-api.inbound-server.pathLOSC=test_tomcat9/p2 \ No newline at end of file +gateway-api.inbound-server.host=10.200.200.183 +gateway-api.inbound-server.port=8084 +gateway-api.inbound-server.pathLOCM=/test_rest/inbound_request +gateway-api.inbound-server.pathLOSC=/test_rest/inbound_request \ No newline at end of file diff --git a/clearing-parent/securities-service/src/main/resources/application.properties b/clearing-parent/securities-service/src/main/resources/application.properties index 1fae05658..0160153ca 100644 --- a/clearing-parent/securities-service/src/main/resources/application.properties +++ b/clearing-parent/securities-service/src/main/resources/application.properties @@ -1,10 +1,10 @@ spring.main.web-application-type=none -securities-service.hazelcast.cluster-members=127.0.0.1:5701 +securities-service.hazelcast.cluster-members=10.200.200.183:5701 securities-service.hazelcast.login=dev securities-service.hazelcast.password=dev-pass -securities-service.kafka-consumer.bootstrap-servers=localhost:9092 +securities-service.kafka-consumer.bootstrap-servers=127.0.0.1:9092 securities-service.kafka-consumer.group-id=dev-group-securities-service securities-service.kafka-consumer.enable-auto-commit=false securities-service.kafka-consumer.session-timeout-ms=30000 @@ -12,7 +12,7 @@ securities-service.kafka-consumer.auto-offset-reset=latest securities-service.kafka-consumer.linger-ms=1 securities-service.kafka-consumer.buffer-memory=33554432 -securities-service.kafka-producer.bootstrap-servers=localhost:9092 +securities-service.kafka-producer.bootstrap-servers=127.0.0.1:9092 securities-service.kafka-producer.acks=all securities-service.kafka-producer.retries=0 securities-service.kafka-producer.batch-size=16384 diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ObjectType.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ObjectType.java index 55db093f3..1ae0500ae 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ObjectType.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ObjectType.java @@ -3,7 +3,7 @@ package ru.spcex.platform.enumeration; import ru.spcex.platform.utils.enumeration.IEnumKey; public enum ObjectType implements IEnumKey { - statement("STMT"), rgst("RGST"); + statement("STMT"), rgst("RGST"), gateway("GTWY"); private final String key;