From b9ef37db2bc6bf58be01d7fa83dd8f7d07904261 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 25 Jun 2015 09:17:03 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Implementing Aggregation Strategy git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115522 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../java/org/gcube/accounting/datamodel/BasicUsageRecord.java | 2 +- .../aggregated => aggregation}/JobUsageRecord.java | 2 +- .../aggregated => aggregation}/PortletUsageRecord.java | 2 +- .../aggregated => aggregation}/ServiceUsageRecord.java | 2 +- .../aggregated => aggregation}/StorageStatusUsageRecord.java | 2 +- .../aggregated => aggregation}/StorageUsageRecord.java | 2 +- .../ServiceUsageRecordAggregationStrategy.java | 4 ++-- .../StorageUsageRecordAggregationStrategy.java | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/org/gcube/accounting/datamodel/{implementations/aggregated => aggregation}/JobUsageRecord.java (94%) rename src/main/java/org/gcube/accounting/datamodel/{implementations/aggregated => aggregation}/PortletUsageRecord.java (94%) rename src/main/java/org/gcube/accounting/datamodel/{implementations/aggregated => aggregation}/ServiceUsageRecord.java (98%) rename src/main/java/org/gcube/accounting/datamodel/{implementations/aggregated => aggregation}/StorageStatusUsageRecord.java (96%) rename src/main/java/org/gcube/accounting/datamodel/{implementations/aggregated => aggregation}/StorageUsageRecord.java (97%) rename src/main/java/org/gcube/accounting/datamodel/{implementations => aggregation}/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java (90%) rename src/main/java/org/gcube/accounting/datamodel/{implementations => aggregation}/aggregationstrategy/StorageUsageRecordAggregationStrategy.java (88%) diff --git a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java index a758113..b49ead6 100644 --- a/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java @@ -399,7 +399,7 @@ public abstract class BasicUsageRecord implements UsageRecord, Serializable { Class utilityClass = org.gcube.accounting.datamodel.implementations.JobUsageRecord.class; if(aggregated){ - utilityClass = org.gcube.accounting.datamodel.implementations.aggregated.JobUsageRecord.class; + utilityClass = org.gcube.accounting.datamodel.aggregation.JobUsageRecord.class; } String classCanonicalName = utilityClass.getCanonicalName(); diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/JobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/JobUsageRecord.java similarity index 94% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/JobUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/JobUsageRecord.java index f0d5944..2734ec1 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/JobUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/JobUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregated; +package org.gcube.accounting.datamodel.aggregation; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/PortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/PortletUsageRecord.java similarity index 94% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/PortletUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/PortletUsageRecord.java index 3206770..1390707 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/PortletUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/PortletUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregated; +package org.gcube.accounting.datamodel.aggregation; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/ServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/ServiceUsageRecord.java similarity index 98% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/ServiceUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/ServiceUsageRecord.java index 1691bc8..6e7249c 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/ServiceUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/ServiceUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregated; +package org.gcube.accounting.datamodel.aggregation; import java.io.Serializable; import java.util.Calendar; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageStatusUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/StorageStatusUsageRecord.java similarity index 96% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageStatusUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/StorageStatusUsageRecord.java index 1b37389..b806502 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageStatusUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/StorageStatusUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregated; +package org.gcube.accounting.datamodel.aggregation; import org.gcube.accounting.datamodel.BasicUsageRecord; /* diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/StorageUsageRecord.java similarity index 97% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/StorageUsageRecord.java index 50efefc..d3dd73b 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/StorageUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregated; +package org.gcube.accounting.datamodel.aggregation; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java similarity index 90% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java index 865e695..cd51310 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/ServiceUsageRecordAggregationStrategy.java @@ -1,10 +1,10 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregationstrategy; +package org.gcube.accounting.datamodel.aggregation.aggregationstrategy; import org.gcube.accounting.datamodel.AggregationStrategy; -import org.gcube.accounting.datamodel.implementations.aggregated.ServiceUsageRecord; +import org.gcube.accounting.datamodel.aggregation.ServiceUsageRecord; import org.gcube.accounting.exception.NotAggregatableRecordsExceptions; /** diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/StorageUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java similarity index 88% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/StorageUsageRecordAggregationStrategy.java rename to src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java index b286cb6..cb9b406 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregationstrategy/StorageUsageRecordAggregationStrategy.java +++ b/src/main/java/org/gcube/accounting/datamodel/aggregation/aggregationstrategy/StorageUsageRecordAggregationStrategy.java @@ -1,10 +1,10 @@ /** * */ -package org.gcube.accounting.datamodel.implementations.aggregationstrategy; +package org.gcube.accounting.datamodel.aggregation.aggregationstrategy; import org.gcube.accounting.datamodel.AggregationStrategy; -import org.gcube.accounting.datamodel.implementations.aggregated.StorageUsageRecord; +import org.gcube.accounting.datamodel.aggregation.StorageUsageRecord; import org.gcube.accounting.exception.NotAggregatableRecordsExceptions; /**