move the getAdapterInfoFuture and getAdapterInfo response bodies case classes into obp-commons

This commit is contained in:
hongwei 2019-03-27 10:31:20 +01:00
parent 113a79c1fd
commit 8465335cf3
12 changed files with 42 additions and 45 deletions

View File

@ -1067,25 +1067,6 @@ object APIUtil extends MdcLoggable {
Glossary.glossaryItems.toList.sortBy(_.title)
}
/**
*
* This is the base class for all kafka outbound case class
* action and messageFormat are mandatory
* The optionalFields can be any other new fields .
*/
abstract class OutboundMessageBase(
optionalFields: String*
) {
def action: String
def messageFormat: String
}
abstract class InboundMessageBase(
optionalFields: String*
) {
def errorCode: String
}
// Used to document the KafkaMessage calls
case class MessageDoc(
process: String,

View File

@ -17,7 +17,6 @@ import code.api.v3_1_0.{ContactDetailsJson, InviteeJson}
import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
import code.atms.Atms
import code.atms.Atms.AtmId
import code.bankconnectors.vMar2017.InboundAdapterInfoInternal
import code.bankconnectors.{Connector, ObpApiLoopback}
import code.branches.Branches
import code.branches.Branches.{Branch, BranchId, DriveUp, DriveUpString, Lobby, LobbyString}

View File

@ -39,7 +39,6 @@ import code.api.v2_0_0.EntitlementJSONs
import code.api.v2_0_0.JSONFactory200.{UserJsonV200, UsersJsonV200}
import code.api.v2_1_0.CustomerCreditRatingJSON
import code.atms.Atms.{Atm, AtmId, AtmT}
import code.bankconnectors.vMar2017.InboundAdapterInfoInternal
import code.branches.Branches._
import code.entitlement.Entitlement
import code.entitlementrequest.EntitlementRequest

View File

@ -20,7 +20,7 @@ import code.atms.Atms
import code.atms.Atms.{AtmId, AtmT}
import code.bankconnectors.akka.AkkaConnector_vDec2018
import code.bankconnectors.vJune2017.KafkaMappedConnector_vJune2017
import code.bankconnectors.vMar2017.{InboundAdapterInfoInternal, KafkaMappedConnector_vMar2017}
import code.bankconnectors.vMar2017.KafkaMappedConnector_vMar2017
import code.bankconnectors.vSept2018.KafkaMappedConnector_vSept2018
import code.branches.Branches.{Branch, BranchId, BranchT}
import code.context.UserAuthContext

View File

@ -30,7 +30,7 @@ import code.accountholders.AccountHolders
import code.api.util.ErrorMessages._
import code.api.util._
import code.api.v2_1_0.TransactionRequestCommonBodyJSON
import code.bankconnectors.vMar2017.{InboundAdapterInfoInternal, KafkaMappedConnector_vMar2017}
import code.bankconnectors.vMar2017.{KafkaMappedConnector_vMar2017}
import code.branches.Branches.{Branch, BranchT}
import code.fx.{FXRate, fx}
import code.kafka.KafkaHelper

View File

@ -10,7 +10,6 @@ import code.api.util._
import code.bankconnectors._
import code.bankconnectors.akka.InboundTransformerDec2018._
import code.bankconnectors.akka.actor.{AkkaConnectorActorInit, AkkaConnectorHelperActor}
import code.bankconnectors.vMar2017.InboundAdapterInfoInternal
import code.model.Transaction
import com.openbankproject.commons.dto._
import com.openbankproject.commons.model.{CounterpartyTrait, CreditLimit, _}

View File

@ -5,7 +5,6 @@ import java.text.SimpleDateFormat
import java.util.{Date, Locale, UUID}
import code.api.util.APIUtil
import code.api.util.APIUtil.InboundMessageBase
import code.api.v3_1_0.CheckbookOrdersJson
import code.atms.Atms.{AtmId, AtmT}
import code.bankconnectors._

View File

@ -29,7 +29,7 @@ package code.bankconnectors.vMar2017
import java.util.Date
import code.api.util.APIUtil
import code.api.util.APIUtil.{InboundMessageBase, MessageDoc, OutboundMessageBase}
import code.api.util.APIUtil.{MessageDoc}
import code.bankconnectors.InboundUser
import code.fx.FXRate
import code.model._
@ -299,13 +299,6 @@ case class CounterpartyTrait2(counterparty: InboundCounterparty) extends Counter
def bespoke: List[CounterpartyBespoke] = Nil
}
case class InboundStatusMessage(
source: String,
status: String,
errorCode: String,
text: String
)
case class InboundBank(
bankId: String,
name: String,
@ -313,16 +306,6 @@ case class InboundBank(
url: String
)
case class InboundAdapterInfoInternal(
errorCode: String,
backendMessages: List[InboundStatusMessage],
name: String,
version: String,
git_commit: String,
date: String
) extends InboundMessageBase
case class Bank2(r: InboundBank) extends Bank {
def fullName = r.name

View File

@ -3,7 +3,6 @@ package code.bankconnectors.vSept2018
import java.util.Date
import code.api.util.APIUtil
import code.api.util.APIUtil.InboundMessageBase
import code.api.v2_1_0.TransactionRequestCommonBodyJSON
import code.api.v3_1_0.CheckbookOrdersJson
import code.atms.Atms.{AtmId, AtmT}

View File

@ -3,7 +3,6 @@ package code.connector
import code.api.util.CallContext
import code.bankconnectors._
import code.bankconnectors.vJune2017.InboundAccountJune2017
import code.bankconnectors.vMar2017.InboundStatusMessage
import code.model._
import code.setup.{DefaultConnectorTestSetup, DefaultUsers, ServerSetup}
import code.util.Helper.MdcLoggable

View File

@ -0,0 +1 @@
package com.openbankproject.commons.dto.rest

View File

@ -0,0 +1,38 @@
package com.openbankproject.commons.model
import scala.collection.immutable.List
/**
*
* This is the base class for all kafka outbound case class
* action and messageFormat are mandatory
* The optionalFields can be any other new fields .
*/
abstract class OutboundMessageBase(
optionalFields: String*
) {
def action: String
def messageFormat: String
}
abstract class InboundMessageBase(
optionalFields: String*
) {
def errorCode: String
}
case class InboundStatusMessage(
source: String,
status: String,
errorCode: String,
text: String
)
case class InboundAdapterInfoInternal(
errorCode: String,
backendMessages: List[InboundStatusMessage],
name: String,
version: String,
git_commit: String,
date: String
) extends InboundMessageBase