diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala index 19562906c..548648912 100644 --- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala @@ -558,15 +558,7 @@ trait Connector extends MdcLoggable { def checkBankAccountExistsLegacy(bankId : BankId, accountId : AccountId, callContext: Option[CallContext] = None) : Box[(BankAccount, Option[CallContext])]= Failure(setUnimplementedError(nameOf(checkBankAccountExistsLegacy _))) def checkBankAccountExists(bankId : BankId, accountId : AccountId, callContext: Option[CallContext] = None) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(checkBankAccountExists _))), callContext)} - - /** - * This method is just return an empty account to AccountType. - * It is used for SEPA, Counterparty empty toAccount - * - * @return empty bankAccount - */ - def getEmptyBankAccount(): Box[BankAccount]= Failure(setUnimplementedError(nameOf(getEmptyBankAccount _))) - + def getCounterpartyFromTransaction(bankId: BankId, accountId: AccountId, counterpartyId: String): Box[Counterparty] = { val transactions = getTransactionsLegacy(bankId, accountId ,None).map(_._1).toList.flatten val counterparties = for { diff --git a/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala b/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala index 84c8596e0..8164009f2 100644 --- a/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala +++ b/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala @@ -410,7 +410,6 @@ object ConnectorBuilderUtil { //"getPhysicalCardsForBankLegacy", // should not generate for Legacy methods //"getBranchLegacy", // should not generate for Legacy methods //"getAtmLegacy", // should not generate for Legacy methods - "getEmptyBankAccount", "getCounterpartyFromTransaction", "getCounterpartiesFromTransaction", ).distinct diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala index c1aebc972..3e52ab132 100644 --- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala @@ -1224,10 +1224,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { } - override def getEmptyBankAccount(): Box[BankAccount] = { - Full(new MappedBankAccount()) - } - + /** * This is used for create or update the special bankAccount for COUNTERPARTY stuff (toAccountProvider != "OBP") and (Connector = Kafka) * details in createTransactionRequest - V210 ,case COUNTERPARTY.toString diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala b/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala index 0f1d1a0f4..a4bc46442 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala @@ -1024,10 +1024,6 @@ case class InBoundDynamicEntityProcessDoc (inboundAdapterCallContext: InboundAda case class OutBoundCreateChallenges(outboundAdapterCallContext: OutboundAdapterCallContext, bankId: BankId, accountId: AccountId, userIds: List[String], transactionRequestType: TransactionRequestType, transactionRequestId: String, scaMethod: Option[StrongCustomerAuthentication.SCA]) extends TopicTrait case class InBoundCreateChallenges(inboundAdapterCallContext: InboundAdapterCallContext, status: Status, data: List[String]) extends InBoundTrait[List[String]] -case class OutBoundGetEmptyBankAccount() extends TopicTrait -case class InBoundGetEmptyBankAccount(status: Status, data: BankAccountCommons) extends InBoundTrait[BankAccountCommons] { - override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext() -} case class OutBoundGetCounterpartyFromTransaction(bankId: BankId, accountId: AccountId, counterpartyId: String) extends TopicTrait case class InBoundGetCounterpartyFromTransaction(status: Status, data: Counterparty) extends InBoundTrait[Counterparty] {