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

rename xxxEx to xxxExtended

Browse Source
This commit is contained in:
hongwei 2019-04-02 14:29:53 +02:00
parent 7d5e463551
commit 6db1d00a36
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obp-api/src/main/scala/code/api/UKOpenBanking/v2_0_0/JSONFactory_UKOpenBanking_200.scala
View File

@ -6,7 +6,7 @@ import code.api.Constant
import code.api.util.APIUtil.DateWithDayExampleObject
import com.openbankproject.commons.model.AmountOfMoneyJsonV121
import code.model.{ModeratedBankAccount, ModeratedTransaction}
import code.model.toBankAccountEx
import code.model.toBankAccountExtended
import com.openbankproject.commons.model.TransactionRequest
import com.openbankproject.commons.model.BankAccount

2
obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala
View File

@ -14,7 +14,7 @@ import code.api.util._
import code.bankconnectors._
import code.metadata.comments.Comments
import code.metadata.counterparties.Counterparties
import code.model.{Bank, BankAccount, ModeratedTransactionMetadata, toBankAccountEx, toBankEx, toUserEx}
import code.model.{Bank, BankAccount, ModeratedTransactionMetadata, toBankAccountExtended, toBankExtended, toUserExtended}
import code.util.Helper.booleanToBox
import code.views.Views
import com.google.common.cache.CacheBuilder

2
obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
View File

@ -21,7 +21,7 @@ import code.customer.Customer
import code.entitlement.Entitlement
import code.fx.fx
import code.metrics.APIMetrics
import code.model.{Bank, BankAccount, Consumer, User, toUserEx}
import code.model.{Bank, BankAccount, Consumer, User, toUserExtended}
import code.sandbox.SandboxData
import code.transactionrequests.TransactionRequests.{TransactionChallengeTypes, TransactionRequestTypes}
import code.usercustomerlinks.UserCustomerLink

2
obp-api/src/main/scala/code/bankconnectors/Connector.scala
View File

@ -21,7 +21,7 @@ import code.fx.FXRate
import code.fx.fx.TTL
import code.management.ImporterAPI.ImporterTransaction
import code.model.dataAccess.ResourceUser
import code.model.toUserEx
import code.model.toUserExtended
import code.products.Products.Product
import code.transactionChallenge.ExpectedChallengeAnswer
import code.transactionrequests.TransactionRequests.TransactionRequestTypes._

4
obp-api/src/main/scala/code/model/BankingData.scala
View File

@ -45,7 +45,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
case class BankEx(bank: Bank) {
case class BankExtended(bank: Bank) {
def publicAccounts(publicViewsForBank: List[View]) : List[BankAccount] = {
publicViewsForBank
@ -115,7 +115,7 @@ class AccountOwner(
// TODO Add: @define productCode A code (no spaces, url friendly) that identifies the financial product this account is based on.
case class BankAccountEx(val bankAccount: BankAccount) extends MdcLoggable {
case class BankAccountExtended(val bankAccount: BankAccount) extends MdcLoggable {
private val bankId = bankAccount.bankId

2
obp-api/src/main/scala/code/model/Metadata.scala
View File

@ -34,7 +34,7 @@ import net.liftweb.json.JsonAST.JObject
import net.liftweb.json.JsonDSL._
case class CommentEx(val comment: Comment) {
case class CommentExtended(val comment: Comment) {
@deprecated(Helper.deprecatedJsonGenerationMessage)
def toJson : JObject = {

2
obp-api/src/main/scala/code/model/User.scala
View File

@ -40,7 +40,7 @@ import code.util.Helper.MdcLoggable
import com.openbankproject.commons.model.{BankIdAccountId, User, UserPrimaryKey, View, ViewId}
import net.liftweb.mapper.By
case class UserEx(val user: User) extends MdcLoggable {
case class UserExtended(val user: User) extends MdcLoggable {
private[this] val userPrimaryKey: UserPrimaryKey = user.userPrimaryKey
private[this] val userId: String = user.userId

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

@ -35,9 +35,9 @@ import code.metadata.counterparties.Counterparties
import com.openbankproject.commons.model._
import net.liftweb.common._
case class ViewEx(val view: View) {
case class ViewExtended(val view: View) {
val viewLogger = Logger(classOf[ViewEx])
val viewLogger = Logger(classOf[ViewExtended])
def moderateTransaction(transaction : Transaction): Box[ModeratedTransaction] = {
moderateTransactionUsingModeratedAccount(transaction, moderateAccount(transaction.thisAccount))

14
obp-api/src/main/scala/code/model/package.scala
View File

@ -17,17 +17,17 @@ import com.openbankproject.commons.model._
*/
package object model {
implicit def toBankEx(bank: Bank) = BankEx(bank)
implicit def toBankExtended(bank: Bank) = BankExtended(bank)
implicit def toBankAccountEx(bankAccount: BankAccount) = BankAccountEx(bankAccount)
implicit def toBankAccountExtended(bankAccount: BankAccount) = BankAccountExtended(bankAccount)
implicit def toCommentEx(comment: Comment) = CommentEx(comment)
implicit def toCommentExtended(comment: Comment) = CommentExtended(comment)
implicit def toUserEx(user: User) = UserEx(user)
implicit def toUserExtended(user: User) = UserExtended(user)
implicit def toViewEx(view: View) = ViewEx(view)
implicit def toViewExtended(view: View) = ViewExtended(view)
implicit class CounterpartyEx(counterparty: Counterparty) {
implicit class CounterpartyExtended(counterparty: Counterparty) {
lazy val metadata: CounterpartyMetadata = Counterparties.counterparties.vend.getOrCreateMetadata(
counterparty.thisBankId,
counterparty.thisAccountId,
@ -36,7 +36,7 @@ package object model {
).openOrThrowException("Can not getOrCreateMetadata !")
}
implicit class TransactionEx(transaction: Transaction) {
implicit class TransactionExtended(transaction: Transaction) {
private[this] val bankId = transaction.bankId
private[this] val accountId = transaction.accountId