gCubeSystem
/
accounting-lib-legacy
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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@115752 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-07-01 10:50:46 +00:00
parent 980ebbb588
commit 0907cc7810
18 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/accounting/aggregation/JobUsageRecord.java
View File

@ -13,7 +13,7 @@ import org.gcube.accounting.exception.InvalidValueException;
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class JobUsageRecord extends org.gcube.accounting.datamodel.basetypes.JobUsageRecord implements AggregatedUsageRecord<JobUsageRecord, org.gcube.accounting.datamodel.usagerecord.JobUsageRecord> {
public class JobUsageRecord extends org.gcube.accounting.datamodel.basetypes.JobUsageRecord implements AggregatedUsageRecord<JobUsageRecord, org.gcube.accounting.datamodel.usagerecords.JobUsageRecord> {
/**
* Generated Serial Version UID
@ -39,7 +39,7 @@ public class JobUsageRecord extends org.gcube.accounting.datamodel.basetypes.Job
*/
@Override
public JobUsageRecord getAggregatedUsageRecord(
org.gcube.accounting.datamodel.usagerecord.JobUsageRecord b)
org.gcube.accounting.datamodel.usagerecords.JobUsageRecord b)
throws InvalidValueException {
// TODO Auto-generated method stub
return null;

4
src/main/java/org/gcube/accounting/aggregation/PortletUsageRecord.java
View File

@ -13,7 +13,7 @@ import org.gcube.accounting.exception.InvalidValueException;
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class PortletUsageRecord extends org.gcube.accounting.datamodel.basetypes.PortletUsageRecord implements AggregatedUsageRecord<PortletUsageRecord, org.gcube.accounting.datamodel.usagerecord.PortletUsageRecord> {
public class PortletUsageRecord extends org.gcube.accounting.datamodel.basetypes.PortletUsageRecord implements AggregatedUsageRecord<PortletUsageRecord, org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord> {
/**
@ -40,7 +40,7 @@ public class PortletUsageRecord extends org.gcube.accounting.datamodel.basetypes
*/
@Override
public PortletUsageRecord getAggregatedUsageRecord(
org.gcube.accounting.datamodel.usagerecord.PortletUsageRecord usageRecord)
org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord usageRecord)
throws InvalidValueException {
// TODO Auto-generated method stub
return null;

4
src/main/java/org/gcube/accounting/aggregation/ServiceUsageRecord.java
View File

@ -17,7 +17,7 @@ import org.gcube.accounting.exception.InvalidValueException;
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class ServiceUsageRecord extends org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord implements AggregatedUsageRecord<ServiceUsageRecord, org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord> {
public class ServiceUsageRecord extends org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord implements AggregatedUsageRecord<ServiceUsageRecord, org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord> {
/**
* Generated Serial Version UID
@ -91,7 +91,7 @@ public class ServiceUsageRecord extends org.gcube.accounting.datamodel.basetypes
*/
@Override
public ServiceUsageRecord getAggregatedUsageRecord(
org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord usageRecord)
org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord usageRecord)
throws InvalidValueException {
return new ServiceUsageRecord(usageRecord);
}

4
src/main/java/org/gcube/accounting/aggregation/StorageUsageRecord.java
View File

@ -17,7 +17,7 @@ import org.gcube.accounting.exception.InvalidValueException;
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class StorageUsageRecord extends org.gcube.accounting.datamodel.basetypes.StorageUsageRecord implements AggregatedUsageRecord<StorageUsageRecord, org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord> {
public class StorageUsageRecord extends org.gcube.accounting.datamodel.basetypes.StorageUsageRecord implements AggregatedUsageRecord<StorageUsageRecord, org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord> {
/**
* Generated Serial Version UID
@ -68,7 +68,7 @@ public class StorageUsageRecord extends org.gcube.accounting.datamodel.basetypes
*/
@Override
public StorageUsageRecord getAggregatedUsageRecord(
org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord usageRecord)
org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord usageRecord)
throws InvalidValueException {
return new StorageUsageRecord(usageRecord);
}

4
src/main/java/org/gcube/accounting/aggregation/TaskUsageRecord.java
View File

@ -13,7 +13,7 @@ import org.gcube.accounting.exception.InvalidValueException;
* This Class is for library internal use only
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class TaskUsageRecord extends org.gcube.accounting.datamodel.basetypes.TaskUsageRecord implements AggregatedUsageRecord<TaskUsageRecord, org.gcube.accounting.datamodel.usagerecord.TaskUsageRecord> {
public class TaskUsageRecord extends org.gcube.accounting.datamodel.basetypes.TaskUsageRecord implements AggregatedUsageRecord<TaskUsageRecord, org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord> {
/**
@ -40,7 +40,7 @@ public class TaskUsageRecord extends org.gcube.accounting.datamodel.basetypes.Ta
*/
@Override
public TaskUsageRecord getAggregatedUsageRecord(
org.gcube.accounting.datamodel.usagerecord.TaskUsageRecord usageRecord)
org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord usageRecord)
throws InvalidValueException {
// TODO Auto-generated method stub
return null;

2
src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java
View File

@ -11,7 +11,7 @@ import org.gcube.accounting.exception.NotAggregatableRecordsExceptions;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
*/
public class ServiceUsageRecordAggregationStrategy extends AggregationStrategy<ServiceUsageRecord, org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord>{
public class ServiceUsageRecordAggregationStrategy extends AggregationStrategy<ServiceUsageRecord, org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord>{
/**
* @param serviceUsageRecord

2
src/main/java/org/gcube/accounting/aggregation/strategy/StorageUsageRecordAggregationStrategy.java
View File

@ -11,7 +11,7 @@ import org.gcube.accounting.exception.NotAggregatableRecordsExceptions;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
*/
public class StorageUsageRecordAggregationStrategy extends AggregationStrategy<StorageUsageRecord, org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord>{
public class StorageUsageRecordAggregationStrategy extends AggregationStrategy<StorageUsageRecord, org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord>{
/**
* @param serviceUsageRecord

2
src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
View File

@ -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.usagerecord.JobUsageRecord.class;
Class<? extends UsageRecord> utilityClass = org.gcube.accounting.datamodel.usagerecords.JobUsageRecord.class;
if(aggregated){
utilityClass = org.gcube.accounting.aggregation.JobUsageRecord.class;
}

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

@ -13,11 +13,11 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
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.usagerecords.JobUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord;
import org.gcube.accounting.datamodel.decorators.FieldAction;
import org.gcube.accounting.datamodel.decorators.FieldDecorator;
import org.gcube.accounting.datamodel.deprecationmanagement.annotations.DeprecatedWarning;

4
src/main/java/org/gcube/accounting/datamodel/TestUsageRecord.java
View File

@ -7,8 +7,8 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.gcube.accounting.datamodel.UsageRecord.OperationResult;
import org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
import org.gcube.accounting.datamodel.basetypes.StorageUsageRecord.DataType;
import org.gcube.accounting.datamodel.basetypes.StorageUsageRecord.OperationType;
import org.gcube.accounting.exception.InvalidValueException;

2
src/main/java/org/gcube/accounting/datamodel/usagerecord/JobUsageRecord.java → src/main/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecord.java
View File

@ -1,4 +1,4 @@
package org.gcube.accounting.datamodel.usagerecord;
package org.gcube.accounting.datamodel.usagerecords;
import java.io.Serializable;
import java.util.Map;

2
src/main/java/org/gcube/accounting/datamodel/usagerecord/PortletUsageRecord.java → src/main/java/org/gcube/accounting/datamodel/usagerecords/PortletUsageRecord.java
View File

@ -1,4 +1,4 @@
package org.gcube.accounting.datamodel.usagerecord;
package org.gcube.accounting.datamodel.usagerecords;
import java.io.Serializable;
import java.util.Map;

2
src/main/java/org/gcube/accounting/datamodel/usagerecord/ServiceUsageRecord.java → src/main/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecord.java
View File

@ -1,4 +1,4 @@
package org.gcube.accounting.datamodel.usagerecord;
package org.gcube.accounting.datamodel.usagerecords;
import java.io.Serializable;
import java.util.Map;

2
src/main/java/org/gcube/accounting/datamodel/usagerecord/StorageUsageRecord.java → src/main/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecord.java
View File

@ -1,4 +1,4 @@
package org.gcube.accounting.datamodel.usagerecord;
package org.gcube.accounting.datamodel.usagerecords;
import java.io.Serializable;
import java.util.Map;

2
src/main/java/org/gcube/accounting/datamodel/usagerecord/TaskUsageRecord.java → src/main/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecord.java
View File

@ -1,4 +1,4 @@
package org.gcube.accounting.datamodel.usagerecord;
package org.gcube.accounting.datamodel.usagerecords;
import java.io.Serializable;
import java.util.Map;

2
src/test/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategyTest.java
View File

@ -5,7 +5,7 @@ package org.gcube.accounting.aggregation.strategy;
import org.gcube.accounting.aggregation.strategy.ServiceUsageRecordAggregationStrategy;
import org.gcube.accounting.datamodel.TestUsageRecord;
import org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.accounting.exception.InvalidValueException;
import org.gcube.accounting.exception.NotAggregatableRecordsExceptions;
import org.junit.Assert;

2
src/test/java/org/gcube/accounting/aggregation/strategy/StorageUsageRecordAggregationStrategyTest.java
View File

@ -5,7 +5,7 @@ package org.gcube.accounting.aggregation.strategy;
import org.gcube.accounting.aggregation.strategy.StorageUsageRecordAggregationStrategy;
import org.gcube.accounting.datamodel.TestUsageRecord;
import org.gcube.accounting.datamodel.usagerecord.StorageUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
import org.gcube.accounting.exception.InvalidValueException;
import org.gcube.accounting.exception.NotAggregatableRecordsExceptions;
import org.junit.Assert;

2
src/test/java/org/gcube/accounting/datamodel/implementation/ServiceUsageRecordTest.java
View File

@ -4,7 +4,7 @@
package org.gcube.accounting.datamodel.implementation;
import org.gcube.accounting.datamodel.TestUsageRecord;
import org.gcube.accounting.datamodel.usagerecord.ServiceUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
import org.gcube.accounting.exception.InvalidValueException;
import org.gcube.accounting.persistence.Persistence;
import org.junit.Test;