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

2251: Accounting Manager - Stacked column chart for tops 

Task-Url: https://support.d4science.org/issues/2251

Fixed Call to Client Library

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@126075 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2016-03-22 17:48:51 +00:00
parent 6dc4bf329b
commit 6154c35d3e
5 changed files with 112 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java
View File

@ -77,10 +77,13 @@ public class AccountingQuery4Job extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterBasic.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters.getFilterKey()
.getKey(), accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryBasic(
AggregatedJobUsageRecord.class, temporalConstraint,
@ -92,11 +95,13 @@ public class AccountingQuery4Job extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterTop.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryTop(
AggregatedJobUsageRecord.class,

45
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java
View File

@ -67,6 +67,7 @@ public class AccountingQuery4Portlet extends AccountingQueryBuilder {
ArrayList<Filter> filters = null;
ArrayList<AccountingFilter> accountingFilters = null;
AccountingQuery invocation = null;
if (seriesRequest != null
&& seriesRequest.getAccountingFilterDefinition() != null) {
@ -74,25 +75,49 @@ public class AccountingQuery4Portlet extends AccountingQueryBuilder {
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
.getAccountingFilterDefinition();
accountingFilters = accountingFilterBasic.getFilters();
filters = new ArrayList<Filter>();
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryBasic(
AggregatedPortletUsageRecord.class, temporalConstraint,
filters);
} else {
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
.getAccountingFilterDefinition();
accountingFilters = accountingFilterTop.getFilters();
filters = new ArrayList<Filter>();
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryTop(
AggregatedPortletUsageRecord.class,
accountingFilterTop.getFilterKey(),
accountingFilterTop.getTopNumber(),
temporalConstraint, filters);
} else {
logger.error("Invalid Request: " + seriesRequest);
throw new AccountingManagerServiceException(
"Invalid Request!");
}
}
}
if (accountingFilters != null) {
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters.getFilterKey()
.getKey(), accountigFilters.getFilterValue());
filters.add(filter);
}
} else {
logger.error("Invalid Request: " + seriesRequest);
throw new AccountingManagerServiceException("Invalid Request!");
}
AccountingQueryBasic invocation = new AccountingQueryBasic(
AggregatedPortletUsageRecord.class, temporalConstraint, filters);
accountingQuerySpec.setOp(invocation);

23
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java
View File

@ -77,10 +77,13 @@ public class AccountingQuery4Service extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterBasic.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters.getFilterKey()
.getKey(), accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryBasic(
AggregatedServiceUsageRecord.class, temporalConstraint,
@ -92,11 +95,13 @@ public class AccountingQuery4Service extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterTop.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryTop(
AggregatedServiceUsageRecord.class,

23
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java
View File

@ -77,10 +77,13 @@ public class AccountingQuery4Storage extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterBasic.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters.getFilterKey()
.getKey(), accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryBasic(
AggregatedStorageUsageRecord.class, temporalConstraint,
@ -92,11 +95,13 @@ public class AccountingQuery4Storage extends AccountingQueryBuilder {
.getAccountingFilterDefinition();
accountingFilters = accountingFilterTop.getFilters();
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryTop(
AggregatedStorageUsageRecord.class,

48
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java
View File

@ -35,7 +35,6 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
@Override
public void buildOpEx() throws AccountingManagerServiceException {
Calendar startCalendar = GregorianCalendar
.getInstance(TemporalConstraint.DEFAULT_TIME_ZONE);
try {
@ -68,6 +67,7 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
ArrayList<Filter> filters = null;
ArrayList<AccountingFilter> accountingFilters = null;
AccountingQuery invocation = null;
if (seriesRequest != null
&& seriesRequest.getAccountingFilterDefinition() != null) {
@ -75,28 +75,50 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
.getAccountingFilterDefinition();
accountingFilters = accountingFilterBasic.getFilters();
filters = new ArrayList<Filter>();
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryBasic(
AggregatedTaskUsageRecord.class, temporalConstraint,
filters);
} else {
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
.getAccountingFilterDefinition();
accountingFilters = accountingFilterTop.getFilters();
filters = new ArrayList<Filter>();
if (accountingFilters != null) {
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters
.getFilterKey().getKey(),
accountigFilters.getFilterValue());
filters.add(filter);
}
}
invocation = new AccountingQueryTop(
AggregatedTaskUsageRecord.class,
accountingFilterTop.getFilterKey(),
accountingFilterTop.getTopNumber(),
temporalConstraint, filters);
} else {
logger.error("Invalid Request: " + seriesRequest);
throw new AccountingManagerServiceException(
"Invalid Request!");
}
}
}
if (accountingFilters != null) {
filters = new ArrayList<Filter>();
for (AccountingFilter accountigFilters : accountingFilters) {
Filter filter = new Filter(accountigFilters.getFilterKey()
.getKey(), accountigFilters.getFilterValue());
filters.add(filter);
}
} else {
logger.error("Invalid Request: " + seriesRequest);
throw new AccountingManagerServiceException("Invalid Request!");
}
AccountingQueryBasic invocation = new AccountingQueryBasic(
AggregatedTaskUsageRecord.class, temporalConstraint, filters);
accountingQuerySpec.setOp(invocation);
}