artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 13:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved the apisResource.json to resources folder and tweaked the code

Browse Source
This commit is contained in:
hongwei 2020-01-10 15:14:36 +01:00
parent 5ae7b9a9e2
commit aca871ad73
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -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

0
obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/apisResource.json → obp-api/src/main/resources/apiBuilder/apisResource.json
View File

2
obp-api/src/main/scala/code/api/APIBuilder/APIBuilderModel.scala
View File

@ -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)

9
obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
View File

@ -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

4
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -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