From c4dcf1aac48980494d95a5640a7ab7a3c2d345d5 Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Sat, 10 Nov 2018 11:54:05 -0500
Subject: Controller Design Studio

Upgrade Spring Boot and Kotlin versions.

Change-Id: If0d7d0f476d8cfd23916013ff1ab554b26bc6b7a
Issue-ID: CCSDK-658
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 components/resource-dict/pom.xml                                    | 2 +-
 .../resource/dict/service/ResourceDefinitionRepoService.kt          | 6 ++++--
 .../resource/dict/service/ResourceDefinitionRepoServiceTest.java    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'components/resource-dict')

diff --git a/components/resource-dict/pom.xml b/components/resource-dict/pom.xml
index 508ae96f4..517895cb4 100644
--- a/components/resource-dict/pom.xml
+++ b/components/resource-dict/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
+            <artifactId>kotlin-test-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
index 6c83e5f93..6d186b598 100644
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
@@ -49,10 +49,12 @@ open class ResourceDefinitionFileRepoService : BluePrintRepoFileService,
 
     constructor(basePath: String) : this(basePath,
             basePath.plus(BluePrintConstants.PATH_DIVIDER)
-                    .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE))
+                    .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE)
+                    .plus(BluePrintConstants.PATH_DIVIDER)
+                    .plus("starter-type"))
 
     constructor(basePath: String, modelTypePath: String) : super(modelTypePath) {
-        resourceDefinitionPath = basePath.plus("/resource_dictionary")
+        resourceDefinitionPath = basePath.plus("/resource-dictionary/starter-dictionary")
     }
 
     override fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition> {
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
index 1772277df..6789c0e0e 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
@@ -25,7 +25,7 @@ public class ResourceDefinitionRepoServiceTest {
 
     @Test
     public void testGetResourceDefinition() throws Exception{
-        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("load");
+        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../model-catalog");
         ResourceDefinition resourceDefinition = resourceDefinitionRepoService
                 .getResourceDefinition("db-source").block();
         Assert.assertNotNull("Failed to get Resource Definition db-source", resourceDefinition);
-- 
cgit 1.2.3-korg