4 files changed, 22 insertions, 25 deletions
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java
index 7e773ed..5bc618c 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java
@@ -42,9 +42,8 @@ import reactor.core.publisher.Mono;
 public class BffConfig {
 
   @NotBlank private final String realm;
-  @NotBlank private final String portalServiceUrl;
-  @NotBlank private final String portalPrefsUrl;
-  @NotBlank private final String portalHistoryUrl;
+  @NotBlank private final String preferencesUrl;
+  @NotBlank private final String historyUrl;
   @NotBlank private final String keycloakUrl;
 
   @NotNull private final Map<String, List<String>> accessControl;
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalHistoryConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/HistoryConfig.java
index e6904b1..c7f8709 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalHistoryConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/HistoryConfig.java
@@ -30,11 +30,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.portalng.bff.config.BeansConfig;
 import org.onap.portalng.bff.config.BffConfig;
 import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portalng.bff.openapi.client_portal_history.ApiClient;
-import org.onap.portalng.bff.openapi.client_portal_history.api.ActionsApi;
-import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_history.ApiClient;
+import org.onap.portalng.bff.openapi.client_history.api.ActionsApi;
+import org.onap.portalng.bff.openapi.client_history.model.ProblemHistoryDto;
 import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,18 +43,17 @@ import org.springframework.web.reactive.function.client.WebClient;
 
 @Slf4j
 @Configuration
-public class PortalHistoryConfig extends AbstractClientConfig<ProblemPortalHistoryDto> {
+public class HistoryConfig extends AbstractClientConfig<ProblemHistoryDto> {
   private final ObjectMapper objectMapper;
   private final BffConfig bffConfig;
   private final ExchangeFilterFunction oauth2ExchangeFilterFunction;
 
-  @Autowired
-  public PortalHistoryConfig(
+  public HistoryConfig(
       @Qualifier(BeansConfig.OAUTH2_EXCHANGE_FILTER_FUNCTION)
           ExchangeFilterFunction oauth2ExchangeFilterFunction,
       ObjectMapper objectMapper,
       BffConfig bffConfig) {
-    super(ProblemPortalHistoryDto.class);
+    super(ProblemHistoryDto.class);
     this.objectMapper = objectMapper;
     this.bffConfig = bffConfig;
     this.oauth2ExchangeFilterFunction = oauth2ExchangeFilterFunction;
@@ -76,7 +74,7 @@ public class PortalHistoryConfig extends AbstractClientConfig<ProblemPortalHisto
     final String generatedBasePath = apiClient.getBasePath();
     String basePath = "";
     try {
-      basePath = bffConfig.getPortalHistoryUrl() + new URL(generatedBasePath).getPath();
+      basePath = bffConfig.getHistoryUrl() + new URL(generatedBasePath).getPath();
     } catch (MalformedURLException e) {
       log.error(e.getLocalizedMessage());
     }
@@ -85,7 +83,7 @@ public class PortalHistoryConfig extends AbstractClientConfig<ProblemPortalHisto
 
   @Override
   protected DownstreamApiProblemException mapException(
-      ProblemPortalHistoryDto errorResponse, HttpStatusCode httpStatusCode) {
+      ProblemHistoryDto errorResponse, HttpStatusCode httpStatusCode) {
     return DownstreamApiProblemException.builder()
         .title(httpStatusCode.toString())
         .detail(errorResponse.getDetail())
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
index 9880ef7..2ff3974 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
@@ -27,9 +27,9 @@ import java.util.function.Function;
 import org.onap.portalng.bff.config.BeansConfig;
 import org.onap.portalng.bff.config.BffConfig;
 import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.ApiClient;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.api.KeycloakApi;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.ApiClient;
+import org.onap.portalng.bff.openapi.client_keycloak.api.KeycloakApi;
+import org.onap.portalng.bff.openapi.client_keycloak.model.ErrorResponseKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalPrefsConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/PreferencesConfig.java
index 8c2eba4..d94eae2 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalPrefsConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/PreferencesConfig.java
@@ -30,9 +30,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.portalng.bff.config.BeansConfig;
 import org.onap.portalng.bff.config.BffConfig;
 import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portalng.bff.openapi.client_portal_prefs.ApiClient;
-import org.onap.portalng.bff.openapi.client_portal_prefs.api.PreferencesApi;
-import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_preferences.ApiClient;
+import org.onap.portalng.bff.openapi.client_preferences.api.PreferencesApi;
+import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto;
 import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -43,17 +43,17 @@ import org.springframework.web.reactive.function.client.WebClient;
 
 @Slf4j
 @Configuration
-public class PortalPrefsConfig extends AbstractClientConfig<ProblemPortalPrefsDto> {
+public class PreferencesConfig extends AbstractClientConfig<ProblemPreferencesDto> {
   private final ObjectMapper objectMapper;
   private final BffConfig bffConfig;
   private final ExchangeFilterFunction oauth2ExchangeFilterFunction;
 
-  public PortalPrefsConfig(
+  public PreferencesConfig(
       @Qualifier(BeansConfig.OAUTH2_EXCHANGE_FILTER_FUNCTION)
           ExchangeFilterFunction oauth2ExchangeFilterFunction,
       ObjectMapper objectMapper,
       BffConfig bffConfig) {
-    super(ProblemPortalPrefsDto.class);
+    super(ProblemPreferencesDto.class);
     this.objectMapper = objectMapper;
     this.bffConfig = bffConfig;
     this.oauth2ExchangeFilterFunction = oauth2ExchangeFilterFunction;
@@ -75,7 +75,7 @@ public class PortalPrefsConfig extends AbstractClientConfig<ProblemPortalPrefsDt
     final String generatedBasePath = apiClient.getBasePath();
     String basePath = "";
     try {
-      basePath = bffConfig.getPortalPrefsUrl() + new URL(generatedBasePath).getPath();
+      basePath = bffConfig.getPreferencesUrl() + new URL(generatedBasePath).getPath();
     } catch (MalformedURLException e) {
       log.error(e.getLocalizedMessage());
     }
@@ -84,12 +84,12 @@ public class PortalPrefsConfig extends AbstractClientConfig<ProblemPortalPrefsDt
 
   @Override
   protected DownstreamApiProblemException mapException(
-      ProblemPortalPrefsDto errorResponse, HttpStatusCode httpStatusCode) {
+      ProblemPreferencesDto errorResponse, HttpStatusCode httpStatusCode) {
     return DownstreamApiProblemException.builder()
         .title(httpStatusCode.toString())
         .detail(errorResponse.getDetail())
         .downstreamMessageId(errorResponse.getType())
-        .downstreamSystem(ProblemApiDto.DownstreamSystemEnum.PORTAL_PREFS.toString())
+        .downstreamSystem(ProblemApiDto.DownstreamSystemEnum.PREFERENCES.toString())
         .downstreamStatus(httpStatusCode.value())
         .build();
   }