Consistently use the bff name in the bff code base

- rename package name from org.onap.portal.bff to org.onap.portalng.bff
- replace all other occurences of portal-bff with bff

Other:
- remove Sonarqube plugin

Issue-ID: PORTALNG-40
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Change-Id: I50548630212e46a0ab84c88ff5fef743dafe9d38

35 files changed, 153 insertions, 153 deletions

diff --git a/app/src/main/java/org/onap/portal/bff/Application.java b/app/src/main/java/org/onap/portalng/bff/Application.java
index 32a07e8..679d103 100644
--- a/app/src/main/java/org/onap/portal/bff/Application.java
+++ b/app/src/main/java/org/onap/portalng/bff/Application.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
-import org.onap.portal.bff.config.PortalBffConfig;
+import org.onap.portalng.bff.config.BffConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-@EnableConfigurationProperties(PortalBffConfig.class)
+@EnableConfigurationProperties(BffConfig.class)
 @SpringBootApplication
 public class Application {
 
diff --git a/app/src/main/resources/application-access-control.yml b/app/src/main/resources/application-access-control.yml
index d967c53..450ab8a 100644
--- a/app/src/main/resources/application-access-control.yml
+++ b/app/src/main/resources/application-access-control.yml
@@ -1,4 +1,4 @@
-portal-bff.access-control:
+bff.access-control:
   ACTIONS_CREATE: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_GET: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_LIST: [ onap_admin, onap_designer, onap_operator ]
diff --git a/app/src/main/resources/application-development.yml b/app/src/main/resources/application-development.yml
index 50dfb51..c7e869f 100644
--- a/app/src/main/resources/application-development.yml
+++ b/app/src/main/resources/application-development.yml
@@ -9,7 +9,7 @@ spring:
         registration:
           keycloak:
             provider: keycloak
-            client-id: portal-bff
+            client-id: bff
             client-secret: 5933482a-9f4c-44e0-9814-dca17e0a9137
             authorization-grant-type: client_credentials
       resourceserver:
@@ -22,7 +22,7 @@ management:
       exposure:
         include: "*"
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: ${PORTAL_PREFS_URL}
   portal-history-url: ${PORTAL_HISTORY_URL}
diff --git a/app/src/main/resources/application-local.yml b/app/src/main/resources/application-local.yml
index e90a13b..0cb6e6b 100644
--- a/app/src/main/resources/application-local.yml
+++ b/app/src/main/resources/application-local.yml
@@ -9,7 +9,7 @@ spring:
         registration:
           keycloak:
             provider: keycloak
-            client-id: portal-bff
+            client-id: bff
             client-secret: pKOuVH1bwRZoNzp5P5t4GV8CqcCJYVtr
             authorization-grant-type: client_credentials
       resourceserver:
@@ -22,7 +22,7 @@ management:
       exposure:
         include: "*"
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:9001
   portal-history-url: http://localhost:9002
diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml
index 83686b5..6e74453 100644
--- a/app/src/main/resources/application.yml
+++ b/app/src/main/resources/application.yml
@@ -16,7 +16,7 @@ management:
 
 spring:
   application:
-    name: portal-bff
+    name: bff
   profiles:
     include:
       - access-control
@@ -40,7 +40,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ${KEYCLOAK_REALM}
   portal-prefs-url: ${PORTAL_PREFS_URL}
   portal-history-url: ${PORTAL_HISTORY_URL}
diff --git a/app/src/test/java/org/onap/portal/bff/ApiDocsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/ApiDocsIntegrationTest.java
index 66edfee..98a5360 100644
--- a/app/src/test/java/org/onap/portal/bff/ApiDocsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/ApiDocsIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
diff --git a/app/src/test/java/org/onap/portal/bff/BaseIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
index c02082c..8821b76 100644
--- a/app/src/test/java/org/onap/portal/bff/BaseIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.client.WireMock;
@@ -39,8 +39,8 @@ import java.util.UUID;
 import org.apache.http.client.utils.URIBuilder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.onap.portal.bff.config.IdTokenExchangeFilterFunction;
-import org.onap.portal.bff.config.PortalBffConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.config.IdTokenExchangeFilterFunction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -66,13 +66,13 @@ public abstract class BaseIntegrationTest {
 
   @LocalServerPort protected int port;
 
-  @Value("${portal-bff.realm}")
+  @Value("${bff.realm}")
   protected String realm;
 
   @Autowired protected ObjectMapper objectMapper;
   @Autowired private TokenGenerator tokenGenerator;
 
-  @Autowired protected PortalBffConfig portalBffConfig;
+  @Autowired protected BffConfig bffConfig;
 
   @BeforeAll
   public static void setup() {
diff --git a/app/src/test/java/org/onap/portal/bff/HealthCheckIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/HealthCheckIntegrationTest.java
index cef85e1..3d3a1cd 100644
--- a/app/src/test/java/org/onap/portal/bff/HealthCheckIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/HealthCheckIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/app/src/test/java/org/onap/portal/bff/TokenGenerator.java b/app/src/test/java/org/onap/portalng/bff/TokenGenerator.java
index 33b9207..051129f 100644
--- a/app/src/test/java/org/onap/portal/bff/TokenGenerator.java
+++ b/app/src/test/java/org/onap/portalng/bff/TokenGenerator.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import com.nimbusds.jose.JOSEObjectType;
 import com.nimbusds.jose.JWSAlgorithm;
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionDto.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionDto.java
index c88a0db..a80f7a1 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionDto.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionDto.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionFixtures.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionFixtures.java
index 3e7c917..0acd0eb 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionFixtures.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionFixtures.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
 
 public class ActionFixtures {
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionsMocks.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionsMocks.java
index 0bb27d7..aa9e2f3 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionsMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionsMocks.java
@@ -19,21 +19,21 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
 import io.restassured.http.Header;
 import org.apache.http.HttpHeaders;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/CreateActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/CreateActionsIntegrationTest.java
index 0b6ec57..3508f19 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/CreateActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/CreateActionsIntegrationTest.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 
 class CreateActionsIntegrationTest extends ActionsMocks {
diff --git a/app/src/test/java/org/onap/portal/bff/actions/GetActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/GetActionsIntegrationTest.java
index 1f77036..489a8d3 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/GetActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/GetActionsIntegrationTest.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
 
 class GetActionsIntegrationTest extends ActionsMocks {
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ListActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/ListActionsIntegrationTest.java
index 7eb7078..8451641 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ListActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ListActionsIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 
 class ListActionsIntegrationTest extends ActionsMocks {
diff --git a/app/src/test/java/org/onap/portal/bff/headers/XRequestIdHeaderTest.java b/app/src/test/java/org/onap/portalng/bff/headers/XRequestIdHeaderTest.java
index 50f75c7..6f82308 100644
--- a/app/src/test/java/org/onap/portal/bff/headers/XRequestIdHeaderTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/headers/XRequestIdHeaderTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.headers;
+package org.onap.portalng.bff.headers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,8 +27,8 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/app/src/test/java/org/onap/portal/bff/idtoken/IdTokenExchangeFilterFunctionTest.java b/app/src/test/java/org/onap/portalng/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
index 7d65849..cb6694a 100644
--- a/app/src/test/java/org/onap/portal/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.idtoken;
+package org.onap.portalng.bff.idtoken;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -28,8 +28,8 @@ import static org.mockito.Mockito.mock;
 import java.net.URI;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.config.IdTokenExchangeFilterFunction;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.config.IdTokenExchangeFilterFunction;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
 import org.springframework.mock.web.server.MockServerWebExchange;
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/CreatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java
index 5259de8..65a6f19 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/CreatePreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/GetPreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java
index 1e1317b..06329d4 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/GetPreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/PreferencesMocks.java b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java
index e08c690..0d5b69a 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/PreferencesMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,11 +29,11 @@ import io.restassured.http.Header;
 import java.io.File;
 import java.io.IOException;
 import org.apache.http.HttpHeaders;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/UpdatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java
index 74d902c..031726e 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/UpdatePreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/roles/ListRealmRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/roles/ListRealmRolesIntegrationTest.java
index 8228ac9..df95e2c 100644
--- a/app/src/test/java/org/onap/portal/bff/roles/ListRealmRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/roles/ListRealmRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.roles;
+package org.onap.portalng.bff.roles;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,11 +27,11 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/roles/RolesMocks.java b/app/src/test/java/org/onap/portalng/bff/roles/RolesMocks.java
index 3243497..fe065a7 100644
--- a/app/src/test/java/org/onap/portal/bff/roles/RolesMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/roles/RolesMocks.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.roles;
+package org.onap.portalng.bff.roles;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/CreateUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/CreateUserIntegrationTest.java
index 8fb1eba..aa67631 100644
--- a/app/src/test/java/org/onap/portal/bff/users/CreateUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/CreateUserIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,16 +29,16 @@ import io.restassured.http.Header;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.CreateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.CreateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/DeleteUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/DeleteUserIntegrationTest.java
index 69f6906..639e5d3 100644
--- a/app/src/test/java/org/onap/portal/bff/users/DeleteUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/DeleteUserIntegrationTest.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/GetUserDetailIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/GetUserDetailIntegrationTest.java
index 7974549..6704cbc 100644
--- a/app/src/test/java/org/onap/portal/bff/users/GetUserDetailIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/GetUserDetailIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,12 +28,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListAssignedRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListAssignedRolesIntegrationTest.java
index 193f399..7d05c67 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListAssignedRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListAssignedRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,12 +27,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListAvailableRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListAvailableRolesIntegrationTest.java
index d5f9bbf..86f9ed8 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListAvailableRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListAvailableRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,12 +27,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListUsersIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListUsersIntegrationTest.java
index 18c486a..27a8ecd 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListUsersIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListUsersIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,13 +29,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UserListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateAssignedRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
index 8abe781..a1a5ee3 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateAssignedRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,12 +29,12 @@ import io.restassured.http.Header;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserIntegrationTest.java
index f75773c..f181c5e 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,12 +28,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserRequestApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserRequestApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateUserPasswordIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserPasswordIntegrationTest.java
index 200ad69..0bdaaa9 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateUserPasswordIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserPasswordIntegrationTest.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/resources/application-access-control.yml b/app/src/test/resources/application-access-control.yml
index 5454a15..1eb37b8 100644
--- a/app/src/test/resources/application-access-control.yml
+++ b/app/src/test/resources/application-access-control.yml
@@ -1,4 +1,4 @@
-portal-bff.access-control:
+bff.access-control:
   ACTIONS_CREATE: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_GET: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_LIST: [ onap_admin, onap_designer, onap_operator ]
diff --git a/app/src/test/resources/application-development.yml b/app/src/test/resources/application-development.yml
index 8e97b45..2f408fe 100644
--- a/app/src/test/resources/application-development.yml
+++ b/app/src/test/resources/application-development.yml
@@ -25,7 +25,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:${wiremock.server.port}
   portal-history-url: http://localhost:${wiremock.server.port}
diff --git a/app/src/test/resources/application.yml b/app/src/test/resources/application.yml
index f9a82d8..b26e5d4 100644
--- a/app/src/test/resources/application.yml
+++ b/app/src/test/resources/application.yml
@@ -26,7 +26,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:${wiremock.server.port}
   portal-history-url: http://localhost:${wiremock.server.port}