gCubeSystem
/
accounting-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #200: Create accouting-lib library 

https://support.d4science.org/issues/200
Implementing library

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115265 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-06-09 12:54:14 +00:00
parent b7fef09600
commit ecda3255a9
14 changed files with 272 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java
View File

@ -11,6 +11,7 @@ import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -70,12 +71,11 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
private static final long serialVersionUID = -2060728578456796388L; private static final long serialVersionUID = -2060728578456796388L;
/** /** resource-specific properties */
* resource-specific properties protected Map<String, Serializable> resourceProperties;
*/
protected Map<String, Serializable> resourceSpecificProperties;
protected final Map<String, List<ValidatorAction>> validation; protected Map<String, List<ValidatorAction>> validation;
protected Set<String> requiredFields;
protected void initializeValidation() { protected void initializeValidation() {
logger.debug("Initializing Field Validators"); logger.debug("Initializing Field Validators");
@ -100,25 +100,34 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
} }
fieldValidators.add(validator); fieldValidators.add(validator);
} }
if(annotation.getClass().isAssignableFrom(RequiredField.class)){
requiredFields.add(keyString);
}
} }
} }
} }
/**
protected RawUsageRecord(){ * Initialize variable
this.resourceSpecificProperties = new HashMap<String, Serializable>(); */
private void init() {
this.validation = new HashMap<String, List<ValidatorAction>>(); this.validation = new HashMap<String, List<ValidatorAction>>();
this.requiredFields = new HashSet<String>();
initializeValidation(); 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());
} }
protected RawUsageRecord(){
init();
this.resourceProperties = new HashMap<String, Serializable>();
this.resourceProperties.put(ID, UUID.randomUUID().toString());
this.resourceProperties.put(RESOURCE_TYPE, this.getClass().getSimpleName());
Calendar calendar = Calendar.getInstance();
this.resourceProperties.put(CREATION_TIME, calendar.getTimeInMillis());
}
protected RawUsageRecord(Map<String, Serializable> properties) throws InvalidValueException { protected RawUsageRecord(Map<String, Serializable> properties) throws InvalidValueException {
this.validation = new HashMap<String, List<ValidatorAction>>(); init();
initializeValidation(); setResourceProperties(properties);
setResourceSpecificProperties(properties);
} }
/** /**
@ -126,7 +135,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public String getId() { public String getId() {
return (String) this.resourceSpecificProperties.get(ID); return (String) this.resourceProperties.get(ID);
} }
/** /**
@ -134,7 +143,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setId(String id) throws InvalidValueException { public void setId(String id) throws InvalidValueException {
setResourceSpecificProperty(ID, id); setResourceProperty(ID, id);
} }
/** /**
@ -142,7 +151,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public String getCreatorId() { public String getCreatorId() {
return (String) this.resourceSpecificProperties.get(CREATOR_ID); return (String) this.resourceProperties.get(CREATOR_ID);
} }
/** /**
@ -150,7 +159,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setCreatorId(String creatorId) throws InvalidValueException { public void setCreatorId(String creatorId) throws InvalidValueException {
setResourceSpecificProperty(CREATOR_ID, creatorId); setResourceProperty(CREATOR_ID, creatorId);
} }
/** /**
@ -158,7 +167,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public String getConsumerId() { public String getConsumerId() {
return (String) this.resourceSpecificProperties.get(CONSUMER_ID); return (String) this.resourceProperties.get(CONSUMER_ID);
} }
/** /**
@ -166,7 +175,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setConsumerId(String consumerId) throws InvalidValueException { public void setConsumerId(String consumerId) throws InvalidValueException {
setResourceSpecificProperty(CONSUMER_ID, consumerId); setResourceProperty(CONSUMER_ID, consumerId);
} }
protected Calendar timestampStringToCalendar(long millis){ protected Calendar timestampStringToCalendar(long millis){
@ -180,7 +189,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public Calendar getCreationTime() { public Calendar getCreationTime() {
long millis = (Long) this.resourceSpecificProperties.get(CREATION_TIME); long millis = (Long) this.resourceProperties.get(CREATION_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
@ -189,13 +198,13 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setCreationTime(Calendar creationTime) throws InvalidValueException { public void setCreationTime(Calendar creationTime) throws InvalidValueException {
setResourceSpecificProperty(CREATION_TIME, creationTime.getTimeInMillis()); setResourceProperty(CREATION_TIME, creationTime.getTimeInMillis());
} }
@Override @Override
@Deprecated @Deprecated
public Date getCreateTime() { public Date getCreateTime() {
long millis = (Long) this.resourceSpecificProperties.get(CREATION_TIME); long millis = (Long) this.resourceProperties.get(CREATION_TIME);
return timestampStringToCalendar(millis).getTime(); return timestampStringToCalendar(millis).getTime();
} }
@ -215,7 +224,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public Calendar getStartTime() { public Calendar getStartTime() {
long millis = (Long) this.resourceSpecificProperties.get(START_TIME); long millis = (Long) this.resourceProperties.get(START_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
@ -225,7 +234,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
* @throws InvalidValueException * @throws InvalidValueException
*/ */
protected void setStartTime(Calendar startTime) throws InvalidValueException { protected void setStartTime(Calendar startTime) throws InvalidValueException {
setResourceSpecificProperty(START_TIME, startTime.getTimeInMillis()); setResourceProperty(START_TIME, startTime.getTimeInMillis());
} }
/* * /* *
@ -245,7 +254,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public Calendar getEndTime() { public Calendar getEndTime() {
long millis = (Long) this.resourceSpecificProperties.get(END_TIME); long millis = (Long) this.resourceProperties.get(END_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
@ -255,7 +264,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
* @throws InvalidValueException * @throws InvalidValueException
*/ */
protected void setEndTime(Calendar endTime) throws InvalidValueException { protected void setEndTime(Calendar endTime) throws InvalidValueException {
setResourceSpecificProperty(END_TIME, endTime.getTimeInMillis()); setResourceProperty(END_TIME, endTime.getTimeInMillis());
} }
/* * /* *
@ -270,13 +279,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
} }
*/ */
protected String getUsageRecordType() {
/**
* {@inheritDoc}
*/
@Override
@Deprecated
public String getUsageRecordType() {
//return (String) this.resourceSpecificProperties.get(RESOURCE_TYPE); //return (String) this.resourceSpecificProperties.get(RESOURCE_TYPE);
return this.getClass().getSimpleName(); return this.getClass().getSimpleName();
} }
@ -301,7 +304,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public String getResourceScope() { public String getResourceScope() {
return (String) this.resourceSpecificProperties.get(RESOURCE_SCOPE); return (String) this.resourceProperties.get(RESOURCE_SCOPE);
} }
/** /**
@ -309,7 +312,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setResourceScope(String scope) throws InvalidValueException { public void setResourceScope(String scope) throws InvalidValueException {
setResourceSpecificProperty(RESOURCE_SCOPE, scope); setResourceProperty(RESOURCE_SCOPE, scope);
} }
/** /**
@ -318,7 +321,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
@Override @Override
@Deprecated @Deprecated
public String getResourceOwner() { public String getResourceOwner() {
return (String) this.resourceSpecificProperties.get(RESOURCE_OWNER); return (String) this.resourceProperties.get(RESOURCE_OWNER);
} }
/** /**
@ -327,7 +330,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
@Override @Override
@Deprecated @Deprecated
public void setResourceOwner(String owner) throws InvalidValueException { public void setResourceOwner(String owner) throws InvalidValueException {
setResourceSpecificProperty(RESOURCE_OWNER, owner); setResourceProperty(RESOURCE_OWNER, owner);
} }
/** /**
@ -336,7 +339,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
@Override @Override
@Deprecated @Deprecated
public String getAggregatedId() { public String getAggregatedId() {
return (String) this.resourceSpecificProperties.get(AGGREGATED_ID); return (String) this.resourceProperties.get(AGGREGATED_ID);
} }
/** /**
@ -345,7 +348,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
@Override@ @Override@
Deprecated Deprecated
public void setAggregatedId(String aggregatedId) throws InvalidValueException { public void setAggregatedId(String aggregatedId) throws InvalidValueException {
setResourceSpecificProperty(AGGREGATED_ID, aggregatedId); setResourceProperty(AGGREGATED_ID, aggregatedId);
} }
/** /**
@ -353,7 +356,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public String getAggregatedUsageRecordId() { public String getAggregatedUsageRecordId() {
return (String) this.resourceSpecificProperties.get(AGGREGATED_USAGE_RECORD_ID); return (String) this.resourceProperties.get(AGGREGATED_USAGE_RECORD_ID);
} }
/** /**
@ -361,45 +364,88 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setAggregatedUsageRecordId(String aggregatedId) throws InvalidValueException { public void setAggregatedUsageRecordId(String aggregatedId) throws InvalidValueException {
setResourceSpecificProperty(AGGREGATED_USAGE_RECORD_ID, aggregatedId); setResourceProperty(AGGREGATED_USAGE_RECORD_ID, aggregatedId);
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Deprecated
public Map<String, Serializable> getResourceSpecificProperties() { public Map<String, Serializable> getResourceSpecificProperties() {
return this.resourceSpecificProperties; return getResourceProperties();
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Deprecated
public void setResourceSpecificProperties(Map<String, Serializable> properties) throws InvalidValueException { public void setResourceSpecificProperties(Map<String, Serializable> properties) throws InvalidValueException {
validate(properties); setResourceProperties(properties);
this.resourceSpecificProperties = new HashMap<String, Serializable>(properties); }
/**
* {@inheritDoc}
*/
@Override
public Map<String, Serializable> getResourceProperties() {
return this.resourceProperties;
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public Serializable getResourceSpecificProperty(String key) { public void setResourceProperties(Map<String, Serializable> properties) throws InvalidValueException {
return this.resourceSpecificProperties.get(key); validateProperties(properties);
this.resourceProperties = new HashMap<String, Serializable>(properties);
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Deprecated
public Serializable getResourceSpecificProperty(String key) {
return getResourceProperty(key);
}
/**
* {@inheritDoc}
*/
@Override
@Deprecated
public void setResourceSpecificProperty(String key, Serializable value) throws InvalidValueException { public void setResourceSpecificProperty(String key, Serializable value) throws InvalidValueException {
setResourceProperty(key, value);
}
/**
* {@inheritDoc}
*/
@Override
public Serializable getResourceProperty(String key) {
return this.resourceProperties.get(key);
}
/**
* {@inheritDoc}
*/
@Override
public void setResourceProperty(String key, Serializable value) throws InvalidValueException {
Serializable checkedValue = validateField(key, value); Serializable checkedValue = validateField(key, value);
this.resourceSpecificProperties.put(key, checkedValue); if(checkedValue == null){
this.resourceProperties.remove(key);
}else{
this.resourceProperties.put(key, checkedValue);
}
} }
protected Serializable validateField(String key, Serializable serializable) throws InvalidValueException { protected Serializable validateField(String key, Serializable serializable) throws InvalidValueException {
if(key == null){
throw new InvalidValueException("The key of property to set cannot be null");
}
Serializable checkedValue = serializable; Serializable checkedValue = serializable;
List<ValidatorAction> fieldValidators = validation.get(key); List<ValidatorAction> fieldValidators = validation.get(key);
if(fieldValidators!=null){ if(fieldValidators!=null){
@ -410,7 +456,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
return checkedValue; return checkedValue;
} }
protected void validate(Map<String, Serializable> properties) throws InvalidValueException{ protected void validateProperties(Map<String, Serializable> properties) throws InvalidValueException{
for(String key : properties.keySet()){ for(String key : properties.keySet()){
Serializable serializable = properties.get(key); Serializable serializable = properties.get(key);
validateField(key, serializable); validateField(key, serializable);
@ -421,13 +467,23 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public void validate() throws InvalidValueException{ public void validate() throws InvalidValueException {
validate(this.resourceSpecificProperties); validateProperties(this.resourceProperties);
Set<String> notPresentProperties = new HashSet<String>();
for(String key : this.requiredFields){
if(!this.resourceProperties.containsKey(key)){
notPresentProperties.add(key);
}
}
if(!notPresentProperties.isEmpty()){
String pluralManagement = notPresentProperties.size() == 1 ? "y" : "ies";
throw new InvalidValueException(String.format("The Usage Record does not contain the following required propert%s %s", pluralManagement, notPresentProperties.toString()));
}
} }
@Override @Override
public String toString(){ public String toString(){
return resourceSpecificProperties.toString(); return resourceProperties.toString();
} }
@ -453,7 +509,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public OperationResult getOperationResult(){ public OperationResult getOperationResult(){
return OperationResult.valueOf((String) this.resourceSpecificProperties.get(OPERATION_RESULT)); return OperationResult.valueOf((String) this.resourceProperties.get(OPERATION_RESULT));
} }
/** /**
@ -462,7 +518,7 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public void setOperationResult(OperationResult operationResult) throws InvalidValueException { public void setOperationResult(OperationResult operationResult) throws InvalidValueException {
setResourceSpecificProperty(OPERATION_RESULT, operationResult); setResourceProperty(OPERATION_RESULT, operationResult);
} }
@ -479,8 +535,8 @@ public abstract class RawUsageRecord implements UsageRecord, Serializable {
*/ */
@Override @Override
public int compareTo(UsageRecord usageRecord) { public int compareTo(UsageRecord usageRecord) {
Set<Entry<String, Serializable>> thisSet = this.resourceSpecificProperties.entrySet(); Set<Entry<String, Serializable>> thisSet = this.resourceProperties.entrySet();
Set<Entry<String, Serializable>> usageRecordSet = usageRecord.getResourceSpecificProperties().entrySet(); Set<Entry<String, Serializable>> usageRecordSet = usageRecord.getResourceProperties().entrySet();
if(thisSet.size() != usageRecordSet.size()){ if(thisSet.size() != usageRecordSet.size()){
return thisSet.size() - usageRecordSet.size(); return thisSet.size() - usageRecordSet.size();
} }

63
src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
View File

@ -124,15 +124,6 @@ public interface UsageRecord extends Comparable<UsageRecord>{
@Deprecated @Deprecated
public void setEndTime(Date endTime) throws InvalidValueException; public void setEndTime(Date endTime) throws InvalidValueException;
*/ */
/**
* Return the type of the {#UsageRecord}.
* It is a alternative way of obj.getClass().getSimpleName() use this
* instead
* @return Resource Type
*/
@Deprecated
public String getUsageRecordType();
/** /**
* Use {#getUsageRecordType} instead * Use {#getUsageRecordType} instead
@ -214,30 +205,66 @@ public interface UsageRecord extends Comparable<UsageRecord>{
public void setAggregatedUsageRecordId(String aggregatedId) throws InvalidValueException; public void setAggregatedUsageRecordId(String aggregatedId) throws InvalidValueException;
/** /**
* Return all resource-specific properties * Return all resource properties
* @return * Use {@link #getResourceSpecificProperties()}
* @return a Map containing the properties
*/ */
@Deprecated
public Map<String, Serializable> getResourceSpecificProperties(); public Map<String, Serializable> getResourceSpecificProperties();
/**
* Set all resource properties, replacing existing ones
* Use {@link #setResourceSpecificProperties()}
*/
@Deprecated
public void setResourceSpecificProperties(Map<String, Serializable> resourceSpecificProperties) throws InvalidValueException;
/**
* Return all resource-specific properties
* @return a Map containing the properties
*/
public Map<String, Serializable> getResourceProperties();
/** /**
* Set all resource-specific properties, replacing existing ones * Set all resource-specific properties, replacing existing ones
*/ */
public void setResourceSpecificProperties(Map<String, Serializable> resourceSpecificProperties) throws InvalidValueException; public void setResourceProperties(Map<String, Serializable> resourceSpecificProperties) throws InvalidValueException;
/** /**
* Return the value of the given resource-specific property * Return the value of the given resource property.
* @param key * @param key the key of the requested property
* @return the value of the given resource-specific property * @return the value of the given resource property
*/ */
@Deprecated
public Serializable getResourceSpecificProperty(String key); public Serializable getResourceSpecificProperty(String key);
/** /**
* Set the value of the given resource-specific property * Set the value of the given resource property.
* @param key * If the key has the value of one of the predefined property, the value
* @param value * is validated.
* @param key the key of the requested property
* @param value the value of the given resource property
*/ */
@Deprecated
public void setResourceSpecificProperty(String key, Serializable value) throws InvalidValueException; public void setResourceSpecificProperty(String key, Serializable value) throws InvalidValueException;
/**
* Return the value of the given resource property.
* @param key the key of the requested property
* @return the value of the given resource property
*/
public Serializable getResourceProperty(String key);
/**
* Set the value of the given resource property.
* If the key has the value of one of the predefined property, the value
* is validated.
* @param key the key of the requested property
* @param value the value of the given resource property
*/
public void setResourceProperty(String key, Serializable value) throws InvalidValueException;
/** /**
* The method is deprecated and the implementations in known classes * The method is deprecated and the implementations in known classes
* return Consumer ID * return Consumer ID

36
src/main/java/org/gcube/accounting/datamodel/implementations/JobUsageRecord.java
View File

@ -58,7 +58,7 @@ public class JobUsageRecord extends RawUsageRecord implements SingleUsageRecord
* @return the Job Id * @return the Job Id
*/ */
public String getJobId() { public String getJobId() {
return (String) this.resourceSpecificProperties.get(JOB_ID); return (String) this.resourceProperties.get(JOB_ID);
} }
/** /**
@ -66,69 +66,69 @@ public class JobUsageRecord extends RawUsageRecord implements SingleUsageRecord
* @throws InvalidValueException if fails * @throws InvalidValueException if fails
*/ */
public void setJobId(String jobId) throws InvalidValueException { public void setJobId(String jobId) throws InvalidValueException {
setResourceSpecificProperty(JOB_ID, jobId); setResourceProperty(JOB_ID, jobId);
} }
public String getJobQualifier() { public String getJobQualifier() {
return (String) this.resourceSpecificProperties.get(JOB_QUALIFIER); return (String) this.resourceProperties.get(JOB_QUALIFIER);
} }
public void setJobQualifier(String jobQualifier) throws InvalidValueException { public void setJobQualifier(String jobQualifier) throws InvalidValueException {
setResourceSpecificProperty(JOB_QUALIFIER, jobQualifier); setResourceProperty(JOB_QUALIFIER, jobQualifier);
} }
public String getJobName() { public String getJobName() {
return (String) this.resourceSpecificProperties.get(JOB_NAME); return (String) this.resourceProperties.get(JOB_NAME);
} }
public void setJobName(String jobName) throws InvalidValueException { public void setJobName(String jobName) throws InvalidValueException {
setResourceSpecificProperty(JOB_NAME, jobName); setResourceProperty(JOB_NAME, jobName);
} }
public Calendar getJobStartTime() { public Calendar getJobStartTime() {
long millis = (Long) this.resourceSpecificProperties.get(JOB_START_TIME); long millis = (Long) this.resourceProperties.get(JOB_START_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
public void setJobStartTime(Calendar jobStartTime) throws InvalidValueException { public void setJobStartTime(Calendar jobStartTime) throws InvalidValueException {
setResourceSpecificProperty(JOB_START_TIME, jobStartTime.getTimeInMillis()); setResourceProperty(JOB_START_TIME, jobStartTime.getTimeInMillis());
} }
public Calendar getJobEndTime() { public Calendar getJobEndTime() {
long millis = (Long) this.resourceSpecificProperties.get(JOB_END_TIME); long millis = (Long) this.resourceProperties.get(JOB_END_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
public void setJobEndTime(Calendar jobEndTime) throws InvalidValueException { public void setJobEndTime(Calendar jobEndTime) throws InvalidValueException {
setResourceSpecificProperty(JOB_END_TIME, jobEndTime.getTimeInMillis()); setResourceProperty(JOB_END_TIME, jobEndTime.getTimeInMillis());
} }
@Deprecated @Deprecated
public JobStatus getJobStatus() { public JobStatus getJobStatus() {
return JobStatus.values()[((OperationResult) this.resourceSpecificProperties.get(OPERATION_RESULT)).ordinal()]; return JobStatus.values()[((OperationResult) this.resourceProperties.get(OPERATION_RESULT)).ordinal()];
} }
@Deprecated @Deprecated
public void setJobStatus(JobStatus jobStatus) throws InvalidValueException { public void setJobStatus(JobStatus jobStatus) throws InvalidValueException {
setResourceSpecificProperty(OPERATION_RESULT, OperationResult.values()[jobStatus.ordinal()]); setResourceProperty(OPERATION_RESULT, OperationResult.values()[jobStatus.ordinal()]);
} }
public int getVmsUsed() { public int getVmsUsed() {
return (Integer) this.resourceSpecificProperties.get(VMS_USED); return (Integer) this.resourceProperties.get(VMS_USED);
} }
public void setVmsUsed(int vmsUsed) throws InvalidValueException { public void setVmsUsed(int vmsUsed) throws InvalidValueException {
setResourceSpecificProperty(VMS_USED, vmsUsed); setResourceProperty(VMS_USED, vmsUsed);
} }
protected void calculateWallDuration() throws InvalidValueException { protected void calculateWallDuration() throws InvalidValueException {
try { try {
long endTime = (Long) this.resourceSpecificProperties.get(JOB_END_TIME); long endTime = (Long) this.resourceProperties.get(JOB_END_TIME);
long startTime = (Long) this.resourceSpecificProperties.get(JOB_START_TIME); long startTime = (Long) this.resourceProperties.get(JOB_START_TIME);
long wallDuration = endTime - startTime; long wallDuration = endTime - startTime;
setResourceSpecificProperty(WALL_DURATION, wallDuration); setResourceProperty(WALL_DURATION, wallDuration);
}catch(Exception e){ }catch(Exception e){
throw new InvalidValueException(String.format("To calculate Wall Duration both %s and %s must be set", throw new InvalidValueException(String.format("To calculate Wall Duration both %s and %s must be set",
START_TIME, END_TIME), e.getCause()); START_TIME, END_TIME), e.getCause());
@ -136,7 +136,7 @@ public class JobUsageRecord extends RawUsageRecord implements SingleUsageRecord
} }
public long getWallDuration() throws InvalidValueException { public long getWallDuration() throws InvalidValueException {
Long wallDuration = (Long) this.resourceSpecificProperties.get(WALL_DURATION); Long wallDuration = (Long) this.resourceProperties.get(WALL_DURATION);
if(wallDuration == null){ if(wallDuration == null){
calculateWallDuration(); calculateWallDuration();
} }

12
src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java
View File

@ -37,28 +37,28 @@ public class PortletUsageRecord extends RawUsageRecord implements SingleUsageRec
@Deprecated @Deprecated
public String getUserId() { public String getUserId() {
return (String) this.resourceSpecificProperties.get(USER_ID); return (String) this.resourceProperties.get(USER_ID);
} }
@Deprecated @Deprecated
public void setUserId(String userId) throws InvalidValueException { public void setUserId(String userId) throws InvalidValueException {
setResourceSpecificProperty(USER_ID, userId); setResourceProperty(USER_ID, userId);
} }
public String getPortletId() { public String getPortletId() {
return (String) this.resourceSpecificProperties.get(PORTLET_ID); return (String) this.resourceProperties.get(PORTLET_ID);
} }
public void setPortletId(String portletId) throws InvalidValueException { public void setPortletId(String portletId) throws InvalidValueException {
setResourceSpecificProperty(PORTLET_ID, portletId); setResourceProperty(PORTLET_ID, portletId);
} }
public String getOperationId() { public String getOperationId() {
return (String) this.resourceSpecificProperties.get(OPERATION_ID); return (String) this.resourceProperties.get(OPERATION_ID);
} }
public void setOperationId(String operationId) throws InvalidValueException { public void setOperationId(String operationId) throws InvalidValueException {
setResourceSpecificProperty(OPERATION_ID, operationId); setResourceProperty(OPERATION_ID, operationId);
} }
} }

36
src/main/java/org/gcube/accounting/datamodel/implementations/ServiceUsageRecord.java
View File

@ -48,75 +48,75 @@ public class ServiceUsageRecord extends RawUsageRecord implements SingleUsageRec
} }
public String getCallerIP() { public String getCallerIP() {
return (String) this.resourceSpecificProperties.get(CALLER_IP); return (String) this.resourceProperties.get(CALLER_IP);
} }
public void setCallerIP(String callerIP) throws InvalidValueException { public void setCallerIP(String callerIP) throws InvalidValueException {
setResourceSpecificProperty(CALLER_IP, callerIP); setResourceProperty(CALLER_IP, callerIP);
} }
public String getCallerScope() { public String getCallerScope() {
return (String) this.resourceSpecificProperties.get(CALLER_SCOPE); return (String) this.resourceProperties.get(CALLER_SCOPE);
} }
public void setCallerScope(String callerScope) throws InvalidValueException { public void setCallerScope(String callerScope) throws InvalidValueException {
setResourceSpecificProperty(CALLER_SCOPE, callerScope); setResourceProperty(CALLER_SCOPE, callerScope);
} }
public String getRefHost() { public String getRefHost() {
return (String) this.resourceSpecificProperties.get(REF_HOST); return (String) this.resourceProperties.get(REF_HOST);
} }
public void setRefHost(String refHost) throws InvalidValueException { public void setRefHost(String refHost) throws InvalidValueException {
setResourceSpecificProperty(REF_HOST, refHost); setResourceProperty(REF_HOST, refHost);
} }
public String getRefVM() { public String getRefVM() {
return (String) this.resourceSpecificProperties.get(REF_VM); return (String) this.resourceProperties.get(REF_VM);
} }
public void setRefVM(String refVM) throws InvalidValueException { public void setRefVM(String refVM) throws InvalidValueException {
setResourceSpecificProperty(REF_VM, refVM); setResourceProperty(REF_VM, refVM);
} }
protected String getDomain() { protected String getDomain() {
return (String) this.resourceSpecificProperties.get(DOMAIN); return (String) this.resourceProperties.get(DOMAIN);
} }
protected void setDomain(String domain) throws InvalidValueException { protected void setDomain(String domain) throws InvalidValueException {
setResourceSpecificProperty(DOMAIN, domain); setResourceProperty(DOMAIN, domain);
} }
public String getInvocationCount() { public String getInvocationCount() {
return (String) this.resourceSpecificProperties.get(INVOCATION_COUNT); return (String) this.resourceProperties.get(INVOCATION_COUNT);
} }
public void setInvocationCount(String invocationCount) throws InvalidValueException { public void setInvocationCount(String invocationCount) throws InvalidValueException {
setResourceSpecificProperty(INVOCATION_COUNT, invocationCount); setResourceProperty(INVOCATION_COUNT, invocationCount);
} }
public String getAverageInvocationTime() { public String getAverageInvocationTime() {
return (String) this.resourceSpecificProperties.get(AVERAGE_INVOCATION_COUNT); return (String) this.resourceProperties.get(AVERAGE_INVOCATION_COUNT);
} }
public void setAverageInvocationTime(String averageInvocationTime) throws InvalidValueException { public void setAverageInvocationTime(String averageInvocationTime) throws InvalidValueException {
setResourceSpecificProperty(AVERAGE_INVOCATION_COUNT, averageInvocationTime); setResourceProperty(AVERAGE_INVOCATION_COUNT, averageInvocationTime);
} }
public String getServiceClass() { public String getServiceClass() {
return (String) this.resourceSpecificProperties.get(SERVICE_CLASS); return (String) this.resourceProperties.get(SERVICE_CLASS);
} }
public void setServiceClass(String serviceClass) throws InvalidValueException { public void setServiceClass(String serviceClass) throws InvalidValueException {
setResourceSpecificProperty(SERVICE_CLASS, serviceClass); setResourceProperty(SERVICE_CLASS, serviceClass);
} }
public String getServiceName() { public String getServiceName() {
return (String) this.resourceSpecificProperties.get(SERVICE_NAME); return (String) this.resourceProperties.get(SERVICE_NAME);
} }
public void setServiceName(String serviceName) throws InvalidValueException { public void setServiceName(String serviceName) throws InvalidValueException {
setResourceSpecificProperty(SERVICE_NAME, serviceName); setResourceProperty(SERVICE_NAME, serviceName);
} }
} }

36
src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java
View File

@ -46,67 +46,67 @@ public class StorageUsageUsageRecord extends RawUsageRecord implements SingleUsa
} }
public String getObjectURI() { public String getObjectURI() {
return (String) this.resourceSpecificProperties.get(OBJECT_URI); return (String) this.resourceProperties.get(OBJECT_URI);
} }
public void setObjectURI(String objectURI) throws InvalidValueException { public void setObjectURI(String objectURI) throws InvalidValueException {
setResourceSpecificProperty(OBJECT_URI, objectURI); setResourceProperty(OBJECT_URI, objectURI);
} }
public String getOperationType() { public String getOperationType() {
return (String) this.resourceSpecificProperties.get(OPERATION_TYPE); return (String) this.resourceProperties.get(OPERATION_TYPE);
} }
public void setOperationType(String operationType) throws InvalidValueException { public void setOperationType(String operationType) throws InvalidValueException {
setResourceSpecificProperty(OPERATION_TYPE, operationType); setResourceProperty(OPERATION_TYPE, operationType);
} }
public String getCallerIP() { public String getCallerIP() {
return (String) this.resourceSpecificProperties.get(CALLER_IP); return (String) this.resourceProperties.get(CALLER_IP);
} }
public void setCallerIP(String callerIP) throws InvalidValueException { public void setCallerIP(String callerIP) throws InvalidValueException {
setResourceSpecificProperty(CALLER_IP, callerIP); setResourceProperty(CALLER_IP, callerIP);
} }
public String getProviderId() { public String getProviderId() {
return (String) this.resourceSpecificProperties.get(PROVIDER_ID); return (String) this.resourceProperties.get(PROVIDER_ID);
} }
public void setProviderId(String providerId) throws InvalidValueException { public void setProviderId(String providerId) throws InvalidValueException {
setResourceSpecificProperty(PROVIDER_ID, providerId); setResourceProperty(PROVIDER_ID, providerId);
} }
public String getQualifier() { public String getQualifier() {
return (String) this.resourceSpecificProperties.get(QUALIFIER); return (String) this.resourceProperties.get(QUALIFIER);
} }
public void setQualifier(String qualifier) throws InvalidValueException { public void setQualifier(String qualifier) throws InvalidValueException {
setResourceSpecificProperty(QUALIFIER, qualifier); setResourceProperty(QUALIFIER, qualifier);
} }
public String getDataType() { public String getDataType() {
return (String) this.resourceSpecificProperties.get(DATA_TYPE); return (String) this.resourceProperties.get(DATA_TYPE);
} }
public void setDataType(String dataType) throws InvalidValueException { public void setDataType(String dataType) throws InvalidValueException {
setResourceSpecificProperty(DATA_TYPE, dataType); setResourceProperty(DATA_TYPE, dataType);
} }
public long getDataVolume() { public long getDataVolume() {
return (Long) this.resourceSpecificProperties.get(DATA_VOLUME); return (Long) this.resourceProperties.get(DATA_VOLUME);
} }
public void setDataVolume(long dataVolume) throws InvalidValueException { public void setDataVolume(long dataVolume) throws InvalidValueException {
setResourceSpecificProperty(DATA_VOLUME, dataVolume); setResourceProperty(DATA_VOLUME, dataVolume);
} }
public int getDataCount() { public int getDataCount() {
return (Integer) this.resourceSpecificProperties.get(DATA_COUNT); return (Integer) this.resourceProperties.get(DATA_COUNT);
} }
public void setDataCount(int dataCount) throws InvalidValueException { public void setDataCount(int dataCount) throws InvalidValueException {
setResourceSpecificProperty(DATA_COUNT, dataCount); setResourceProperty(DATA_COUNT, dataCount);
} }
/** /**
@ -114,7 +114,7 @@ public class StorageUsageUsageRecord extends RawUsageRecord implements SingleUsa
*/ */
@Override @Override
public String getResourceOwner() { public String getResourceOwner() {
return (String) this.resourceSpecificProperties.get(RESOURCE_OWNER); return (String) this.resourceProperties.get(RESOURCE_OWNER);
} }
/** /**
@ -122,7 +122,7 @@ public class StorageUsageUsageRecord extends RawUsageRecord implements SingleUsa
*/ */
@Override @Override
public void setResourceOwner(String owner) throws InvalidValueException { public void setResourceOwner(String owner) throws InvalidValueException {
setResourceSpecificProperty(RESOURCE_OWNER, owner); setResourceProperty(RESOURCE_OWNER, owner);
} }
} }

58
src/main/java/org/gcube/accounting/datamodel/implementations/TaskUsageRecord.java
View File

@ -70,7 +70,7 @@ public class TaskUsageRecord extends RawUsageRecord implements SingleUsageRecord
* @return the Job Id * @return the Job Id
*/ */
public String getJobId() { public String getJobId() {
return (String) this.resourceSpecificProperties.get(JOB_ID); return (String) this.resourceProperties.get(JOB_ID);
} }
/** /**
@ -78,23 +78,23 @@ public class TaskUsageRecord extends RawUsageRecord implements SingleUsageRecord
* @throws InvalidValueException if fails * @throws InvalidValueException if fails
*/ */
public void setJobId(String jobId) throws InvalidValueException { public void setJobId(String jobId) throws InvalidValueException {
setResourceSpecificProperty(JOB_ID, jobId); setResourceProperty(JOB_ID, jobId);
} }
public String getRefHost() { public String getRefHost() {
return (String) this.resourceSpecificProperties.get(REF_HOST); return (String) this.resourceProperties.get(REF_HOST);
} }
public void setRefHost(String refHost) throws InvalidValueException { public void setRefHost(String refHost) throws InvalidValueException {
setResourceSpecificProperty(REF_HOST, refHost); setResourceProperty(REF_HOST, refHost);
} }
public String getRefVM() { public String getRefVM() {
return (String) this.resourceSpecificProperties.get(REF_VM); return (String) this.resourceProperties.get(REF_VM);
} }
public void setRefVM(String refVM) throws InvalidValueException { public void setRefVM(String refVM) throws InvalidValueException {
setResourceSpecificProperty(REF_VM, refVM); setResourceProperty(REF_VM, refVM);
} }
/* /*
@ -103,100 +103,100 @@ public class TaskUsageRecord extends RawUsageRecord implements SingleUsageRecord
} }
private void setDomain(String domain) throws InvalidValueException { private void setDomain(String domain) throws InvalidValueException {
setResourceSpecificProperty(DOMAIN, domain); setResourceProperty(DOMAIN, domain);
} }
*/ */
public Calendar getUsageStartTime() { public Calendar getUsageStartTime() {
long millis = (Long) this.resourceSpecificProperties.get(USAGE_START_TIME); long millis = (Long) this.resourceProperties.get(USAGE_START_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
public void setUsageStartTime(Calendar usageStartTime) throws InvalidValueException { public void setUsageStartTime(Calendar usageStartTime) throws InvalidValueException {
setResourceSpecificProperty(USAGE_START_TIME, usageStartTime.getTimeInMillis()); setResourceProperty(USAGE_START_TIME, usageStartTime.getTimeInMillis());
} }
public Calendar getUsageEndTime() { public Calendar getUsageEndTime() {
long millis = (Long) this.resourceSpecificProperties.get(USAGE_END_TIME); long millis = (Long) this.resourceProperties.get(USAGE_END_TIME);
return timestampStringToCalendar(millis); return timestampStringToCalendar(millis);
} }
public void setUsageEndTime(Calendar usageEndTime) throws InvalidValueException { public void setUsageEndTime(Calendar usageEndTime) throws InvalidValueException {
setResourceSpecificProperty(USAGE_END_TIME, usageEndTime.getTimeInMillis()); setResourceProperty(USAGE_END_TIME, usageEndTime.getTimeInMillis());
} }
public USAGE_PHASE getUsagePhase() { public USAGE_PHASE getUsagePhase() {
return (USAGE_PHASE) this.resourceSpecificProperties.get(USAGE_PHASE); return (USAGE_PHASE) this.resourceProperties.get(USAGE_PHASE);
} }
public void setUsagePhase(USAGE_PHASE usagePhase) throws InvalidValueException { public void setUsagePhase(USAGE_PHASE usagePhase) throws InvalidValueException {
setResourceSpecificProperty(USAGE_PHASE, usagePhase); setResourceProperty(USAGE_PHASE, usagePhase);
} }
public int getInputFilesNumber() { public int getInputFilesNumber() {
return (Integer) this.resourceSpecificProperties.get(INPUT_FILES_NUMBER); return (Integer) this.resourceProperties.get(INPUT_FILES_NUMBER);
} }
public void setInputFilesNumber(int inputFilesNumber) throws InvalidValueException { public void setInputFilesNumber(int inputFilesNumber) throws InvalidValueException {
setResourceSpecificProperty(INPUT_FILES_NUMBER, inputFilesNumber); setResourceProperty(INPUT_FILES_NUMBER, inputFilesNumber);
} }
public long getInputFilesSize() { public long getInputFilesSize() {
return (Long) this.resourceSpecificProperties.get(INPUT_FILES_SIZE); return (Long) this.resourceProperties.get(INPUT_FILES_SIZE);
} }
public void setInputFilesSize(long inputFilesSize) throws InvalidValueException { public void setInputFilesSize(long inputFilesSize) throws InvalidValueException {
setResourceSpecificProperty(INPUT_FILES_SIZE, inputFilesSize); setResourceProperty(INPUT_FILES_SIZE, inputFilesSize);
} }
public int getOutputFilesNumber() { public int getOutputFilesNumber() {
return (Integer) this.resourceSpecificProperties.get(OUTPUT_FILES_NUMBER); return (Integer) this.resourceProperties.get(OUTPUT_FILES_NUMBER);
} }
public void setOutputFilesNumber(int outputFilesNumber) throws InvalidValueException { public void setOutputFilesNumber(int outputFilesNumber) throws InvalidValueException {
setResourceSpecificProperty(OUTPUT_FILES_NUMBER, outputFilesNumber); setResourceProperty(OUTPUT_FILES_NUMBER, outputFilesNumber);
} }
public long getOutputFilesSize() { public long getOutputFilesSize() {
return (Long) this.resourceSpecificProperties.get(OUTPUT_FILES_SIZE); return (Long) this.resourceProperties.get(OUTPUT_FILES_SIZE);
} }
public void setOutputFilesSize(long outputFilesSize) throws InvalidValueException { public void setOutputFilesSize(long outputFilesSize) throws InvalidValueException {
setResourceSpecificProperty(OUTPUT_FILES_SIZE, outputFilesSize); setResourceProperty(OUTPUT_FILES_SIZE, outputFilesSize);
} }
public long getOverallNetworkIn() { public long getOverallNetworkIn() {
return (Long) this.resourceSpecificProperties.get(OVERALL_NETWORK_IN); return (Long) this.resourceProperties.get(OVERALL_NETWORK_IN);
} }
public void setOverallNetworkIn(long overallNetworkIn) throws InvalidValueException { public void setOverallNetworkIn(long overallNetworkIn) throws InvalidValueException {
setResourceSpecificProperty(OVERALL_NETWORK_IN, overallNetworkIn); setResourceProperty(OVERALL_NETWORK_IN, overallNetworkIn);
} }
public long getOverallNetworkOut() { public long getOverallNetworkOut() {
return (Long) this.resourceSpecificProperties.get(OVERALL_NETWORK_OUT); return (Long) this.resourceProperties.get(OVERALL_NETWORK_OUT);
} }
public void setOverallNetworkOut(long overallNetworkOut) throws InvalidValueException { public void setOverallNetworkOut(long overallNetworkOut) throws InvalidValueException {
setResourceSpecificProperty(OVERALL_NETWORK_OUT, overallNetworkOut); setResourceProperty(OVERALL_NETWORK_OUT, overallNetworkOut);
} }
public int getCores() { public int getCores() {
return (Integer) this.resourceSpecificProperties.get(CORES); return (Integer) this.resourceProperties.get(CORES);
} }
public void setCores(int cores) throws InvalidValueException { public void setCores(int cores) throws InvalidValueException {
setResourceSpecificProperty(CORES, cores); setResourceProperty(CORES, cores);
} }
public int getProcessors() { public int getProcessors() {
return (Integer) this.resourceSpecificProperties.get(PROCESSORS); return (Integer) this.resourceProperties.get(PROCESSORS);
} }
public void setProcessors(int processors) throws InvalidValueException { public void setProcessors(int processors) throws InvalidValueException {
setResourceSpecificProperty(PROCESSORS, processors); setResourceProperty(PROCESSORS, processors);
} }
} }

8
src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/ServiceUsageRecord.java
View File

@ -32,19 +32,19 @@ public class ServiceUsageRecord extends org.gcube.accounting.datamodel.implement
public String getInvocationCount() { public String getInvocationCount() {
return (String) this.resourceSpecificProperties.get(INVOCATION_COUNT); return (String) this.resourceProperties.get(INVOCATION_COUNT);
} }
public void setInvocationCount(String invocationCount) throws InvalidValueException { public void setInvocationCount(String invocationCount) throws InvalidValueException {
setResourceSpecificProperty(INVOCATION_COUNT, invocationCount); setResourceProperty(INVOCATION_COUNT, invocationCount);
} }
public String getAverageInvocationTime() { public String getAverageInvocationTime() {
return (String) this.resourceSpecificProperties.get(AVERAGE_INVOCATION_COUNT); return (String) this.resourceProperties.get(AVERAGE_INVOCATION_COUNT);
} }
public void setAverageInvocationTime(String averageInvocationTime) throws InvalidValueException { public void setAverageInvocationTime(String averageInvocationTime) throws InvalidValueException {
setResourceSpecificProperty(AVERAGE_INVOCATION_COUNT, averageInvocationTime); setResourceProperty(AVERAGE_INVOCATION_COUNT, averageInvocationTime);
} }
/** /**

20
src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageStatusUsageRecord.java
View File

@ -36,43 +36,43 @@ public class StorageStatusUsageRecord extends RawUsageRecord {
} }
public String getProviderId() { public String getProviderId() {
return (String) this.resourceSpecificProperties.get(PROVIDER_ID); return (String) this.resourceProperties.get(PROVIDER_ID);
} }
public void setProviderId(String providerId) throws InvalidValueException { public void setProviderId(String providerId) throws InvalidValueException {
setResourceSpecificProperty(PROVIDER_ID, providerId); setResourceProperty(PROVIDER_ID, providerId);
} }
public String getQualifier() { public String getQualifier() {
return (String) this.resourceSpecificProperties.get(QUALIFIER); return (String) this.resourceProperties.get(QUALIFIER);
} }
public void setQualifier(String qualifier) throws InvalidValueException { public void setQualifier(String qualifier) throws InvalidValueException {
setResourceSpecificProperty(QUALIFIER, qualifier); setResourceProperty(QUALIFIER, qualifier);
} }
public String getDataType() { public String getDataType() {
return (String) this.resourceSpecificProperties.get(DATA_TYPE); return (String) this.resourceProperties.get(DATA_TYPE);
} }
public void setDataType(String dataType) throws InvalidValueException { public void setDataType(String dataType) throws InvalidValueException {
setResourceSpecificProperty(DATA_TYPE, dataType); setResourceProperty(DATA_TYPE, dataType);
} }
public long getDataVolume() { public long getDataVolume() {
return (Long) this.resourceSpecificProperties.get(DATA_VOLUME); return (Long) this.resourceProperties.get(DATA_VOLUME);
} }
public void setDataVolume(long dataVolume) throws InvalidValueException { public void setDataVolume(long dataVolume) throws InvalidValueException {
setResourceSpecificProperty(DATA_VOLUME, dataVolume); setResourceProperty(DATA_VOLUME, dataVolume);
} }
public int getDataCount() { public int getDataCount() {
return (Integer) this.resourceSpecificProperties.get(DATA_COUNT); return (Integer) this.resourceProperties.get(DATA_COUNT);
} }
public void setDataCount(int dataCount) throws InvalidValueException { public void setDataCount(int dataCount) throws InvalidValueException {
setResourceSpecificProperty(DATA_COUNT, dataCount); setResourceProperty(DATA_COUNT, dataCount);
} }
} }

2
src/main/java/org/gcube/accounting/exception/InvalidValueException.java
View File

@ -18,5 +18,5 @@ public class InvalidValueException extends Exception {
public InvalidValueException(String message, Throwable cause) { public InvalidValueException(String message, Throwable cause) {
super(message, cause); super(message, cause);
} }
} }

2
src/main/java/org/gcube/accounting/messaging/ResourceAccounting.java
View File

@ -19,7 +19,7 @@ public class ResourceAccounting {
} }
@Deprecated @Deprecated
public void sendAccountingMessage(@SuppressWarnings("rawtypes") RawUsageRecord message){ public void sendAccountingMessage(RawUsageRecord message){
persistence.account(message); persistence.account(message);
} }

2
src/main/java/org/gcube/accounting/persistence/CouchDBPersistence.java
View File

@ -102,7 +102,7 @@ public class CouchDBPersistence extends Persistence {
public static JsonNode usageRecordToJsonNode(UsageRecord usageRecord) throws Exception { public static JsonNode usageRecordToJsonNode(UsageRecord usageRecord) throws Exception {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
JsonNode node = mapper.valueToTree(usageRecord.getResourceSpecificProperties()); JsonNode node = mapper.valueToTree(usageRecord.getResourceProperties());
return node; return node;
} }

2
src/main/java/org/gcube/accounting/persistence/Persistence.java
View File

@ -103,7 +103,7 @@ public abstract class Persistence {
//usageRecord.setStartTime(startTime); //usageRecord.setStartTime(startTime);
//usageRecord.setEndTime(endTime); //usageRecord.setEndTime(endTime);
usageRecord.setResourceSpecificProperty("ConnectionTest", "Test"); usageRecord.setResourceProperty("ConnectionTest", "Test");
} catch (InvalidValueException e1) { } catch (InvalidValueException e1) {

12
src/test/java/org/gcube/accounting/datamodel/RawUsageRecordTest.java
View File

@ -24,7 +24,7 @@ public class RawUsageRecordTest {
@Test @Test
public void testCompareToEqualsObject() throws Exception { public void testCompareToEqualsObject() throws Exception {
UsageRecord usageRecord = Persistence.createTestRawUsageRecord(); UsageRecord usageRecord = Persistence.createTestRawUsageRecord();
UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceSpecificProperties()); UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceProperties());
Assert.assertEquals(0, usageRecord.compareTo(ur)); Assert.assertEquals(0, usageRecord.compareTo(ur));
Assert.assertEquals(0, ur.compareTo(usageRecord)); Assert.assertEquals(0, ur.compareTo(usageRecord));
} }
@ -32,9 +32,9 @@ public class RawUsageRecordTest {
@Test @Test
public void testCompareToComparedAddedProperty() throws Exception { public void testCompareToComparedAddedProperty() throws Exception {
UsageRecord usageRecord = Persistence.createTestRawUsageRecord(); UsageRecord usageRecord = Persistence.createTestRawUsageRecord();
UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceSpecificProperties()); UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceProperties());
for(int i=1; i<31; i++){ for(int i=1; i<31; i++){
ur.setResourceSpecificProperty(Integer.toString(i), i); ur.setResourceProperty(Integer.toString(i), i);
Assert.assertEquals(-i, usageRecord.compareTo(ur)); Assert.assertEquals(-i, usageRecord.compareTo(ur));
Assert.assertEquals(i, ur.compareTo(usageRecord)); Assert.assertEquals(i, ur.compareTo(usageRecord));
} }
@ -43,9 +43,9 @@ public class RawUsageRecordTest {
@Test @Test
public void testCompareToDifferentForAddedProperties() throws Exception { public void testCompareToDifferentForAddedProperties() throws Exception {
UsageRecord usageRecord = Persistence.createTestRawUsageRecord(); UsageRecord usageRecord = Persistence.createTestRawUsageRecord();
UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceSpecificProperties()); UsageRecord ur = RawUsageRecord.getUsageRecord(usageRecord.getResourceProperties());
usageRecord.setResourceSpecificProperty(Integer.toString(1), 2); usageRecord.setResourceProperty(Integer.toString(1), 2);
ur.setResourceSpecificProperty(Integer.toString(2), 2); ur.setResourceProperty(Integer.toString(2), 2);
Assert.assertEquals(1, usageRecord.compareTo(ur)); Assert.assertEquals(1, usageRecord.compareTo(ur));
Assert.assertEquals(1, ur.compareTo(usageRecord)); Assert.assertEquals(1, ur.compareTo(usageRecord));
} }