From fa5edccf8d37767c8f9d4dde9a5f65988dbe1242 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Mon, 21 Aug 2023 08:51:07 +0000
Subject: Use more of the new plugin syntax in the bff build.gradle files

- replace apply plugin with plugin {} block syntax
- ultimately the buildscript should be replaced, but that currently leads to a StackOverflow during the build

Issue-ID: PORTALNG-42
Change-Id: I6c65127c3f6b8e095ccffb7e930576461fd5901c
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 openapi/client-portal-keycloak/build.gradle | 30 ++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'openapi/client-portal-keycloak/build.gradle')

diff --git a/openapi/client-portal-keycloak/build.gradle b/openapi/client-portal-keycloak/build.gradle
index f01cf4b..525fa18 100644
--- a/openapi/client-portal-keycloak/build.gradle
+++ b/openapi/client-portal-keycloak/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'org.openapi.generator'
+plugins {
+  id 'org.openapi.generator'
+}
 
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-webflux"
@@ -6,8 +8,7 @@ dependencies {
 }
 
 compileJava {
-    createOpenApiGenerateClientTask(project, "portal_keycloak_openapi.yaml", "client_portal_keycloak", "KeycloakDto")
-    dependsOn = [':openapi:openApiGenerate_client_portal_keycloak']
+    dependsOn = ['openApiGenerate_keycloak']
 }
 
 sourceSets {
@@ -23,3 +24,26 @@ idea {
         generatedSourceDirs += file("$buildDir/openapi/src/main/java")
     }
 }
+
+tasks.register('openApiGenerate_keycloak', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
+    generatorName = "java"
+    library = "webclient"
+    inputSpec = "${project.projectDir}/src/portal_keycloak_openapi.yaml"
+    outputDir = "${buildDir}/openapi"
+    configOptions = [
+      openApiNullable     : "false",
+      dateLibrary         : "java8",
+      serializationLibrary: "jackson"
+    ]
+    typeMappings = [
+            "File": "org.springframework.core.io.buffer.DataBuffer"
+    ]
+    generateApiTests = false
+    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"
+    modelNameSuffix = "KeycloakDto"
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg