From f35debd0ceb1b6c53d70777ef770cbb345364311 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 2 Dec 2015 10:08:14 +0000 Subject: [PATCH] Reorganizing internals git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120555 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../accounting/aggregation/AggregatedJobUsageRecord.java | 6 +++--- .../aggregation/AggregatedPortletUsageRecord.java | 6 +++--- .../aggregation/AggregatedServiceUsageRecord.java | 8 ++++---- .../aggregation/AggregatedStorageUsageRecord.java | 4 ++-- .../accounting/aggregation/AggregatedTaskUsageRecord.java | 6 +++--- .../gcube/accounting/datamodel/AggregatedUsageRecord.java | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/accounting/aggregation/AggregatedJobUsageRecord.java b/src/main/java/org/gcube/accounting/aggregation/AggregatedJobUsageRecord.java index 9addb05..be1017d 100644 --- a/src/main/java/org/gcube/accounting/aggregation/AggregatedJobUsageRecord.java +++ b/src/main/java/org/gcube/accounting/aggregation/AggregatedJobUsageRecord.java @@ -62,7 +62,7 @@ public class AggregatedJobUsageRecord extends AbstractJobUsageRecord implements */ @Override public Calendar getStartTime() { - return getStartTimeAsCalendar(); + return super.getStartTimeAsCalendar(); } /** @@ -77,8 +77,8 @@ public class AggregatedJobUsageRecord extends AbstractJobUsageRecord implements * {@inheritDoc} */ @Override - public Calendar getEndTimeAsCalendar() { - return getEndTimeAsCalendar(); + public Calendar getEndTime() { + return super.getEndTimeAsCalendar(); } /** diff --git a/src/main/java/org/gcube/accounting/aggregation/AggregatedPortletUsageRecord.java b/src/main/java/org/gcube/accounting/aggregation/AggregatedPortletUsageRecord.java index 8971ef2..3f7b6be 100644 --- a/src/main/java/org/gcube/accounting/aggregation/AggregatedPortletUsageRecord.java +++ b/src/main/java/org/gcube/accounting/aggregation/AggregatedPortletUsageRecord.java @@ -63,7 +63,7 @@ public class AggregatedPortletUsageRecord extends AbstractPortletUsageRecord imp */ @Override public Calendar getStartTime() { - return getStartTimeAsCalendar(); + return super.getStartTimeAsCalendar(); } /** @@ -78,8 +78,8 @@ public class AggregatedPortletUsageRecord extends AbstractPortletUsageRecord imp * {@inheritDoc} */ @Override - public Calendar getEndTimeAsCalendar() { - return getEndTimeAsCalendar(); + public Calendar getEndTime() { + return super.getEndTimeAsCalendar(); } /** diff --git a/src/main/java/org/gcube/accounting/aggregation/AggregatedServiceUsageRecord.java b/src/main/java/org/gcube/accounting/aggregation/AggregatedServiceUsageRecord.java index 6dae65a..0e27fc2 100644 --- a/src/main/java/org/gcube/accounting/aggregation/AggregatedServiceUsageRecord.java +++ b/src/main/java/org/gcube/accounting/aggregation/AggregatedServiceUsageRecord.java @@ -77,7 +77,7 @@ public class AggregatedServiceUsageRecord extends AbstractServiceUsageRecord imp } public void setMaxInvocationTime(long maxInvocationTime) throws InvalidValueException { - setResourceProperty(MAX_INVOCATION_TIME, maxInvocationTime); + super.setResourceProperty(MAX_INVOCATION_TIME, maxInvocationTime); } public long getMinInvocationTime() { @@ -102,7 +102,7 @@ public class AggregatedServiceUsageRecord extends AbstractServiceUsageRecord imp */ @Override public Calendar getStartTime() { - return getStartTimeAsCalendar(); + return super.getStartTimeAsCalendar(); } /** @@ -117,8 +117,8 @@ public class AggregatedServiceUsageRecord extends AbstractServiceUsageRecord imp * {@inheritDoc} */ @Override - public Calendar getEndTimeAsCalendar() { - return getEndTimeAsCalendar(); + public Calendar getEndTime() { + return super.getEndTimeAsCalendar(); } /** diff --git a/src/main/java/org/gcube/accounting/aggregation/AggregatedStorageUsageRecord.java b/src/main/java/org/gcube/accounting/aggregation/AggregatedStorageUsageRecord.java index 1277cce..a57bd76 100644 --- a/src/main/java/org/gcube/accounting/aggregation/AggregatedStorageUsageRecord.java +++ b/src/main/java/org/gcube/accounting/aggregation/AggregatedStorageUsageRecord.java @@ -79,7 +79,7 @@ public class AggregatedStorageUsageRecord extends AbstractStorageUsageRecord imp */ @Override public Calendar getStartTime() { - return getStartTimeAsCalendar(); + return super.getStartTimeAsCalendar(); } /** @@ -94,7 +94,7 @@ public class AggregatedStorageUsageRecord extends AbstractStorageUsageRecord imp * {@inheritDoc} */ @Override - public Calendar getEndTimeAsCalendar() { + public Calendar getEndTime() { return super.getEndTimeAsCalendar(); } diff --git a/src/main/java/org/gcube/accounting/aggregation/AggregatedTaskUsageRecord.java b/src/main/java/org/gcube/accounting/aggregation/AggregatedTaskUsageRecord.java index 47747ef..45d127c 100644 --- a/src/main/java/org/gcube/accounting/aggregation/AggregatedTaskUsageRecord.java +++ b/src/main/java/org/gcube/accounting/aggregation/AggregatedTaskUsageRecord.java @@ -63,7 +63,7 @@ public class AggregatedTaskUsageRecord extends AbstractTaskUsageRecord implement */ @Override public Calendar getStartTime() { - return getStartTimeAsCalendar(); + return super.getStartTimeAsCalendar(); } /** @@ -78,8 +78,8 @@ public class AggregatedTaskUsageRecord extends AbstractTaskUsageRecord implement * {@inheritDoc} */ @Override - public Calendar getEndTimeAsCalendar() { - return getEndTimeAsCalendar(); + public Calendar getEndTime() { + return super.getEndTimeAsCalendar(); } /** diff --git a/src/main/java/org/gcube/accounting/datamodel/AggregatedUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/AggregatedUsageRecord.java index bdd7d29..8c9afa3 100644 --- a/src/main/java/org/gcube/accounting/datamodel/AggregatedUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/AggregatedUsageRecord.java @@ -27,7 +27,7 @@ public interface AggregatedUsageRecord, B public void setStartTime(Calendar startTime) throws InvalidValueException; - public Calendar getEndTimeAsCalendar(); + public Calendar getEndTime(); public void setEndTime(Calendar endTime) throws InvalidValueException;