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

Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop

Browse Source
This commit is contained in:
Simon Redfern 2015-09-26 05:14:02 +01:00
commit 00865a4665
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -137,10 +137,9 @@
<version>4.5</version>
</dependency>
<dependency>
<!-- 2.18-SNAPSHOT needed for selenium webdriver (http://htmlunit.10904.n7.nabble.com/HtmlUnit-htmlunit-bugs-1692-Update-to-HttpComponents-4-5-td36318.html) - potentially update to 2.18 when possible -->
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.18-SNAPSHOT</version>
<version>2.18</version>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>

2
src/main/scala/bootstrap/liftweb/Boot.scala
View File

@ -174,7 +174,7 @@ class Boot extends Loggable{
logger.info("running mode: " + runningMode)
// where to search snippet
// where to search snippets
LiftRules.addToPackages("code")
//OAuth API call

2
src/main/scala/code/management/ImporterAPI.scala
View File

@ -134,7 +134,7 @@ object ImporterAPI extends RestHelper with Loggable {
logger.info("Received " + rawTransactions.size +
" json transactions to insert from ip address " + ipAddress)
//importer api expects lossless dates
//importer api expects dates that also include milliseconds (lossless)
val losslessFormats = net.liftweb.json.DefaultFormats.lossless
val mf = implicitly[Manifest[ImporterTransaction]]
val importerTransactions = rawTransactions.flatMap(j => j.extractOpt[ImporterTransaction](losslessFormats, mf))