From aca871ad73330359bd46006070c29db44161fc12 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Fri, 10 Jan 2020 15:14:36 +0100
Subject: [PATCH] moved the apisResource.json to resources folder and tweaked
 the code

---
 CONTRIBUTING.md                                          | 2 +-
 .../apiBuilder}/apisResource.json                        | 0
 .../main/scala/code/api/APIBuilder/APIBuilderModel.scala | 2 +-
 .../code/api/APIBuilder/apiResourceDoc/APIBuilder.scala  | 9 ++++-----
 obp-api/src/main/scala/code/api/util/APIUtil.scala       | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename obp-api/src/main/{scala/code/api/APIBuilder/apiResourceDoc => resources/apiBuilder}/apisResource.json (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7d41920c..4ca1c395b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -154,7 +154,7 @@ Type1: If you use `modelSource.json`, please run `APIBuilderModel.scala` main me
 ```
 Type2: If you use `apisResource.json`, please run `APIBuilder.scala` main method
 ```
-OBP-API/src/main/scala/code/api/APIBuilder/apiResourceDoc/apisResource.json
+/OBP-API/obp-api/src/main/resources/apiBuilder/apisResource.json
 OBP-API/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
 ```
 Type3: If you use `swaggerResource.json`, please run `APIBuilderSwagger.scala` main method
diff --git a/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/apisResource.json b/obp-api/src/main/resources/apiBuilder/apisResource.json
similarity index 100%
rename from obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/apisResource.json
rename to obp-api/src/main/resources/apiBuilder/apisResource.json
diff --git a/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderModel.scala b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderModel.scala
index a72a6d851..da79fe913 100644
--- a/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderModel.scala
+++ b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderModel.scala
@@ -265,7 +265,7 @@ object APIBuilderModel
     println("Congratulations! You make the new APIs. Please restart OBP-API server!")
   }
   
-  val jsonJValueFromFile: JValue = APIUtil.APIModelSourceJValue 
+  val jsonJValueFromFile: JValue = APIUtil.getJValueFromJsonFile("apiBuilder/APIModelSource.json") 
   
   //"/templates"
   val apiUrl= getApiUrl(jsonJValueFromFile)
diff --git a/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala b/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
index 113338426..51cb8f878 100644
--- a/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
+++ b/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
@@ -36,7 +36,7 @@ object APIBuilder
 {
   def main(args: Array[String]): Unit = overwriteApiCode(apiSource,jsonFactorySource)
 
-  val jsonJValueFromFile: JValue = APIUtil.getJValueFromFile("obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/apisResource.json")
+  val jsonJValueFromFile: JValue = APIUtil.getJValueFromJsonFile("apiBuilder/apisResource.json") 
 
   val resourceDocsJObject= jsonJValueFromFile.\("resource_docs").children.asInstanceOf[List[JObject]]
     
@@ -210,9 +210,7 @@ object APIBuilder
         cc => {
           for {
             u <- $getMultipleAuthenticationStatement
-            jsonStringFromFile = scala.io.Source.fromFile("obp-api/src/main/scala/code/api/APIBuilder/apisResource.json").mkString 
-            jsonJValueFromFile = json.parse(jsonStringFromFile)
-            resourceDocsJObject= jsonJValueFromFile.\("resource_docs").children.asInstanceOf[List[JObject]]
+            resourceDocsJObject= jsonFromApisResource.\("resource_docs").children.asInstanceOf[List[JObject]]
             getMethodJValue = resourceDocsJObject.filter(jObject => jObject.\("request_verb") == JString("GET")&& !jObject.\("request_url").asInstanceOf[JString].values.contains("_ID")).head
             jsonObject = getMethodJValue \ "success_response_body"
           } yield {
@@ -388,7 +386,8 @@ trait APIMethods_APIBuilder
 
     $errorMessageVal;
     def endpointsOfBuilderAPI = getTemplatesFromFile :: getTemplate :: createTemplate :: getTemplates :: deleteTemplate :: Nil
-    
+    val jsonFromApisResource: JValue = getJValueFromJsonFile("apiBuilder/apisResource.json")
+      
     $getTemplateFromFileResourceCode
     $getTemplateFromFilePartialFunction
  
diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index 412ffbdc7..f028d12da 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -2757,8 +2757,8 @@ Returns a string showed to the developer
       AccountHolders.accountHolders.vend.getAccountHolders(bankId, accountId).exists(_.userId == user.userId)
   }
 
-  val APIModelSourceJValue = {
-    val stream = getClass().getClassLoader().getResourceAsStream("apiBuilder/APIModelSource.json")
+  def getJValueFromJsonFile(path: String) = {
+    val stream = getClass().getClassLoader().getResourceAsStream(path)
     try {
       val bufferedSource = scala.io.Source.fromInputStream(stream, "utf-8")
       val jsonStringFromFile = bufferedSource.mkString