From 52836049c9888669658888754f48c5af93fe1a45 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 30 Jul 2015 13:09:54 +0000
Subject: [PATCH] refs #166: Create accouting-analytics library
 https://support.d4science.org/issues/166 Added filter support

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics@117562 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../org/gcube/accounting/analytics/ResourceRecordQuery.java | 5 +++--
 .../analytics/persistence/AccountingPersistenceQuery.java   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java b/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
index 2197f21..b51b7a3 100644
--- a/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
@@ -16,6 +16,7 @@ import org.gcube.accounting.analytics.exception.NoAvailableScopeException;
 import org.gcube.accounting.analytics.exception.NoUsableAccountingPersistenceQueryFound;
 import org.gcube.accounting.analytics.persistence.AccountingPersistenceQuery;
 import org.gcube.accounting.analytics.persistence.AccountingPersistenceQueryFactory;
+import org.gcube.accounting.datamodel.AggregatedUsageRecord;
 import org.gcube.accounting.datamodel.SingleUsageRecord;
 import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
 import org.gcube.common.scope.api.ScopeProvider;
@@ -110,7 +111,7 @@ public class ResourceRecordQuery {
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Info> getInfo(Class<? extends SingleUsageRecord> usageRecordType, 
+	public List<Info> getInfo(@SuppressWarnings("rawtypes") Class<? extends AggregatedUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters, boolean pad) throws Exception {
 		Map<Calendar, Info> unpaddedResults = accountingPersistenceQuery.query(usageRecordType, temporalConstraint, filters);
 		if(!pad){
@@ -128,7 +129,7 @@ public class ResourceRecordQuery {
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Info> getInfo(Class<? extends SingleUsageRecord> usageRecordType, 
+	public List<Info> getInfo(@SuppressWarnings("rawtypes") Class<? extends AggregatedUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception{
 		return getInfo(usageRecordType, temporalConstraint, filters, false);
 	}
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
index ded3e1b..7fc24c0 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import org.gcube.accounting.analytics.Filter;
 import org.gcube.accounting.analytics.Info;
 import org.gcube.accounting.analytics.TemporalConstraint;
-import org.gcube.accounting.datamodel.SingleUsageRecord;
+import org.gcube.accounting.datamodel.AggregatedUsageRecord;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
@@ -20,10 +20,10 @@ public abstract class AccountingPersistenceQuery {
 	
 	protected abstract void prepareConnection(AccountingPersistenceQueryConfiguration configuration) throws Exception;
 	
-	protected abstract Map<Calendar, Info> reallyQuery(Class<? extends SingleUsageRecord> usageRecordType, 
+	protected abstract Map<Calendar, Info> reallyQuery(@SuppressWarnings("rawtypes") Class<? extends AggregatedUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception;
 	
-	public Map<Calendar, Info> query(Class<? extends SingleUsageRecord> usageRecordType, 
+	public Map<Calendar, Info> query(@SuppressWarnings("rawtypes") Class<? extends AggregatedUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception{
 		return reallyQuery(usageRecordType, temporalConstraint, filters);
 	}