From 27cb4099d5a88a24cd6793b6367af1054d40b947 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Fri, 10 Jan 2020 15:47:37 +0100
Subject: [PATCH] clean the APIBuilder folder

---
 CONTRIBUTING.md                                               | 4 ++--
 .../code/api/APIBuilder/{apiResourceDoc => }/APIBuilder.scala | 3 +--
 .../code/api/APIBuilder/{swagger => }/APIBuilderSwagger.scala | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename obp-api/src/main/scala/code/api/APIBuilder/{apiResourceDoc => }/APIBuilder.scala (99%)
 rename obp-api/src/main/scala/code/api/APIBuilder/{swagger => }/APIBuilderSwagger.scala (99%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5cffe8f77..697bdb246 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -155,12 +155,12 @@ 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/obp-api/src/main/resources/apiBuilder/apisResource.json
-OBP-API/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
+OBP-API/src/main/scala/code/api/APIBuilder/APIBuilder.scala
 ```
 Type3: If you use `swaggerResource.json`, please run `APIBuilderSwagger.scala` main method
 ```
 /OBP-API/obp-api/src/main/resources/apiBuilder/swaggerResource.json
-OBP-API/src/main/scala/code/api/APIBuilder/swagger/APIBuilderSwagger.scala
+OBP-API/src/main/scala/code/api/APIBuilder/APIBuilderSwagger.scala
 ```
 
 ## Issues
diff --git a/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilder.scala
similarity index 99%
rename from obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
rename to obp-api/src/main/scala/code/api/APIBuilder/APIBuilder.scala
index 51cb8f878..73ceec4c2 100644
--- a/obp-api/src/main/scala/code/api/APIBuilder/apiResourceDoc/APIBuilder.scala
+++ b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilder.scala
@@ -23,10 +23,9 @@ Berlin 13359, Germany
   This product includes software developed at
   TESOBE (http://www.tesobe.com/)
  */
-package code.api.APIBuilder.apiResourceDoc;
+package code.api.APIBuilder
 
 import code.api.APIBuilder.APIBuilderModel._
-import code.api.APIBuilder.APIBuilderModel
 import code.api.util.APIUtil
 import scala.meta._
 import net.liftweb.json.JsonAST.{JObject, JString}
diff --git a/obp-api/src/main/scala/code/api/APIBuilder/swagger/APIBuilderSwagger.scala b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderSwagger.scala
similarity index 99%
rename from obp-api/src/main/scala/code/api/APIBuilder/swagger/APIBuilderSwagger.scala
rename to obp-api/src/main/scala/code/api/APIBuilder/APIBuilderSwagger.scala
index 16dddbc4f..1cfa9233a 100644
--- a/obp-api/src/main/scala/code/api/APIBuilder/swagger/APIBuilderSwagger.scala
+++ b/obp-api/src/main/scala/code/api/APIBuilder/APIBuilderSwagger.scala
@@ -23,10 +23,9 @@ Berlin 13359, Germany
   This product includes software developed at
   TESOBE (http://www.tesobe.com/)
  */
-package code.api.APIBuilder.swagger
+package code.api.APIBuilder
 
 import code.api.APIBuilder.APIBuilderModel._
-import code.api.APIBuilder.APIBuilderModel
 import code.api.util.APIUtil
 import net.liftweb.json.JsonAST.{JObject, JString}
 import net.liftweb.json.{JArray, JValue}