From 42dafd82ab059583e61639fe43f779ee4c53e4cc Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 25 Jun 2015 14:21:56 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Fixing model git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115550 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../implementations/StorageUsageRecord.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java index 6237b4a..6ceed86 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java @@ -97,6 +97,16 @@ public class StorageUsageRecord extends BasicUsageRecord implements SingleUsageR setResourceProperty(RESOURCE_SCOPE, scope); } + /* + public String getProviderId() { + return (String) this.resourceProperties.get(PROVIDER_ID); + } + + public void setProviderId(String providerId) throws InvalidValueException { + setResourceProperty(PROVIDER_ID, providerId); + } + */ + public URI getObjectURI() { return (URI) this.resourceProperties.get(OBJECT_URI); } @@ -113,32 +123,6 @@ public class StorageUsageRecord extends BasicUsageRecord implements SingleUsageR setResourceProperty(OPERATION_TYPE, operationType); } - public String getCallerIP() { - return (String) this.resourceProperties.get(CALLER_IP); - } - - public void setCallerIP(String callerIP) throws InvalidValueException { - setResourceProperty(CALLER_IP, callerIP); - } - - /* - public String getProviderId() { - return (String) this.resourceProperties.get(PROVIDER_ID); - } - - public void setProviderId(String providerId) throws InvalidValueException { - setResourceProperty(PROVIDER_ID, providerId); - } - */ - - public String getQualifier() { - return (String) this.resourceProperties.get(QUALIFIER); - } - - public void setQualifier(String qualifier) throws InvalidValueException { - setResourceProperty(QUALIFIER, qualifier); - } - public String getDataType() { return (String) this.resourceProperties.get(DATA_TYPE); } @@ -153,7 +137,23 @@ public class StorageUsageRecord extends BasicUsageRecord implements SingleUsageR public void setDataVolume(long dataVolume) throws InvalidValueException { setResourceProperty(DATA_VOLUME, dataVolume); - } + } + + public String getQualifier() { + return (String) this.resourceProperties.get(QUALIFIER); + } + + public void setQualifier(String qualifier) throws InvalidValueException { + setResourceProperty(QUALIFIER, qualifier); + } + + public String getCallerIP() { + return (String) this.resourceProperties.get(CALLER_IP); + } + + public void setCallerIP(String callerIP) throws InvalidValueException { + setResourceProperty(CALLER_IP, callerIP); + }