From d7b5dca960b8cf2e976281b5fb467f2f85118863 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 4 Jun 2015 14:42:53 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Fixing validators git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115219 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/accounting/datamodel/RawUsageRecord.java | 2 ++ ...torageUsageRecord.java => StorageUsageUsageRecord.java} | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename src/main/java/org/gcube/accounting/datamodel/implementations/{StorageUsageRecord.java => StorageUsageUsageRecord.java} (87%) diff --git a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java index 1385c76..024a86f 100644 --- a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java @@ -101,6 +101,8 @@ public class RawUsageRecord implements UsageRecord, Serializable { initializeValidation(); this.resourceSpecificProperties.put(ID, UUID.randomUUID().toString()); this.resourceSpecificProperties.put(RESOURCE_TYPE, this.getClass().getSimpleName()); + Calendar calendar = Calendar.getInstance(); + this.resourceSpecificProperties.put(CREATION_TIME, calendar.getTimeInMillis()); } public RawUsageRecord(Map properties) throws InvalidValueException { diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java similarity index 87% rename from src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java index ff6b49d..0007a6d 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java @@ -3,6 +3,7 @@ */ package org.gcube.accounting.datamodel.implementations; +import org.gcube.accounting.datamodel.validators.NotEmptyIfNotNull; import org.gcube.accounting.datamodel.validators.ValidIP; import org.gcube.accounting.exception.InvalidValueException; import org.gcube.common.validator.annotations.NotEmpty; @@ -11,14 +12,14 @@ import org.gcube.common.validator.annotations.NotEmpty; * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * */ -public class StorageUsageRecord extends StorageStatusUsageRecord { +public class StorageUsageUsageRecord extends StorageStatusUsageRecord { /** * Generated Serial Version UID */ private static final long serialVersionUID = 1381025822586583326L; - @NotEmpty + @NotEmptyIfNotNull public static final String OBJECT_URI = "objectURI"; @NotEmpty public static final String OPERATION_TYPE = "operationType"; @@ -26,7 +27,7 @@ public class StorageUsageRecord extends StorageStatusUsageRecord { public static final String CALLER_IP = "callerIP"; - public StorageUsageRecord(){ + public StorageUsageUsageRecord(){ super(); }