From 70777d4a1bc8900c01e5bab1a1c0512e55b2d340 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 10 Jun 2015 14:13:28 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Renamed Classes git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115299 82a268e6-3cf1-43bd-a215-b396298e98cf --- ...orageUsageUsageRecord.java => StorageUsageRecord.java} | 6 +++--- ...orageUsageUsageRecord.java => StorageUsageRecord.java} | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/org/gcube/accounting/datamodel/implementations/{StorageUsageUsageRecord.java => StorageUsageRecord.java} (94%) rename src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/{StorageUsageUsageRecord.java => StorageUsageRecord.java} (63%) diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java similarity index 94% rename from src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java index 37d3123..9b1e508 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/StorageUsageRecord.java @@ -20,7 +20,7 @@ import org.gcube.accounting.exception.InvalidValueException; * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * */ -public class StorageUsageUsageRecord extends RawUsageRecord implements SingleUsageRecord { +public class StorageUsageRecord extends RawUsageRecord implements SingleUsageRecord { /** * Generated Serial Version UID @@ -44,11 +44,11 @@ public class StorageUsageUsageRecord extends RawUsageRecord implements SingleUsa @ValidIP public static final String CALLER_IP = "callerIP"; - public StorageUsageUsageRecord(){ + public StorageUsageRecord(){ super(); } - public StorageUsageUsageRecord(Map properties) throws InvalidValueException { + public StorageUsageRecord(Map properties) throws InvalidValueException { super(properties); } diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java similarity index 63% rename from src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageUsageRecord.java rename to src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java index ef45f50..8e2dc2f 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/aggregated/StorageUsageRecord.java @@ -14,19 +14,19 @@ import org.gcube.accounting.exception.InvalidValueException; * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * */ -public class StorageUsageUsageRecord extends org.gcube.accounting.datamodel.implementations.StorageUsageUsageRecord implements AggregatedUsageRecord { +public class StorageUsageRecord extends org.gcube.accounting.datamodel.implementations.StorageUsageRecord implements AggregatedUsageRecord { /** * Generated Serial Version UID */ private static final long serialVersionUID = 1082525518686785682L; - public StorageUsageUsageRecord(){ + public StorageUsageRecord(){ super(); this.resourceProperties.put(AGGREGATED, true); } - public StorageUsageUsageRecord(Map properties) throws InvalidValueException{ + public StorageUsageRecord(Map properties) throws InvalidValueException{ super(properties); this.resourceProperties.put(AGGREGATED, true); } @@ -35,7 +35,7 @@ public class StorageUsageUsageRecord extends org.gcube.accounting.datamodel.impl * {@inheritDoc} */ @Override - public List aggregate(List records) { + public List aggregate(List records) { // TODO throw new UnsupportedOperationException(); }