From b4433e8721fc6fbd3c19b2c08a2c7bf24e63a630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Tue, 28 Jul 2026 16:14:24 +0200
Subject: [PATCH 1/2] fix: Update code

---
 src/main/java/org/hisp/dhis/BaseDhis2.java    | 12 +++++-----
 .../org/hisp/dhis/model/AttributeValue.java   |  9 +++++---
 .../java/org/hisp/dhis/model/DataElement.java |  6 +++--
 .../java/org/hisp/dhis/model/IdScheme.java    |  9 +++++---
 .../hisp/dhis/model/IdentifiableObject.java   |  7 ++++--
 .../java/org/hisp/dhis/model/OptionSet.java   | 22 +++++++++++++++++++
 .../java/org/hisp/dhis/model/OrgUnit.java     |  3 ++-
 .../java/org/hisp/dhis/model/Program.java     | 10 +++++----
 .../dhis/model/analytics/AnalyticsData.java   | 13 ++++++-----
 .../dhis/model/analytics/AnalyticsHeader.java |  6 +++--
 .../model/analytics/AnalyticsMetaData.java    |  7 +++---
 .../dhis/model/analytics/MetaDataItem.java    |  3 ++-
 .../hisp/dhis/model/dashboard/Dashboard.java  |  4 +++-
 .../java/org/hisp/dhis/model/event/Event.java |  6 +++--
 .../dhis/model/metadata/MetadataEntity.java   |  3 ++-
 .../model/trackedentity/TrackedEntity.java    |  3 ++-
 src/main/java/org/hisp/dhis/query/Order.java  |  4 +++-
 src/main/java/org/hisp/dhis/query/Paging.java | 10 +++++----
 src/main/java/org/hisp/dhis/query/Query.java  |  6 +++--
 .../hisp/dhis/response/BaseHttpResponse.java  |  5 +++--
 .../org/hisp/dhis/response/HttpStatus.java    |  6 +++--
 .../response/data/AsyncSummaryResponse.java   |  3 ++-
 .../response/data/ImportSummaryResponse.java  |  4 +++-
 .../dhis/response/event/EventResponse.java    |  3 ++-
 .../dhis/response/object/ObjectReport.java    |  4 +++-
 .../response/objects/ObjectsResponse.java     |  3 ++-
 .../trackedentity/TrackedEntityResponse.java  |  3 ++-
 .../org/hisp/dhis/util/CollectionUtils.java   | 13 ++++++-----
 .../java/org/hisp/dhis/util/Comparing.java    |  6 +++--
 .../org/hisp/dhis/util/DateTimeUtils.java     | 13 ++++++-----
 .../org/hisp/dhis/util/JacksonXmlUtils.java   |  4 +++-
 .../java/org/hisp/dhis/util/NumberUtils.java  | 13 ++++++-----
 .../java/org/hisp/dhis/util/RegexUtils.java   |  4 +++-
 .../java/org/hisp/dhis/util/StopWatch.java    |  4 +++-
 .../java/org/hisp/dhis/util/TextUtils.java    | 11 ++++++----
 .../java/org/hisp/dhis/util/UidUtils.java     |  7 ++++--
 src/main/java/org/hisp/dhis/util/Verify.java  |  4 +++-
 .../java/org/hisp/dhis/util/VersionUtils.java |  4 +++-
 38 files changed, 175 insertions(+), 82 deletions(-)

diff --git a/src/main/java/org/hisp/dhis/BaseDhis2.java b/src/main/java/org/hisp/dhis/BaseDhis2.java
index 362dcc2a..0d85085d 100644
--- a/src/main/java/org/hisp/dhis/BaseDhis2.java
+++ b/src/main/java/org/hisp/dhis/BaseDhis2.java
@@ -38,6 +38,8 @@
 import static org.hisp.dhis.util.CollectionUtils.asList;
 import static org.hisp.dhis.util.CollectionUtils.toCommaSeparated;
 import static org.hisp.dhis.util.HttpUtils.getUriAsString;
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -892,7 +894,7 @@ protected URI withCompleteDataSetRegistrationsImportParams(
    * @param value the query parameter value.
    */
   private void addParameter(URIBuilder uriBuilder, String parameter, Object value) {
-    if (value != null) {
+    if (isPresent(value)) {
       uriBuilder.addParameter(parameter, value.toString());
     }
   }
@@ -906,7 +908,7 @@ private void addParameter(URIBuilder uriBuilder, String parameter, Object value)
    * @param value the query parameter Date value.
    */
   private void addParameter(URIBuilder uriBuilder, String parameter, Date value) {
-    if (value != null) {
+    if (isPresent(value)) {
       uriBuilder.addParameter(parameter, DateTimeUtils.getDateTimeString(value));
     }
   }
@@ -1041,7 +1043,7 @@ protected Response executeRequest(HttpUriRequestBase request) {
 
             HttpStatus httpStatus = HttpStatus.valueOf(response.getCode());
             Status status =
-                httpStatus != null && httpStatus.is2xxSuccessful() ? Status.OK : Status.ERROR;
+                isPresent(httpStatus) && httpStatus.is2xxSuccessful() ? Status.OK : Status.ERROR;
 
             Response resp = new Response();
             resp.setHeaders(asList(response.getHeaders()));
@@ -1257,7 +1259,7 @@ private String getErrorMessage(int code) {
    * @throws Dhis2ClientException if object is invalid.
    */
   private void validateRequestObject(Object object) {
-    if (object == null) {
+    if (isAbsent(object)) {
       throw new Dhis2ClientException("Request object is null", 400);
     }
   }
@@ -1475,7 +1477,7 @@ protected boolean redirectedToLogin(HttpResponse response) {
     }
 
     final Header locationHeader = response.getLastHeader(HttpHeaders.LOCATION);
-    return locationHeader != null && locationHeader.getValue().contains("dhis-web-login");
+    return isPresent(locationHeader) && locationHeader.getValue().contains("dhis-web-login");
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/model/AttributeValue.java b/src/main/java/org/hisp/dhis/model/AttributeValue.java
index ca2ca4d4..7986c82a 100644
--- a/src/main/java/org/hisp/dhis/model/AttributeValue.java
+++ b/src/main/java/org/hisp/dhis/model/AttributeValue.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.model;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
@@ -56,7 +59,7 @@ public AttributeValue(Attribute attribute, String value) {
    * @return true if the attribute is not null.
    */
   public boolean hasAttribute() {
-    return attribute != null;
+    return isPresent(attribute);
   }
 
   /**
@@ -111,7 +114,7 @@ public Integer getIntegerValue() {
 
   @Override
   public int hashCode() {
-    return attribute != null ? Objects.hash(attribute.getId()) : 0;
+    return isPresent(attribute) ? Objects.hash(attribute.getId()) : 0;
   }
 
   @Override
@@ -120,7 +123,7 @@ public boolean equals(Object o) {
       return true;
     }
 
-    if (o == null || attribute == null) {
+    if (isAbsent(o) || isAbsent(attribute)) {
       return false;
     }
 
diff --git a/src/main/java/org/hisp/dhis/model/DataElement.java b/src/main/java/org/hisp/dhis/model/DataElement.java
index dcf48140..384c7f57 100644
--- a/src/main/java/org/hisp/dhis/model/DataElement.java
+++ b/src/main/java/org/hisp/dhis/model/DataElement.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.model;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
@@ -61,12 +63,12 @@ public class DataElement extends DimensionItem {
 
   @JsonIgnore
   public boolean hasOptionSet() {
-    return optionSet != null;
+    return isPresent(optionSet);
   }
 
   @JsonIgnore
   public boolean hasCategoryCombo() {
-    return categoryCombo != null;
+    return isPresent(categoryCombo);
   }
 
   @Override
diff --git a/src/main/java/org/hisp/dhis/model/IdScheme.java b/src/main/java/org/hisp/dhis/model/IdScheme.java
index 0927bd90..fe5db154 100644
--- a/src/main/java/org/hisp/dhis/model/IdScheme.java
+++ b/src/main/java/org/hisp/dhis/model/IdScheme.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.model;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.io.Serializable;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -105,7 +108,7 @@ public static IdScheme createAttributeIdScheme(String attribute) {
    * @throws IllegalArgumentException if the ID scheme string is invalid.
    */
   public static IdScheme createIdScheme(String idScheme) {
-    if (idScheme == null) {
+    if (isAbsent(idScheme)) {
       return null;
     }
 
@@ -135,7 +138,7 @@ public static IdScheme createIdScheme(String idScheme) {
    * @return true if the given UID is valid.
    */
   private static boolean isValidUid(String uid) {
-    return uid != null && UID_PATTERN.matcher(uid).matches();
+    return isPresent(uid) && UID_PATTERN.matcher(uid).matches();
   }
 
   // -------------------------------------------------------------------------
@@ -165,7 +168,7 @@ public boolean equals(Object o) {
       return true;
     }
 
-    if (o == null || !getClass().isAssignableFrom(o.getClass())) {
+    if (isAbsent(o) || !getClass().isAssignableFrom(o.getClass())) {
       return false;
     }
 
diff --git a/src/main/java/org/hisp/dhis/model/IdentifiableObject.java b/src/main/java/org/hisp/dhis/model/IdentifiableObject.java
index 99a1d749..a60766a9 100644
--- a/src/main/java/org/hisp/dhis/model/IdentifiableObject.java
+++ b/src/main/java/org/hisp/dhis/model/IdentifiableObject.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.model;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.io.Serializable;
@@ -157,7 +160,7 @@ public boolean hasAttributeValue(String attribute) {
    */
   public String getAttributeValueAsString(String attribute) {
     AttributeValue attributeValue = getAttributeValue(attribute);
-    return attributeValue != null ? attributeValue.getValue() : null;
+    return isPresent(attributeValue) ? attributeValue.getValue() : null;
   }
 
   /**
@@ -190,7 +193,7 @@ public boolean equals(Object o) {
       return true;
     }
 
-    if (o == null) {
+    if (isAbsent(o)) {
       return false;
     }
 
diff --git a/src/main/java/org/hisp/dhis/model/OptionSet.java b/src/main/java/org/hisp/dhis/model/OptionSet.java
index a88972ea..5dd8e89b 100644
--- a/src/main/java/org/hisp/dhis/model/OptionSet.java
+++ b/src/main/java/org/hisp/dhis/model/OptionSet.java
@@ -27,12 +27,14 @@
  */
 package org.hisp.dhis.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hisp.dhis.util.CollectionUtils;
 
 @Getter
 @Setter
@@ -45,4 +47,24 @@ public class OptionSet extends IdentifiableObject {
   @JsonProperty private String version;
 
   @JsonProperty private List<Option> options = new ArrayList<>();
+
+  /**
+   * Returns the number of options.
+   *
+   * @return the number of options.
+   */
+  @JsonIgnore
+  public int getOptionCount() {
+    return options.size();
+  }
+
+  /**
+   * Returns a list with the codes of the options.
+   *
+   * @return a list with the codes of the options.
+   */
+  @JsonIgnore
+  public List<String> getOptionCodes() {
+    return CollectionUtils.mapToList(options, Option::getCode);
+  }
 }
diff --git a/src/main/java/org/hisp/dhis/model/OrgUnit.java b/src/main/java/org/hisp/dhis/model/OrgUnit.java
index c64c4b11..603be35e 100644
--- a/src/main/java/org/hisp/dhis/model/OrgUnit.java
+++ b/src/main/java/org/hisp/dhis/model/OrgUnit.java
@@ -28,6 +28,7 @@
 package org.hisp.dhis.model;
 
 import static org.hisp.dhis.util.DateTimeUtils.DATE_FORMAT;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -99,6 +100,6 @@ public DimensionItemType getDimensionItemType() {
    * @return true if this org unit has a parent, false otherwise.
    */
   public boolean hasParent() {
-    return parent != null;
+    return isPresent(parent);
   }
 }
diff --git a/src/main/java/org/hisp/dhis/model/Program.java b/src/main/java/org/hisp/dhis/model/Program.java
index dcc415a0..70462eac 100644
--- a/src/main/java/org/hisp/dhis/model/Program.java
+++ b/src/main/java/org/hisp/dhis/model/Program.java
@@ -28,6 +28,8 @@
 package org.hisp.dhis.model;
 
 import static org.hisp.dhis.util.CollectionUtils.notEmpty;
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -132,7 +134,7 @@ public Program(String id, String name) {
    */
   @JsonIgnore
   public List<TrackedEntityAttribute> getTrackedEntityTypeAttributes() {
-    if (ProgramType.WITHOUT_REGISTRATION == programType || trackedEntityType == null) {
+    if (ProgramType.WITHOUT_REGISTRATION == programType || isAbsent(trackedEntityType)) {
       return List.of();
     }
 
@@ -148,7 +150,7 @@ public List<TrackedEntityAttribute> getTrackedEntityTypeAttributes() {
    * @return an immutable list of {@link TrackedEntityAttribute}.
    */
   public List<TrackedEntityAttribute> getNonConfidentialTrackedEntityTypeAttributes() {
-    if (ProgramType.WITHOUT_REGISTRATION == programType || trackedEntityType == null) {
+    if (ProgramType.WITHOUT_REGISTRATION == programType || isAbsent(trackedEntityType)) {
       return List.of();
     }
 
@@ -253,7 +255,7 @@ public List<ProgramStageSection> getProgramStageSections() {
    */
   @JsonIgnore
   public boolean hasCategoryCombo() {
-    return categoryCombo != null;
+    return isPresent(categoryCombo);
   }
 
   /**
@@ -263,7 +265,7 @@ public boolean hasCategoryCombo() {
    */
   @JsonIgnore
   public boolean hasTrackedEntityType() {
-    return trackedEntityType != null;
+    return isPresent(trackedEntityType);
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsData.java b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsData.java
index 9c27d9cb..2b4af1dc 100644
--- a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsData.java
+++ b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsData.java
@@ -31,6 +31,7 @@
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.hisp.dhis.model.analytics.AnalyticsDataIndex.toKey;
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
 import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -89,7 +90,7 @@ public AnalyticsData(List<AnalyticsHeader> headers, List<List<String>> rows) {
    */
   @JsonProperty
   public int getHeight() {
-    return rows != null ? rows.size() : 0;
+    return isPresent(rows) ? rows.size() : 0;
   }
 
   /**
@@ -99,7 +100,7 @@ public int getHeight() {
    */
   @JsonProperty
   public int getWidth() {
-    return rows != null && !rows.isEmpty() ? rows.get(0).size() : 0;
+    return isPresent(rows) && !rows.isEmpty() ? rows.get(0).size() : 0;
   }
 
   /**
@@ -109,7 +110,7 @@ public int getWidth() {
    */
   @JsonProperty
   public int getHeaderWidth() {
-    return headers != null ? headers.size() : 0;
+    return isPresent(headers) ? headers.size() : 0;
   }
 
   // Non-serializable logic methods
@@ -181,7 +182,7 @@ public List<AnalyticsHeader> getCopyOfHeaders() {
    */
   @JsonIgnore
   public boolean hasMetaData() {
-    return metaData != null;
+    return isPresent(metaData);
   }
 
   /**
@@ -212,7 +213,7 @@ public void addRow(List<String> row) {
    */
   @JsonIgnore
   public List<String> getRow(int index) {
-    if (rows == null || index < 0 || index >= rows.size()) {
+    if (isAbsent(rows) || index < 0 || index >= rows.size()) {
       return null;
     }
 
@@ -227,7 +228,7 @@ public List<String> getRow(int index) {
    */
   @JsonIgnore
   public void truncate(int maxRows) {
-    if (rows != null && rows.size() > maxRows) {
+    if (isPresent(rows) && rows.size() > maxRows) {
       rows = rows.subList(0, maxRows);
       truncated = true;
     }
diff --git a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsHeader.java b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsHeader.java
index 67f5562a..3b304d04 100644
--- a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsHeader.java
+++ b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsHeader.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.model.analytics;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
@@ -92,11 +94,11 @@ public String getLabel() {
 
   @JsonIgnore
   public boolean isHidden() {
-    return hidden != null && hidden;
+    return isPresent(hidden) && hidden;
   }
 
   @JsonIgnore
   public boolean isMeta() {
-    return meta != null && meta;
+    return isPresent(meta) && meta;
   }
 }
diff --git a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsMetaData.java b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsMetaData.java
index f0391935..5917e428 100644
--- a/src/main/java/org/hisp/dhis/model/analytics/AnalyticsMetaData.java
+++ b/src/main/java/org/hisp/dhis/model/analytics/AnalyticsMetaData.java
@@ -32,6 +32,7 @@
 import static org.apache.commons.collections4.MapUtils.isEmpty;
 import static org.hisp.dhis.util.CollectionUtils.filterToList;
 import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -148,7 +149,7 @@ public boolean hasDataItem(DimensionItemType type) {
   @JsonIgnore
   public int getDimensionItemCount(String dimension) {
     List<String> dimItems = dimensions.get(dimension);
-    return dimItems != null ? dimItems.size() : -1;
+    return isPresent(dimItems) ? dimItems.size() : -1;
   }
 
   /** Returns the count of data dimension items. */
@@ -192,7 +193,7 @@ public int getOrgUnitItemCount() {
   @JsonIgnore
   public MetaDataItem getMetadataItem(String id) {
     MetaDataItem item = items.get(id);
-    if (item != null) {
+    if (isPresent(item)) {
       item.setUid(id);
     }
     return item;
@@ -207,7 +208,7 @@ public MetaDataItem getMetadataItem(String id) {
   @JsonIgnore
   public String getMetadataItemName(String id) {
     MetaDataItem item = items.get(id);
-    return item != null ? item.getName() : null;
+    return isPresent(item) ? item.getName() : null;
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/model/analytics/MetaDataItem.java b/src/main/java/org/hisp/dhis/model/analytics/MetaDataItem.java
index b5a5c6db..58b2afc9 100644
--- a/src/main/java/org/hisp/dhis/model/analytics/MetaDataItem.java
+++ b/src/main/java/org/hisp/dhis/model/analytics/MetaDataItem.java
@@ -28,6 +28,7 @@
 package org.hisp.dhis.model.analytics;
 
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -129,6 +130,6 @@ public boolean hasName() {
    */
   @JsonIgnore
   public boolean hasIndicatorType() {
-    return indicatorType != null;
+    return isPresent(indicatorType);
   }
 }
diff --git a/src/main/java/org/hisp/dhis/model/dashboard/Dashboard.java b/src/main/java/org/hisp/dhis/model/dashboard/Dashboard.java
index 098b3fe3..4f2e15fd 100644
--- a/src/main/java/org/hisp/dhis/model/dashboard/Dashboard.java
+++ b/src/main/java/org/hisp/dhis/model/dashboard/Dashboard.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.model.dashboard;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
@@ -47,6 +49,6 @@ public class Dashboard extends NameableObject {
 
   @JsonIgnore
   public boolean isEmbedded() {
-    return embedded != null;
+    return isPresent(embedded);
   }
 }
diff --git a/src/main/java/org/hisp/dhis/model/event/Event.java b/src/main/java/org/hisp/dhis/model/event/Event.java
index c9d9484d..b480dbf8 100644
--- a/src/main/java/org/hisp/dhis/model/event/Event.java
+++ b/src/main/java/org/hisp/dhis/model/event/Event.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.model.event;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -205,7 +207,7 @@ public boolean isGeometryPoint() {
    */
   public boolean isGeometryType(String type) {
     Objects.requireNonNull(type);
-    return geometry != null && type.equals(geometry.getGeometryType());
+    return isPresent(geometry) && type.equals(geometry.getGeometryType());
   }
 
   /**
@@ -231,7 +233,7 @@ public EventDataValue getEventDataValue(String dataElement) {
    */
   public String getDataValue(String dataElement) {
     EventDataValue eventDataValue = getEventDataValue(dataElement);
-    return eventDataValue != null ? eventDataValue.getValue() : null;
+    return isPresent(eventDataValue) ? eventDataValue.getValue() : null;
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/model/metadata/MetadataEntity.java b/src/main/java/org/hisp/dhis/model/metadata/MetadataEntity.java
index 267fb861..cb8f5b8d 100644
--- a/src/main/java/org/hisp/dhis/model/metadata/MetadataEntity.java
+++ b/src/main/java/org/hisp/dhis/model/metadata/MetadataEntity.java
@@ -84,6 +84,7 @@
 import static org.hisp.dhis.api.ApiFields.USER_GROUP_FIELDS;
 import static org.hisp.dhis.api.ApiFields.USER_ROLE_FIELDS;
 import static org.hisp.dhis.api.ApiFields.VISUALIZATION_FIELDS;
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
 
 import java.util.List;
 import java.util.function.Function;
@@ -444,7 +445,7 @@ public enum MetadataEntity {
    * @return the {@link MetadataEntity}.
    */
   public static <T extends IdentifiableObject> MetadataEntity from(T object) {
-    if (object == null) {
+    if (isAbsent(object)) {
       throw new Dhis2ClientException("Object is null", HttpStatus.BAD_REQUEST);
     } else if (object instanceof AnalyticsTableHook) {
       return ANALYTICS_TABLE_HOOK;
diff --git a/src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntity.java b/src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntity.java
index c5284aff..b91bc090 100644
--- a/src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntity.java
+++ b/src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntity.java
@@ -29,6 +29,7 @@
 
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -128,7 +129,7 @@ public boolean hasAttributes() {
   public void addAttributeValue(String attribute, String value) {
     TrackedEntityAttributeValue existing = getTrackedEntityAttributeValue(attribute);
 
-    if (existing != null) {
+    if (isPresent(existing)) {
       existing.setValue(value);
     } else {
       attributes.add(new TrackedEntityAttributeValue(attribute, value));
diff --git a/src/main/java/org/hisp/dhis/query/Order.java b/src/main/java/org/hisp/dhis/query/Order.java
index 245cd8fe..77a29b59 100644
--- a/src/main/java/org/hisp/dhis/query/Order.java
+++ b/src/main/java/org/hisp/dhis/query/Order.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.query;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -62,7 +64,7 @@ public Direction getDirection() {
   }
 
   public boolean hasOrder() {
-    return property != null && direction != null;
+    return isPresent(property) && isPresent(direction);
   }
 
   public String toValue() {
diff --git a/src/main/java/org/hisp/dhis/query/Paging.java b/src/main/java/org/hisp/dhis/query/Paging.java
index 743c13e7..d75e53c0 100644
--- a/src/main/java/org/hisp/dhis/query/Paging.java
+++ b/src/main/java/org/hisp/dhis/query/Paging.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.query;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import lombok.Getter;
 import lombok.ToString;
 import org.apache.commons.lang3.Validate;
@@ -60,9 +62,9 @@ public Paging() {
    * @param pageSize the page size, can be null, cannot be negative.
    */
   public Paging(Integer page, Integer pageSize) {
-    Validate.isTrue(!(page != null && page < 1), "Page must be greater than zero if specified");
+    Validate.isTrue(!(isPresent(page) && page < 1), "Page must be greater than zero if specified");
     Validate.isTrue(
-        !(pageSize != null && pageSize < 1), "Page size must be greater than zero if specified");
+        !(isPresent(pageSize) && pageSize < 1), "Page size must be greater than zero if specified");
     this.page = page;
     this.pageSize = pageSize;
   }
@@ -77,7 +79,7 @@ public static Paging empty() {
   }
 
   public boolean hasPage() {
-    return page != null && page > 0;
+    return isPresent(page) && page > 0;
   }
 
   public int getPageOrDefault() {
@@ -89,7 +91,7 @@ public int getPageSizeOrDefault() {
   }
 
   public boolean hasPageSize() {
-    return pageSize != null && pageSize >= 0;
+    return isPresent(pageSize) && pageSize >= 0;
   }
 
   public boolean hasPaging() {
diff --git a/src/main/java/org/hisp/dhis/query/Query.java b/src/main/java/org/hisp/dhis/query/Query.java
index 8f039466..ce7f7ef5 100644
--- a/src/main/java/org/hisp/dhis/query/Query.java
+++ b/src/main/java/org/hisp/dhis/query/Query.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.query;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AccessLevel;
@@ -155,7 +157,7 @@ public Query setMaxResults(Integer maxResults) {
    */
   @Override
   public Paging getPaging() {
-    return paging != null ? paging : new Paging(null, null);
+    return isPresent(paging) ? paging : new Paging(null, null);
   }
 
   /**
@@ -164,7 +166,7 @@ public Paging getPaging() {
    * @return the {@link RootJunction}
    */
   public RootJunction getRootJunction() {
-    return rootJunction != null ? rootJunction : RootJunction.AND;
+    return isPresent(rootJunction) ? rootJunction : RootJunction.AND;
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/response/BaseHttpResponse.java b/src/main/java/org/hisp/dhis/response/BaseHttpResponse.java
index d7097397..97d16907 100644
--- a/src/main/java/org/hisp/dhis/response/BaseHttpResponse.java
+++ b/src/main/java/org/hisp/dhis/response/BaseHttpResponse.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.response;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 import static org.hisp.dhis.util.TextUtils.newToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -64,7 +65,7 @@ protected BaseHttpResponse(Integer httpStatusCode) {
    * @return an {@link HttpStatus}.
    */
   public HttpStatus getHttpStatus() {
-    if (httpStatusCode != null) {
+    if (isPresent(httpStatusCode)) {
       return HttpStatus.valueOf(httpStatusCode);
     }
 
@@ -78,7 +79,7 @@ public HttpStatus getHttpStatus() {
    * @return the HTTP header value.
    */
   public String getHeader(String name) {
-    if (headers != null) {
+    if (isPresent(headers)) {
       for (Header header : headers) {
         if (name.equals(header.getName())) {
           return header.getValue();
diff --git a/src/main/java/org/hisp/dhis/response/HttpStatus.java b/src/main/java/org/hisp/dhis/response/HttpStatus.java
index 4bd4e2f4..d0eb8ed0 100644
--- a/src/main/java/org/hisp/dhis/response/HttpStatus.java
+++ b/src/main/java/org/hisp/dhis/response/HttpStatus.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.response;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+
 import org.hisp.dhis.model.exception.IllegalArgumentFormatException;
 
 /** Enumeration of HTTP status codes. */
@@ -191,7 +193,7 @@ public boolean isError() {
    */
   public static HttpStatus valueOf(int statusCode) {
     HttpStatus status = resolve(statusCode);
-    if (status == null) {
+    if (isAbsent(status)) {
       throw new IllegalArgumentFormatException(
           "No matching constant for status code: {}", statusCode);
     }
@@ -271,7 +273,7 @@ public static Series valueOf(HttpStatus status) {
      */
     public static Series valueOf(int statusCode) {
       Series series = resolve(statusCode);
-      if (series == null) {
+      if (isAbsent(series)) {
         throw new IllegalArgumentFormatException("No matching constant for [{}]", statusCode);
       }
       return series;
diff --git a/src/main/java/org/hisp/dhis/response/data/AsyncSummaryResponse.java b/src/main/java/org/hisp/dhis/response/data/AsyncSummaryResponse.java
index 717a65f3..d70c9ef3 100644
--- a/src/main/java/org/hisp/dhis/response/data/AsyncSummaryResponse.java
+++ b/src/main/java/org/hisp/dhis/response/data/AsyncSummaryResponse.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.response.data;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 import static org.hisp.dhis.util.TextUtils.newToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -60,7 +61,7 @@ public abstract class AsyncSummaryResponse extends BaseHttpResponse {
    */
   @JsonIgnore
   public boolean hasImportCount() {
-    return importCount != null;
+    return isPresent(importCount);
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/response/data/ImportSummaryResponse.java b/src/main/java/org/hisp/dhis/response/data/ImportSummaryResponse.java
index c0d9637e..7ef0c4bd 100644
--- a/src/main/java/org/hisp/dhis/response/data/ImportSummaryResponse.java
+++ b/src/main/java/org/hisp/dhis/response/data/ImportSummaryResponse.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.response.data;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
@@ -42,7 +44,7 @@ public class ImportSummaryResponse extends Response {
 
   @JsonIgnore
   public boolean hasResponse() {
-    return response != null;
+    return isPresent(response);
   }
 
   @JsonIgnore
diff --git a/src/main/java/org/hisp/dhis/response/event/EventResponse.java b/src/main/java/org/hisp/dhis/response/event/EventResponse.java
index 207ca995..4a2b971b 100644
--- a/src/main/java/org/hisp/dhis/response/event/EventResponse.java
+++ b/src/main/java/org/hisp/dhis/response/event/EventResponse.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.response.event;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 import static org.hisp.dhis.util.TextUtils.newToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -52,7 +53,7 @@ public EventResponse(Status status, Integer httpStatusCode, String message) {
 
   @JsonIgnore
   public boolean hasValidationReport() {
-    return validationReport != null;
+    return isPresent(validationReport);
   }
 
   @JsonIgnore
diff --git a/src/main/java/org/hisp/dhis/response/object/ObjectReport.java b/src/main/java/org/hisp/dhis/response/object/ObjectReport.java
index e72a4beb..130ed785 100644
--- a/src/main/java/org/hisp/dhis/response/object/ObjectReport.java
+++ b/src/main/java/org/hisp/dhis/response/object/ObjectReport.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.response.object;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +63,6 @@ public String getId() {
    * @return the number of errors.
    */
   public int getErrorCount() {
-    return errorReports != null ? errorReports.size() : 0;
+    return isPresent(errorReports) ? errorReports.size() : 0;
   }
 }
diff --git a/src/main/java/org/hisp/dhis/response/objects/ObjectsResponse.java b/src/main/java/org/hisp/dhis/response/objects/ObjectsResponse.java
index 97071481..6bfeb47d 100644
--- a/src/main/java/org/hisp/dhis/response/objects/ObjectsResponse.java
+++ b/src/main/java/org/hisp/dhis/response/objects/ObjectsResponse.java
@@ -28,6 +28,7 @@
 package org.hisp.dhis.response.objects;
 
 import static org.hisp.dhis.util.CollectionUtils.notEmpty;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 import static org.hisp.dhis.util.TextUtils.newToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -84,7 +85,7 @@ public TypeReport getTypeReport() {
   }
 
   private boolean hasResponse() {
-    return response != null;
+    return isPresent(response);
   }
 
   @Override
diff --git a/src/main/java/org/hisp/dhis/response/trackedentity/TrackedEntityResponse.java b/src/main/java/org/hisp/dhis/response/trackedentity/TrackedEntityResponse.java
index d312943a..1761700c 100644
--- a/src/main/java/org/hisp/dhis/response/trackedentity/TrackedEntityResponse.java
+++ b/src/main/java/org/hisp/dhis/response/trackedentity/TrackedEntityResponse.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.response.trackedentity;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
 import static org.hisp.dhis.util.TextUtils.newToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -48,7 +49,7 @@ public class TrackedEntityResponse extends Response {
 
   @JsonIgnore
   public boolean hasValidationReport() {
-    return validationReport != null;
+    return isPresent(validationReport);
   }
 
   @JsonIgnore
diff --git a/src/main/java/org/hisp/dhis/util/CollectionUtils.java b/src/main/java/org/hisp/dhis/util/CollectionUtils.java
index 37421d70..5fa1ece6 100644
--- a/src/main/java/org/hisp/dhis/util/CollectionUtils.java
+++ b/src/main/java/org/hisp/dhis/util/CollectionUtils.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -330,7 +333,7 @@ public static <T> List<T> excludeIndexes(List<T> list, Set<Integer> indexes) {
    * @return true if any item is a prefix, false otherwise.
    */
   public static boolean anyStartsWith(Collection<String> collection, String input) {
-    if (empty(collection) || input == null) {
+    if (empty(collection) || isAbsent(input)) {
       return false;
     }
 
@@ -375,7 +378,7 @@ public static <K, V> Map<K, V> index(Collection<V> collection, Function<V, K> ke
    * @return true if the given collection is null or empty.
    */
   public static <T> boolean empty(Collection<T> collection) {
-    return collection == null || collection.isEmpty();
+    return isAbsent(collection) || collection.isEmpty();
   }
 
   /**
@@ -386,7 +389,7 @@ public static <T> boolean empty(Collection<T> collection) {
    * @return true if the given collection is not null and not empty.
    */
   public static <T> boolean notEmpty(Collection<T> collection) {
-    return collection != null && !collection.isEmpty();
+    return isPresent(collection) && !collection.isEmpty();
   }
 
   /**
@@ -399,7 +402,7 @@ public static <T> boolean notEmpty(Collection<T> collection) {
    * @return an item or null.
    */
   public static <T> T get(List<T> list, int index) {
-    if (index >= 0 && list != null && index < list.size()) {
+    if (index >= 0 && isPresent(list) && index < list.size()) {
       return list.get(index);
     }
 
@@ -439,7 +442,7 @@ public static <T> Optional<T> last(List<T> list) {
    * @return true if the index is the last index in the list.
    */
   public static boolean isLast(List<?> list, int index) {
-    return list != null && !list.isEmpty() && index >= 0 && index == list.size() - 1;
+    return isPresent(list) && !list.isEmpty() && index >= 0 && index == list.size() - 1;
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/util/Comparing.java b/src/main/java/org/hisp/dhis/util/Comparing.java
index 99dbcc20..604f2f50 100644
--- a/src/main/java/org/hisp/dhis/util/Comparing.java
+++ b/src/main/java/org/hisp/dhis/util/Comparing.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
@@ -48,7 +50,7 @@ public static <T extends Comparable<T>> int compareTo(T a, T b) {
       return 0;
     }
 
-    return a != null ? b != null ? a.compareTo(b) : 1 : -1;
+    return isPresent(a) ? isPresent(b) ? a.compareTo(b) : 1 : -1;
   }
 
   /**
@@ -66,6 +68,6 @@ public static <T extends Comparable<T>> int compareToNullLast(T a, T b) {
       return 0;
     }
 
-    return a != null ? b != null ? a.compareTo(b) : -1 : 1;
+    return isPresent(a) ? isPresent(b) ? a.compareTo(b) : -1 : 1;
   }
 }
diff --git a/src/main/java/org/hisp/dhis/util/DateTimeUtils.java b/src/main/java/org/hisp/dhis/util/DateTimeUtils.java
index 72f56672..ba47f93c 100644
--- a/src/main/java/org/hisp/dhis/util/DateTimeUtils.java
+++ b/src/main/java/org/hisp/dhis/util/DateTimeUtils.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.DateTimeException;
@@ -165,7 +168,7 @@ public static LocalDate toLocalDateTimeAsDate(String string) {
    * @return the {@link Instant} of received date param.
    */
   public static Instant toInstant(Date date) {
-    return date != null ? date.toInstant() : null;
+    return isPresent(date) ? date.toInstant() : null;
   }
 
   /**
@@ -310,7 +313,7 @@ public static String getUtcDateTimeString(Date dateTime) {
    * @return the escaped date time string (e.g. {@code "2024-01-15T10/:30/:00"}).
    */
   public static String escapeDateTimeForFilter(String dateTime) {
-    if (dateTime == null) {
+    if (isAbsent(dateTime)) {
       return "";
     }
     return dateTime.replace(":", "/:");
@@ -329,7 +332,7 @@ public static String escapeDateTimeForFilter(String dateTime) {
    */
   public static boolean isValidLocalDate(String string) {
     try {
-      return string != null && toLocalDate(string) != null;
+      return isPresent(string) && isPresent(toLocalDate(string));
     } catch (DateTimeException ex) {
       return false;
     }
@@ -344,7 +347,7 @@ public static boolean isValidLocalDate(String string) {
    */
   public static boolean isValidLocalDateTime(String string) {
     try {
-      return string != null && toLocalDateTime(string) != null;
+      return isPresent(string) && isPresent(toLocalDateTime(string));
     } catch (DateTimeException ex) {
       return false;
     }
@@ -359,7 +362,7 @@ public static boolean isValidLocalDateTime(String string) {
    */
   public static boolean isValidDuration(String string) {
     try {
-      return string != null && toDuration(string) != null;
+      return isPresent(string) && isPresent(toDuration(string));
     } catch (DateTimeException ex) {
       return false;
     }
diff --git a/src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java b/src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java
index 14a33e02..2954086c 100644
--- a/src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java
+++ b/src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -175,7 +177,7 @@ public static String getRootElementName(String string) {
    * @param reader the {@link XMLStreamReader} to close.
    */
   private static void closeReader(XMLStreamReader reader) {
-    if (reader != null) {
+    if (isPresent(reader)) {
       try {
         reader.close();
       } catch (XMLStreamException ex) {
diff --git a/src/main/java/org/hisp/dhis/util/NumberUtils.java b/src/main/java/org/hisp/dhis/util/NumberUtils.java
index b1ffef34..eb2a6477 100644
--- a/src/main/java/org/hisp/dhis/util/NumberUtils.java
+++ b/src/main/java/org/hisp/dhis/util/NumberUtils.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -57,7 +60,7 @@ public static double round(double value, int scale) {
    * @return a string.
    */
   public static String toString(Integer number) {
-    return number == null ? null : String.valueOf(number);
+    return isAbsent(number) ? null : String.valueOf(number);
   }
 
   /**
@@ -67,7 +70,7 @@ public static String toString(Integer number) {
    * @return a string.
    */
   public static String toString(Double number) {
-    return number == null ? null : String.valueOf(number);
+    return isAbsent(number) ? null : String.valueOf(number);
   }
 
   /**
@@ -107,7 +110,7 @@ public static boolean isInteger(String value) {
    * @return the int value.
    */
   public static int toInt(Integer integer) {
-    return integer != null ? integer.intValue() : 0;
+    return isPresent(integer) ? integer.intValue() : 0;
   }
 
   /**
@@ -127,7 +130,7 @@ public static Double toDouble(String string) {
    * @return true if the given value equals zero, false otherwise.
    */
   public static boolean isZero(Double value) {
-    return value != null && Double.compare(value, 0.0) == 0;
+    return isPresent(value) && Double.compare(value, 0.0) == 0;
   }
 
   /**
@@ -139,7 +142,7 @@ public static boolean isZero(Double value) {
    * @return the value formatted as a string.
    */
   public static String formatDouble(Double value) {
-    if (value == null) {
+    if (isAbsent(value)) {
       return StringUtils.EMPTY;
     }
 
diff --git a/src/main/java/org/hisp/dhis/util/RegexUtils.java b/src/main/java/org/hisp/dhis/util/RegexUtils.java
index 7297dc0b..a6482b3d 100644
--- a/src/main/java/org/hisp/dhis/util/RegexUtils.java
+++ b/src/main/java/org/hisp/dhis/util/RegexUtils.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.AccessLevel;
@@ -55,7 +57,7 @@ public static String getFirstMatch(Pattern pattern, String value) {
    * @return the matching group, or null if no match is found.
    */
   public static String getMatch(Pattern pattern, String value, int group) {
-    if (pattern == null || value == null) {
+    if (isAbsent(pattern) || isAbsent(value)) {
       return null;
     }
 
diff --git a/src/main/java/org/hisp/dhis/util/StopWatch.java b/src/main/java/org/hisp/dhis/util/StopWatch.java
index d5960d30..02b0d8f5 100644
--- a/src/main/java/org/hisp/dhis/util/StopWatch.java
+++ b/src/main/java/org/hisp/dhis/util/StopWatch.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -213,7 +215,7 @@ public String getTimeFormatted() {
    * @return the duration of the last split in milliseconds, or -1 if watch is not split.
    */
   public long getLastSplitDuration() {
-    return lastSplitDuration != null ? lastSplitDuration.toMillis() : -1;
+    return isPresent(lastSplitDuration) ? lastSplitDuration.toMillis() : -1;
   }
 
   /**
diff --git a/src/main/java/org/hisp/dhis/util/TextUtils.java b/src/main/java/org/hisp/dhis/util/TextUtils.java
index f8ace200..2b9f2671 100644
--- a/src/main/java/org/hisp/dhis/util/TextUtils.java
+++ b/src/main/java/org/hisp/dhis/util/TextUtils.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -65,7 +68,7 @@ public static String format(String format, Object... arguments) {
    * @return "false" or "true".
    */
   public static String toTrueFalse(Boolean bool) {
-    return bool != null && bool ? "true" : "false";
+    return isPresent(bool) && bool ? "true" : "false";
   }
 
   /**
@@ -201,7 +204,7 @@ public static String wrapInCodeFences(String input, String language) {
    * @return the possibly truncated input string.
    */
   public static String truncate(String input, int maxLength, String ellipsis) {
-    if (StringUtils.isEmpty(input) || maxLength <= 0 || ellipsis == null) {
+    if (StringUtils.isEmpty(input) || maxLength <= 0 || isAbsent(ellipsis)) {
       return input;
     }
 
@@ -230,7 +233,7 @@ public static String wrapInJsonCodeFences(String input) {
    * @return true if the input is null, false otherwise.
    */
   public static boolean isNull(String input) {
-    return input == null;
+    return isAbsent(input);
   }
 
   /**
@@ -243,7 +246,7 @@ public static boolean isNull(String input) {
    */
   public static String join(CharSequence delimiter, String... items) {
     return Stream.of(items)
-        .filter(item -> item != null && item.length() > 0)
+        .filter(item -> isPresent(item) && item.length() > 0)
         .collect(Collectors.joining(delimiter));
   }
 
diff --git a/src/main/java/org/hisp/dhis/util/UidUtils.java b/src/main/java/org/hisp/dhis/util/UidUtils.java
index cad3b7ea..0a145394 100644
--- a/src/main/java/org/hisp/dhis/util/UidUtils.java
+++ b/src/main/java/org/hisp/dhis/util/UidUtils.java
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isAbsent;
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -87,7 +90,7 @@ public static List<String> generateUids(int n) {
    * @return true if the code is valid.
    */
   public static boolean isValidUid(String input) {
-    return input != null && UID_PATTERN.matcher(input).matches();
+    return isPresent(input) && UID_PATTERN.matcher(input).matches();
   }
 
   /**
@@ -139,7 +142,7 @@ public static String generateCode(int length) {
    * @throws IllegalArgumentException if the input string is invalid.
    */
   public static String toUid(String input) {
-    if (input == null) {
+    if (isAbsent(input)) {
       return null;
     }
     if (input.isBlank()) {
diff --git a/src/main/java/org/hisp/dhis/util/Verify.java b/src/main/java/org/hisp/dhis/util/Verify.java
index da878bca..90c4d24b 100644
--- a/src/main/java/org/hisp/dhis/util/Verify.java
+++ b/src/main/java/org/hisp/dhis/util/Verify.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -46,7 +48,7 @@ public class Verify {
    * @return the object if it is not null.
    */
   public static <T> T notNull(T object, String format, Object... arguments) {
-    test(object != null, format, arguments);
+    test(isPresent(object), format, arguments);
     return object;
   }
 
diff --git a/src/main/java/org/hisp/dhis/util/VersionUtils.java b/src/main/java/org/hisp/dhis/util/VersionUtils.java
index a0e432d6..a64b403e 100644
--- a/src/main/java/org/hisp/dhis/util/VersionUtils.java
+++ b/src/main/java/org/hisp/dhis/util/VersionUtils.java
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.util;
 
+import static org.hisp.dhis.util.ObjectUtils.isPresent;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.AccessLevel;
@@ -62,7 +64,7 @@ public static Integer getPatchVersion(String version) {
   }
 
   private static Integer asInt(String string) {
-    return string != null ? Integer.valueOf(string) : null;
+    return isPresent(string) ? Integer.valueOf(string) : null;
   }
 
   private static String getFirstGroup(Pattern pattern, String string) {

From 5dd7d828f1b131dfe02d1991212b15d2f8302644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Tue, 28 Jul 2026 16:19:30 +0200
Subject: [PATCH 2/2] fix: Update code

---
 src/main/java/org/hisp/dhis/util/TextUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/hisp/dhis/util/TextUtils.java b/src/main/java/org/hisp/dhis/util/TextUtils.java
index 2b9f2671..462a6061 100644
--- a/src/main/java/org/hisp/dhis/util/TextUtils.java
+++ b/src/main/java/org/hisp/dhis/util/TextUtils.java
@@ -68,7 +68,7 @@ public static String format(String format, Object... arguments) {
    * @return "false" or "true".
    */
   public static String toTrueFalse(Boolean bool) {
-    return isPresent(bool) && bool ? "true" : "false";
+    return isPresent(bool) && bool == true ? "true" : "false";
   }
 
   /**