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:
parent
6dc4bf329b
commit
6154c35d3e
|
@ -77,11 +77,14 @@ public class AccountingQuery4Job extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterBasic.getFilters();
|
accountingFilters = accountingFilterBasic.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters.getFilterKey()
|
Filter filter = new Filter(accountigFilters
|
||||||
.getKey(), accountigFilters.getFilterValue());
|
.getFilterKey().getKey(),
|
||||||
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryBasic(
|
invocation = new AccountingQueryBasic(
|
||||||
AggregatedJobUsageRecord.class, temporalConstraint,
|
AggregatedJobUsageRecord.class, temporalConstraint,
|
||||||
filters);
|
filters);
|
||||||
|
@ -92,12 +95,14 @@ public class AccountingQuery4Job extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterTop.getFilters();
|
accountingFilters = accountingFilterTop.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters
|
Filter filter = new Filter(accountigFilters
|
||||||
.getFilterKey().getKey(),
|
.getFilterKey().getKey(),
|
||||||
accountigFilters.getFilterValue());
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryTop(
|
invocation = new AccountingQueryTop(
|
||||||
AggregatedJobUsageRecord.class,
|
AggregatedJobUsageRecord.class,
|
||||||
accountingFilterTop.getFilterKey(),
|
accountingFilterTop.getFilterKey(),
|
||||||
|
|
|
@ -67,6 +67,7 @@ public class AccountingQuery4Portlet extends AccountingQueryBuilder {
|
||||||
|
|
||||||
ArrayList<Filter> filters = null;
|
ArrayList<Filter> filters = null;
|
||||||
ArrayList<AccountingFilter> accountingFilters = null;
|
ArrayList<AccountingFilter> accountingFilters = null;
|
||||||
|
AccountingQuery invocation = null;
|
||||||
|
|
||||||
if (seriesRequest != null
|
if (seriesRequest != null
|
||||||
&& seriesRequest.getAccountingFilterDefinition() != null) {
|
&& seriesRequest.getAccountingFilterDefinition() != null) {
|
||||||
|
@ -74,25 +75,49 @@ public class AccountingQuery4Portlet extends AccountingQueryBuilder {
|
||||||
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
|
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterBasic.getFilters();
|
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 {
|
} else {
|
||||||
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
|
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
|
||||||
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
|
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterTop.getFilters();
|
accountingFilters = accountingFilterTop.getFilters();
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (accountingFilters != null) {
|
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters.getFilterKey()
|
Filter filter = new Filter(accountigFilters
|
||||||
.getKey(), accountigFilters.getFilterValue());
|
.getFilterKey().getKey(),
|
||||||
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
AccountingQueryBasic invocation = new AccountingQueryBasic(
|
invocation = new AccountingQueryTop(
|
||||||
AggregatedPortletUsageRecord.class, temporalConstraint, filters);
|
AggregatedPortletUsageRecord.class,
|
||||||
|
accountingFilterTop.getFilterKey(),
|
||||||
|
accountingFilterTop.getTopNumber(),
|
||||||
|
temporalConstraint, filters);
|
||||||
|
} else {
|
||||||
|
logger.error("Invalid Request: " + seriesRequest);
|
||||||
|
throw new AccountingManagerServiceException(
|
||||||
|
"Invalid Request!");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.error("Invalid Request: " + seriesRequest);
|
||||||
|
throw new AccountingManagerServiceException("Invalid Request!");
|
||||||
|
}
|
||||||
|
|
||||||
accountingQuerySpec.setOp(invocation);
|
accountingQuerySpec.setOp(invocation);
|
||||||
|
|
||||||
|
|
|
@ -77,11 +77,14 @@ public class AccountingQuery4Service extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterBasic.getFilters();
|
accountingFilters = accountingFilterBasic.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters.getFilterKey()
|
Filter filter = new Filter(accountigFilters
|
||||||
.getKey(), accountigFilters.getFilterValue());
|
.getFilterKey().getKey(),
|
||||||
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryBasic(
|
invocation = new AccountingQueryBasic(
|
||||||
AggregatedServiceUsageRecord.class, temporalConstraint,
|
AggregatedServiceUsageRecord.class, temporalConstraint,
|
||||||
filters);
|
filters);
|
||||||
|
@ -92,12 +95,14 @@ public class AccountingQuery4Service extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterTop.getFilters();
|
accountingFilters = accountingFilterTop.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters
|
Filter filter = new Filter(accountigFilters
|
||||||
.getFilterKey().getKey(),
|
.getFilterKey().getKey(),
|
||||||
accountigFilters.getFilterValue());
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryTop(
|
invocation = new AccountingQueryTop(
|
||||||
AggregatedServiceUsageRecord.class,
|
AggregatedServiceUsageRecord.class,
|
||||||
accountingFilterTop.getFilterKey(),
|
accountingFilterTop.getFilterKey(),
|
||||||
|
|
|
@ -77,11 +77,14 @@ public class AccountingQuery4Storage extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterBasic.getFilters();
|
accountingFilters = accountingFilterBasic.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters.getFilterKey()
|
Filter filter = new Filter(accountigFilters
|
||||||
.getKey(), accountigFilters.getFilterValue());
|
.getFilterKey().getKey(),
|
||||||
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryBasic(
|
invocation = new AccountingQueryBasic(
|
||||||
AggregatedStorageUsageRecord.class, temporalConstraint,
|
AggregatedStorageUsageRecord.class, temporalConstraint,
|
||||||
filters);
|
filters);
|
||||||
|
@ -92,12 +95,14 @@ public class AccountingQuery4Storage extends AccountingQueryBuilder {
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterTop.getFilters();
|
accountingFilters = accountingFilterTop.getFilters();
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters
|
Filter filter = new Filter(accountigFilters
|
||||||
.getFilterKey().getKey(),
|
.getFilterKey().getKey(),
|
||||||
accountigFilters.getFilterValue());
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
invocation = new AccountingQueryTop(
|
invocation = new AccountingQueryTop(
|
||||||
AggregatedStorageUsageRecord.class,
|
AggregatedStorageUsageRecord.class,
|
||||||
accountingFilterTop.getFilterKey(),
|
accountingFilterTop.getFilterKey(),
|
||||||
|
|
|
@ -35,7 +35,6 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void buildOpEx() throws AccountingManagerServiceException {
|
public void buildOpEx() throws AccountingManagerServiceException {
|
||||||
|
|
||||||
Calendar startCalendar = GregorianCalendar
|
Calendar startCalendar = GregorianCalendar
|
||||||
.getInstance(TemporalConstraint.DEFAULT_TIME_ZONE);
|
.getInstance(TemporalConstraint.DEFAULT_TIME_ZONE);
|
||||||
try {
|
try {
|
||||||
|
@ -68,6 +67,7 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
|
||||||
|
|
||||||
ArrayList<Filter> filters = null;
|
ArrayList<Filter> filters = null;
|
||||||
ArrayList<AccountingFilter> accountingFilters = null;
|
ArrayList<AccountingFilter> accountingFilters = null;
|
||||||
|
AccountingQuery invocation = null;
|
||||||
|
|
||||||
if (seriesRequest != null
|
if (seriesRequest != null
|
||||||
&& seriesRequest.getAccountingFilterDefinition() != null) {
|
&& seriesRequest.getAccountingFilterDefinition() != null) {
|
||||||
|
@ -75,27 +75,49 @@ public class AccountingQuery4Task extends AccountingQueryBuilder {
|
||||||
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
|
AccountingFilterBasic accountingFilterBasic = (AccountingFilterBasic) seriesRequest
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterBasic.getFilters();
|
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 {
|
} else {
|
||||||
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
|
if (seriesRequest.getAccountingFilterDefinition() instanceof AccountingFilterTop) {
|
||||||
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
|
AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
|
||||||
.getAccountingFilterDefinition();
|
.getAccountingFilterDefinition();
|
||||||
accountingFilters = accountingFilterTop.getFilters();
|
accountingFilters = accountingFilterTop.getFilters();
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (accountingFilters != null) {
|
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
|
if (accountingFilters != null) {
|
||||||
for (AccountingFilter accountigFilters : accountingFilters) {
|
for (AccountingFilter accountigFilters : accountingFilters) {
|
||||||
Filter filter = new Filter(accountigFilters.getFilterKey()
|
Filter filter = new Filter(accountigFilters
|
||||||
.getKey(), accountigFilters.getFilterValue());
|
.getFilterKey().getKey(),
|
||||||
|
accountigFilters.getFilterValue());
|
||||||
filters.add(filter);
|
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!");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
AccountingQueryBasic invocation = new AccountingQueryBasic(
|
} else {
|
||||||
AggregatedTaskUsageRecord.class, temporalConstraint, filters);
|
logger.error("Invalid Request: " + seriesRequest);
|
||||||
|
throw new AccountingManagerServiceException("Invalid Request!");
|
||||||
|
}
|
||||||
|
|
||||||
accountingQuerySpec.setOp(invocation);
|
accountingQuerySpec.setOp(invocation);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue