diff --git a/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountAccess.scala b/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountAccess.scala index 189eecbd8..0aad03910 100644 --- a/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountAccess.scala +++ b/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountAccess.scala @@ -35,7 +35,7 @@ object TableAccountAccess { .user_fk(permission.user.get) .view_id(viewId) .view_fk(viewFk) - .save() + .save } val isSuccessful = insertedRows.forall(_ == true) val accountAccess = AccountAccess.findAll() diff --git a/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountRoutings.scala b/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountRoutings.scala index c8a07a0f6..99373e84a 100644 --- a/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountRoutings.scala +++ b/obp-api/src/main/scala/code/api/util/migration/MigrationOfAccountRoutings.scala @@ -99,7 +99,7 @@ object MigrationOfAccountRoutings { false // DB have the same routing case Full(routing) => // only accountRoutingAddress is different. - routing.AccountRoutingAddress(accountRoutingAddress).save() + routing.AccountRoutingAddress(accountRoutingAddress).save case _ => // query according unique index: UniqueIndex(BankId, AccountRoutingScheme, AccountRoutingAddress) BankAccountRouting.find(By(BankAccountRouting.BankId, bankId), @@ -108,7 +108,7 @@ object MigrationOfAccountRoutings { ) match { case Full(routing) => // only accountId is different - routing.AccountId(accountId).save() + routing.AccountId(accountId).save case _ => // not exists corresponding routing in DB. BankAccountRouting.create @@ -116,7 +116,7 @@ object MigrationOfAccountRoutings { .AccountId(accountId) .AccountRoutingScheme(accountRoutingScheme) .AccountRoutingAddress(accountRoutingAddress) - .save() + .save } } } diff --git a/obp-api/src/main/scala/code/api/util/migration/MigrationOfConsumerRateLimiting.scala b/obp-api/src/main/scala/code/api/util/migration/MigrationOfConsumerRateLimiting.scala index d9bff914b..3bb5a9dff 100644 --- a/obp-api/src/main/scala/code/api/util/migration/MigrationOfConsumerRateLimiting.scala +++ b/obp-api/src/main/scala/code/api/util/migration/MigrationOfConsumerRateLimiting.scala @@ -47,7 +47,7 @@ object TableRateLmiting { .PerMonthCallLimit(consumer.perMonthCallLimit.get) .FromDate(Date.from(oneDayAgo.toInstant())) .ToDate(Date.from(oneYearInFuture.toInstant())) - .save() + .save } } val isSuccessful = insertedRows.forall(_ == true) diff --git a/obp-api/src/main/scala/code/api/util/migration/MigrationOfSystemViewsToCustomViews.scala b/obp-api/src/main/scala/code/api/util/migration/MigrationOfSystemViewsToCustomViews.scala index 55fdc90f6..a4252eb69 100644 --- a/obp-api/src/main/scala/code/api/util/migration/MigrationOfSystemViewsToCustomViews.scala +++ b/obp-api/src/main/scala/code/api/util/migration/MigrationOfSystemViewsToCustomViews.scala @@ -58,7 +58,7 @@ object UpdateTableViewDefinition { view <- views accountAccess <- AccountAccess.find(By(AccountAccess.view_fk, view.id)).toList } yield { - accountAccess.view_id(view.viewId.value).save() + accountAccess.view_id(view.viewId.value).save } val isSuccessful = views.forall(_.isSystem == false) diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala index a691822b6..dba5db999 100644 --- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala @@ -1892,7 +1892,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { newAccountBalance <- Full(Helper.convertToSmallestCurrencyUnits(fromAccount.balance, currency) + Helper.convertToSmallestCurrencyUnits(amount, currency)) //Here is the `LocalMappedConnector`, once get this point, fromAccount must be a mappedBankAccount. So can use asInstanceOf.... - _ <- tryo(fromAccount.asInstanceOf[MappedBankAccount].accountBalance(newAccountBalance).save()) ?~! UpdateBankAccountException + _ <- tryo(fromAccount.asInstanceOf[MappedBankAccount].accountBalance(newAccountBalance).save) ?~! UpdateBankAccountException mappedTransaction <- tryo(MappedTransaction.create .bank(fromAccount.bankId.value) @@ -2047,7 +2047,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { newAccountBalance <- Full(Helper.convertToSmallestCurrencyUnits(fromAccount.balance, currency) + Helper.convertToSmallestCurrencyUnits(amount, currency)) //Here is the `LocalMappedConnector`, once get this point, fromAccount must be a mappedBankAccount. So can use asInstanceOf.... - _ <- tryo(fromAccount.asInstanceOf[MappedBankAccount].accountBalance(newAccountBalance).save()) ?~! UpdateBankAccountException + _ <- tryo(fromAccount.asInstanceOf[MappedBankAccount].accountBalance(newAccountBalance).save) ?~! UpdateBankAccountException mappedTransaction <- tryo(MappedTransaction.create //No matter which type (SANDBOX_TAN,SEPA,FREE_FORM,COUNTERPARTYE), always filled the following nine fields. @@ -5070,7 +5070,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { .Currency(reason.currency.getOrElse("")) .DocumentNumber(reason.documentNumber.getOrElse("")) .Description(reason.description.getOrElse("")) - .save() + .save } } diff --git a/obp-api/src/main/scala/code/cards/MappedPhisicalCard.scala b/obp-api/src/main/scala/code/cards/MappedPhisicalCard.scala index 0dd125d84..618848bcf 100644 --- a/obp-api/src/main/scala/code/cards/MappedPhisicalCard.scala +++ b/obp-api/src/main/scala/code/cards/MappedPhisicalCard.scala @@ -110,7 +110,7 @@ object MappedPhysicalCardProvider extends PhysicalCardProvider { .card(v) .saveMe() v.mPinResets += pin - v.save() + v.save } } case _ => // There is no enough information to set foreign key @@ -217,7 +217,7 @@ object MappedPhysicalCardProvider extends PhysicalCardProvider { .card(v) .saveMe() v.mPinResets += pin - v.save() + v.save } } case _ => // There is no enough information to set foreign key diff --git a/obp-api/src/main/scala/code/customer/MappedCustomerProvider.scala b/obp-api/src/main/scala/code/customer/MappedCustomerProvider.scala index eda7c0880..45d73a3cf 100644 --- a/obp-api/src/main/scala/code/customer/MappedCustomerProvider.scala +++ b/obp-api/src/main/scala/code/customer/MappedCustomerProvider.scala @@ -318,7 +318,7 @@ object MappedCustomerProvider extends CustomerProvider with MdcLoggable { for { customer <- MappedCustomer.findAll(NullRef(MappedCustomer.mCustomerId))++ MappedCustomer.findAll(By(MappedCustomer.mCustomerId, "")) } yield { - customer.mCustomerId(APIUtil.generateUUID()).save() + customer.mCustomerId(APIUtil.generateUUID()).save } }.forall(_ == true) diff --git a/obp-api/src/main/scala/code/loginattempts/LoginAttempts.scala b/obp-api/src/main/scala/code/loginattempts/LoginAttempts.scala index c03ed712a..f96413e5d 100644 --- a/obp-api/src/main/scala/code/loginattempts/LoginAttempts.scala +++ b/obp-api/src/main/scala/code/loginattempts/LoginAttempts.scala @@ -37,7 +37,7 @@ object LoginAttempt extends MdcLoggable { .Provider(provider) .mLastFailureDate(now) .mBadAttemptsSinceLastSuccessOrReset(1) // Start with 1 - .save() + .save logger.debug(s"incrementBadLoginAttempts created loginAttempt") } diff --git a/obp-api/src/main/scala/code/meetings/MappedMeetingProvider.scala b/obp-api/src/main/scala/code/meetings/MappedMeetingProvider.scala index b4f24c70c..8b275d65d 100644 --- a/obp-api/src/main/scala/code/meetings/MappedMeetingProvider.scala +++ b/obp-api/src/main/scala/code/meetings/MappedMeetingProvider.scala @@ -74,7 +74,7 @@ object MappedMeetingProvider extends MeetingProvider { .mStatus(invitee.status) .saveMe() createdMeeting.mInvitees += meetingInvitee - createdMeeting.save() + createdMeeting.save }} ?~! ErrorMessages.CreateMeetingInviteeException } yield { createdMeeting diff --git a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala index f4b5922ad..62e365964 100644 --- a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala +++ b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala @@ -290,27 +290,27 @@ object MapperCounterparties extends Counterparties with MdcLoggable { } override def addPublicAlias(counterpartyId : String, alias: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.publicAlias(alias).save()) + getCounterpartyMetadata(counterpartyId).map(_.publicAlias(alias).save) } override def addPrivateAlias(counterpartyId : String, alias: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.privateAlias(alias).save()) + getCounterpartyMetadata(counterpartyId).map(_.privateAlias(alias).save) } override def addURL(counterpartyId : String, url: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.url(url).save()) + getCounterpartyMetadata(counterpartyId).map(_.url(url).save) } override def addImageURL(counterpartyId : String, url: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.imageUrl(url).save()) + getCounterpartyMetadata(counterpartyId).map(_.imageUrl(url).save) } override def addOpenCorporatesURL(counterpartyId : String, url: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.openCorporatesUrl(url).save()) + getCounterpartyMetadata(counterpartyId).map(_.openCorporatesUrl(url).save) } override def addMoreInfo(counterpartyId : String, moreInfo: String): Box[Boolean] = { - getCounterpartyMetadata(counterpartyId).map(_.moreInfo(moreInfo).save()) + getCounterpartyMetadata(counterpartyId).map(_.moreInfo(moreInfo).save) } override def addPhysicalLocation(counterpartyId : String, userId: UserPrimaryKey, datePosted : Date, longitude : Double, latitude : Double): Box[Boolean] = { @@ -372,7 +372,7 @@ class MappedCounterpartyMetadata extends CounterpartyMetadata with LongKeyedMapp private def trySave(f : => Any) : Boolean = tryo{ f - save() + save }.getOrElse(false) private def setWhere(whereTag : Box[MappedCounterpartyWhereTag]) diff --git a/obp-api/src/main/scala/code/migration/MappedMigrationScriptLogProvider.scala b/obp-api/src/main/scala/code/migration/MappedMigrationScriptLogProvider.scala index cafbbffce..d3465a343 100644 --- a/obp-api/src/main/scala/code/migration/MappedMigrationScriptLogProvider.scala +++ b/obp-api/src/main/scala/code/migration/MappedMigrationScriptLogProvider.scala @@ -15,7 +15,7 @@ object MappedMigrationScriptLogProvider extends MigrationScriptLogProvider with .StartDate(startDate) .EndDate(endDate) .Remark(comment) - .save() + .save case _ => MigrationScriptLog .create @@ -25,7 +25,7 @@ object MappedMigrationScriptLogProvider extends MigrationScriptLogProvider with .StartDate(startDate) .EndDate(endDate) .Remark(comment) - .save() + .save } } override def isExecuted(name: String): Boolean = { diff --git a/obp-api/src/main/scala/code/model/OAuth.scala b/obp-api/src/main/scala/code/model/OAuth.scala index 1463460cf..d50a9a2f6 100644 --- a/obp-api/src/main/scala/code/model/OAuth.scala +++ b/obp-api/src/main/scala/code/model/OAuth.scala @@ -455,7 +455,7 @@ object MappedConsumersProvider extends ConsumersProvider with MdcLoggable { for { consumer <- Consumer.findAll(NullRef(Consumer.consumerId))++ Consumer.findAll(By(Consumer.consumerId,"")) } yield { - consumer.consumerId(APIUtil.generateUUID()).save() + consumer.consumerId(APIUtil.generateUUID()).save } }.forall(_ == true) @@ -843,7 +843,7 @@ object MappedTokenProvider extends TokensProvider { override def updateToken(id: Long, userId: Long): Boolean = { Token.find(By(Token.id, id)) match { - case Full(t) => t.userForeignKey(userId).save() + case Full(t) => t.userForeignKey(userId).save case _ => false } } diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 947828bd4..5e51b9f79 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -82,7 +82,7 @@ import scala.concurrent.Future * * * 3 RelationShips: - * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save() --> create ResourceUser user. + * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save --> create ResourceUser user. * They share the same username and email. * 2)AuthUser `user` field as the Foreign Key to link to Resource User. * one AuthUser <---> one ResourceUser @@ -370,7 +370,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga } } } - super.save() + super.save } override def delete_!(): Boolean = { @@ -1581,7 +1581,7 @@ def restoreSomeSessions(): Unit = { .lastName(Helpers.randomString(16)) .password(Helpers.randomString(40)) .validated(false) - scrambledUser.save() + scrambledUser.save case Empty => true // There is a resource user but no the correlated Auth user case _ => false // Error case } diff --git a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala index 331b48caa..d0dcb5c52 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala @@ -50,7 +50,7 @@ import net.liftweb.mapper._ * * * 3 RelationShips: - * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save() --> create ResourceUser user. + * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save --> create ResourceUser user. * They share the same username and email. * 2)AuthUser `user` field as the Foreign Key to link to Resource User. * one AuthUser <---> one ResourceUser diff --git a/obp-api/src/main/scala/code/sandbox/CreateOBPUsers.scala b/obp-api/src/main/scala/code/sandbox/CreateOBPUsers.scala index 55171e84b..969ffbd7d 100644 --- a/obp-api/src/main/scala/code/sandbox/CreateOBPUsers.scala +++ b/obp-api/src/main/scala/code/sandbox/CreateOBPUsers.scala @@ -18,7 +18,7 @@ trait CreateAuthUsers { def save() = { val usr = Users.users.vend.saveResourceUser(value) for (uu <- usr) { - u.user(uu).save() + u.user(uu).save } } } diff --git a/obp-api/src/main/scala/code/sandbox/LocalMappedConnectorDataImport.scala b/obp-api/src/main/scala/code/sandbox/LocalMappedConnectorDataImport.scala index d06d26126..e193edcbe 100644 --- a/obp-api/src/main/scala/code/sandbox/LocalMappedConnectorDataImport.scala +++ b/obp-api/src/main/scala/code/sandbox/LocalMappedConnectorDataImport.scala @@ -18,7 +18,7 @@ import net.liftweb.mapper.Mapper import net.liftweb.util.Helpers._ case class MappedSaveable[T <: Mapper[_]](value : T) extends Saveable[T] { - def save() = value.save() + def save() = value.save } object LocalMappedConnectorDataImport extends OBPDataImport with CreateAuthUsers { diff --git a/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala b/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala index 4f0b0e92e..99031489d 100644 --- a/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala +++ b/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala @@ -500,22 +500,22 @@ trait OBPDataImport extends MdcLoggable { crmEvents <- createCrmEvents(data) } yield { logger.info(s"importData is saving ${banks.size} banks..") - banks.foreach(_.save()) + banks.foreach(_.save) logger.info(s"importData is saving ${users.size} users..") - users.foreach(_.save()) + users.foreach(_.save) logger.info(s"importData is saving ${branches.size} branches..") - branches.foreach(_.save()) + branches.foreach(_.save) logger.info(s"importData is saving ${atms.size} ATMs..") - atms.foreach(_.save()) + atms.foreach(_.save) logger.info(s"importData is saving ${products.size} products..") - products.foreach(_.save()) + products.foreach(_.save) logger.info(s"importData is saving ${crmEvents.size} crmEvents..") - crmEvents.foreach(_.save()) + crmEvents.foreach(_.save) @@ -526,7 +526,7 @@ trait OBPDataImport extends MdcLoggable { logger.info(s"importData is saving ${accountResults.size} accountResults (accounts, views and permissions)..") accountResults.foreach { case (account, systemViews, accOwnerUsernames) => - account.save() + account.save systemViews.filterNot(_.isPublic).foreach(v => { //grant the owner access to Private systemViews @@ -539,7 +539,7 @@ trait OBPDataImport extends MdcLoggable { } logger.info(s"importData is saving ${transactions.size} transactions (and loading them again)") transactions.foreach { t => - t.save() + t.save //load it to force creation of metadata (If we are using Mapped connector, MappedCounterpartyMetadata.create will be called) val lt = Connector.connector.vend.getTransactionLegacy(t.value.theBankId, t.value.theAccountId, t.value.theTransactionId) } diff --git a/obp-api/src/main/scala/code/socialmedia/MappedSocialMediasProvider.scala b/obp-api/src/main/scala/code/socialmedia/MappedSocialMediasProvider.scala index 1764e033b..b1b93c8b7 100644 --- a/obp-api/src/main/scala/code/socialmedia/MappedSocialMediasProvider.scala +++ b/obp-api/src/main/scala/code/socialmedia/MappedSocialMediasProvider.scala @@ -21,7 +21,7 @@ object MappedSocialMediasProvider extends SocialMediaHandleProvider { .mHandle(handle) .mDateAdded(dateAdded) .mDateActivated(dateActivated) - .save() + .save } } diff --git a/obp-api/src/main/scala/code/users/LiftUsers.scala b/obp-api/src/main/scala/code/users/LiftUsers.scala index 73e759889..04f48a3e8 100644 --- a/obp-api/src/main/scala/code/users/LiftUsers.scala +++ b/obp-api/src/main/scala/code/users/LiftUsers.scala @@ -302,12 +302,12 @@ object LiftUsers extends Users with MdcLoggable{ .name_("DELETED-" + Helpers.randomString(16)) .email(Helpers.randomString(10) + "@example.com") .providerId(Helpers.randomString(16)) - .save() + .save case _ => u .Company(Helpers.randomString(16)) .IsDeleted(true) - .save() + .save } } } diff --git a/obp-api/src/main/scala/code/users/UserInvitation.scala b/obp-api/src/main/scala/code/users/UserInvitation.scala index 04982739b..89a40bcf7 100644 --- a/obp-api/src/main/scala/code/users/UserInvitation.scala +++ b/obp-api/src/main/scala/code/users/UserInvitation.scala @@ -32,7 +32,7 @@ object MappedUserInvitationProvider extends UserInvitationProvider { UserInvitation.find( By(UserInvitation.UserInvitationId, userInvitationId) ) match { - case Full(userInvitation) => userInvitation.Status(status).save() + case Full(userInvitation) => userInvitation.Status(status).save case _ => false } } @@ -49,7 +49,7 @@ object MappedUserInvitationProvider extends UserInvitationProvider { .Country(Helpers.randomString(userInvitation.country.length)) .Purpose(Helpers.randomString(userInvitation.purpose.length)) .Status("DELETED") - .save() + .save case _ => false } } diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/UserModel.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/UserModel.scala index 20fd1e898..25dab9553 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/UserModel.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/UserModel.scala @@ -44,7 +44,7 @@ import java.util.Date * * * 3 RelationShips: - * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save() --> create ResourceUser user. + * 1)When `Sign up` new user --> create AuthUser --> call AuthUser.save --> create ResourceUser user. * They share the same username and email. * 2)AuthUser `user` field as the Foreign Key to link to Resource User. * one AuthUser <---> one ResourceUser diff --git a/pom.xml b/pom.xml index efb6ae00c..2b8287314 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,12 @@ 2011 2.12 - 2.12.10 + 2.12.12 2.5.32 2.0.5 1.1.0 1.8.2 - 3.4.1 + 3.5.0 9.4.50.v20221201 2.17.1 2016.11-RC6-SNAPSHOT