chore: remove old data integrity report API (#19393)

dhis2 · Dec 5, 2024 · 280db2b · 280db2b
1 parent be39817
commit 280db2b
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 1,187 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java
@@ -34,25 +34,9 @@
 import org.hisp.dhis.scheduling.JobProgress;
 
 /**
- * @author Fredrik Fjeld (old API)
- * @author Jan Bernitt (new API)
+ * @author Jan Bernitt
  */
 public interface DataIntegrityService {
-  /*
-   * Old API
-   */
-
-  /**
-   * @deprecated Replaced by {@link #getSummaries(Set, long)} and {@link #getDetails(Set, long)},
-   *     kept for backwards compatibility until new UI exists
-   */
-  @Deprecated(since = "2.38", forRemoval = true)
-  @Nonnull
-  FlattenedDataIntegrityReport getReport(Set<String> checks, JobProgress progress);
-
-  /*
-   * New generic API
-   */
 
   default @Nonnull Collection<DataIntegrityCheck> getDataIntegrityChecks() {
     return getDataIntegrityChecks(Set.of());

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/FlattenedDataIntegrityReport.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/FlattenedDataIntegrityReport.java
diff --git a/...his-api/src/main/java/org/hisp/dhis/scheduling/parameters/DataIntegrityJobParameters.java b/...his-api/src/main/java/org/hisp/dhis/scheduling/parameters/DataIntegrityJobParameters.java
@@ -51,11 +51,11 @@ public enum DataIntegrityReportType {
     DETAILS
   }
 
-  @JsonProperty(required = false)
+  @JsonProperty
   @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
   private DataIntegrityReportType type;
 
-  @JsonProperty(required = false)
+  @JsonProperty
   @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
   private Set<String> checks;
 }
diff --git a/...administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java b/...administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
@@ -45,7 +45,6 @@
 import static org.hisp.dhis.scheduling.JobProgress.FailurePolicy.SKIP_ITEM;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
@@ -512,23 +511,6 @@ Set<String> addSQLChecksToFlattedReport() {
     return checks;
   }
 
-  @Nonnull
-  @Override
-  @Transactional(readOnly = true)
-  public FlattenedDataIntegrityReport getReport(Set<String> checks, JobProgress progress) {
-    if (checks == null || checks.isEmpty()) {
-      // report only needs these
-      checks =
-          Arrays.stream(DataIntegrityCheckType.values())
-              .map(DataIntegrityCheckType::getName)
-              .collect(Collectors.toSet());
-      // Add additional SQL based checks here
-      checks.addAll(addSQLChecksToFlattedReport());
-    }
-    runDetailsChecks(checks, progress);
-    return new FlattenedDataIntegrityReport(getDetails(checks, -1L));
-  }
-
   /** Get all ProgramIndicators with invalid expressions. */
   List<DataIntegrityIssue> getInvalidProgramIndicatorExpressions() {
     return getInvalidProgramIndicators(