Commit Graph

141 Commits

Author SHA1 Message Date
Luca Frosini dff433de7c Fixed jackson serialization
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@153094 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-14 12:21:23 +00:00
Luca Frosini 8e592a4f0f Revisited models. Refined jackson support refs #9617
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@152713 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-06 09:47:13 +00:00
Alessandro Pieve 987f94b896 version 3.0 Insert jackson to convert model.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@148471 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-05-11 14:38:38 +00:00
Alessandro Pieve cd4d3838be git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@146421 82a268e6-3cf1-43bd-a215-b396298e98cf 2017-03-29 10:31:44 +00:00
Alessandro Pieve a57a673874 Add a new UsageRecord for Storage Volume
e.g.
{
"scope": "/gcube",
"operationCount": 2,
"dataCount": 2802,
"dataServiceName": "dataServiceName",
"endTime": 1480606453491,
"consumerId": "alessandro.pieve",
"startTime": 1480606453487,
"id": "6e6808bf-3567-4ebf-93d3-0d55c97202a1",
"dataVolume": 5104,
"dataType": "STORAGE",
"operationResult": "SUCCESS",
"dataServiceId": "dataServiceId",
"aggregated": true,
"providerId": "testprotocol://providerURI",
"creationTime": 1480606453494,
"recordType": "StorageStatusRecord",
"dataServiceClass": "dataServiceClass"
}

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@141599 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-01-17 10:59:14 +00:00
Luca Frosini 0d80ace47a Changed classes signature
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@133100 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 12:15:28 +00:00
Alessandro Pieve e4106b214c git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@132052 82a268e6-3cf1-43bd-a215-b396298e98cf 2016-09-29 11:45:29 +00:00
Alessandro Pieve 4310511cd9 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@132051 82a268e6-3cf1-43bd-a215-b396298e98cf 2016-09-29 11:44:25 +00:00
Alessandro Pieve 50953662fc git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@132025 82a268e6-3cf1-43bd-a215-b396298e98cf 2016-09-29 08:37:39 +00:00
Luca Frosini 5a92c474db Solving querable keys issue
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@131482 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-09-19 10:53:57 +00:00
Alessandro Pieve 392c09eaae git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@131473 82a268e6-3cf1-43bd-a215-b396298e98cf 2016-09-19 09:06:46 +00:00
Alessandro Pieve f71a86ad74 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@131245 82a268e6-3cf1-43bd-a215-b396298e98cf 2016-09-08 15:21:05 +00:00
Luca Frosini 3ab13d8d6e Using new authorization lib
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@130783 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-07-25 15:27:51 +00:00
Luca Frosini 87e0ba1ba0 Removed unused keys
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@128083 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-04-14 12:50:56 +00:00
Luca Frosini 56738c036a Removed unused import
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@128082 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-04-14 12:42:15 +00:00
Luca Frosini 7c07bee695 refs #3253: Couchdb does not support documents with object key starting with _
https://support.d4science.org/issues/3253

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@128059 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-04-13 14:44:22 +00:00
Luca Frosini bee51230d8 made variable public
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@126040 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-03-22 13:38:04 +00:00
Luca Frosini 1485749a35 Revisited internals
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@125517 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-03-16 17:36:46 +00:00
Luca Frosini 34df63030e refs #2437: Some records accounted on fallback are not recovered in the proper way in a special case
https://support.d4science.org/issues/2437
Added Tests

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124673 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-29 14:30:48 +00:00
Luca Frosini 9ba2a2e788 refs #2437: Some records accounted on fallback are not recovered in the proper way in a special case
https://support.d4science.org/issues/2437

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124667 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-29 14:16:54 +00:00
Luca Frosini c4fd8c253c Catching the right exception
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124342 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-19 10:49:07 +00:00
Luca Frosini 43c63f2fc6 Reintroduced ScopeProvider to avoid problem in the next release
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124138 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-12 16:08:49 +00:00
Luca Frosini 70e0570c82 Fixed Tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124114 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-12 11:20:04 +00:00
Luca Frosini 9a3f477262 refs #2222: Move infrastructure tests outside of components junit tests
https://support.d4science.org/issues/2222

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124044 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-10 14:14:31 +00:00
Luca Frosini 67667da8d1 refs #2201: Remove the use of ScopeProvider if any from accounting-lib
https://support.d4science.org/issues/2201

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124017 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-02-09 17:46:23 +00:00
Luca Frosini 8c3b5456eb Removed unneeded classes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122627 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-01-28 17:31:18 +00:00
Luca Frosini d106fe5b4c Fixing internals
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122626 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-01-28 17:29:11 +00:00
Luca Frosini 51cc51f546 Improving Model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122582 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-01-28 10:28:38 +00:00
Luca Frosini 9050adfdd1 Improving Model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122578 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-01-28 09:42:30 +00:00
Luca Frosini 1a48e45faa Fixed Aggregations and added/fixed tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122218 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-01-13 15:18:59 +00:00
Luca Frosini c6e66a11c3 Switched to validators added to document-store library
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122003 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-21 11:00:46 +00:00
Luca Frosini 345c850de8 Switched to validators added to document-store library
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@122000 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-21 10:50:09 +00:00
Luca Frosini 6e4e3d4c93 refs #1746: Separate Accounting Model and generalize solution
https://support.d4science.org/issues/1746

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@121990 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-18 16:09:05 +00:00
Luca Frosini c6067def1c Reorganizing internals
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120580 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-03 10:06:15 +00:00
Luca Frosini f35debd0ce Reorganizing internals
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120555 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-02 10:08:14 +00:00
Luca Frosini 7d31661459 Reorganizing internal decorators
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120528 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-01 13:37:23 +00:00
Luca Frosini 94d6b5e4ce removed uneeded enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120516 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-12-01 11:44:45 +00:00
Luca Frosini 43d8a93f9f Added some methods the AggregatedUsageRecords has to implement
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120495 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-11-30 17:34:48 +00:00
Luca Frosini 523bb8c8bd Changed the property value type from Serializable to Comparable<? extends Serializable> which is much more what represent the value of a property. This should not imply any changes in clients.
All tests run. All tests OK.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120485 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-11-30 16:49:18 +00:00
Luca Frosini 1987001f31 Fixing model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120324 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-11-19 15:19:51 +00:00
Luca Frosini 492d32550e Fixed constructor visibility
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120317 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-11-19 14:51:47 +00:00
Luca Frosini 15ccd8487a refs #1352: Create repetitive thread to retry to persist UsageRecords
https://support.d4science.org/issues/1352

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120285 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-11-17 08:32:41 +00:00
Luca Frosini f9b21e7f9e refs #1117: Accounting lib's StackOverflow
https://support.d4science.org/issues/1117
The bug should be fixed. Some junit tests were added

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@119889 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-10-20 12:40:30 +00:00
Luca Frosini 90ca3ebafd refs #1117: Accounting lib's StackOverflow
https://support.d4science.org/issues/1117

Added missing logging argument.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@119870 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-10-19 15:59:09 +00:00
Luca Frosini dcf3e3ec1c Reorganizing library
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@119712 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-10-14 08:46:13 +00:00
Luca Frosini 78dc833d14 Merged from branch
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@119574 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-10-09 12:52:42 +00:00
Luca Frosini 9995c4873b Renamed classes to avoid name and import conflicts
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117529 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-07-29 12:41:28 +00:00
Luca Frosini b16f6751ac Fixed bug on StorageUsageRecord and created test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117470 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-07-27 10:45:23 +00:00
Luca Frosini 67f32854d5 Changed way to log and throw up exception
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117434 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-07-22 15:28:30 +00:00
Luca Frosini 98db31d173 The scope is get from scope provider if available
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117357 82a268e6-3cf1-43bd-a215-b396298e98cf
2015-07-20 15:02:43 +00:00