gCubeSystem
/
accounting-analytics
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Solving querable keys issue 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics@131483 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-09-19 10:54:05 +00:00
parent 75d3f25978
commit 4366a5b5e5
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
View File

@ -11,7 +11,6 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import javax.activity.InvalidActivityException;
@ -22,10 +21,8 @@ import org.gcube.accounting.analytics.TemporalConstraint;
import org.gcube.accounting.analytics.exception.DuplicatedKeyFilterException;
import org.gcube.accounting.analytics.exception.KeyException;
import org.gcube.accounting.analytics.exception.ValueException;
import org.gcube.accounting.datamodel.UsageRecord;
import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
import org.gcube.documentstore.records.AggregatedRecord;
import org.gcube.documentstore.records.Record;
import org.json.JSONException;
import org.json.JSONObject;
@ -50,27 +47,18 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
return accountingPersistenceQuery;
}
@Deprecated
public static SortedSet<String> getQuerableKeys(
@SuppressWarnings("rawtypes") AggregatedRecord instance)
throws Exception {
SortedSet<String> properties = new TreeSet<>(
instance.getRequiredFields());
properties.removeAll(instance.getAggregatedFields());
properties.removeAll(instance.getComputedFields());
properties.remove(Record.ID);
properties.remove(Record.CREATION_TIME);
properties.remove(Record.RECORD_TYPE);
properties.remove(UsageRecord.SCOPE);
return properties;
return instance.getQuerableKeys();
}
public static SortedSet<String> getQuerableKeys(
Class<? extends AggregatedRecord<?,?>> clz)
throws Exception {
AggregatedRecord<?,?> instance = clz.newInstance();
return getQuerableKeys(instance);
return instance.getQuerableKeys();
}
public static String getDefaultOrderingProperties(