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

Fixed conflicts

This commit is contained in:
Luca Frosini 2021-11-02 11:38:21 +01:00
parent 7cc25cd68e
commit 1fcbd5d9db
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -9,11 +9,7 @@
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.accounting</groupId>
<artifactId>accounting-analytics</artifactId> <artifactId>accounting-analytics</artifactId>
<<<<<<< HEAD
<version>3.0.1</version>
=======
<version>4.0.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
>>>>>>> refs/heads/feature/21353
<name>Accounting Analytics</name> <name>Accounting Analytics</name>
<description> <description>
Accounting Analytics allows querying accounting data. It Accounting Analytics allows querying accounting data. It

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

@ -99,15 +99,11 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
AggregatedRecord<?, ?> instance = clz.newInstance(); AggregatedRecord<?, ?> instance = clz.newInstance();
// limit filter key for accounting storage status (used from portlet // limit filter key for accounting storage status (used from portlet
// accounting for tab space) // accounting for tad space)
if (clz.equals(AggregatedStorageStatusRecord.class)) { if (clz.equals(AggregatedStorageStatusRecord.class)) {
SortedSet<String> storageStatus = new TreeSet<>(); SortedSet<String> storageStatus = new TreeSet<>();
storageStatus.add(AggregatedStorageStatusRecord.CONSUMER_ID); storageStatus.add(AggregatedStorageStatusRecord.CONSUMER_ID);
<<<<<<< HEAD
storageStatus.add(AggregatedStorageStatusRecord.PROVIDER_URI);
=======
// storageStatus.add(AggregatedStorageStatusRecord.DATA_SERVICEID); // storageStatus.add(AggregatedStorageStatusRecord.DATA_SERVICEID);
>>>>>>> refs/heads/feature/21353
return storageStatus; return storageStatus;
} else { } else {
return instance.getQuerableKeys(); return instance.getQuerableKeys();