refs #200: Create accouting-lib library
https://support.d4science.org/issues/200 Reorganizing library git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115749 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
75c59a8995
commit
0fc7e853c0
|
@ -460,7 +460,7 @@ public abstract class BasicUsageRecord implements UsageRecord, Serializable {
|
|||
protected static Class<? extends UsageRecord> getClass(String usageRecordName, boolean aggregated) throws ClassNotFoundException {
|
||||
Class<? extends UsageRecord> clz = null;
|
||||
|
||||
Class<? extends UsageRecord> utilityClass = org.gcube.accounting.datamodel.basetype.JobUsageRecord.class;
|
||||
Class<? extends UsageRecord> utilityClass = org.gcube.accounting.datamodel.usagerecord.JobUsageRecord.class;
|
||||
if(aggregated){
|
||||
utilityClass = org.gcube.accounting.aggregation.JobUsageRecord.class;
|
||||
}
|
||||
|
|
|
@ -13,11 +13,11 @@ import java.util.Date;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.basetype.JobUsageRecord;
|
||||
import org.gcube.accounting.datamodel.basetype.PortletUsageRecord;
|
||||
import org.gcube.accounting.datamodel.basetype.ServiceUsageRecord;
|
||||
import org.gcube.accounting.datamodel.basetype.StorageUsageRecord;
|
||||
import org.gcube.accounting.datamodel.basetype.TaskUsageRecord;
|
||||
import org.gcube.accounting.datamodel.usagerecord.JobUsageRecord;
|
||||
import org.gcube.accounting.datamodel.usagerecord.PortletUsageRecord;
|
||||
import org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord;
|
||||
import org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord;
|
||||
import org.gcube.accounting.datamodel.usagerecord.TaskUsageRecord;
|
||||
import org.gcube.accounting.datamodel.decorators.FieldAction;
|
||||
import org.gcube.accounting.datamodel.decorators.FieldDecorator;
|
||||
import org.gcube.accounting.datamodel.deprecationmanagement.annotations.DeprecatedWarning;
|
||||
|
|
|
@ -53,8 +53,7 @@ public abstract class ServiceUsageRecord extends BasicUsageRecord {
|
|||
@RequiredField @ValidLong
|
||||
public static final String DURATION = "duration";
|
||||
|
||||
|
||||
public ServiceUsageRecord(){
|
||||
public ServiceUsageRecord(){
|
||||
super();
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
package org.gcube.accounting.datamodel.usagerecord;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.SingleUsageRecord;
|
||||
import org.gcube.accounting.exception.InvalidValueException;
|
||||
|
||||
public class JobUsageRecord extends org.gcube.accounting.datamodel.basetype.JobUsageRecord implements SingleUsageRecord {
|
||||
|
||||
/**
|
||||
* Generated Serial Version UID
|
||||
*/
|
||||
private static final long serialVersionUID = 5589190770192442225L;
|
||||
|
||||
public JobUsageRecord(){
|
||||
super();
|
||||
}
|
||||
|
||||
public JobUsageRecord(Map<String, Serializable> properties) throws InvalidValueException{
|
||||
super(properties);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,24 @@
|
|||
package org.gcube.accounting.datamodel.usagerecord;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.SingleUsageRecord;
|
||||
import org.gcube.accounting.exception.InvalidValueException;
|
||||
|
||||
public class PortletUsageRecord extends org.gcube.accounting.datamodel.basetype.PortletUsageRecord implements SingleUsageRecord {
|
||||
|
||||
/**
|
||||
* Generated Serial Version UID
|
||||
*/
|
||||
private static final long serialVersionUID = -6639325322297348702L;
|
||||
|
||||
public PortletUsageRecord(){
|
||||
super();
|
||||
}
|
||||
|
||||
public PortletUsageRecord(Map<String, Serializable> properties) throws InvalidValueException {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,23 @@
|
|||
package org.gcube.accounting.datamodel.usagerecord;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.SingleUsageRecord;
|
||||
import org.gcube.accounting.exception.InvalidValueException;
|
||||
|
||||
public class ServiceUsageRecord extends org.gcube.accounting.datamodel.basetype.ServiceUsageRecord implements SingleUsageRecord {
|
||||
|
||||
/**
|
||||
* Generated Serial Version UID
|
||||
*/
|
||||
private static final long serialVersionUID = 1941140440484309668L;
|
||||
|
||||
public ServiceUsageRecord(){
|
||||
super();
|
||||
}
|
||||
|
||||
public ServiceUsageRecord(Map<String, Serializable> properties) throws InvalidValueException {
|
||||
super(properties);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,24 @@
|
|||
package org.gcube.accounting.datamodel.usagerecord;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.SingleUsageRecord;
|
||||
import org.gcube.accounting.exception.InvalidValueException;
|
||||
|
||||
public class StorageUsageRecord extends org.gcube.accounting.datamodel.basetype.StorageUsageRecord implements SingleUsageRecord {
|
||||
|
||||
/**
|
||||
* Generated Serial Version UID
|
||||
*/
|
||||
private static final long serialVersionUID = 8174719617939936365L;
|
||||
|
||||
public StorageUsageRecord() {
|
||||
super();
|
||||
}
|
||||
|
||||
public StorageUsageRecord(Map<String, Serializable> properties) throws InvalidValueException {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,23 @@
|
|||
package org.gcube.accounting.datamodel.usagerecord;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.accounting.datamodel.SingleUsageRecord;
|
||||
import org.gcube.accounting.exception.InvalidValueException;
|
||||
|
||||
public class TaskUsageRecord extends org.gcube.accounting.datamodel.basetype.TaskUsageRecord implements SingleUsageRecord {
|
||||
|
||||
/**
|
||||
* Generated Serial Version UID
|
||||
*/
|
||||
private static final long serialVersionUID = 5053135599013854281L;
|
||||
|
||||
public TaskUsageRecord(){
|
||||
super();
|
||||
}
|
||||
|
||||
public TaskUsageRecord(Map<String, Serializable> properties) throws InvalidValueException {
|
||||
super(properties);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue