Backbase · BB-piotr · Jan 31, 2022 · Jan 31, 2022
diff --git a/...tions/api/service-api/legal-entity-composition-api/src/main/resources/service-api-v2.yaml b/...tions/api/service-api/legal-entity-composition-api/src/main/resources/service-api-v2.yaml
@@ -20,14 +20,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PullIngestionRequest'
+              $ref: '#/components/schemas/LegalEntityPullIngestionRequest'
       responses:
         "201":
           description: Legal Entity ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/LegalEntityIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -53,14 +53,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PushIngestionRequest'
+              $ref: '#/components/schemas/LegalEntityPushIngestionRequest'
       responses:
         "201":
           description: Legal Entity ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/LegalEntityIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -84,7 +84,7 @@ components:
         message:
           type: string
 
-    PullIngestionRequest:
+    LegalEntityPullIngestionRequest:
       type: object
       properties:
         legalEntityExternalId:
@@ -94,13 +94,13 @@ components:
           additionalProperties:
             type: string
 
-    PushIngestionRequest:
+    LegalEntityPushIngestionRequest:
       type: object
       properties:
         legalEntity:
           $ref: '../../../../../../../api/stream-legal-entity/openapi.yaml#/components/schemas/LegalEntity'
 
-    IngestionResponse:
+    LegalEntityIngestionResponse:
       type: object
       properties:
         legalEntity:

diff --git a/...ns/api/service-api/product-catalog-composition-api/src/main/resources/service-api-v2.yaml b/...ns/api/service-api/product-catalog-composition-api/src/main/resources/service-api-v2.yaml
@@ -20,14 +20,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PullIngestionRequest'
+              $ref: '#/components/schemas/ProductCatalogPullIngestionRequest'
       responses:
         "201":
           description: Product group ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/ProductCatalogIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -53,14 +53,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PushIngestionRequest'
+              $ref: '#/components/schemas/ProductCatalogPushIngestionRequest'
       responses:
         "201":
           description: Product catalog ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/ProductCatalogIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -84,21 +84,21 @@ components:
         message:
           type: string
 
-    PullIngestionRequest:
+    ProductCatalogPullIngestionRequest:
       type: object
       properties:
         additionalParameters:
           type: object
           additionalProperties:
             type: string
 
-    PushIngestionRequest:
+    ProductCatalogPushIngestionRequest:
       type: object
       properties:
         productCatalog:
           $ref: '../../../../../../../api/stream-product-catalog/openapi.yaml#/components/schemas/ProductCatalog'
 
-    IngestionResponse:
+    ProductCatalogIngestionResponse:
       type: object
       properties:
         productCatalog:

diff --git a/...mpositions/api/service-api/product-composition-api/src/main/resources/service-api-v2.yaml b/...mpositions/api/service-api/product-composition-api/src/main/resources/service-api-v2.yaml
@@ -20,14 +20,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PullIngestionRequest'
+              $ref: '#/components/schemas/ProductPullIngestionRequest'
       responses:
         "201":
           description: Product group ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/ProductIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -53,14 +53,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PushIngestionRequest'
+              $ref: '#/components/schemas/ProductPushIngestionRequest'
       responses:
         "201":
           description: Product group ingested.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/IngestionResponse'
+                $ref: '#/components/schemas/ProductIngestionResponse'
         "400":
           description: BadRequest
           content:
@@ -84,7 +84,7 @@ components:
         message:
           type: string
 
-    PullIngestionRequest:
+    ProductPullIngestionRequest:
       type: object
       required:
         - legalEntityExternalId
@@ -104,13 +104,13 @@ components:
           additionalProperties:
             type: string
 
-    PushIngestionRequest:
+    ProductPushIngestionRequest:
       type: object
       properties:
         productGgroup:
           $ref: '../../../../../../../api/stream-legal-entity/openapi.yaml#/components/schemas/ProductGroup'
 
-    IngestionResponse:
+    ProductIngestionResponse:
       type: object
       properties:
         productGgroup:

diff --git a/...rc/main/java/com/backbase/stream/compositions/legalentity/http/LegalEntityController.java b/...rc/main/java/com/backbase/stream/compositions/legalentity/http/LegalEntityController.java
@@ -6,9 +6,9 @@
 import com.backbase.stream.compositions.legalentity.core.model.LegalEntityIngestPushRequest;
 import com.backbase.stream.compositions.legalentity.core.model.LegalEntityIngestResponse;
 import com.backbase.stream.compositions.legalentity.core.service.LegalEntityIngestionService;
-import com.backbase.stream.compositions.legalentity.model.IngestionResponse;
-import com.backbase.stream.compositions.legalentity.model.PullIngestionRequest;
-import com.backbase.stream.compositions.legalentity.model.PushIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityIngestionResponse;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPullIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPushIngestionRequest;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,8 +28,8 @@ public class LegalEntityController implements LegalEntityCompositionApi {
      * {@inheritDoc}
      */
     @Override
-    public Mono<ResponseEntity<IngestionResponse>> pullIngestLegalEntity(
-            @Valid Mono<PullIngestionRequest> pullIngestionRequest, ServerWebExchange exchange) {
+    public Mono<ResponseEntity<LegalEntityIngestionResponse>> pullIngestLegalEntity(
+            @Valid Mono<LegalEntityPullIngestionRequest> pullIngestionRequest, ServerWebExchange exchange) {
         return legalEntityIngestionService
                 .ingestPull(pullIngestionRequest.map(this::buildPullRequest))
                 .map(this::mapIngestionToResponse);
@@ -39,8 +39,8 @@ public Mono<ResponseEntity<IngestionResponse>> pullIngestLegalEntity(
      * {@inheritDoc}
      */
     @Override
-    public Mono<ResponseEntity<IngestionResponse>> pushIngestLegalEntity(
-            @Valid Mono<PushIngestionRequest> pushIngestionRequest, ServerWebExchange exchange) {
+    public Mono<ResponseEntity<LegalEntityIngestionResponse>> pushIngestLegalEntity(
+            @Valid Mono<LegalEntityPushIngestionRequest> pushIngestionRequest, ServerWebExchange exchange) {
         return legalEntityIngestionService
                 .ingestPush(pushIngestionRequest.map(this::buildPushRequest))
                 .map(this::mapIngestionToResponse);
@@ -52,7 +52,7 @@ public Mono<ResponseEntity<IngestionResponse>> pushIngestLegalEntity(
      * @param request PullIngestionRequest
      * @return LegalEntityIngestPullRequest
      */
-    private LegalEntityIngestPullRequest buildPullRequest(PullIngestionRequest request) {
+    private LegalEntityIngestPullRequest buildPullRequest(LegalEntityPullIngestionRequest request) {
         return LegalEntityIngestPullRequest
                 .builder()
                 .legalEntityExternalId(request.getLegalEntityExternalId())
@@ -66,7 +66,7 @@ private LegalEntityIngestPullRequest buildPullRequest(PullIngestionRequest reque
      * @param request PushIngestionRequest
      * @return LegalEntityIngestPushRequest
      */
-    private LegalEntityIngestPushRequest buildPushRequest(PushIngestionRequest request) {
+    private LegalEntityIngestPushRequest buildPushRequest(LegalEntityPushIngestionRequest request) {
         return LegalEntityIngestPushRequest
                 .builder()
                 .legalEntity(mapper.mapCompostionToStream(request.getLegalEntity()))
@@ -79,9 +79,9 @@ private LegalEntityIngestPushRequest buildPushRequest(PushIngestionRequest reque
      * @param response LegalEntityIngestResponse
      * @return ResponseEntity<IngestionResponse>
      */
-    private ResponseEntity<IngestionResponse> mapIngestionToResponse(LegalEntityIngestResponse response) {
+    private ResponseEntity<LegalEntityIngestionResponse> mapIngestionToResponse(LegalEntityIngestResponse response) {
         return new ResponseEntity<>(
-                new IngestionResponse()
+                new LegalEntityIngestionResponse()
                         .withLegalEntity(mapper.mapStreamToComposition(response.getLegalEntity())),
                 HttpStatus.CREATED);
     }

diff --git a/.../test/java/com/backbase/stream/compositions/legalentity/http/LegalEntityControllerIT.java b/.../test/java/com/backbase/stream/compositions/legalentity/http/LegalEntityControllerIT.java
@@ -2,16 +2,15 @@
 
 import com.backbase.stream.LegalEntitySaga;
 import com.backbase.stream.LegalEntityTask;
-import com.backbase.stream.compositions.legalentity.model.PullIngestionRequest;
-import com.backbase.stream.compositions.legalentity.model.PushIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPullIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPushIngestionRequest;
 import com.backbase.stream.legalentity.model.LegalEntity;
 import com.backbase.streams.compositions.test.IntegrationTest;
 import com.google.gson.Gson;
 import org.apache.activemq.broker.BrokerService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockserver.client.MockServerClient;
@@ -110,11 +109,11 @@ void pullIngestLegalEntity_Success() throws Exception {
                 .thenReturn(Mono.just(new LegalEntityTask(legalEntity)));
 
         URI uri = URI.create("/service-api/v2/pull-ingestion");
-        PullIngestionRequest pullIngestionRequest =
-                new PullIngestionRequest().withLegalEntityExternalId("externalId");
+        LegalEntityPullIngestionRequest pullIngestionRequest =
+                new LegalEntityPullIngestionRequest().withLegalEntityExternalId("externalId");
 
         WebTestClient webTestClient = WebTestClient.bindToController(legalEntityController).build();
-        webTestClient.post().uri(uri).body(Mono.just(pullIngestionRequest), PullIngestionRequest.class).exchange()
+        webTestClient.post().uri(uri).body(Mono.just(pullIngestionRequest), LegalEntityPullIngestionRequest.class).exchange()
                 .expectStatus().isCreated()
                 .expectHeader().valueEquals("Content-Type", "application/json")
                 .expectBody().jsonPath("$.legalEntity.name").isEqualTo("Test Legal Entity");
@@ -124,11 +123,11 @@ void pullIngestLegalEntity_Success() throws Exception {
     void pushIngestLegalEntity_Fail() {
         URI uri = URI.create("/service-api/v2/push-ingestion");
 
-        PushIngestionRequest pushIngestionRequest = new PushIngestionRequest()
+        LegalEntityPushIngestionRequest pushIngestionRequest = new LegalEntityPushIngestionRequest()
                 .withLegalEntity(new com.backbase.stream.compositions.legalentity.model.LegalEntity());
 
         WebTestClient webTestClient = WebTestClient.bindToController(legalEntityController).build();
-        webTestClient.post().uri(uri).body(Mono.just(pushIngestionRequest), PullIngestionRequest.class).exchange()
+        webTestClient.post().uri(uri).body(Mono.just(pushIngestionRequest), LegalEntityPullIngestionRequest.class).exchange()
                 .expectStatus().is5xxServerError();
     }
 }

diff --git a/...est/java/com/backbase/stream/compositions/legalentity/http/LegalEntityControllerTest.java b/...est/java/com/backbase/stream/compositions/legalentity/http/LegalEntityControllerTest.java
@@ -3,8 +3,8 @@
 import com.backbase.stream.compositions.legalentity.core.mapper.LegalEntityMapperImpl;
 import com.backbase.stream.compositions.legalentity.core.model.LegalEntityIngestResponse;
 import com.backbase.stream.compositions.legalentity.core.service.LegalEntityIngestionService;
-import com.backbase.stream.compositions.legalentity.model.PullIngestionRequest;
-import com.backbase.stream.compositions.legalentity.model.PushIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPullIngestionRequest;
+import com.backbase.stream.compositions.legalentity.model.LegalEntityPushIngestionRequest;
 import com.backbase.stream.legalentity.model.LegalEntity;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,8 +36,8 @@ void setUp() {
 
     @Test
     void testPullIngestion_Success() {
-        Mono<PullIngestionRequest> requestMono = Mono.just(
-                new PullIngestionRequest().withLegalEntityExternalId("externalId"));
+        Mono<LegalEntityPullIngestionRequest> requestMono = Mono.just(
+                new LegalEntityPullIngestionRequest().withLegalEntityExternalId("externalId"));
 
         when(legalEntityIngestionService.ingestPull(any())).thenReturn(
                 Mono.just(LegalEntityIngestResponse.builder()
@@ -50,8 +50,8 @@ void testPullIngestion_Success() {
 
     @Test
     void testPushIngestion_Success() {
-        Mono<PushIngestionRequest> requestMono = Mono.just(
-                new PushIngestionRequest().withLegalEntity(new com.backbase.stream.compositions.legalentity.model.LegalEntity()));
+        Mono<LegalEntityPushIngestionRequest> requestMono = Mono.just(
+                new LegalEntityPushIngestionRequest().withLegalEntity(new com.backbase.stream.compositions.legalentity.model.LegalEntity()));
 
         when(legalEntityIngestionService.ingestPush(any())).thenReturn(
                 Mono.just(LegalEntityIngestResponse.builder()

diff --git a/...n/java/com/backbase/stream/compositions/productcatalog/http/ProductCatalogController.java b/...n/java/com/backbase/stream/compositions/productcatalog/http/ProductCatalogController.java
@@ -6,9 +6,9 @@
 import com.backbase.stream.compositions.productcatalog.core.model.ProductCatalogIngestResponse;
 import com.backbase.stream.compositions.productcatalog.core.service.ProductCatalogIngestionService;
 import com.backbase.stream.compositions.productcatalog.mapper.ProductCatalogMapper;
-import com.backbase.stream.compositions.productcatalog.model.IngestionResponse;
-import com.backbase.stream.compositions.productcatalog.model.PullIngestionRequest;
-import com.backbase.stream.compositions.productcatalog.model.PushIngestionRequest;
+import com.backbase.stream.compositions.productcatalog.model.ProductCatalogIngestionResponse;
+import com.backbase.stream.compositions.productcatalog.model.ProductCatalogPullIngestionRequest;
+import com.backbase.stream.compositions.productcatalog.model.ProductCatalogPushIngestionRequest;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -25,16 +25,16 @@ public class ProductCatalogController implements ProductCatalogCompositionApi {
     private final ProductCatalogMapper mapper;
 
     @Override
-    public Mono<ResponseEntity<IngestionResponse>> pullIngestProductCatalog(
-            @Valid Mono<PullIngestionRequest> pullIngestionRequest, ServerWebExchange exchange) {
+    public Mono<ResponseEntity<ProductCatalogIngestionResponse>> pullIngestProductCatalog(
+            @Valid Mono<ProductCatalogPullIngestionRequest> pullIngestionRequest, ServerWebExchange exchange) {
         return productCatalogIngestionService
                 .ingestPull(pullIngestionRequest.map(this::buildPullRequest))
                 .map(this::mapIngestionToResponse);
     }
 
     @Override
-    public Mono<ResponseEntity<IngestionResponse>> pushIngestProductCatalog(
-            @Valid Mono<PushIngestionRequest> pushIngestionRequest, ServerWebExchange exchange) {
+    public Mono<ResponseEntity<ProductCatalogIngestionResponse>> pushIngestProductCatalog(
+            @Valid Mono<ProductCatalogPushIngestionRequest> pushIngestionRequest, ServerWebExchange exchange) {
         return productCatalogIngestionService
                 .ingestPush(pushIngestionRequest.map(this::buildPushRequest))
                 .map(this::mapIngestionToResponse);
@@ -46,7 +46,7 @@ public Mono<ResponseEntity<IngestionResponse>> pushIngestProductCatalog(
      * @param request PullIngestionRequest
      * @return ProductIngestPullRequest
      */
-    private ProductCatalogIngestPullRequest buildPullRequest(PullIngestionRequest request) {
+    private ProductCatalogIngestPullRequest buildPullRequest(ProductCatalogPullIngestionRequest request) {
         return ProductCatalogIngestPullRequest.builder()
                 .additionalParameters(request.getAdditionalParameters())
                 .build();
@@ -58,7 +58,7 @@ private ProductCatalogIngestPullRequest buildPullRequest(PullIngestionRequest re
      * @param request PushIngestionRequest
      * @return LegalEntityIngestPushRequest
      */
-    private ProductCatalogIngestPushRequest buildPushRequest(PushIngestionRequest request) {
+    private ProductCatalogIngestPushRequest buildPushRequest(ProductCatalogPushIngestionRequest request) {
         return ProductCatalogIngestPushRequest.builder()
                 .productCatalog(mapper.mapCompositionToStream(request.getProductCatalog()))
                 .build();
@@ -71,9 +71,9 @@ private ProductCatalogIngestPushRequest buildPushRequest(PushIngestionRequest re
      * @param response ProductCatalogIngestResponse
      * @return IngestionResponse
      */
-    private ResponseEntity<IngestionResponse> mapIngestionToResponse(ProductCatalogIngestResponse response) {
+    private ResponseEntity<ProductCatalogIngestionResponse> mapIngestionToResponse(ProductCatalogIngestResponse response) {
         return new ResponseEntity<>(
-                new IngestionResponse()
+                new ProductCatalogIngestionResponse()
                         .withProductCatalog(mapper.mapStreamToComposition(response.getProductCatalog())),
                 HttpStatus.CREATED);
     }