From f02590c86ad435ba39b961fc1c583dd7a527ef80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Tue, 11 Aug 2026 08:45:30 +0200 Subject: [PATCH 1/5] fix: Update code --- .../dhis/dxf2/monitoring/DefaultMonitoringService.java | 10 +++++----- .../hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java | 1 - .../hisp/dhis/system/notification/FakeRedisTest.java | 5 ----- .../data/AnalyticsServiceQueryModifiersTest.java | 3 --- .../hisp/dhis/analytics/data/AnalyticsServiceTest.java | 3 --- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/monitoring/DefaultMonitoringService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/monitoring/DefaultMonitoringService.java index 152d54af5233..c1b54b71738b 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/monitoring/DefaultMonitoringService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/monitoring/DefaultMonitoringService.java @@ -30,6 +30,8 @@ package org.hisp.dhis.dxf2.monitoring; import jakarta.annotation.PostConstruct; +import java.time.Duration; +import java.time.Instant; import java.util.Date; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -41,8 +43,6 @@ import org.hisp.dhis.system.SystemInfo; import org.hisp.dhis.system.SystemService; import org.hisp.dhis.system.util.HttpHeadersBuilder; -import org.joda.time.DateTime; -import org.joda.time.DateTimeConstants; import org.springframework.http.HttpEntity; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; @@ -60,9 +60,9 @@ @RequiredArgsConstructor @Service("org.hisp.dhis.dxf2.monitoring.MonitoringService") public class DefaultMonitoringService implements MonitoringService { - private static final int PUSH_INTERVAL = DateTimeConstants.MILLIS_PER_MINUTE * 5; + private static final Duration PUSH_INTERVAL = Duration.ofMinutes(5); - private static final int PUSH_INITIAL_DELAY = DateTimeConstants.MILLIS_PER_SECOND * 30; + private static final Duration PUSH_INITIAL_DELAY = Duration.ofSeconds(30); private final SystemService systemService; @@ -76,7 +76,7 @@ public class DefaultMonitoringService implements MonitoringService { @PostConstruct public void init() { - Date date = new DateTime().plus(PUSH_INITIAL_DELAY).toDate(); + Instant date = Instant.now().plus(PUSH_INITIAL_DELAY); String url = config.getProperty(ConfigurationKey.SYSTEM_MONITORING_URL); diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java index 72419cd0aa55..0e79042f6a94 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java @@ -205,7 +205,6 @@ public static DataValueSet getDataValueSet(InputStream in) { // Loop Through the Fields and get data. - @SuppressWarnings("unchecked") Set fldNames = form.getAllFields().keySet(); for (String fldName : fldNames) { diff --git a/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/FakeRedisTest.java b/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/FakeRedisTest.java index 0eed81f94538..970c75cf7952 100644 --- a/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/FakeRedisTest.java +++ b/dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/FakeRedisTest.java @@ -92,7 +92,6 @@ void testKeys_hashTable() { } @Test - @SuppressWarnings("DataFlowIssue") void testDelete_NonExistingHasNoEffect() { BoundZSetOperations set1 = redis.boundZSetOps("empty:s"); assertEquals(0L, set1.zCard()); @@ -106,7 +105,6 @@ void testDelete_NonExistingHasNoEffect() { } @Test - @SuppressWarnings("DataFlowIssue") void testDelete_byKey() { BoundZSetOperations set1 = redis.boundZSetOps("my:set"); set1.add("val", 42); @@ -148,7 +146,6 @@ void testZCard() { } @Test - @SuppressWarnings("DataFlowIssue") void testRange() { BoundZSetOperations set1 = redis.boundZSetOps("my:set"); set1.add("1", 1); @@ -165,7 +162,6 @@ void testRange() { } @Test - @SuppressWarnings("DataFlowIssue") void testReverseRange() { BoundZSetOperations set1 = redis.boundZSetOps("my:set"); set1.add("1", 1); @@ -180,7 +176,6 @@ void testReverseRange() { } @Test - @SuppressWarnings("DataFlowIssue") void testRemoveRange() { BoundZSetOperations set1 = redis.boundZSetOps("my:set"); set1.add("1", 1); diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceQueryModifiersTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceQueryModifiersTest.java index 7dc4f74dc6bb..a0ffb572c373 100644 --- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceQueryModifiersTest.java +++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceQueryModifiersTest.java @@ -54,7 +54,6 @@ import org.hisp.dhis.category.CategoryOptionCombo; import org.hisp.dhis.category.CategoryService; import org.hisp.dhis.common.ValueType; -import org.hisp.dhis.configuration.ConfigurationService; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.dataset.DataSet; @@ -107,8 +106,6 @@ class AnalyticsServiceQueryModifiersTest extends PostgresIntegrationTestBase { @Autowired private IndicatorService indicatorService; - @Autowired private ConfigurationService configurationService; - private Period jan; private Period feb; diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java index 256cf90dc6f9..3cf9815b5938 100644 --- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java +++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java @@ -76,7 +76,6 @@ import org.hisp.dhis.datavalue.DataEntryGroup; import org.hisp.dhis.datavalue.DataEntryInput; import org.hisp.dhis.datavalue.DataEntryValue; -import org.hisp.dhis.datavalue.DataValueService; import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.datavalueset.DataValueSet; import org.hisp.dhis.expression.Expression; @@ -204,8 +203,6 @@ class AnalyticsServiceTest extends PostgresIntegrationTestBase { @Autowired private CategoryService categoryService; - @Autowired private DataValueService dataValueService; - @Autowired private OrganisationUnitService organisationUnitService; @Autowired private OrganisationUnitGroupService organisationUnitGroupService; From 39ec6613baf4bf7e3a9f3021db59c6907ba5a6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Tue, 11 Aug 2026 10:13:37 +0200 Subject: [PATCH 2/5] fix: Update code --- dhis-2/dhis-services/dhis-service-dxf2/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/pom.xml b/dhis-2/dhis-services/dhis-service-dxf2/pom.xml index 74a6c4811652..0d5a69aaedf5 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/pom.xml +++ b/dhis-2/dhis-services/dhis-service-dxf2/pom.xml @@ -111,10 +111,6 @@ commons-io commons-io - - joda-time - joda-time - org.locationtech.jts jts-core From 236d44e22e9bfd2aa5c2d30c0af85ed6fef7c94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Wed, 12 Aug 2026 14:50:20 +0200 Subject: [PATCH 3/5] fix: Update code --- ...mStageWorkingListObjectBundleHookTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java index 256761cb0456..ed550808a1ae 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java @@ -43,6 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; +import java.time.ZonedDateTime; import java.util.Collections; import java.util.Date; import java.util.List; @@ -63,7 +64,6 @@ import org.hisp.dhis.trackedentity.TrackedEntityAttribute; import org.hisp.dhis.trackedentity.TrackedEntityAttributeService; import org.hisp.dhis.trackedentityfilter.AttributeValueFilter; -import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -106,28 +106,28 @@ void shouldReturnNoErrorsWhenQueryCriteriaSuppliedIsValid() { ProgramStageQueryCriteria.builder() .enrolledAt( createDatePeriod( - DateTime.now().minusDays(1).toDate(), - DateTime.now().plusDays(1).toDate(), + Date.from(ZonedDateTime.now().minusDays(1).toInstant()), + Date.from(ZonedDateTime.now().plusDays(1).toInstant()), DatePeriodType.ABSOLUTE)) .enrollmentOccurredAt( createDatePeriod( - DateTime.now().minusDays(1).toDate(), - DateTime.now().plusDays(1).toDate(), + Date.from(ZonedDateTime.now().minusDays(1).toInstant()), + Date.from(ZonedDateTime.now().plusDays(1).toInstant()), DatePeriodType.RELATIVE)) .eventCreatedAt( createDatePeriod( - DateTime.now().minusDays(1).toDate(), - DateTime.now().plusDays(1).toDate(), + Date.from(ZonedDateTime.now().minusDays(1).toInstant()), + Date.from(ZonedDateTime.now().plusDays(1).toInstant()), DatePeriodType.ABSOLUTE)) .eventOccurredAt( createDatePeriod( - DateTime.now().minusDays(1).toDate(), - DateTime.now().plusDays(1).toDate(), + Date.from(ZonedDateTime.now().minusDays(1).toInstant()), + Date.from(ZonedDateTime.now().plusDays(1).toInstant()), DatePeriodType.ABSOLUTE)) .eventScheduledAt( createDatePeriod( - DateTime.now().minusDays(1).toDate(), - DateTime.now().plusDays(1).toDate(), + Date.from(ZonedDateTime.now().minusDays(1).toInstant()), + Date.from(ZonedDateTime.now().plusDays(1).toInstant()), DatePeriodType.RELATIVE)) .assignedUsers(Collections.singleton("User")) .assignedUserMode(AssignedUserSelectionMode.PROVIDED) From c64909854f5f1fee45fc8dd3be017b1257b9f7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Thu, 13 Aug 2026 11:53:20 +0200 Subject: [PATCH 4/5] fix: Update code --- .../hooks/ProgramStageWorkingListObjectBundleHookTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java index ed550808a1ae..297858ea7ca4 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageWorkingListObjectBundleHookTest.java @@ -89,7 +89,7 @@ class ProgramStageWorkingListObjectBundleHookTest { private ProgramStageWorkingList programStageWorkingList; @BeforeEach - public void setUp() { + void setUp() { workingListHook = new ProgramStageWorkingListObjectBundleHook( dataElementService, organisationUnitService, attributeService); From b4260d2b60c479dbf74eb881e28387b1808a3a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= Date: Thu, 1 Oct 2026 15:11:45 +0200 Subject: [PATCH 5/5] fix: Use database --- .../src/main/java/org/hisp/dhis/dataelement/DataElement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java index 9ec89f1285b2..1b7777ee6ea4 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java @@ -176,7 +176,7 @@ public class DataElement extends BaseMetadataObject /** Data element value type (int, boolean, etc) */ @Enumerated(EnumType.STRING) - @Column(name = "valueType", length = 50, nullable = false) + @Column(name = "valuetype", length = 50, nullable = false) private ValueType valueType; /** Abstract class representing options for value types. */ @@ -188,7 +188,7 @@ public class DataElement extends BaseMetadataObject * DataElementDomainType.TRACKER. */ @Enumerated(EnumType.STRING) - @Column(name = "domainType", nullable = false) + @Column(name = "domaintype", nullable = false) private DataElementDomain domainType; @Enumerated(EnumType.STRING)