From c0aebdf1f43ed6f64fcc76e19cbc2dfee2e0f3df Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 9 Mar 2023 10:20:51 -0500 Subject: Code changes needed to resolve openjdk17 issues Upgraded groovy maven plugin for openjdk17. Changed parent version to latest snapshot to pick up grpc upgrade needed to allow local compiles on newer macbooks, based on apple silicon. Issue-ID: CCSDK-3861 Signed-off-by: Dan Timoney Change-Id: Ie11456682a3a038892a35a5ec3b3e0f2e8847b13 --- .../designer/api/load/BluePrintCatalogLoadService.kt | 2 +- .../cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt | 2 +- .../designer/api/load/ResourceDictionaryLoadService.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ms/blueprintsprocessor/modules') diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt index ceeeb05ba..813eeb52c 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt @@ -53,7 +53,7 @@ open class BluePrintCatalogLoadService(private val controllerBlueprintsCatalogSe deferredResult.await() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt index e96daf9f0..5206e36e2 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt @@ -98,7 +98,7 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler) deferred.awaitAll() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } catch (e: Exception) { diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt index 15cf3dcb0..dad43f64a 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt @@ -61,7 +61,7 @@ open class ResourceDictionaryLoadService(private val resourceDictionaryHandler: deferred.awaitAll() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } -- cgit 1.2.3-korg