Skip to content

Commit ec2a646

Browse files
fix formatting
1 parent f408d0b commit ec2a646

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EventAggregateService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ private void addData(Grid grid, EventQueryParams params, int maxLimit) {
284284
timer.getSplitTime("Planned event query, got partitions: {}", params.getPartitions());
285285

286286
for (EventQueryParams query : queries) {
287-
if
288-
(query.hasEnrollmentProgramIndicatorDimension()) {
287+
if (query.hasEnrollmentProgramIndicatorDimension()) {
289288
enrollmentAnalyticsManager.getAggregatedEventData(query, grid, maxLimit);
290289
} else {
291290
eventAnalyticsManager.getAggregatedEventData(query, grid, maxLimit);

dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EnrollmentAnalyticsManagerCteTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ void verifyAggregateEnrollmentWithStageDateDimensionGeneratesValidSql() {
339339

340340
String generatedSql = sql.getValue();
341341
String baseCteSql =
342-
generatedSql.substring(
343-
generatedSql.indexOf("enrollment_aggr_base as ("),
344-
generatedSql.indexOf("select count(eb.enrollment) as value"));
342+
generatedSql.substring(
343+
generatedSql.indexOf("enrollment_aggr_base as ("),
344+
generatedSql.indexOf("select count(eb.enrollment) as value"));
345345
// The SQL should contain a per-stage filter CTE
346346
assertThat(generatedSql, containsString("latest_events_" + programStage.getUid()));
347347

@@ -376,7 +376,7 @@ void verifyAggregateEnrollmentStageOrgUnitFilterStaysInFilterCte() {
376376
queryItem.addFilter(new QueryFilter(IN, "ImspTQPwCqd"));
377377

378378
when(organisationUnitResolver.resolveOrgUnits(
379-
any(QueryFilter.class), anyList() , any(QueryItem.class)))
379+
any(QueryFilter.class), anyList(), any(QueryItem.class)))
380380
.thenReturn("ImspTQPwCqd");
381381

382382
EventQueryParams.Builder params = createRequestParamsBuilder();

0 commit comments

Comments
 (0)