12 files changed, 26 insertions, 26 deletions
diff --git a/openapi/build.gradle b/openapi/build.gradle
index 0b3e556..34d949b 100644
--- a/openapi/build.gradle
+++ b/openapi/build.gradle
@@ -5,15 +5,11 @@ plugins {
 
 dependencies {
   implementation project('server')
-  implementation project('client-portal-history')
-  implementation project('client-portal-keycloak')
-  implementation project('client-portal-prefs')
+  implementation project('client-history')
+  implementation project('client-keycloak')
+  implementation project('client-preferences')
 }
+
 ext {
   openapiVersion = '7.0.0-beta'
-}
-subprojects {
-  repositories {
-    mavenCentral()
-  }
 }
 \ No newline at end of file
diff --git a/openapi/client-portal-history/LICENSE b/openapi/client-history/LICENSE
index abe3069..abe3069 100644
--- a/openapi/client-portal-history/LICENSE
+++ b/openapi/client-history/LICENSE
diff --git a/openapi/client-portal-prefs/build.gradle b/openapi/client-history/build.gradle
index 9eaa4b0..20b5258 100644
--- a/openapi/client-portal-prefs/build.gradle
+++ b/openapi/client-history/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 openApiGenerate {
     generatorName = "java"
     library = "webclient"
-    inputSpec = "${project.projectDir}/src/portal_prefs_openapi.yaml"
+    inputSpec = "${project.projectDir}/src/api.yaml"
     outputDir = "${project.buildDir}/openapi"
     configOptions = [
       openApiNullable     : "false",
@@ -29,10 +29,10 @@ openApiGenerate {
     generateApiDocumentation = false
     generateModelTests = false
     generateModelDocumentation = false
-    invokerPackage = "org.onap.portalng.bff.openapi.client_portal_prefs"
-    apiPackage = "org.onap.portalng.bff.openapi.client_portal_prefs.api"
-    modelPackage = "org.onap.portalng.bff.openapi.client_portal_prefs.model"
-    modelNameSuffix = "PortalPrefsDto"
+    invokerPackage = "org.onap.portalng.bff.openapi.client_history"
+    apiPackage = "org.onap.portalng.bff.openapi.client_history.api"
+    modelPackage = "org.onap.portalng.bff.openapi.client_history.model"
+    modelNameSuffix = "HistoryDto"
 }
 
 compileJava {
diff --git a/openapi/client-portal-history/src/portal_history_openapi.yaml b/openapi/client-history/src/api.yaml
index 5057592..22c6ae5 100644
--- a/openapi/client-portal-history/src/portal_history_openapi.yaml
+++ b/openapi/client-history/src/api.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.2
 info:
   title: Config API
   version: '1.0'
-  description: API to provide actions for portal-history
+  description: API to provide actions for history
   contact:
     name: TNAP Team Tesla
     url: 'https://www.telekom.de'
diff --git a/openapi/client-portal-keycloak/LICENSE b/openapi/client-keycloak/LICENSE
index abe3069..abe3069 100644
--- a/openapi/client-portal-keycloak/LICENSE
+++ b/openapi/client-keycloak/LICENSE
diff --git a/openapi/client-portal-keycloak/build.gradle b/openapi/client-keycloak/build.gradle
index 22da1f2..46c842d 100644
--- a/openapi/client-portal-keycloak/build.gradle
+++ b/openapi/client-keycloak/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 openApiGenerate {
     generatorName = "java"
     library = "webclient"
-    inputSpec = "${project.projectDir}/src/portal_keycloak_openapi.yaml"
+    inputSpec = "${project.projectDir}/src/api.yaml"
     outputDir = "${project.buildDir}/openapi"
     configOptions = [
       openApiNullable     : "false",
@@ -29,9 +29,9 @@ openApiGenerate {
     generateApiDocumentation = false
     generateModelTests = false
     generateModelDocumentation = false
-    invokerPackage = "org.onap.portalng.bff.openapi.client_portal_keycloak"
-    apiPackage = "org.onap.portalng.bff.openapi.client_portal_keycloak.api"
-    modelPackage = "org.onap.portalng.bff.openapi.client_portal_keycloak.model"
+    invokerPackage = "org.onap.portalng.bff.openapi.client_keycloak"
+    apiPackage = "org.onap.portalng.bff.openapi.client_keycloak.api"
+    modelPackage = "org.onap.portalng.bff.openapi.client_keycloak.model"
     modelNameSuffix = "KeycloakDto"
 }
 
diff --git a/openapi/client-portal-keycloak/src/portal_keycloak_openapi.yaml b/openapi/client-keycloak/src/api.yaml
index a09f0f4..a09f0f4 100644
--- a/openapi/client-portal-keycloak/src/portal_keycloak_openapi.yaml
+++ b/openapi/client-keycloak/src/api.yaml
diff --git a/openapi/client-portal-prefs/LICENSE b/openapi/client-preferences/LICENSE
index abe3069..abe3069 100644
--- a/openapi/client-portal-prefs/LICENSE
+++ b/openapi/client-preferences/LICENSE
diff --git a/openapi/client-portal-history/build.gradle b/openapi/client-preferences/build.gradle
index a087be9..208b20d 100644
--- a/openapi/client-portal-history/build.gradle
+++ b/openapi/client-preferences/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 openApiGenerate {
     generatorName = "java"
     library = "webclient"
-    inputSpec = "${project.projectDir}/src/portal_history_openapi.yaml"
+    inputSpec = "${project.projectDir}/src/api.yaml"
     outputDir = "${project.buildDir}/openapi"
     configOptions = [
       openApiNullable     : "false",
@@ -23,16 +23,20 @@ openApiGenerate {
       useJakartaEe        : "true",
     ]
     typeMappings = [
-            "File": "org.springframework.core.io.buffer.DataBuffer"
+            "File": "org.springframework.core.io.buffer.DataBuffer",
+            "mapOfObjects": "Map<String,Object>"
+    ]
+    importMappings = [
+            "Map<String,Object>": "java.util.Map"
     ]
     generateApiTests = false
     generateApiDocumentation = false
     generateModelTests = false
     generateModelDocumentation = false
-    invokerPackage = "org.onap.portalng.bff.openapi.client_portal_history"
-    apiPackage = "org.onap.portalng.bff.openapi.client_portal_history.api"
-    modelPackage = "org.onap.portalng.bff.openapi.client_portal_history.model"
-    modelNameSuffix = "PortalHistoryDto"
+    invokerPackage = "org.onap.portalng.bff.openapi.client_preferences"
+    apiPackage = "org.onap.portalng.bff.openapi.client_preferences.api"
+    modelPackage = "org.onap.portalng.bff.openapi.client_preferences.model"
+    modelNameSuffix = "PreferencesDto"
 }
 
 compileJava {
diff --git a/openapi/client-portal-prefs/src/portal_prefs_openapi.yaml b/openapi/client-preferences/src/api.yaml
index 86d9e2b..86d9e2b 100644
--- a/openapi/client-portal-prefs/src/portal_prefs_openapi.yaml
+++ b/openapi/client-preferences/src/api.yaml
diff --git a/openapi/server/build.gradle b/openapi/server/build.gradle
index 99e401b..78c5103 100644
--- a/openapi/server/build.gradle
+++ b/openapi/server/build.gradle
@@ -24,7 +24,7 @@ openApiGenerate {
   inputSpec = "$projectDir/src/main/resources/static/api.yaml"
   outputDir = "$buildDir/openapi"
   configOptions = [
-    hideGenerationTimestamps: "true",
+    hideGenerationTimestamp: "true",
     openApiNullable: "false",
     skipDefaultInterface: "true",
     dateLibrary: "java8",
diff --git a/openapi/server/src/main/resources/static/api.yaml b/openapi/server/src/main/resources/static/api.yaml
index be5ae0a..f601785 100644
--- a/openapi/server/src/main/resources/static/api.yaml
+++ b/openapi/server/src/main/resources/static/api.yaml
@@ -734,7 +734,7 @@ components:
           enum:
             - KEYCLOAK
             - PORTAL_SERVICE
-            - PORTAL_PREFS
+            - PREFERENCES
             - PORTAL_HISTORY
         downstreamStatus:
           type: integer