Merge pull request #279 from Backbase/update-access-control-to-version-3

Update to access-control v3

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.backbase.ct</groupId>
     <artifactId>bb-fuel</artifactId>
-    <version>2.6.115-SNAPSHOT</version>
+    <version>2.7.0-SNAPSHOT</version>
     <name>Backbase :: Capability Testing :: bb-fuel</name>
 
     <scm>
@@ -53,7 +53,7 @@
         <!-- Products Specs Versions -->
         <arrangement-integration-outbound-link-account-api.version>2.1.1</arrangement-integration-outbound-link-account-api.version>
         <arrangement-integration-outbound-origination-api.version>1.0.3</arrangement-integration-outbound-origination-api.version>
-        <arrangement-integration-inbound-api.version>2.6.0</arrangement-integration-inbound-api.version>
+        <arrangement-integration-inbound-api.version>2.7.2</arrangement-integration-inbound-api.version>
         <contentservices-client-api.version>2.6.0</contentservices-client-api.version>
         <contact-manager-integration-inbound-api.version>2.9.5</contact-manager-integration-inbound-api.version>
 
@@ -313,7 +313,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <url>https://repo.backbase.com/specs/access-control</url>
-                            <fromFile>access-control-client-api-v2.6.0.yaml</fromFile>
+                            <fromFile>access-control-client-api-v3.6.0.yaml</fromFile>
                         </configuration>
                     </execution>
                     <execution>
@@ -497,10 +497,10 @@
                         <goal>generate</goal>
                     </goals>
                     <configuration>
-                        <inputSpec>${api.target}/access-control-client-api-v2.6.0.yaml</inputSpec>
+                        <inputSpec>${api.target}/access-control-client-api-v3.6.0.yaml</inputSpec>
                         <configOptions>
-                            <apiPackage>com.backbase.dbs.accesscontrol.client.v2</apiPackage>
-                            <modelPackage>com.backbase.dbs.accesscontrol.client.v2.model</modelPackage>
+                            <apiPackage>com.backbase.dbs.accesscontrol.client.v3</apiPackage>
+                            <modelPackage>com.backbase.dbs.accesscontrol.client.v3.model</modelPackage>
                         </configOptions>
                     </configuration>
                 </execution>

src/main/java/com/backbase/ct/bbfuel/client/accessgroup/AccessGroupIntegrationRestClient.java

@@ -28,14 +28,11 @@ public class AccessGroupIntegrationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
 
-    private static final String SERVICE_VERSION = "v2";
-    private static final String ENDPOINT_ACCESS_GROUPS = "/accessgroups";
-    private static final String ENDPOINT_FUNCTION = ENDPOINT_ACCESS_GROUPS + "/function-groups";
-    private static final String ENDPOINT_USERS_PERMISSIONS =
-        ENDPOINT_ACCESS_GROUPS + "/users/permissions/user-permissions";
-    private static final String ENDPOINT_DATA = ENDPOINT_ACCESS_GROUPS + "/data-groups/batch";
-    private static final String ENDPOINT_ASSIGNABLE_PERMISSION_SETS_BY_NAME =
-        ENDPOINT_ACCESS_GROUPS + "/permission-sets";
+    private static final String SERVICE_VERSION = "v3";
+    private static final String ENDPOINT_FUNCTION = "/function-groups";
+    private static final String ENDPOINT_USERS_PERMISSIONS = "/users/permissions/user-permissions";
+    private static final String ENDPOINT_DATA = "/data-groups/batch";
+    private static final String ENDPOINT_ASSIGNABLE_PERMISSION_SETS_BY_NAME = "/permission-sets";
     private static final String REGUlAR_USER_APS_NAME = "Regular user APS";
     private List<FunctionsGetResponseBody> allBusinessFunctions = new ArrayList<>();
 

src/main/java/com/backbase/ct/bbfuel/client/accessgroup/AccessGroupPresentationRestClient.java

@@ -5,8 +5,8 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.DataGroupItem;
-import com.backbase.dbs.accesscontrol.client.v2.model.FunctionGroupItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.DataGroupItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.FunctionGroupItem;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
 import java.util.List;
@@ -20,7 +20,7 @@ public class AccessGroupPresentationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
 
-    private static final String SERVICE_VERSION = "v2";
+    private static final String SERVICE_VERSION = "v3";
     private static final String ENDPOINT_ACCESS_GROUPS = "/accessgroups";
     private static final String ENDPOINT_USER_ACCESS = ENDPOINT_ACCESS_GROUPS + "/users";
     private static final String ENDPOINT_FUNCTION_BY_SERVICE_AGREEMENT_ID =

src/main/java/com/backbase/ct/bbfuel/client/accessgroup/ServiceAgreementsIntegrationRestClient.java

@@ -20,9 +20,8 @@
 public class ServiceAgreementsIntegrationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
-    private static final String SERVICE_VERSION = "v2";
-    private static final String ENDPOINT_ACCESS_GROUPS = "/accessgroups";
-    private static final String ENDPOINT_SERVICE_AGREEMENTS = ENDPOINT_ACCESS_GROUPS + "/serviceagreements";
+    private static final String SERVICE_VERSION = "v3";
+    private static final String ENDPOINT_SERVICE_AGREEMENTS = "/service-agreements";
     private static final String ENDPOINT_SERVICE_AGREEMENTS_BY_ID = ENDPOINT_SERVICE_AGREEMENTS + "/%s";
     private static final String ADD_ADMINS_IN_SA = ENDPOINT_SERVICE_AGREEMENTS + "/admins/add";
 

src/main/java/com/backbase/ct/bbfuel/client/accessgroup/ServiceAgreementsPresentationRestClient.java

@@ -4,7 +4,7 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.ServiceAgreementItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.ServiceAgreementItem;
 import io.restassured.http.ContentType;
 import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
@@ -16,9 +16,9 @@ public class ServiceAgreementsPresentationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
 
-    private static final String SERVICE_VERSION = "v2";
+    private static final String SERVICE_VERSION = "v3";
     private static final String ENDPOINT_ACCESS_GROUPS = "/accessgroups";
-    private static final String ENDPOINT_SERVICE_AGREEMENTS = ENDPOINT_ACCESS_GROUPS + "/serviceagreements";
+    private static final String ENDPOINT_SERVICE_AGREEMENTS = ENDPOINT_ACCESS_GROUPS + "/service-agreements";
     private static final String ENDPOINT_SERVICE_AGREEMENTS_BY_ID = ENDPOINT_SERVICE_AGREEMENTS + "/%s";
 
     @PostConstruct

src/main/java/com/backbase/ct/bbfuel/client/accessgroup/UserContextPresentationRestClient.java

@@ -5,8 +5,8 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.UserContextPOST;
-import com.backbase.dbs.accesscontrol.client.v2.model.ServiceAgreementItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.ServiceAgreementItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.UserContextPost;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
 import java.util.Arrays;
@@ -22,10 +22,10 @@ public class UserContextPresentationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
 
-    private static final String SERVICE_VERSION = "v2";
+    private static final String SERVICE_VERSION = "v3";
     private static final String ENDPOINT_ACCESS_GROUPS = "/accessgroups";
-    private static final String ENDPOINT_USER_CONTEXT = ENDPOINT_ACCESS_GROUPS + "/usercontext";
-    private static final String ENDPOINT_USER_CONTEXT_SERVICE_AGREEMENTS = ENDPOINT_USER_CONTEXT + "/serviceagreements";
+    private static final String ENDPOINT_USER_CONTEXT = ENDPOINT_ACCESS_GROUPS + "/user-context";
+    private static final String ENDPOINT_USER_CONTEXT_SERVICE_AGREEMENTS = ENDPOINT_USER_CONTEXT + "/service-agreements";
 
     @PostConstruct
     public void init() {
@@ -37,13 +37,13 @@ public void init() {
     public void selectContextBasedOnMasterServiceAgreement() {
         ServiceAgreementItem masterServiceAgreement = getMasterServiceAgreementForUserContext();
 
-        postUserContext(new UserContextPOST()
+        postUserContext(new UserContextPost()
                 .serviceAgreementId(masterServiceAgreement.getId()))
                 .then()
                 .statusCode(SC_NO_CONTENT);
     }
 
-    private Response postUserContext(UserContextPOST userContextPostRequestBody) {
+    private Response postUserContext(UserContextPost userContextPostRequestBody) {
         Response response = requestSpec()
             .contentType(ContentType.JSON)
             .body(userContextPostRequestBody)

src/main/java/com/backbase/ct/bbfuel/client/legalentity/LegalEntityIntegrationRestClient.java

@@ -4,7 +4,7 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.ServiceAgreementItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.ServiceAgreementItem;
 import com.backbase.dbs.accesscontrol.legalentity.client.v2.model.LegalEntityCreateItem;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;

src/main/java/com/backbase/ct/bbfuel/client/legalentity/LegalEntityPresentationRestClient.java

@@ -4,8 +4,8 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.LegalEntityBase;
-import com.backbase.dbs.accesscontrol.client.v2.model.ServiceAgreementItem;
+import com.backbase.dbs.user.manager.models.v2.LegalEntity;
+import com.backbase.dbs.accesscontrol.client.v3.model.ServiceAgreementItem;
 import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -16,12 +16,12 @@ public class LegalEntityPresentationRestClient extends RestClient {
 
     private final BbFuelConfiguration config;
 
-    private static final String SERVICE_VERSION = "v2";
+    private static final String SERVICE_VERSION = "v3";
     private static final String CLIENT_API = "client-api";
-    private static final String ENDPOINT_LEGAL_ENTITIES = "/legalentities";
+    private static final String ENDPOINT_LEGAL_ENTITIES = "/legal-entities";
     private static final String ENDPOINT_EXTERNAL = ENDPOINT_LEGAL_ENTITIES + "/external/%s";
     private static final String ENDPOINT_SERVICE_AGREEMENTS_MASTER =
-        ENDPOINT_LEGAL_ENTITIES + "/%s/serviceagreements/master";
+        ENDPOINT_LEGAL_ENTITIES + "/%s/service-agreements/master";
 
     @PostConstruct
     public void init() {
@@ -30,13 +30,13 @@ public void init() {
         setInitialPath(config.getDbsServiceNames().getLegalentity() + "/" + CLIENT_API);
     }
 
-    public LegalEntityBase retrieveLegalEntityByExternalId(String externalLegalEntityId) {
+    public LegalEntity retrieveLegalEntityByExternalId(String externalLegalEntityId) {
         return requestSpec()
             .get(String.format(getPath(ENDPOINT_EXTERNAL), externalLegalEntityId))
             .then()
             .statusCode(SC_OK)
             .extract()
-            .as(LegalEntityBase.class);
+            .as(LegalEntity.class);
     }
 
 

src/main/java/com/backbase/ct/bbfuel/client/pfm/PocketTailorActuatorClient.java

@@ -2,7 +2,7 @@
 
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
-import com.backbase.dbs.accesscontrol.client.v2.model.LegalEntityBase;
+import com.backbase.dbs.user.manager.models.v2.LegalEntity;
 import io.restassured.http.ContentType;
 import javax.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
@@ -27,7 +27,7 @@ public void init() {
      * @param arrangementId arrangement id
      * @param legalEntity legal entity
      */
-    public void createArrangedLegalEntity(String arrangementId, LegalEntityBase legalEntity) {
+    public void createArrangedLegalEntity(String arrangementId, LegalEntity legalEntity) {
         requestSpec()
             .contentType(ContentType.JSON)
             .body(new ArrangedLegalEntityRequest(arrangementId, legalEntity.getId()))

src/main/java/com/backbase/ct/bbfuel/client/user/UserPresentationRestClient.java

@@ -8,7 +8,6 @@
 import com.backbase.ct.bbfuel.client.common.RestClient;
 import com.backbase.ct.bbfuel.config.BbFuelConfiguration;
 
-import com.backbase.dbs.accesscontrol.client.v2.model.LegalEntityBase;
 import com.backbase.dbs.user.manager.models.v2.*;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
@@ -40,13 +39,13 @@ public void init() {
         setInitialPath(config.getDbsServiceNames().getUser() + "/" + CLIENT_API);
     }
 
-    public LegalEntityBase retrieveLegalEntityByExternalUserId(String externalUserId) {
+    public LegalEntity retrieveLegalEntityByExternalUserId(String externalUserId) {
         return requestSpec()
             .get(String.format(getPath(ENDPOINT_EXTERNAL_ID_LEGAL_ENTITIES), externalUserId))
             .then()
             .statusCode(SC_OK)
             .extract()
-            .as(LegalEntityBase.class);
+            .as(LegalEntity.class);
     }
 
     public GetUser getUserByExternalId(String userExternalId) {

src/main/java/com/backbase/ct/bbfuel/configurator/PocketsConfigurator.java

@@ -7,7 +7,7 @@
 import com.backbase.ct.bbfuel.data.ProductSummaryDataGenerator;
 import com.backbase.ct.bbfuel.input.PocketsReader;
 import com.backbase.ct.bbfuel.service.AccessGroupService;
-import com.backbase.dbs.accesscontrol.client.v2.model.LegalEntityBase;
+import com.backbase.dbs.user.manager.models.v2.LegalEntity;
 import com.backbase.dbs.arrangement.integration.inbound.api.v2.model.ArrangementAddedResponse;
 import com.backbase.dbs.arrangement.integration.inbound.api.v2.model.PostArrangement;
 import com.backbase.dbs.pocket.tailor.client.v2.model.Pocket;
@@ -39,7 +39,7 @@ public class PocketsConfigurator {
      * @param legalEntity legal entity
      * @return pocket parent arrangement id as String
      */
-    public String ingestPocketArrangementForModeOnetoManyAndSetEntitlements(LegalEntityBase legalEntity) {
+    public String ingestPocketArrangementForModeOnetoManyAndSetEntitlements(LegalEntity legalEntity) {
         // -> creating parent pocket arrangement for legal entity
         log.debug("Going to ingest a parent pocket arrangement for external legal entity ID: [{}]", legalEntity);
 
@@ -70,7 +70,7 @@ public String ingestPocketArrangementForModeOnetoManyAndSetEntitlements(LegalEnt
      * @param legalEntity legal entity
      */
     public void ingestPocketArrangementForModeOnetoOneAndSetEntitlements(
-        LegalEntityBase legalEntity, int counter) {
+        LegalEntity legalEntity, int counter) {
         // -> creating pocket arrangement for legal entity
         log.debug("Going to ingest a pocket arrangement for external legal entity ID: [{}]", legalEntity);
 
@@ -133,31 +133,30 @@ public void ingestPocket(String externalUserId, int counter) {
             externalUserId);
     }
 
-    private ArrangementAddedResponse ingestParentPocketArrangement(LegalEntityBase legalEntity) {
+    private ArrangementAddedResponse ingestParentPocketArrangement(LegalEntity legalEntity) {
         PostArrangement parentPocketArrangement = ProductSummaryDataGenerator
             .generateParentPocketArrangement(legalEntity.getExternalId());
         return arrangementsIntegrationRestClient
             .ingestPocketArrangementAndLogResponse(parentPocketArrangement, EXTERNAL_ARRANGEMENT_ORIGINATION_1, true);
     }
 
-    private ArrangementAddedResponse ingestPocketArrangement(LegalEntityBase legalEntity, int counter) {
+    private ArrangementAddedResponse ingestPocketArrangement(LegalEntity legalEntity, int counter) {
         String externalArrangementId = EXTERNAL_ARRANGEMENT_ORIGINATION + counter;
         PostArrangement childPostArrangement = ProductSummaryDataGenerator
             .generateChildPocketArrangement(legalEntity.getExternalId(), externalArrangementId, counter);
         return arrangementsIntegrationRestClient
             .ingestPocketArrangementAndLogResponse(childPostArrangement, externalArrangementId, false);
     }
 
-    private void updateDataGroupForPockets(String pocketArrangementId, LegalEntityBase legalEntity) {
+    private void updateDataGroupForPockets(String pocketArrangementId, LegalEntity legalEntity) {
 
         String dataGroupId = accessGroupService.updateDataGroup(pocketArrangementId,
             getExternalServiceAgreementId(legalEntity));
 
         log.debug("Updated data group with id [{}]", dataGroupId);
     }
 
-    private String getExternalServiceAgreementId(
-        com.backbase.dbs.accesscontrol.client.v2.model.LegalEntityBase legalEntity) {
+    private String getExternalServiceAgreementId(LegalEntity legalEntity) {
         String internalServiceAgreementId = this.legalEntityPresentationRestClient
             .getMasterServiceAgreementOfLegalEntity(legalEntity.getId())
             .getId();

src/main/java/com/backbase/ct/bbfuel/configurator/ServiceAgreementsConfigurator.java

@@ -10,7 +10,7 @@
 import com.backbase.ct.bbfuel.client.common.LoginRestClient;
 import com.backbase.ct.bbfuel.client.legalentity.LegalEntityIntegrationRestClient;
 import com.backbase.ct.bbfuel.client.user.UserPresentationRestClient;
-import com.backbase.dbs.accesscontrol.client.v2.model.ServiceAgreementItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.ServiceAgreementItem;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.serviceagreements.Participant;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.serviceagreements.ServiceAgreementPostResponseBody;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.serviceagreements.UserServiceAgreementPair;

src/main/java/com/backbase/ct/bbfuel/data/CommonConstants.java

@@ -35,7 +35,6 @@ private CommonConstants() {
     public static final String US_DOMESTIC_WIRE_FUNCTION_NAME = "US Domestic Wire";
     public static final String US_DOMESTIC_WIRE_INTRACOMPANY_FUNCTION_NAME = "US Domestic Wire - Intracompany";
     public static final String US_FOREIGN_WIRE_FUNCTION_NAME = "US Foreign Wire";
-    public static final String US_FOREIGN_WIRE_INTRACOMPANY_FUNCTION_NAME = "US Foreign Wire - Intracompany";
     public static final String PRODUCT_SUMMARY_RESOURCE_NAME = "Product Summary";
     public static final String PAYMENTS_RESOURCE_NAME = "Payments";
     public static final String CONTACTS_RESOURCE_NAME = "Contacts";

src/main/java/com/backbase/ct/bbfuel/data/ServiceAgreementsDataGenerator.java

@@ -27,7 +27,8 @@ public static ServiceAgreementPostRequestBody generateServiceAgreementPostReques
 
     public static ServiceAgreementPutRequestBody generateServiceAgreementPutRequestBody() {
         return new ServiceAgreementPutRequestBody()
-            .withExternalId(UUID.randomUUID()
-                .toString());
+            .withExternalId(UUID.randomUUID().toString())
+            .withName(faker.company().name())
+            .withDescription(faker.company().catchPhrase());
     }
 }

src/main/java/com/backbase/ct/bbfuel/service/AccessGroupService.java

@@ -10,8 +10,8 @@
 import com.backbase.ct.bbfuel.client.accessgroup.AccessGroupIntegrationRestClient;
 import com.backbase.ct.bbfuel.client.accessgroup.AccessGroupPresentationRestClient;
 import com.backbase.ct.bbfuel.client.accessgroup.ServiceAgreementsIntegrationRestClient;
-import com.backbase.dbs.accesscontrol.client.v2.model.DataGroupItem;
-import com.backbase.dbs.accesscontrol.client.v2.model.FunctionGroupItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.DataGroupItem;
+import com.backbase.dbs.accesscontrol.client.v3.model.FunctionGroupItem;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.BatchResponseItem;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.function.Permission;
 import com.backbase.integration.accessgroup.rest.spec.v2.accessgroups.functiongroups.FunctionGroupPostResponseBody;

src/main/java/com/backbase/ct/bbfuel/service/PaymentsFunctionService.java

@@ -12,7 +12,6 @@
 import static com.backbase.ct.bbfuel.data.CommonConstants.US_DOMESTIC_WIRE_FUNCTION_NAME;
 import static com.backbase.ct.bbfuel.data.CommonConstants.US_DOMESTIC_WIRE_INTRACOMPANY_FUNCTION_NAME;
 import static com.backbase.ct.bbfuel.data.CommonConstants.US_FOREIGN_WIRE_FUNCTION_NAME;
-import static com.backbase.ct.bbfuel.data.CommonConstants.US_FOREIGN_WIRE_INTRACOMPANY_FUNCTION_NAME;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
 
@@ -36,7 +35,6 @@ public final class PaymentsFunctionService {
         US_DOMESTIC_WIRE_FUNCTION_NAME,
         US_DOMESTIC_WIRE_INTRACOMPANY_FUNCTION_NAME,
         US_FOREIGN_WIRE_FUNCTION_NAME,
-        US_FOREIGN_WIRE_INTRACOMPANY_FUNCTION_NAME,
         ACH_DEBIT_FUNCTION_NAME));
 
     /**