From ddcc79f9968f65f34bb049e469acfafe0a0aa2e9 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 26 Apr 2023 12:14:16 -0400 Subject: Adding some minor features * Adding proxy and ssl context to CloseableHttpClient * Adding paged capability to ResourceDictionary GET API, and adding POST APi to bulk load resource definitions * Adding more packages to swagger-maven-plugin to get more RestCOntroller generating swagger doc * Fixing maven artifact versions all places Issue-ID: CCSDK-3895 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I096f80a2326cd00068029330b241da209e46e31d (cherry picked from commit 2f4cc180555b1891fb749443449bd969db408d9c) --- .../resource/resolution/utils/ResourceAssignmentUtilsTest.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ms/blueprintsprocessor/functions') diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt index 541d017b9..36229b77e 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt @@ -484,13 +484,13 @@ class ResourceAssignmentUtilsTest { resourceAssignment = when (sourceType) { "list" -> { - prepareRADataDictionaryCollection(dictionary_source, sourceType, entrySchema) + prepareRAResourceDictionaryCollection(dictionary_source, sourceType, entrySchema) } "string" -> { - prepareRADataDictionaryOfPrimaryType(dictionary_source) + prepareRAResourceDictionaryOfPrimaryType(dictionary_source) } else -> { - prepareRADataDictionaryComplexType(dictionary_source, sourceType, entrySchema) + prepareRAResourceDictionaryComplexType(dictionary_source, sourceType, entrySchema) } } @@ -508,7 +508,7 @@ class ResourceAssignmentUtilsTest { ) } - private fun prepareRADataDictionaryOfPrimaryType(dictionary_source: String): ResourceAssignment { + private fun prepareRAResourceDictionaryOfPrimaryType(dictionary_source: String): ResourceAssignment { return ResourceAssignment().apply { name = "ipAddress" dictionaryName = "sample-ip" @@ -519,7 +519,7 @@ class ResourceAssignmentUtilsTest { } } - private fun prepareRADataDictionaryCollection( + private fun prepareRAResourceDictionaryCollection( dictionary_source: String, sourceType: String, schema: String @@ -537,7 +537,7 @@ class ResourceAssignmentUtilsTest { } } - private fun prepareRADataDictionaryComplexType( + private fun prepareRAResourceDictionaryComplexType( dictionary_source: String, sourceType: String, schema: String -- cgit 1.2.3-korg