Compare commits

...

5 Commits

Author SHA1 Message Date
luca.frosini 0f49e44d97 Ignored MacOs File 2023-06-21 11:31:01 +02:00
Luca Frosini 1aaa78b9bb fixed test 2021-04-19 16:40:10 +02:00
Luca Frosini c8cb04a41d Enhanced version 2021-04-19 16:38:51 +02:00
Luca Frosini c978f5ad6f FIXED TEST 2021-04-19 16:35:57 +02:00
Luca Frosini df72ab6a57 Removed link from docs which should not be there #20777 2021-02-22 09:19:32 +01:00
4 changed files with 11 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
target
.classpath
.project
/.DS_Store

View File

@ -2,8 +2,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for Document Store Backend Connector Library for Accounting Service
## [v2.0.1-SNAPSHOT]
## [v2.0.0] [r5.0.0] -
- Moved http links to https in comments
- Fixed test
## [v2.0.0]
- Switched JSON management to gcube-jackson [#19115]
- Added more logs to provide bugs investigation

View File

@ -9,7 +9,7 @@
<groupId>org.gcube.data.publishing</groupId>
<artifactId>document-store-lib-accounting-service</artifactId>
<version>2.0.0</version>
<version>2.0.1-SNAPSHOT</version>
<name>Document Store Backend Connector Library for Accounting Service</name>
<description>Document Store Backend Connector Library for Accounting Service</description>

View File

@ -11,6 +11,7 @@ import java.util.UUID;
import org.gcube.accounting.datamodel.UsageRecord.OperationResult;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageStatusRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.DataType;
import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
@ -22,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
* @author Luca Frosini (ISTI - CNR)
*
*/
public class TestUsageRecord {
@ -156,12 +157,13 @@ public class TestUsageRecord {
usageRecord.setConsumerId(TEST_CONSUMER_ID);
usageRecord.setOperationResult(TEST_OPERATION_RESULT);
usageRecord.setDataVolume(generateRandomLong(MIN_DATA_VOLUME, MAX_DATA_VOLUME));
usageRecord.setDataType(AbstractStorageStatusRecord.DataType.STORAGE);
usageRecord.setDataType(DataType.STORAGE);
usageRecord.setDataCount(generateRandomLong(MIN_DATA_VOLUME, MAX_DATA_VOLUME));
usageRecord.setDataServiceClass("dataServiceClass");
usageRecord.setDataServiceName("dataServiceName");
usageRecord.setDataServiceId("dataServiceId");
usageRecord.setProviderId(new URI(TEST_PROVIDER_URI));
usageRecord.setProviderURI(new URI("data.d4science.org"));
} catch (InvalidValueException | URISyntaxException e) {
logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e);