Consistently use the preferences and history names in the bff code base

- rename openapi clients (client-portal-prefs -> client-preferences, client-portal-history -> client-history, client-portal-keycloak -> client-keycloak)
- rename related spring configurations (portal-prefs -> preferences, portal-history -> history)
- rename related environment variables (PORTAL_PREFS_URL -> PREFERENCES_URL, PORTAL_HISTORY_URL -> HISTORY_URL)
Note that the changes to the configurations and variables affect external services using it and the bff chart

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

14 files changed, 61 insertions, 72 deletions

diff --git a/lib/build.gradle b/lib/build.gradle
index 76b1d42..e72062d 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot'
     id 'io.spring.dependency-management'
-    id 'com.github.johnrengelman.shadow'    // 
+    id 'com.github.johnrengelman.shadow' 
     id 'maven-publish'                      // publish lib jar to artifact repository
     id 'com.diffplug.spotless'              // code formatting
     id 'com.github.spotbugs'                // bug linting that can be picked up by IDE
@@ -13,9 +13,9 @@ version rootProject.file('version').text.trim()
 
 dependencies {
     implementation project(':openapi:server')
-    implementation project(':openapi:client-portal-prefs')
-    implementation project(':openapi:client-portal-history')
-    implementation project(':openapi:client-portal-keycloak')
+    implementation project(':openapi:client-preferences')
+    implementation project(':openapi:client-history')
+    implementation project(':openapi:client-keycloak')
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -50,9 +50,9 @@ shadowJar {
     archiveBaseName.set('bff')
     dependencies {
         include(project(':openapi:server'))
-        include(project(':openapi:client-portal-history'))
-        include(project(':openapi:client-portal-prefs'))
-        include(project(':openapi:client-portal-keycloak'))
+        include(project(':openapi:client-history'))
+        include(project(':openapi:client-preferences'))
+        include(project(':openapi:client-keycloak'))
     }
 }
 
@@ -69,17 +69,9 @@ publishing {
             }
         }
     }
-    // https://gitlab.devops.telekom.de/tnap/development/tesla-team/portal-community/bff/-/blob/pipeline/lib/build.gradle#L60
+
     repositories{
         mavenCentral()
-        // maven {
-        //     url "${maven_central_url}"
-        //     credentials {
-        //         username = "${artifactory_user}"
-        //         password = "${artifactory_password}"
-        //     }
-        // }
-
     }
 }
 
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();
   }
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
index 3f0ebdf..bc4f550 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
@@ -24,14 +24,14 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_history.model.ActionsListResponseHistoryDto;
 import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
 public interface ActionsMapper
-    extends Converter<ActionsListResponsePortalHistoryDto, ActionsListResponseApiDto> {
+    extends Converter<ActionsListResponseHistoryDto, ActionsListResponseApiDto> {
 
   @Mapping(source = "actionsList", target = "items")
-  ActionsListResponseApiDto convert(ActionsListResponsePortalHistoryDto source);
+  ActionsListResponseApiDto convert(ActionsListResponseHistoryDto source);
 }
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
index b3c7f05..6b05ae3 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
@@ -24,7 +24,7 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.CredentialKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
 
 @Mapper(config = MapperSpringConfig.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
index 6e615c3..13f9e3f 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
@@ -24,14 +24,14 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto;
 import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
 public interface PreferencesMapper
-    extends Converter<PreferencesPortalPrefsDto, PreferencesResponseApiDto> {
+    extends Converter<PreferencesPreferencesDto, PreferencesResponseApiDto> {
 
   @Mapping(source = "properties", target = "properties")
-  PreferencesResponseApiDto convert(PreferencesPortalPrefsDto source);
+  PreferencesResponseApiDto convert(PreferencesPreferencesDto source);
 }
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
index 6e14d7e..ca3ee4c 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
@@ -24,7 +24,7 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.RoleKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
index f494c5d..78ba804 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
@@ -26,8 +26,8 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.UserKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.CreateUserRequestApiDto;
 import org.onap.portalng.bff.openapi.server.model.UpdateUserRequestApiDto;
 import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
diff --git a/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java b/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java
index 17afa39..cb7b6b4 100644
--- a/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java
@@ -23,8 +23,8 @@ package org.onap.portalng.bff.services;
 
 import lombok.RequiredArgsConstructor;
 import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portalng.bff.openapi.client_portal_history.api.ActionsApi;
-import org.onap.portalng.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_history.api.ActionsApi;
+import org.onap.portalng.bff.openapi.client_history.model.CreateActionRequestHistoryDto;
 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;
@@ -43,15 +43,15 @@ public class ActionService {
   public Mono<ActionsResponseApiDto> createAction(
       String userId, String xRequestId, CreateActionRequestApiDto createActionRequestApiDto) {
     // First map from server API model to client API model
-    CreateActionRequestPortalHistoryDto createActionRequestPortalHistoryDto =
-        new CreateActionRequestPortalHistoryDto();
-    createActionRequestPortalHistoryDto.setUserId(createActionRequestApiDto.getUserId());
-    createActionRequestPortalHistoryDto.setAction(createActionRequestApiDto.getAction());
-    createActionRequestPortalHistoryDto.setActionCreatedAt(
+    CreateActionRequestHistoryDto createActionRequestHistoryDto =
+        new CreateActionRequestHistoryDto();
+    createActionRequestHistoryDto.setUserId(createActionRequestApiDto.getUserId());
+    createActionRequestHistoryDto.setAction(createActionRequestApiDto.getAction());
+    createActionRequestHistoryDto.setActionCreatedAt(
         createActionRequestApiDto.getActionCreatedAt());
 
     return actionsApi
-        .createAction(userId, xRequestId, createActionRequestPortalHistoryDto)
+        .createAction(userId, xRequestId, createActionRequestHistoryDto)
         .map(
             action ->
                 new ActionsResponseApiDto()
diff --git a/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java b/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java
index b902128..5780ad0 100644
--- a/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java
@@ -33,8 +33,8 @@ import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
 import org.onap.portalng.bff.mappers.CredentialMapper;
 import org.onap.portalng.bff.mappers.RolesMapper;
 import org.onap.portalng.bff.mappers.UsersMapper;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.api.KeycloakApi;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.api.KeycloakApi;
+import org.onap.portalng.bff.openapi.client_keycloak.model.RequiredActionsKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.*;
 import org.onap.portalng.bff.utils.Logger;
 import org.springframework.core.convert.support.ConfigurableConversionService;
diff --git a/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java b/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java
index af62d28..53bceee 100644
--- a/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java
@@ -23,8 +23,8 @@ package org.onap.portalng.bff.services;
 
 import lombok.RequiredArgsConstructor;
 import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portalng.bff.openapi.client_portal_prefs.api.PreferencesApi;
-import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_preferences.api.PreferencesApi;
+import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto;
 import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
 import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.onap.portalng.bff.utils.Logger;
@@ -36,17 +36,17 @@ import reactor.core.publisher.Mono;
 @Service
 public class PreferencesService {
 
-  private static final String PREFERENCES_APPLICATION_NAME = "PORTAL_PREFS";
+  private static final String PREFERENCES_APPLICATION_NAME = "PREFERENCES";
 
   private final PreferencesApi preferencesApi;
   private final ConfigurableConversionService conversionService;
 
   public Mono<PreferencesResponseApiDto> createPreferences(
       String xRequestId, CreatePreferencesRequestApiDto request) {
-    PreferencesPortalPrefsDto preferencesPortalPrefsDto = new PreferencesPortalPrefsDto();
-    preferencesPortalPrefsDto.setProperties(request.getProperties());
+    PreferencesPreferencesDto preferencesPreferencesDto = new PreferencesPreferencesDto();
+    preferencesPreferencesDto.setProperties(request.getProperties());
     return preferencesApi
-        .savePreferences(xRequestId, preferencesPortalPrefsDto)
+        .savePreferences(xRequestId, preferencesPreferencesDto)
         .map(resp -> conversionService.convert(resp, PreferencesResponseApiDto.class))
         .onErrorResume(
             DownstreamApiProblemException.class,
@@ -59,10 +59,10 @@ public class PreferencesService {
 
   public Mono<PreferencesResponseApiDto> updatePreferences(
       String xRequestId, CreatePreferencesRequestApiDto request) {
-    PreferencesPortalPrefsDto preferencesPortalPrefsDto = new PreferencesPortalPrefsDto();
-    preferencesPortalPrefsDto.setProperties(request.getProperties());
+    PreferencesPreferencesDto preferencesPreferencesDto = new PreferencesPreferencesDto();
+    preferencesPreferencesDto.setProperties(request.getProperties());
     return preferencesApi
-        .updatePreferences(xRequestId, preferencesPortalPrefsDto)
+        .updatePreferences(xRequestId, preferencesPreferencesDto)
         .map(resp -> conversionService.convert(resp, PreferencesResponseApiDto.class))
         .onErrorResume(
             DownstreamApiProblemException.class,
diff --git a/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java b/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java
index c20cd49..10d4833 100644
--- a/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java
+++ b/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java
@@ -35,8 +35,8 @@ public class Logger {
    */
   private Logger() {}
 
-  public static void requestLog(String xRequestId, HttpMethod methode, URI path) {
-    log.info("bff - request - X-Request-Id {} {} {}", xRequestId, methode, path);
+  public static void requestLog(String xRequestId, HttpMethod method, URI path) {
+    log.info("bff - request - X-Request-Id {} {} {}", xRequestId, method, path);
   }
 
   public static void responseLog(String xRequestId, HttpStatusCode httpStatusCode) {