Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop #89

Merged
merged 154 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
2cf5f54
416, working with MarketDataSet objects instead of String. Fix for wo…
Julius278 Mar 7, 2024
0007984
Fix version of custom-webpack
Kourouta Mar 8, 2024
cb0e638
Add package-lock.json for reproducible builds
Kourouta Mar 8, 2024
0c79fc7
Delete obsolete/malformed package-lock.json
Kourouta Mar 8, 2024
36fb6a3
Merge branch 'develop' into feature/416
Julius278 Mar 11, 2024
c895095
Merge pull request #48 from finmath/feature/fix-frontend
cfries Mar 12, 2024
9955c54
refactoring of marketdata adapters (now: generators), introduced a ne…
pekola Mar 12, 2024
e71c224
Added encrypted keys to events to allow that parties check cross-chai…
cfries Mar 13, 2024
d8092db
bugfix, added test for xml/json parsing of marketdata
pekola Mar 13, 2024
d8d472f
Merge remote-tracking branch 'origin/develop' into develop
pekola Mar 13, 2024
c5b2f14
added pojo for marketdata
pekola Mar 13, 2024
089fc27
Added erc to site
cfries Mar 13, 2024
61c7bc5
refactored marketdata persistence format to XML, added a first settle…
pekola Mar 13, 2024
e282ec9
Merge remote-tracking branch 'origin/develop' into develop
pekola Mar 13, 2024
c5813cf
Merge branch 'develop' into feature/416
Julius278 Mar 14, 2024
ee6603c
Merge pull request #49 from Julius278/feature/416
cfries Mar 14, 2024
1389be7
fix for manually tested fpml xml in MarginRequest
Julius278 Mar 14, 2024
4808e72
removed "legacy" of the restendpoints for value and and margin, remov…
pekola Mar 14, 2024
a9820b4
Merge remote-tracking branch 'origin/develop' into develop
pekola Mar 14, 2024
73b669c
added an exception when calibrationitems-set is empty
pekola Mar 14, 2024
dc94307
switch from MarketDataSet to MarketDataList
Julius278 Mar 15, 2024
6f89c6e
switch from MarketDataSet to MarketDataList
Julius278 Mar 15, 2024
04b9a2c
Merge branch 'develop' into demo-settlement
Julius278 Mar 15, 2024
3e0c759
new testset out of settlement xml
Julius278 Mar 15, 2024
4306b75
replace MarketDataSet by MarketDataList, fixes, cleanup
Julius278 Mar 15, 2024
fd16fc1
generic marshaller and unmarshaller added to SDCXMLParser
Julius278 Mar 15, 2024
69d80e0
refactored CalibrationTests to new XML Format plus
pekola Mar 15, 2024
3b0b00a
new testsets
Julius278 Mar 15, 2024
3925748
Merge branch 'develop' into demo-settlement
Julius278 Mar 15, 2024
ad4b413
bugfix - corrected one endpoint / removed "legacy"
pekola Mar 15, 2024
f09bdac
trigger perform settlement via REST endpoint
Julius278 Mar 15, 2024
fdc4597
dont need formatting in XML strings
Julius278 Mar 18, 2024
ca33871
Merge pull request #50 from Julius278/demo-settlement
cfries Mar 18, 2024
e6e0afe
Reorganized solidity documentation
cfries Mar 18, 2024
a0b691b
[maven-release-plugin] prepare release finmath-smart-derivative-contr…
cfries Mar 18, 2024
d8c12bb
[maven-release-plugin] prepare for next development iteration
cfries Mar 18, 2024
47a8c13
add spring boot version to banner
Julius278 Mar 18, 2024
5b43f40
cleanup, added some todos, small fixes
Julius278 Mar 18, 2024
7179bca
SDC-436, added XMLRootElement and XMLElement annotations to Settlemen…
Julius278 Mar 19, 2024
3f0d8a7
Merge pull request #51 from Julius278/demo-settlement
cfries Mar 19, 2024
c497389
Merge pull request #52 from Julius278/feature/436
cfries Mar 19, 2024
40ebb63
SDC-436, fix for pipeline error
Julius278 Mar 19, 2024
a31f342
Merge pull request #53 from Julius278/feature/436
Julius278 Mar 19, 2024
99a87a8
fixed frontend and request format
pekola Mar 20, 2024
67a14db
SDC-436, set order of xml properties in Settlement
Julius278 Mar 22, 2024
2a14ea3
SDC-436, small adjustment for SDCXMLParser
Julius278 Mar 22, 2024
449325b
Merge branch 'feature/436' into feature/403
Julius278 Mar 22, 2024
a2f4b21
SDC-403, added historical market data provided by @pekola, generated …
Julius278 Mar 26, 2024
a0d76b5
SDC-403, transform EventManagerLauncher to Spring Boot component, put…
Julius278 Mar 27, 2024
db93752
SDC-403, implemented MarketDataGeneratorScenarioList with given histo…
Julius278 Mar 27, 2024
5dd2481
SDC-403, code cleanup
Julius278 Mar 27, 2024
19f85de
SDC-403, MarketDataGeneratorScenarioList extended list of files
Julius278 Mar 27, 2024
b26cf8b
Revert "SDC-403, MarketDataGeneratorScenarioList extended list of files"
Julius278 Mar 27, 2024
b0e8dda
SDC-403, MarketDataGeneratorScenarioList extended list of files
Julius278 Mar 27, 2024
67eb9cb
Merge pull request #55 from Julius278/feature/436
Julius278 Mar 28, 2024
d285c20
SDC-403, MarketDataGeneratorScenarioList extended list of files
Julius278 Mar 28, 2024
8ffe4d7
SDC-403, reformat Settlement class
Julius278 Mar 28, 2024
cbb3240
NO_ISSUE, code cleanups
Julius278 Mar 28, 2024
7da03ba
SDC-403, reformat Settlement class
Julius278 Mar 28, 2024
5094810
Merge branch 'develop' into feature/403
Julius278 Mar 28, 2024
4a0a8bb
SDC-403, reformat MarketDataGeneratorScenarioList class
Julius278 Mar 28, 2024
97756da
SDC-403, replace sysout by logger in Application.java
Julius278 Mar 28, 2024
57a53fc
NO_ISSUE, code cleanups
Julius278 Mar 28, 2024
36d764b
NO_ISSUE, code cleanups
Julius278 Mar 28, 2024
512334b
NO_ISSUE, smaller code issues
Julius278 Apr 6, 2024
c9dc1de
SDC-403, MarketDataGeneratorScenarioListTest and adjustments to class…
Julius278 Apr 8, 2024
4a15f4b
Merge pull request #56 from Julius278/feature/403
cfries Apr 8, 2024
459b44b
fabric-2, fabric contract executions after PaymentTriggerd event inte…
Julius278 Apr 9, 2024
8bba9e5
NO_ISSUE, new MarketDataListTest
Julius278 Apr 9, 2024
0b498a8
Merge pull request #58 from Julius278/feature/403
Julius278 Apr 9, 2024
6b24fa8
fabric-2, new ExceptionId entries
Julius278 Apr 9, 2024
aeda7a3
Merge pull request #59 from Julius278/feature/fabric-2
Julius278 Apr 9, 2024
48dcff9
fabric-2, new ExceptionId
Julius278 Apr 11, 2024
e616a1c
fabric-2, new set of ExceptionIds
Julius278 Apr 19, 2024
3ebb604
SDC-463, added new snapshotRepository entry into distributionManageme…
Julius278 Apr 19, 2024
7895bba
SDC-463, new github actions for maven deploy and new maven settings xml
Julius278 Apr 19, 2024
173d2d6
SDC-463, added private token possibility to maven settings xml for mo…
Julius278 Apr 19, 2024
3e0d0f5
Merge pull request #60 from Julius278/feature/463
cfries Apr 19, 2024
c0a3d30
SDC-463, small adjustment to the build job name
Julius278 Apr 19, 2024
6b41a77
Merge pull request #61 from Julius278/feature/463
Julius278 Apr 19, 2024
4e17492
SDC-463, included GitHub Secrets in Actions
Julius278 Apr 19, 2024
c9f11c4
Merge branch 'finmath:main' into feature/463
Julius278 Apr 19, 2024
af2d4f6
Merge pull request #62 from Julius278/feature/463
Julius278 Apr 19, 2024
3ca2b60
Merge pull request #63 from Julius278/feature/fabric-2
Julius278 Apr 22, 2024
3cae018
NO_ISSUE, updated Dockerfile
Julius278 May 3, 2024
b569aec
Merge pull request #64 from Julius278/Dockerfile
Julius278 May 3, 2024
41e9b49
Fixed startup scripts.
cfries May 6, 2024
ba39b6a
changing ExceptionId from numbers to more meaningful enums
Julius278 May 15, 2024
3411303
NO_ISSUE, code cleanup
Julius278 May 15, 2024
9270f93
NO_ISSUE, code cleanup
Julius278 May 15, 2024
881ae7e
NO_ISSUE, code cleanup
Julius278 May 15, 2024
528c60a
Merge pull request #65 from Julius278/ExceptionIDs
Julius278 May 15, 2024
f3899c3
NO_ISSUE, fix for ZonedDateTimeAdapter
Julius278 May 15, 2024
eeed862
Merge pull request #67 from Julius278/ZonedDateTimeAdapterFix
Julius278 May 15, 2024
a045f1d
SDC-510, new ExceptionId
Julius278 May 15, 2024
b0e43c0
Merge pull request #68 from Julius278/ExceptionIDs
Julius278 May 15, 2024
d8d7c62
NO_ISSUE, new ExceptionId
Julius278 May 21, 2024
fc04611
Merge pull request #69 from Julius278/ExceptionIDs
Julius278 May 21, 2024
a3dee88
SDC-325, new TradeUtils to create unique TradeIDs
Julius278 May 24, 2024
1141341
Merge pull request #70 from Julius278/feature/325
pekola May 24, 2024
0de9703
SDC-325, test for TradeUtils
Julius278 May 24, 2024
19a29c0
Merge pull request #71 from Julius278/feature/325
Julius278 May 24, 2024
6aa9c4c
Merge pull request #66 from Julius278/code-cleanup
Julius278 May 24, 2024
7e0e744
NO_ISSUE, cleanup
Julius278 May 24, 2024
cdcc0b1
Merge branch 'feature/515-getting-started-finalized' into develop
cfries May 28, 2024
5726c75
SDCXMLParser more generic in regard to marshalling classes to xml string
Julius278 Jun 12, 2024
b2a9ac2
Merge pull request #73 from Julius278/cleanup
Julius278 Jun 17, 2024
6f893ec
Moved resource file to folder structure.
cfries Jun 18, 2024
e9d6b47
Revert "Moved resource file to folder structure."
cfries Jun 18, 2024
61d7d1a
NO_ISSUE, new entry in ExceptionId
Julius278 Jul 3, 2024
034c5cc
Merge pull request #74 from Julius278/new_ExceptionId
Julius278 Jul 3, 2024
85e7be0
SDC-325, tradeID using hyphen instead of underscore
Julius278 Jul 12, 2024
a0812d5
SDC-325, TradeUtilsTest adjusted
Julius278 Jul 12, 2024
d9059a7
SDC-325, TradeUtilsTest adjusted
Julius278 Jul 12, 2024
d5ddffd
SDC-325, security adjustment of github actions checkout
Julius278 Jul 12, 2024
c93a42c
SDC-325, security adjustment of github actions checkout
Julius278 Jul 12, 2024
18c2967
Merge pull request #75 from Julius278/feature/325-tradeID-fix
cfries Jul 23, 2024
d6e2ed6
NO_ISSUE, adding http status 400 to XML parsing errors cause it refle…
Julius278 Jul 24, 2024
4f2274f
NO_ISSUE, added test for SDCXMLParser
Julius278 Jul 24, 2024
fe29862
Merge pull request #76 from Julius278/http-error-code-xml-parser
Julius278 Jul 24, 2024
c241fab
SDC-543, new MarketDataCheck, comparing product data with delivered m…
Julius278 Aug 2, 2024
66b4e25
SDC-543, new product xml corresponding to historical marketdata xmls
Julius278 Aug 2, 2024
227fe4e
SDC-543, added tests for MarketDataCheck
Julius278 Aug 2, 2024
92a0d5d
SDC-543, new tests for parsing sdc xml with SDCXMLParser
Julius278 Aug 2, 2024
22037b4
SDC-543, extended one MarketDataCheckTest with multiple files
Julius278 Aug 2, 2024
87c61fb
SDC-543, fix for SDCXMLParserTest
Julius278 Aug 2, 2024
3c7997c
SDC-513, added trade ID and trade address to the fpml xsd and xml
Julius278 Aug 6, 2024
0daf0ea
Merge pull request #77 from Julius278/feature/543
cfries Aug 6, 2024
a616746
SDC-513, added checks on SDCXMLParserTest for new trade id and address
Julius278 Aug 6, 2024
7584cc7
SDC-513, added new items to descriptor and SDCXMLParser, changed marg…
Julius278 Aug 6, 2024
99010dc
SDC-513, removed unused methods, general cleanup on SDCXMLParser, add…
Julius278 Aug 6, 2024
521ce87
SDC-513, added trade id and address to historical sdc fpml
Julius278 Aug 6, 2024
895dd5e
Merge pull request #79 from Julius278/feature/513
Julius278 Aug 8, 2024
2b5c106
github action snapshot: security update analog to test action
Julius278 Aug 8, 2024
63ff645
Merge pull request #80 from Julius278/feature/513
Julius278 Aug 8, 2024
1600807
github actions: test with new actions/setup-java@v4
Julius278 Aug 8, 2024
c7eb865
github actions snapshot: test with new actions/setup-java@v4
Julius278 Aug 8, 2024
24f7ad4
Merge pull request #81 from Julius278/feature/513
Julius278 Aug 8, 2024
3325c0c
continue on error for snapshot
Julius278 Aug 9, 2024
8ba180c
Merge pull request #82 from Julius278/feature/513
Julius278 Aug 9, 2024
675aa6c
SDC-526, parse currency out of FPML
Julius278 Aug 9, 2024
9c9c391
SDC-581, parse marketDataProvider out of fpml
Julius278 Aug 28, 2024
a1c672c
Merge pull request #83 from Julius278/feature/526
Julius278 Aug 28, 2024
c167527
Merge pull request #84 from Julius278/feature/581
Julius278 Aug 28, 2024
198342d
SDC-619, new Settlement builder object
Julius278 Aug 29, 2024
8784329
SDC-619, increased test coverage on SettlementGenerator
Julius278 Aug 29, 2024
90379ce
SDC-619, launcher for online MarketData
Julius278 Aug 30, 2024
3429d5c
Merge pull request #85 from Julius278/feature/619
Julius278 Aug 30, 2024
e830782
implemented new endpoint to perform valuation of a product at evaluat…
pekola Sep 2, 2024
af91da3
Merge pull request #86 from finmath/feature/627_new_endpoint_for_eval…
Julius278 Sep 2, 2024
b653e42
SDC-618, new SettlementGenerator build for building the object instea…
Julius278 Sep 2, 2024
b4d92e0
Merge pull request #87 from Julius278/feature/619
Julius278 Sep 2, 2024
e761b57
improved logging on SDCXMLParser
Julius278 Sep 2, 2024
50b0732
Merge pull request #88 from Julius278/xml-parser-logging
Julius278 Sep 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ jobs:
name: Java 17 build and unit testing
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Build with Maven
run: mvn -B package --file pom.xml
26 changes: 26 additions & 0 deletions .github/workflows/upload_snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: finmath smart derivative contract

#trigg
#only push new SNAPSHOTS from develop
on:
push:
branches:
- develop

jobs:
bCP1ld:
name: SNAPSHOT, build and upload
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: upload SNAPSHOT to GitLab
env:
DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
PRIVATE_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: mvn -s github_SNAPSHOT_settings.xml clean install deploy
continue-on-error: true
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ RUN mvn -f /usr/src/app/pom.xml clean package spring-boot:repackage

# Run Stage: Copy fat-jar and define Entrypoint
FROM openjdk:17 as RunStage
COPY --from=BuildStage /usr/src/app/target/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar /usr/app/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar
ENTRYPOINT ["java", "-jar", "/usr/app/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar"]
COPY --from=BuildStage /usr/src/app/target/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar /usr/app/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar
ENTRYPOINT ["java", "-jar", "/usr/app/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar"]
Loading
Loading