Reorganizing internals

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120555 82a268e6-3cf1-43bd-a215-b396298e98cf

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();
 	}
 	
 	/**

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();
 	}
 	
 	/**

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();
 	}
 	
 	/**

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();
 	}
 	

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();
 	}
 	
 	/**

src/main/java/org/gcube/accounting/datamodel/AggregatedUsageRecord.java

@@ -27,7 +27,7 @@ public interface AggregatedUsageRecord<T extends AggregatedUsageRecord<T, B>, B
 	
 	public void setStartTime(Calendar startTime) throws InvalidValueException;
 	
-	public Calendar getEndTimeAsCalendar();
+	public Calendar getEndTime();
 	
 	public void setEndTime(Calendar endTime) throws InvalidValueException;