fix: Update code

dhis2 · Nov 26, 2024 · 490ea09 · 490ea09
1 parent e8e862a
commit 490ea09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java
@@ -38,9 +38,6 @@
 import static org.hisp.dhis.common.DimensionalObject.ITEM_SEP;
 import static org.hisp.dhis.common.DimensionalObject.OPTION_SEP;
 import static org.hisp.dhis.expression.ExpressionService.SYMBOL_WILDCARD;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -53,7 +50,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.NoArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Triple;
@@ -63,6 +59,9 @@
 import org.hisp.dhis.eventvisualization.EventRepetition;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramStage;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.NoArgsConstructor;
 
 /**
  * @author Lars Helge Overland
@@ -141,7 +140,6 @@ public static DimensionalObject linkAssociations(
       EventAnalyticalObject eventAnalyticalObject,
       DimensionalObject dimensionalObject,
       Attribute parent) {
-    // Associating event repetitions.
     List<EventRepetition> repetitions = eventAnalyticalObject.getEventRepetitions();
 
     if (isNotEmpty(repetitions)) {

diff --git a/...services/dhis-service-core/src/main/java/org/hisp/dhis/analytics/common/ColumnHeader.java b/...services/dhis-service-core/src/main/java/org/hisp/dhis/analytics/common/ColumnHeader.java
@@ -34,9 +34,8 @@ public enum ColumnHeader {
   GEOMETRY("geometry", "Geometry"),
   ENROLLMENT_DATE("enrollmentdate", "Enrollment date"),
   /**
-   * @deprecated use @Link{#OCCURRED_DATE} instead.
+   * Deprecated since 2.42. Use @Link{#OCCURRED_DATE} instead.
    */
-  @Deprecated(since = "2.42")
   INCIDENT_DATE("incidentdate", "Incident date"),
   OCCURRED_DATE("occurreddate", "Occurred date"),
   STORED_BY("storedby", "Stored by"),