diff --git a/obp-api/pom.xml b/obp-api/pom.xml index 65650a521..147eb2ba6 100644 --- a/obp-api/pom.xml +++ b/obp-api/pom.xml @@ -349,8 +349,6 @@ - src/main/scala - src/test/scala org.apache.maven.plugins @@ -404,7 +402,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.4.6 ${project.build.sourceEncoding} @@ -471,16 +469,7 @@ - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - / - 5 - -Xmx512m -Xms512m - - + net.alchim31.maven yuicompressor-maven-plugin @@ -497,6 +486,15 @@ ${project.build.sourceEncoding} + + org.mortbay.jetty + maven-jetty-plugin + + / + 5 + -Xmx512m -Xms512m + + org.apache.maven.plugins maven-idea-plugin @@ -548,7 +546,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.4.6 ${project.build.sourceEncoding} diff --git a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala index b074a33cb..fc1f6d51a 100644 --- a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala @@ -31,7 +31,7 @@ import java.util.{Locale, TimeZone} import code.accountapplication.MappedAccountApplication import code.accountattribute.MappedAccountAttribute -import code.accountholder.MapperAccountHolders +import code.accountholders.MapperAccountHolders import code.actorsystem.ObpActorSystem import code.api.Constant._ import code.api.ResourceDocs1_4_0.ResourceDocs300.ResourceDocs310 diff --git a/obp-api/src/main/scala/code/accountholder/AccountHolders.scala b/obp-api/src/main/scala/code/accountholders/AccountHolders.scala similarity index 93% rename from obp-api/src/main/scala/code/accountholder/AccountHolders.scala rename to obp-api/src/main/scala/code/accountholders/AccountHolders.scala index b145a1f36..3c7cf45ef 100644 --- a/obp-api/src/main/scala/code/accountholder/AccountHolders.scala +++ b/obp-api/src/main/scala/code/accountholders/AccountHolders.scala @@ -1,13 +1,10 @@ -package code.accountholder - - +package code.accountholders import code.api.util.APIUtil -import code.model._ -import net.liftweb.util.{Props, SimpleInjector} import code.remotedata.RemotedataAccountHolders import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, User} import net.liftweb.common.Box +import net.liftweb.util.SimpleInjector object AccountHolders extends SimpleInjector { @@ -23,7 +20,7 @@ object AccountHolders extends SimpleInjector { } trait AccountHolders { - + def getAccountHolders(bankId: BankId, accountId: AccountId): Set[User] def getAccountsHeld(bankId: BankId, user: User): Set[BankIdAccountId] def getOrCreateAccountHolder(user: User, bankAccountUID :BankIdAccountId): Box[MapperAccountHolders] //There is no AccountHolder trait, database structure different with view @@ -38,3 +35,7 @@ class RemotedataAccountHoldersCaseClasses { } object RemotedataAccountHoldersCaseClasses extends RemotedataAccountHoldersCaseClasses + + + + diff --git a/obp-api/src/main/scala/code/accountholder/MapperAccountHolders.scala b/obp-api/src/main/scala/code/accountholders/MapperAccountHolders.scala similarity index 99% rename from obp-api/src/main/scala/code/accountholder/MapperAccountHolders.scala rename to obp-api/src/main/scala/code/accountholders/MapperAccountHolders.scala index 07fdde99e..2afecca55 100644 --- a/obp-api/src/main/scala/code/accountholder/MapperAccountHolders.scala +++ b/obp-api/src/main/scala/code/accountholders/MapperAccountHolders.scala @@ -1,4 +1,4 @@ -package code.accountholder +package code.accountholders import code.model._ import code.model.dataAccess.ResourceUser diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala index b1065c6ec..7b2cd0637 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala @@ -2,7 +2,7 @@ package code.api.v3_0_0 import java.util.regex.Pattern -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.APIFailureNewStyle import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{bankJSON, banksJSON, branchJsonV300, _} @@ -42,7 +42,6 @@ import scala.collection.immutable.{List, Nil} import scala.collection.mutable.ArrayBuffer import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future - import com.grum.geocalc.Coordinate import com.grum.geocalc.EarthCalc import com.grum.geocalc.Point diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala index 69c906b21..858c69878 100644 --- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala @@ -5,7 +5,8 @@ import java.util.UUID.randomUUID import code.accountapplication.AccountApplication import code.accountattribute.AccountAttribute.{AccountAttribute, AccountAttributeType} -import code.accountholder.{AccountHolders, MapperAccountHolders} +import code.accountholders.{AccountHolders, MapperAccountHolders} +import code.accountholders.{AccountHolders, MapperAccountHolders} import code.api.cache.Caching import code.api.util.APIUtil._ import code.api.util.ApiRole._ diff --git a/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala index 6bd82806c..c21813f87 100644 --- a/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala @@ -26,8 +26,8 @@ Berlin 13359, Germany import java.text.SimpleDateFormat import java.util.{Date, Locale, UUID} +import code.accountholders.AccountHolders import code.api.util.ErrorMessages._ -import code.accountholder.AccountHolders import code.api.util._ import code.api.v2_1_0.TransactionRequestCommonBodyJSON import code.bankconnectors.vMar2017.{InboundAdapterInfoInternal, KafkaMappedConnector_vMar2017} diff --git a/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector_JVMcompatible.scala b/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector_JVMcompatible.scala index af38a8878..cf30070ee 100644 --- a/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector_JVMcompatible.scala +++ b/obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector_JVMcompatible.scala @@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter import java.util.Date import java.util.UUID.randomUUID -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.cache.Caching import code.api.util.APIUtil.saveConnectorMetric import code.api.util.ErrorMessages._ diff --git a/obp-api/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala index 5896f3054..50421cd8a 100644 --- a/obp-api/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala @@ -4,13 +4,12 @@ import java.text.SimpleDateFormat import java.time.ZoneOffset.UTC import java.time.ZonedDateTime import java.time.format.DateTimeFormatter -import java.util.{Date, Locale, Optional, UUID} +import java.util.{Date, Optional} +import code.accountholders.{AccountHolders, MapperAccountHolders} import code.api.util.ErrorMessages._ -import code.accountholder.{AccountHolders, MapperAccountHolders} import code.api.util._ import code.api.v2_1_0.TransactionRequestCommonBodyJSON -import code.bankconnectors.vMar2017.InboundAdapterInfoInternal import code.branches.Branches.{Branch, BranchT} import code.fx.{FXRate, fx} import code.management.ImporterAPI.ImporterTransaction @@ -29,7 +28,7 @@ import code.util.Helper import code.util.Helper.MdcLoggable import code.views.Views import com.google.common.cache.CacheBuilder -import com.openbankproject.commons.model.{Bank, CounterpartyTrait, _} +import com.openbankproject.commons.model.{Bank, _} import com.tesobe.obp.kafka.{Configuration, SimpleConfiguration, SimpleNorth} import com.tesobe.obp.transport.nov2016.{Bank => _, Transaction => _, User => _, _} import com.tesobe.obp.transport.spi.{DefaultSorter, TimestampFilter} @@ -37,18 +36,16 @@ import com.tesobe.obp.transport.{Pager, Transport} import net.liftweb.common._ import net.liftweb.mapper._ import net.liftweb.util.Helpers._ -import net.liftweb.util.Props - -import scala.collection.JavaConversions._ -import scala.collection.immutable.{List, Seq} -import scala.concurrent.duration._ -import scala.language.postfixOps import scalacache._ import scalacache.guava._ import scalacache.memoization._ -import scala.concurrent.Future +import scala.collection.JavaConversions._ +import scala.collection.immutable.{List, Seq} import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.language.postfixOps /** * Uses the https://github.com/OpenBankProject/OBP-JVM library to connect to diff --git a/obp-api/src/main/scala/code/bankconnectors/vMar2017/KafkaMappedConnector_vMar2017.scala b/obp-api/src/main/scala/code/bankconnectors/vMar2017/KafkaMappedConnector_vMar2017.scala index 54d84a2c4..c3e450627 100644 --- a/obp-api/src/main/scala/code/bankconnectors/vMar2017/KafkaMappedConnector_vMar2017.scala +++ b/obp-api/src/main/scala/code/bankconnectors/vMar2017/KafkaMappedConnector_vMar2017.scala @@ -26,8 +26,8 @@ Berlin 13359, Germany import java.text.SimpleDateFormat import java.util.{Date, Locale, UUID} +import code.accountholders.AccountHolders import code.api.util.ErrorMessages._ -import code.accountholder.AccountHolders import code.api.util.APIUtil.MessageDoc import code.api.util._ import code.api.v2_1_0._ diff --git a/obp-api/src/main/scala/code/model/BankingData.scala b/obp-api/src/main/scala/code/model/BankingData.scala index 795f6cfda..e187a311f 100644 --- a/obp-api/src/main/scala/code/model/BankingData.scala +++ b/obp-api/src/main/scala/code/model/BankingData.scala @@ -28,7 +28,7 @@ package code.model import java.util.Date -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.util.APIUtil.unboxFullOrFail import code.api.util.ErrorMessages._ import code.api.util.{APIUtil, CallContext, ErrorMessages, OBPQueryParam} 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 1f8a2b112..6dbd3c916 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -26,7 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.model.dataAccess -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.util.APIUtil.{hasAnOAuthHeader, isValidStrongPassword, _} import code.api.util.ErrorMessages._ import code.api.util._ diff --git a/obp-api/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala b/obp-api/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala index 9e9ec0d4f..ce2c8efa4 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala @@ -43,19 +43,19 @@ package com.tesobe.model { package code.model.dataAccess { -import code.accountholder.AccountHolders -import code.api.util.APIUtil -import code.bankconnectors.Connector -import code.model._ -import code.users.Users -import code.util.Helper.MdcLoggable -import code.views.Views -import com.openbankproject.commons.model._ -import com.rabbitmq.client.{Channel, ConnectionFactory} -import com.tesobe.model.{CreateBankAccount, UpdateBankAccount} -import net.liftmodules.amqp.{AMQPAddListener, AMQPDispatcher, AMQPMessage, SerializedConsumer} -import net.liftweb.actor.LiftActor -import net.liftweb.common.{Failure, Full} + import code.accountholders.AccountHolders + import code.api.util.APIUtil + import code.bankconnectors.Connector + import code.model._ + import code.users.Users + import code.util.Helper.MdcLoggable + import code.views.Views + import com.openbankproject.commons.model._ + import com.rabbitmq.client.{Channel, ConnectionFactory} + import com.tesobe.model.{CreateBankAccount, UpdateBankAccount} + import net.liftmodules.amqp.{AMQPAddListener, AMQPDispatcher, AMQPMessage, SerializedConsumer} + import net.liftweb.actor.LiftActor + import net.liftweb.common.{Failure, Full} /** diff --git a/obp-api/src/main/scala/code/remotedata/RemotedataAccountHolders.scala b/obp-api/src/main/scala/code/remotedata/RemotedataAccountHolders.scala index 23d2e1373..ac630059e 100644 --- a/obp-api/src/main/scala/code/remotedata/RemotedataAccountHolders.scala +++ b/obp-api/src/main/scala/code/remotedata/RemotedataAccountHolders.scala @@ -1,9 +1,8 @@ package code.remotedata import akka.pattern.ask -import code.accountholder.{AccountHolders, MapperAccountHolders, RemotedataAccountHoldersCaseClasses} +import code.accountholders.{AccountHolders, MapperAccountHolders, RemotedataAccountHoldersCaseClasses} import code.actorsystem.ObpActorInit -import code.model._ import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, User} import net.liftweb.common.Box diff --git a/obp-api/src/main/scala/code/remotedata/RemotedataAccountHoldersActor.scala b/obp-api/src/main/scala/code/remotedata/RemotedataAccountHoldersActor.scala index b9291491d..c8abe6b9c 100644 --- a/obp-api/src/main/scala/code/remotedata/RemotedataAccountHoldersActor.scala +++ b/obp-api/src/main/scala/code/remotedata/RemotedataAccountHoldersActor.scala @@ -1,7 +1,8 @@ package code.remotedata import akka.actor.Actor -import code.accountholder.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses} +import code.accountholders.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses} +import code.accountholders.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses} import code.actorsystem.ObpActorHelper import code.model._ import code.util.Helper.MdcLoggable diff --git a/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala b/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala index 820a1e595..cd58a9e29 100644 --- a/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala +++ b/obp-api/src/main/scala/code/sandbox/OBPDataImport.scala @@ -3,7 +3,7 @@ package code.sandbox import java.text.SimpleDateFormat import java.util.UUID -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.util.APIUtil._ import code.api.util.{APIUtil, ErrorMessages} import code.atms.Atms.AtmT diff --git a/obp-api/src/main/scala/code/views/MapperViews.scala b/obp-api/src/main/scala/code/views/MapperViews.scala index 87ec52101..c2a24a77b 100644 --- a/obp-api/src/main/scala/code/views/MapperViews.scala +++ b/obp-api/src/main/scala/code/views/MapperViews.scala @@ -1,7 +1,7 @@ package code.views import bootstrap.liftweb.ToSchemify -import code.accountholder.MapperAccountHolders +import code.accountholders.MapperAccountHolders import code.api.APIFailure import code.api.util.APIUtil._ import code.api.util.{APIUtil, ApiRole} diff --git a/obp-api/src/test/scala/RunWebApp.scala b/obp-api/src/test/scala/RunWebApp.scala index 020ccf914..a02470c71 100644 --- a/obp-api/src/test/scala/RunWebApp.scala +++ b/obp-api/src/test/scala/RunWebApp.scala @@ -36,7 +36,9 @@ object RunWebApp extends App { val context = new WebAppContext() context.setServer(server) context.setContextPath("/") - context.setWar("src/main/webapp") + // current project absolute path + val basePath = this.getClass.getResource("/").toString .replaceFirst("target[/\\\\].*$", "") + context.setWar(s"${basePath}src/main/webapp") server.setHandler(context) diff --git a/obp-api/src/test/scala/code/accountHolder/AccountHoldersTest.scala b/obp-api/src/test/scala/code/accountHolder/AccountHoldersTest.scala index b5c1c0508..9310db73c 100644 --- a/obp-api/src/test/scala/code/accountHolder/AccountHoldersTest.scala +++ b/obp-api/src/test/scala/code/accountHolder/AccountHoldersTest.scala @@ -1,6 +1,6 @@ package code.accountHolder -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.model._ import code.setup.{DefaultUsers, ServerSetup} import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId} diff --git a/obp-api/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala b/obp-api/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala index ff671261d..73717b0c1 100644 --- a/obp-api/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala +++ b/obp-api/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala @@ -1,6 +1,6 @@ package code.bankaccountcreation -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.util.APIUtil import code.api.util.ErrorMessages._ import code.views.Views diff --git a/obp-api/src/test/scala/code/connector/June2017Test.scala b/obp-api/src/test/scala/code/connector/June2017Test.scala index fc915978d..fa4e61f35 100644 --- a/obp-api/src/test/scala/code/connector/June2017Test.scala +++ b/obp-api/src/test/scala/code/connector/June2017Test.scala @@ -1,8 +1,8 @@ package code.connector -import code.accountholder.MapperAccountHolders -import code.bankconnectors.{Connector} -import code.model.dataAccess.{ViewImpl} +import code.accountholders.MapperAccountHolders +import code.bankconnectors.Connector +import code.model.dataAccess.ViewImpl import code.setup.{DefaultUsers, ServerSetup} class June2017Test extends ServerSetup with DefaultUsers { diff --git a/obp-api/src/test/scala/code/model/AuthUserTest.scala b/obp-api/src/test/scala/code/model/AuthUserTest.scala index f26ed1c24..8bbe509b8 100644 --- a/obp-api/src/test/scala/code/model/AuthUserTest.scala +++ b/obp-api/src/test/scala/code/model/AuthUserTest.scala @@ -1,7 +1,7 @@ package code.model -import code.accountholder.MapperAccountHolders -import code.bankconnectors.{Connector} +import code.accountholders.MapperAccountHolders +import code.bankconnectors.Connector import code.connector.MockedJune2017Connector import code.model.dataAccess.{AuthUser, ViewImpl, ViewPrivileges} import code.setup.{DefaultUsers, ServerSetup} diff --git a/obp-api/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala b/obp-api/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala index 32296b4b3..e79a5afed 100644 --- a/obp-api/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala +++ b/obp-api/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala @@ -1,7 +1,7 @@ package code.setup import bootstrap.liftweb.ToSchemify -import code.accountholder.AccountHolders +import code.accountholders.AccountHolders import code.api.util.ErrorMessages._ import code.model._ import code.model.dataAccess._ diff --git a/pom.xml b/pom.xml index 288435708..3057e62e6 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.4.6 ${project.build.sourceEncoding} @@ -154,6 +154,11 @@ + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + org.apache.maven.plugins maven-idea-plugin @@ -205,7 +210,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.2 + 3.4.6 ${project.build.sourceEncoding}