From ddcc79f9968f65f34bb049e469acfafe0a0aa2e9 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
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) <ks220y@att.com>
Change-Id: I096f80a2326cd00068029330b241da209e46e31d
(cherry picked from commit 2f4cc180555b1891fb749443449bd969db408d9c)
---
 ms/blueprintsprocessor/application/pom.xml         |  5 +-
 .../utils/ResourceAssignmentUtilsTest.kt           | 12 ++--
 .../rest/BluePrintRestLibData.kt                   |  1 +
 .../rest/service/BaseBlueprintWebClientService.kt  | 22 ++++++-
 .../designer/api/ResourceDictionaryController.kt   | 62 ++++++++++++++++---
 .../api/handler/ResourceDictionaryHandler.kt       | 71 +++++++++++++++-------
 .../designer/api/utils/BlueprintSortByOption.kt    | 16 +++++
 .../designer/api/utils/DictionarySortByOption.kt   | 21 +++++++
 .../resource/api/TemplateController.kt             |  2 +-
 .../selfservice/api/ExecutionServiceController.kt  |  4 +-
 10 files changed, 172 insertions(+), 44 deletions(-)
 create mode 100644 ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/DictionarySortByOption.kt

(limited to 'ms')

diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml
index acaa09bc2..3942ac74c 100755
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -336,9 +336,8 @@
                         <apiSource>
                             <springmvc>true</springmvc>
                             <locations>
-                                <location>org.onap.ccsdk.cds.blueprintsprocessor.designer.api.BlueprintModelController</location>
-                                <location>org.onap.ccsdk.cds.blueprintsprocessor.designer.api.ResourceDictionaryController</location>
-                                <location>org.onap.ccsdk.cds.blueprintsprocessor.designer.api.ModelTypeController</location>
+                                <location>org.onap.ccsdk.cds.blueprintsprocessor.designer.api</location>
+                                <location>org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api</location>
                                 <location>org.onap.ccsdk.cds.blueprintsprocessor.resource.api</location>
                                 <location>org.onap.ccsdk.cds.blueprintsprocessor.configs.api</location>
                                 <!-- This location is not implemented yet
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
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
index a12680e07..6688f34e5 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/BluePrintRestLibData.kt
@@ -26,6 +26,7 @@ open class RestClientProperties {
     var connectTimeout: Int = 0
     var socketTimeout: Int = 0
     var connectionRequestTimeout: Int = 0
+    var proxy: String? = null
     var additionalHeaders: Map<String, String>? = null
 }
 
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt
index 1505374be..41426d585 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BaseBlueprintWebClientService.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.io.IOUtils
 import org.apache.http.HttpEntity
+import org.apache.http.HttpHost
 import org.apache.http.HttpResponse
 import org.apache.http.HttpStatus
 import org.apache.http.client.ClientProtocolException
@@ -35,6 +36,9 @@ import org.apache.http.client.methods.HttpPatch
 import org.apache.http.client.methods.HttpPost
 import org.apache.http.client.methods.HttpPut
 import org.apache.http.client.methods.HttpUriRequest
+import org.apache.http.conn.ssl.NoopHostnameVerifier
+import org.apache.http.conn.ssl.SSLContextBuilder
+import org.apache.http.conn.ssl.TrustAllStrategy
 import org.apache.http.entity.StringEntity
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.impl.client.HttpClients
@@ -74,8 +78,24 @@ abstract class BaseBlueprintWebClientService<out E : RestClientProperties> : Blu
         return requestConfigBuilder.build()
     }
 
+    open fun https_proxy(): String? {
+        return getRestClientProperties().proxy
+    }
+
     open fun httpClient(): CloseableHttpClient {
-        return HttpClients.custom()
+        var httpClients = HttpClients.custom()
+        if (https_proxy() != null && https_proxy() != "") {
+            val proxyProtocol = https_proxy()?.split(':')?.get(0) ?: "http"
+            val proxyUri = https_proxy()?.split(':')?.get(1)?.replace("/", "") ?: ""
+            val proxyPort = https_proxy()?.split(':')?.get(2)?.toInt() ?: 0
+            if (proxyUri != "" && proxyPort != 0) {
+                val proxy = HttpHost(proxyUri, proxyPort, proxyProtocol)
+                httpClients = httpClients.setProxy(proxy)
+                    .setSSLContext(SSLContextBuilder().loadTrustMaterial(null, TrustAllStrategy.INSTANCE).build())
+                    .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
+            }
+        }
+        return httpClients
             .addInterceptorFirst(WebClientUtils.logRequest())
             .addInterceptorLast(WebClientUtils.logResponse())
             .setDefaultRequestConfig(getRequestConfig())
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
index 8d69ccdde..a9a2e69f2 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
@@ -21,10 +21,14 @@ import io.swagger.annotations.ApiOperation
 import io.swagger.annotations.ApiParam
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ResourceDictionary
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.handler.ResourceDictionaryHandler
+import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.utils.DictionarySortByOption
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.mdcWebCoroutineScope
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceSourceMapping
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Sort
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
@@ -32,13 +36,14 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.ResponseBody
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping(value = ["/api/v1/dictionary"])
 @Api(
-    value = "Resource dictionary",
+    value = "Resource Dictionary",
     description = "Interaction with stored dictionaries"
 )
 open class ResourceDictionaryController(private val resourceDictionaryHandler: ResourceDictionaryHandler) {
@@ -59,6 +64,26 @@ open class ResourceDictionaryController(private val resourceDictionaryHandler: R
             resourceDictionaryHandler.getResourceDictionaryByName(name)
         }
 
+    @GetMapping("/paged", produces = [MediaType.APPLICATION_JSON_VALUE])
+    @ApiOperation(
+        value = "Get Blueprints Dictionary ordered",
+        notes = "Lists all blueprint Dictionary which are saved in CDS in an ordered mode.",
+        nickname = "BlueprintModelController_allBlueprintDictionaryPaged_GET.org.onap.ccsdk.cds.blueprintsprocessor.designer.api"
+    )
+    @ResponseBody
+    suspend fun allBlueprintModel(
+        @ApiParam(value = "Maximum number of returned blueprint dictionary") @RequestParam(defaultValue = "20") limit: Int,
+        @ApiParam(value = "Offset") @RequestParam(defaultValue = "0") offset: Int,
+        @ApiParam(value = "Order of returned blueprint dictionary") @RequestParam(defaultValue = "DATE") sort: DictionarySortByOption,
+        @ApiParam(value = "Ascend or descend ordering") @RequestParam(defaultValue = "ASC") sortType: String
+    ): Page<ResourceDictionary> {
+        val pageRequest = PageRequest.of(
+            offset, limit,
+            Sort.Direction.fromString(sortType), sort.columnName
+        )
+        return resourceDictionaryHandler.getAllDictionary(pageRequest)
+    }
+
     @PostMapping(
         produces = [MediaType.APPLICATION_JSON_VALUE],
         consumes = [MediaType.APPLICATION_JSON_VALUE]
@@ -72,10 +97,10 @@ open class ResourceDictionaryController(private val resourceDictionaryHandler: R
     @Throws(BluePrintException::class)
     suspend fun saveResourceDictionary(
         @ApiParam(value = "Resource dictionary to store", required = true)
-        @RequestBody dataDictionary: ResourceDictionary
+        @RequestBody resourceDictionary: ResourceDictionary
     ): ResourceDictionary =
         mdcWebCoroutineScope {
-            resourceDictionaryHandler.saveResourceDictionary(dataDictionary)
+            resourceDictionaryHandler.saveResourceDictionary(resourceDictionary)
         }
 
     @PostMapping(
@@ -85,20 +110,41 @@ open class ResourceDictionaryController(private val resourceDictionaryHandler: R
     )
     @ApiOperation(
         value = "Save a resource dictionary",
-        notes = "Save a resource dictionary by resource definition provided.",
+        notes = "Save a resource dictionary by provided resource definition json.",
         nickname = "ResourceDictionaryController_saveResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api",
-        response = ResourceDefinition::class
+        response = ResourceDictionary::class
     )
     @ResponseBody
     @Throws(BluePrintException::class)
-    suspend fun saveResourceDictionary(
-        @ApiParam(value = "Resource definition to generate", required = true)
+    suspend fun saveResourceDefinition(
+        @ApiParam(value = "Resource definition to generate Resource Dictionary", required = true)
         @RequestBody resourceDefinition: ResourceDefinition
-    ): ResourceDefinition =
+    ): ResourceDictionary =
         mdcWebCoroutineScope {
             resourceDictionaryHandler.saveResourceDefinition(resourceDefinition)
         }
 
+    @PostMapping(
+        path = ["/definition-bulk"],
+        produces = [MediaType.APPLICATION_JSON_VALUE],
+        consumes = [MediaType.APPLICATION_JSON_VALUE]
+    )
+    @ApiOperation(
+        value = "Save multiple resource dictionaries",
+        notes = "Save multiple resource dictionaries by provided resource definition json array.",
+        nickname = "ResourceDictionaryController_saveAllResourceDictionary_1_POST.org.onap.ccsdk.cds.blueprintsprocessor.designer.api",
+        response = ResourceDictionary::class
+    )
+    @ResponseBody
+    @Throws(BluePrintException::class)
+    suspend fun saveAllResourceDictionary(
+        @ApiParam(value = "Resource definition json array to generate Resource Dictionaries", required = true)
+        @RequestBody resourceDefinition: List<ResourceDefinition>
+    ): MutableList<ResourceDictionary> =
+        mdcWebCoroutineScope {
+            resourceDictionaryHandler.saveAllResourceDefinition(resourceDefinition)
+        }
+
     @DeleteMapping(path = ["/{name}"])
     @ApiOperation(
         value = "Remove a resource dictionary",
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
index 3f06a4a98..0af1e1586 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
@@ -31,15 +31,17 @@ import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceSourceMappi
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory
 import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogCodes
 import org.springframework.stereotype.Service
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
 
 @Service
 class ResourceDictionaryHandler(private val resourceDictionaryRepository: ResourceDictionaryRepository) {
 
     /**
-     * This is a getDataDictionaryByName service
+     * This is a getResourceDictionaryByName service
      *
      * @param name name
-     * @return DataDictionary
+     * @return ResourceDictionary
      * @throws BluePrintException BluePrintException
      */
     @Throws(BluePrintException::class)
@@ -61,7 +63,7 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
      *
      * @param names names
      * @return List<ResourceDictionary>
-     </ResourceDictionary> */
+     */
     suspend fun searchResourceDictionaryByNames(names: List<String>): List<ResourceDictionary> {
         Preconditions.checkArgument(CollectionUtils.isNotEmpty(names), "No Search Information provide")
         return resourceDictionaryRepository.findByNameIn(names)
@@ -72,17 +74,17 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
      *
      * @param tags tags
      * @return List<ResourceDictionary>
-     </ResourceDictionary> */
+     */
     suspend fun searchResourceDictionaryByTags(tags: String): List<ResourceDictionary> {
         Preconditions.checkArgument(StringUtils.isNotBlank(tags), "No search tag information provide")
         return resourceDictionaryRepository.findByTagsContainingIgnoreCase(tags)
     }
 
     /**
-     * This is a saveDataDictionary service
+     * This is a saveResourceDictionary service
      *
      * @param resourceDictionary resourceDictionary
-     * @return DataDictionary
+     * @return ResourceDictionary
      */
     @Throws(BluePrintException::class)
     suspend fun saveResourceDictionary(resourceDictionary: ResourceDictionary): ResourceDictionary {
@@ -128,33 +130,49 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
     }
 
     /**
-     * This is a saveDataDictionary service
+     * This is to save single ResourceDictionary from json content
      *
      * @param resourceDefinition ResourceDefinition
-     * @return ResourceDefinition
+     * @return ResourceDictionary
+     */
+    @Throws(BluePrintException::class)
+    suspend fun saveResourceDefinition(resourceDefinition: ResourceDefinition): ResourceDictionary {
+        return resourceDictionaryRepository.save(enrichResourceDictionary(resourceDefinition))
+    }
+
+    /**
+     * This is to save multiple ResourceDictionaries from json array content
+     *
+     * @param resourceDefinitionList List<ResourceDefinition>
+     * @return MutableList<ResourceDictionary>
      */
     @Throws(BluePrintException::class)
-    suspend fun saveResourceDefinition(resourceDefinition: ResourceDefinition): ResourceDefinition {
+    suspend fun saveAllResourceDefinition(resourceDefinitionList: List<ResourceDefinition>): MutableList<ResourceDictionary> {
+        val dictionaryList: MutableList<ResourceDictionary> = mutableListOf()
+        resourceDefinitionList.forEach {
+            dictionaryList.add(enrichResourceDictionary(it))
+        }
+        return resourceDictionaryRepository.saveAll(dictionaryList)
+    }
+
+    private fun enrichResourceDictionary(resourceDefinition: ResourceDefinition): ResourceDictionary {
         val resourceDictionary = ResourceDictionary()
         resourceDictionary.name = resourceDefinition.name
         resourceDictionary.updatedBy = resourceDefinition.updatedBy
         resourceDictionary.resourceDictionaryGroup = resourceDefinition.group
         resourceDictionary.entrySchema = resourceDefinition.property.entrySchema?.type
+        resourceDictionary.description = resourceDefinition.property.description!!
+        resourceDictionary.dataType = resourceDefinition.property.type
+        resourceDictionary.definition = resourceDefinition
+
         if (StringUtils.isBlank(resourceDefinition.tags)) {
-            resourceDictionary.tags = (
-                resourceDefinition.name + ", " + resourceDefinition.updatedBy +
-                    ", " + resourceDefinition.updatedBy
-                )
+            resourceDictionary.tags = resourceDefinition.name + ", " + resourceDefinition.updatedBy
         } else {
             resourceDictionary.tags = resourceDefinition.tags!!
         }
-        resourceDictionary.description = resourceDefinition.property.description!!
-        resourceDictionary.dataType = resourceDefinition.property.type
-        resourceDictionary.definition = resourceDefinition
 
         validateResourceDictionary(resourceDictionary)
-
-        return resourceDictionaryRepository.save(resourceDictionary).definition
+        return resourceDictionary
     }
 
     /**
@@ -174,12 +192,19 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
         return ResourceSourceMappingFactory.getRegisterSourceMapping()
     }
 
+    /**
+     * This is a getResourceDirectories service
+     */
+    suspend fun getAllDictionary(pageRequest: Pageable): Page<ResourceDictionary> {
+        return resourceDictionaryRepository.findAll(pageRequest)
+    }
+
     private fun validateResourceDictionary(resourceDictionary: ResourceDictionary): Boolean {
-        checkNotEmpty(resourceDictionary.name) { "DataDictionary Definition name is missing." }
-        checkNotNull(resourceDictionary.definition) { "DataDictionary Definition Information is missing." }
-        checkNotEmpty(resourceDictionary.description) { "DataDictionary Definition Information is missing." }
-        checkNotEmpty(resourceDictionary.tags) { "DataDictionary Definition tags is missing." }
-        checkNotEmpty(resourceDictionary.updatedBy) { "DataDictionary Definition updatedBy is missing." }
+        checkNotEmpty(resourceDictionary.name) { "ResourceDictionary Definition name is missing." }
+        checkNotNull(resourceDictionary.definition) { "ResourceDictionary Definition Information is missing." }
+        checkNotEmpty(resourceDictionary.description) { "ResourceDictionary Definition Information is missing." }
+        checkNotEmpty(resourceDictionary.tags) { "ResourceDictionary Definition tags is missing." }
+        checkNotEmpty(resourceDictionary.updatedBy) { "ResourceDictionary Definition updatedBy is missing." }
         return true
     }
 
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintSortByOption.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintSortByOption.kt
index ff12efdda..846bd0af2 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintSortByOption.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintSortByOption.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright © 2017-2023 AT&T Intellectual Property.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.utils
 
 enum class BlueprintSortByOption(val columnName: String) {
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/DictionarySortByOption.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/DictionarySortByOption.kt
new file mode 100644
index 000000000..c0df4d72c
--- /dev/null
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/DictionarySortByOption.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2017-2023 AT&T Intellectual Property.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.utils
+
+enum class DictionarySortByOption(val columnName: String) {
+    DATE("creationDate")
+}
diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt
index 49e03137b..26badcc08 100644
--- a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/api/v1/template")
 @Api(
-    value = "Resource template",
+    value = "Resource Template",
     description = "Interaction with resolved templates"
 )
 open class TemplateController(private val templateResolutionService: TemplateResolutionService) {
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
index bed8b80e9..7c0672f65 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
@@ -50,8 +50,8 @@ import javax.annotation.PreDestroy
 @RestController
 @RequestMapping("/api/v1/execution-service")
 @Api(
-    value = "/api/v1/execution-service",
-    description = "Interaction with CBA."
+    value = "Execution Service Catalog",
+    description = "Interaction with CBA which are available in CDS"
 )
 open class ExecutionServiceController {
 
-- 
cgit 1.2.3-korg