Renamed class

dhis2 · Jan 10, 2025 · 86b6eb1 · 86b6eb1
1 parent dd4ef27
commit 86b6eb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...vices/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/common/CteContext.java b/...vices/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/common/CteContext.java
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.analytics.common;
 
-import static org.hisp.dhis.analytics.common.CTEUtils.computeKey;
+import static org.hisp.dhis.analytics.common.CteUtils.computeKey;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/.../hisp/dhis/analytics/common/CTEUtils.java → .../hisp/dhis/analytics/common/CteUtils.java b/.../hisp/dhis/analytics/common/CTEUtils.java → .../hisp/dhis/analytics/common/CteUtils.java
@@ -31,7 +31,7 @@
 import org.hisp.dhis.common.QueryItem;
 
 @UtilityClass
-public class CTEUtils {
+public class CteUtils {
 
   public static String computeKey(QueryItem queryItem) {
 

diff --git a/...tics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java b/...tics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
@@ -32,7 +32,7 @@
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.hisp.dhis.analytics.AnalyticsConstants.ANALYTICS_TBL_ALIAS;
 import static org.hisp.dhis.analytics.DataType.BOOLEAN;
-import static org.hisp.dhis.analytics.common.CTEUtils.computeKey;
+import static org.hisp.dhis.analytics.common.CteUtils.computeKey;
 import static org.hisp.dhis.analytics.event.data.OrgUnitTableJoiner.joinOrgUnitTables;
 import static org.hisp.dhis.analytics.util.AnalyticsUtils.withExceptionHandling;
 import static org.hisp.dhis.common.DataDimensionType.ATTRIBUTE;
@@ -59,7 +59,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.hisp.dhis.analytics.analyze.ExecutionPlanStore;
-import org.hisp.dhis.analytics.common.CTEUtils;
+import org.hisp.dhis.analytics.common.CteUtils;
 import org.hisp.dhis.analytics.common.CteContext;
 import org.hisp.dhis.analytics.common.CteDefinition;
 import org.hisp.dhis.analytics.common.InQueryCteFilter;
@@ -508,7 +508,7 @@ private String addCteFiltersToWhereClause(EventQueryParams params, CteContext ct
             .toList();
     // Iterate over each filter and apply the correct condition
     for (QueryItem item : filters) {
-      String cteName = CTEUtils.computeKey(item);
+      String cteName = CteUtils.computeKey(item);
 
       if (cteContext.containsCte(cteName)) {
         processedItems.add(item); // Mark item as processed
@@ -1151,7 +1151,7 @@ private void generateFilterCTEs(EventQueryParams params, CteContext cteContext)
 
     // Process repeatable stage filters
     itemsByRepeatableFlag.getOrDefault(true, List.of()).stream()
-        .collect(groupingBy(CTEUtils::getIdentifier))
+        .collect(groupingBy(CteUtils::getIdentifier))
         .forEach(
             (identifier, items) -> {
               String cteSql = buildFilterCteSql(items, params);