From d447e23f0d09d7e2835d160c665a42bdea66bdd5 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 20 Jul 2023 09:15:41 +0000 Subject: Update preferences openapi generator dependency Issue-ID: PORTALNG-19 Signed-off-by: Fiete Ostkamp Change-Id: Ieb1d895db5cd7e4436de19264df2bbd2d6324d4c --- .../org/onap/portal/prefs/controller/PreferencesController.java | 4 ++-- openapi/build.gradle | 9 +++------ openapi/src/main/resources/api/api.yml | 6 +----- renovate.json | 6 ++++++ settings.gradle | 1 + 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 renovate.json diff --git a/app/src/main/java/org/onap/portal/prefs/controller/PreferencesController.java b/app/src/main/java/org/onap/portal/prefs/controller/PreferencesController.java index 584b3b4..510ef37 100644 --- a/app/src/main/java/org/onap/portal/prefs/controller/PreferencesController.java +++ b/app/src/main/java/org/onap/portal/prefs/controller/PreferencesController.java @@ -63,7 +63,7 @@ public class PreferencesController implements PreferencesApi { } @Override - public Mono> savePreferences(String xRequestId, @Valid Mono preferences, + public Mono> savePreferences(String xRequestId, Mono preferences, ServerWebExchange exchange) { return IdTokenExchange .extractUserId(exchange) @@ -81,7 +81,7 @@ public class PreferencesController implements PreferencesApi { } @Override - public Mono> updatePreferences(String xRequestId, @Valid Mono preferences, ServerWebExchange exchange) { + public Mono> updatePreferences(String xRequestId, Mono preferences, ServerWebExchange exchange) { return savePreferences(xRequestId, preferences, exchange); } diff --git a/openapi/build.gradle b/openapi/build.gradle index 01664eb..1f7148e 100644 --- a/openapi/build.gradle +++ b/openapi/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'idea' - id 'org.openapi.generator' version '5.3.0' + id 'org.openapi.generator' } repositories { @@ -9,11 +9,8 @@ repositories { } dependencies { - implementation 'org.openapitools:openapi-generator:5.3.0' - implementation 'org.springframework.boot:spring-boot-starter-webflux:2.5.5' - // NOTE(KE) needed to add these dependencies, check in next version whether its removable... - // https://github.com/OpenAPITools/openapi-generator/issues/8360 - compileOnly "io.springfox:springfox-swagger2:3.0.0" + implementation 'org.openapitools:openapi-generator:6.2.0' + implementation 'org.springframework.boot:spring-boot-starter-webflux:2.7.3' } // https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc diff --git a/openapi/src/main/resources/api/api.yml b/openapi/src/main/resources/api/api.yml index e578911..db599b1 100644 --- a/openapi/src/main/resources/api/api.yml +++ b/openapi/src/main/resources/api/api.yml @@ -3,11 +3,7 @@ info: title: Config API version: '1.0' servers: - - url: 'http://localhost:9001/{base}' - variables: - base: - default: 'portal-prefs' - description: Basepath + - url: 'http://localhost:9001/' paths: /v1/preferences: get: diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..39a2b6e --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} diff --git a/settings.gradle b/settings.gradle index dc99316..91c8fc5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,7 @@ pluginManagement { id 'org.sonarqube' version '3.4.0.2513' id 'com.github.hierynomus.license' version '0.16.1' id 'com.gorylenko.gradle-git-properties' version '2.4.1' + id 'org.openapi.generator' version '6.2.0' } // https://docs.gradle.org/current/userguide/plugins.html#sec:custom_plugin_repositories repositories { -- cgit 1.2.3-korg