diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java
similarity index 88%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java
index cc6de3e0c..65c856a84 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java
@@ -19,12 +19,12 @@ import java.util.Collection;
import java.util.Map;
@Controller
-@RequestMapping("/securities/coupon-period-securities")
-public class CudCouponPeriodController extends AbstractQueueController {
+@RequestMapping("/securities/coupon-periods")
+public class CouponPeriodController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
- public CudCouponPeriodController(IOperator operator, IStateLoader stateLoader) {
+ public CouponPeriodController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java
similarity index 96%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java
index 39579df45..6a6542568 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java
@@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/equity-securities")
-public class CudEquitySecurityController extends AbstractQueueController {
+public class EquitySecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
- public CudEquitySecurityController(IOperator operator, IStateLoader stateLoader) {
+ public EquitySecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java
similarity index 87%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java
index 2a088010c..00cb58b98 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java
@@ -19,12 +19,12 @@ import java.util.Collection;
import java.util.Map;
@Controller
-@RequestMapping("/securities/fixed-income-cash-flow-securities")
-public class CudFixedIncomeCashFlowController extends AbstractQueueController {
+@RequestMapping("/securities/fixed-income-cash-flows")
+public class FixedIncomeCashFlowController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
- public CudFixedIncomeCashFlowController(IOperator operator, IStateLoader stateLoader) {
+ public FixedIncomeCashFlowController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java
similarity index 96%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java
index 7bb82f98c..527554d73 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java
@@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/fixed-income-securities")
-public class CudFixedIncomeSecurityController extends AbstractQueueController {
+public class FixedIncomeSecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
- public CudFixedIncomeSecurityController(IOperator operator, IStateLoader stateLoader) {
+ public FixedIncomeSecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java
similarity index 96%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java
index d1709ade9..98c321858 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java
@@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/money-securities")
-public class CudMoneyMarketSecurityController extends AbstractQueueController {
+public class MoneyMarketSecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
- public CudMoneyMarketSecurityController(IOperator operator, IStateLoader stateLoader) {
+ public MoneyMarketSecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
index 4f345a0a4..92d491451 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
@@ -139,11 +139,11 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
PlannerController.class,
PlannerTemplateController.class,
//securities
- CudMoneyMarketSecurityController.class,
- CudCouponPeriodController.class,
- CudEquitySecurityController.class,
- CudFixedIncomeCashFlowController.class,
- CudFixedIncomeSecurityController.class,
+ MoneyMarketSecurityController.class,
+ CouponPeriodController.class,
+ EquitySecurityController.class,
+ FixedIncomeCashFlowController.class,
+ FixedIncomeSecurityController.class,
InformationAccountController.class,
SecurityController.class,
//user
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java
similarity index 85%
rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java
rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java
index 4f21fada5..d9f307c5b 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java
@@ -8,13 +8,13 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
-class CudCouponPeriodControllerTest extends AbstractControllerTest {
- public static final String REST_URL = "/securities/coupon-period-securities/";
+class CouponPeriodControllerTest extends AbstractControllerTest {
+ public static final String REST_URL = "/securities/coupon-periods/";
/**
- * {@link CudCouponPeriodController#getAll()}
+ * {@link CouponPeriodController#getAll()}
* Тест проверяет получение запроса по REST API.
- * Входной запрос /securities/coupon-period-securities/
+ * Входной запрос /securities/coupon-periods/
* Ответ CommonGetAllResponse
*/
@Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java
similarity index 93%
rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java
rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java
index c6ab1760d..8c9c8e52f 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java
@@ -12,11 +12,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
-class CudEquitySecurityControllerTest extends AbstractControllerTest {
+class EquitySecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/equity-securities/";
/**
- * {@link CudEquitySecurityController#add(EquitySecurityNewAction)}
+ * {@link EquitySecurityController#add(EquitySecurityNewAction)}
* Тест проверяет получение сущности {@link EquitySecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link EquitySecurityNewAction}:
*/
@@ -39,7 +39,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudEquitySecurityController#update(Long, EquitySecurityUpdateAction)}
+ * {@link EquitySecurityController#update(Long, EquitySecurityUpdateAction)}
* Тест проверяет получение сущности {@link EquitySecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link EquitySecurityUpdateAction}:
*/
@@ -66,7 +66,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudEquitySecurityController#delete(Long)}
+ * {@link EquitySecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/equity-securities/{@link Long}: - 0L
*/
@@ -85,7 +85,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudEquitySecurityController#getAll()}
+ * {@link EquitySecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/equity-securities/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java
similarity index 88%
rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java
rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java
index 4cab2c42f..31b58b92a 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java
@@ -8,13 +8,13 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
-class CudFixedIncomeCashFlowControllerTest extends AbstractControllerTest {
- public static final String REST_URL = "/securities/fixed-income-cash-flow-securities/";
+class FixedIncomeCashFlowControllerTest extends AbstractControllerTest {
+ public static final String REST_URL = "/securities/fixed-income-cash-flows/";
/**
- * {@link CudFixedIncomeCashFlowController#getAll()}
+ * {@link FixedIncomeCashFlowController#getAll()}
* Тест проверяет получение запроса по REST API.
- * Входной запрос /securities/fixed-income-cash-flow-securities/
+ * Входной запрос /securities/fixed-income-cash-flows/
* Ответ CommonGetAllResponse
*/
@Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java
similarity index 93%
rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java
rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java
index c60a9b989..c03d5819d 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java
@@ -12,11 +12,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
-class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
+class FixedIncomeSecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/fixed-income-securities/";
/**
- * {@link CudFixedIncomeSecurityController#add(FixedIncomeSecurityNewAction)}
+ * {@link FixedIncomeSecurityController#add(FixedIncomeSecurityNewAction)}
* Тест проверяет получение сущности {@link FixedIncomeSecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link FixedIncomeSecurityNewAction}:
*/
@@ -39,7 +39,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudFixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)}
+ * {@link FixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)}
* Тест проверяет получение сущности {@link FixedIncomeSecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link FixedIncomeSecurityUpdateAction}:
*/
@@ -66,7 +66,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudFixedIncomeSecurityController#delete(Long)}
+ * {@link FixedIncomeSecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/fixed-income-securities/{@link Long}: - 0L
*/
@@ -85,7 +85,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudFixedIncomeSecurityController#getAll()}
+ * {@link FixedIncomeSecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/fixed-income-securities/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java
similarity index 93%
rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java
index 14414ea13..0aff07b3c 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java
@@ -13,11 +13,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
import java.time.LocalDate;
-class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
+class MoneyMarketSecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/money-securities/";
/**
- * {@link CudMoneyMarketSecurityController#add(MoneyMarketSecurityNewAction)}
+ * {@link MoneyMarketSecurityController#add(MoneyMarketSecurityNewAction)}
* Тест проверяет получение сущности {@link MoneyMarketSecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link MoneyMarketSecurityNewAction}:
*/
@@ -41,7 +41,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudMoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)}
+ * {@link MoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)}
* Тест проверяет получение сущности {@link MoneyMarketSecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link MoneyMarketSecurityUpdateAction}:
*/
@@ -67,7 +67,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudMoneyMarketSecurityController#delete(Long)}
+ * {@link MoneyMarketSecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/money-securities/{@link Long}: - 0L
*/
@@ -86,7 +86,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
- * {@link CudMoneyMarketSecurityController#getAll()}
+ * {@link MoneyMarketSecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/money-securities/
* Ответ CommonGetAllResponse