Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6dbb8d6
fix: Update code
larshelge Jan 19, 2026
5e78bcf
merge: Merge from master branch
larshelge Jan 19, 2026
eef36e9
fix: Update code
larshelge Jan 21, 2026
2aeb160
fix: Update code
larshelge Jan 21, 2026
09e16f5
fix: Update code
larshelge Jan 22, 2026
22baaf0
fix: Update code
larshelge Jan 22, 2026
65e4c6a
fix: Update code
larshelge Jan 22, 2026
6733363
fix: Update code
larshelge Jan 22, 2026
f0670b2
merge: Merge from master branch
larshelge Jan 22, 2026
bcb9517
merge: Merge from master branch
larshelge Jan 22, 2026
524576b
fix: Update code
larshelge Jan 26, 2026
76803c8
fix: Update code
larshelge Jan 27, 2026
6a2afb8
fix: Update code
larshelge Jan 27, 2026
996e4ac
fix: Update code
larshelge Jan 27, 2026
e73e9cc
merge: Merge from master branch
larshelge Jan 27, 2026
adcd707
fix: Update code
larshelge Jan 27, 2026
b895778
merge: Merge from master branch
larshelge Jan 27, 2026
baed0e5
fix: Update code
larshelge Jan 27, 2026
efe180f
fix: Update code
larshelge Jan 27, 2026
733abac
fix: Update code
larshelge Jan 27, 2026
dbbc958
merge: Merge from master branch
larshelge Jan 27, 2026
947da72
fix: Update code
larshelge Jan 27, 2026
13005f5
fix: Update code
larshelge Feb 2, 2026
6adf1d1
fix: Update code
larshelge Feb 18, 2026
a2124a4
fix: Update code
larshelge Feb 18, 2026
3860d11
merge: Merge from master branch
larshelge Feb 18, 2026
1b3b4ff
fix: Update code
larshelge Feb 23, 2026
7e988a8
merge: Merge from master branch
larshelge Feb 23, 2026
72e2b9c
fix: Update code
larshelge Feb 25, 2026
b296677
fix: Update code
larshelge Feb 25, 2026
151ed4f
chore: Bump version
larshelge Feb 25, 2026
6208073
merge: Merge from master branch
larshelge Feb 25, 2026
24a18c3
merge: Merge from master branch
larshelge Feb 25, 2026
cc0ac36
fix: Add test
larshelge Feb 26, 2026
7f2016f
fix: Update code
larshelge Feb 26, 2026
7c02d20
fix: Update code
larshelge Feb 26, 2026
d8a8d5f
merge: Merge from master branch
larshelge Feb 26, 2026
a7568f5
fix: Update code
larshelge Mar 4, 2026
8b4b947
merge: Merge from master branch
larshelge Mar 4, 2026
9fc6e7a
fix: Update code
larshelge Mar 6, 2026
a537088
fix: Update code
larshelge Mar 6, 2026
f18110f
merge: Merge from master branch
larshelge Mar 6, 2026
0249573
merge: Merge from master branch
larshelge Mar 6, 2026
c3b96d4
fix: Update code
larshelge Mar 6, 2026
136d976
merge: Merge from master branch
larshelge Mar 6, 2026
ab9a0ae
fix: Update code
larshelge Mar 7, 2026
247b74b
merge: Merge from master branch
larshelge Mar 7, 2026
6c1d0c8
merge: Merge from master branch
larshelge Mar 7, 2026
437749e
fix: Update code
larshelge Mar 8, 2026
9bd01ae
fix: Update code
larshelge Mar 8, 2026
6cb5cc4
merge: Merge from master branch
larshelge Mar 8, 2026
4cfcbcf
fix: Add util method
larshelge Mar 9, 2026
717f095
merge: Merge from master branch
larshelge Mar 9, 2026
bc14846
fix: Update code
larshelge Mar 9, 2026
cef6eb5
merge: Merge from master branch
larshelge Mar 9, 2026
1880d03
fix: Update code
larshelge Mar 10, 2026
880061e
merge: Merge from master branch
larshelge Mar 10, 2026
485c297
fix: Update code
larshelge Mar 12, 2026
7f4556d
merge: Merge from master branch
larshelge Mar 12, 2026
542a7ec
fix: Update code
larshelge Mar 13, 2026
7cc77e8
fix: Update code
larshelge Mar 13, 2026
2bea5cb
fix: Update code
larshelge Mar 13, 2026
92744b9
merge: Merge from master branch
larshelge Mar 13, 2026
5a3edef
fix: Update code
larshelge Mar 13, 2026
5712164
merge: Merge from master branch
larshelge Mar 13, 2026
b78faf2
fix: Update code
larshelge Apr 6, 2026
53b2015
fix: Update code
larshelge Apr 6, 2026
d9b2f5f
fix: Update code
larshelge Apr 6, 2026
93a4cb5
merge: Merge from master branch
larshelge Apr 6, 2026
e0bff48
merge: Merge from master branch
larshelge Apr 6, 2026
91c67dc
Merge branch 'master' into lars-dev
larshelge Apr 6, 2026
3c5c983
merge: Merge from master branch
larshelge Apr 6, 2026
0cd5cb7
fix: Update code
larshelge Apr 6, 2026
e9510fd
fix: Update code
larshelge Apr 15, 2026
8733638
fix: Update code
larshelge Apr 15, 2026
e2cd534
fix: Update code
larshelge Apr 15, 2026
0e99617
fix: Update code
larshelge Apr 15, 2026
a0266f4
merge: Merge from master branch
larshelge Apr 15, 2026
60794f6
fix: Update code
larshelge Apr 15, 2026
a1f9e43
merge: Merge from master branch
larshelge Apr 15, 2026
979a79c
fix: Update code
larshelge Apr 15, 2026
c6be59f
merge: Merge from master branch
larshelge Apr 15, 2026
e6b1270
fix: Update code
larshelge Apr 24, 2026
93d7c14
fix: Update code
larshelge Apr 30, 2026
14e8cb7
fix: Update code
larshelge Apr 30, 2026
06ca21c
fix: Update code
larshelge May 4, 2026
992beb7
merge: Merge from master branch
larshelge May 4, 2026
c2656e0
merge: Merge from master branch
larshelge May 4, 2026
c9d6aef
fix: Update code
larshelge May 4, 2026
78f4c57
fix: Update code
larshelge May 4, 2026
d639e50
fix: Update code
larshelge May 4, 2026
40a9888
fix: Update code
larshelge May 4, 2026
e729fef
fix: Update code
larshelge May 4, 2026
5bce622
fix: Update code
larshelge May 4, 2026
91f301e
merge: Merge from master branch
larshelge May 5, 2026
0a8d4d0
fix: Update code
larshelge May 6, 2026
a83207f
merge: Merge from master branch
larshelge May 6, 2026
0b03e7f
fix: Add method noContent to DataResponse
larshelge May 6, 2026
a093f8f
merge: Merge from master branch
larshelge May 6, 2026
afc7f61
merge: Merge from master branch
larshelge May 8, 2026
ef5b1fc
fix: Update code
larshelge May 9, 2026
8a68f1f
merge: Merge from master branch
larshelge May 9, 2026
40bf025
fix: Update code
larshelge May 9, 2026
27bcaf7
fix: Update code
larshelge May 9, 2026
a2041e2
fix: Update code
larshelge May 9, 2026
a543223
fix: Update code
larshelge May 9, 2026
9215320
fix: Update code
larshelge May 9, 2026
e8b6da3
merge: Merge from master branch
larshelge May 9, 2026
18c834e
fix: Update code
larshelge May 13, 2026
1b9afac
fix: Update code
larshelge May 29, 2026
47c1687
fix: Update code
larshelge May 29, 2026
ae84de6
merge: Merge from master branch
larshelge May 29, 2026
89298f2
fix: Update code
larshelge May 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/BaseDhis2.java
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@
* <li>409 Conflict
* </ul>
*
* @param response the {@link CloseableHttpResponse}.
* @param response the {@link ClassicHttpResponse}.
* @param url the request URL.
* @throws Dhis2ClientException in the case of error status codes.
*/
Expand Down Expand Up @@ -1300,7 +1300,7 @@
protected Dhis2ClientException newDhis2ClientException(IOException ex) {
int statusCode = -1;

if (ex instanceof HttpResponseException) {

Check warning on line 1303 in src/main/java/org/hisp/dhis/BaseDhis2.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this instanceof check and cast with 'instanceof HttpResponseException httpresponseexception'

See more on https://sonarcloud.io/project/issues?id=dhis2_dhis2-java-client&issues=AZ55yMDrUqANC3p5oz0G&open=AZ55yMDrUqANC3p5oz0G&pullRequest=535
statusCode = ((HttpResponseException) ex).getStatusCode();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/CodecUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.apache.commons.codec.digest.DigestUtils;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class CodecUtils {
public final class CodecUtils {
/**
* Generates an MD5 hash of the given input string.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/CollectionUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

/** Utilities for collections. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class CollectionUtils {
public final class CollectionUtils {
/**
* Returns an immutable set containing the given items. Accepts null items.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/ConfigUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/** Utilities for configuration. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ConfigUtils {
public final class ConfigUtils {
private static final char VALUE_SEPARATOR = ',';

private static final String VALUE_ENABLED = "on";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/DateTimeUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/** Utilities for date and time. */
@Slf4j
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class DateTimeUtils {
public final class DateTimeUtils {
/** Default date format. */
public static final String DATE_FORMAT = "yyyy-MM-dd";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/GeoUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

/** Utilities for geospatial objects. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class GeoUtils {
public final class GeoUtils {
private static final GeometryFactory GEO_FACTORY = new GeometryFactory();

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/HttpUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

/** Utilities for HTTP communication. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class HttpUtils {
public final class HttpUtils {
/** Pattern for matching a DHIS2 access token as part of a HTTP header value. */
public static final Pattern PATTERN_ACCESS_TOKEN = Pattern.compile("^ApiToken\\s+(.+)$");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

/** Utilities for {@link IdentifiableObject}. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class IdentifiableObjectUtils {
public final class IdentifiableObjectUtils {
/**
* Converts the given collection of identifiable objects to a new list of object identifiers.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/JacksonUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

/** Utilities for JSON parsing and serialization. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class JacksonUtils {
public final class JacksonUtils {
/** Static JSON mapper. */
private static final JsonMapper JSON_MAPPER;

Expand All @@ -74,7 +74,7 @@
*
* @return a {@link JsonMapper}.
*/
public static JsonMapper getJsonMapper() {

Check warning on line 77 in src/main/java/org/hisp/dhis/util/JacksonUtils.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Update this method so that its implementation is not identical to "getObjectMapper" on line 68.

See more on https://sonarcloud.io/project/issues?id=dhis2_dhis2-java-client&issues=AZ55yL_ZUqANC3p5oz0D&open=AZ55yL_ZUqANC3p5oz0D&pullRequest=535
return JSON_MAPPER;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/** Utilities for XML parsing and serialization. */
@Slf4j
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class JacksonXmlUtils {
public final class JacksonXmlUtils {
/** Default date format. */
private static final String DATE_FORMAT = "yyyy-MM-dd";

Expand All @@ -73,7 +73,7 @@
* @return the XML factory used by the static {@link XmlMapper}.
*/
public static XmlFactory getXmlFactory() {
XmlFactory xmlFactory = (XmlFactory) XML_MAPPER.tokenStreamFactory();

Check warning on line 76 in src/main/java/org/hisp/dhis/util/JacksonXmlUtils.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unnecessary cast to "XmlFactory".

See more on https://sonarcloud.io/project/issues?id=dhis2_dhis2-java-client&issues=AZ55yMDQUqANC3p5oz0F&open=AZ55yMDQUqANC3p5oz0F&pullRequest=535
xmlFactory.getXMLInputFactory().setProperty(XMLInputFactory.SUPPORT_DTD, false);
xmlFactory
.getXMLInputFactory()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/JacksonYamlUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

@Slf4j
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class JacksonYamlUtils {
public final class JacksonYamlUtils {
private static final YAMLMapper YAML_MAPPER;

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/MetadataItemUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import java.util.Objects;
import org.hisp.dhis.model.analytics.MetaDataItem;

public class MetadataItemUtils {
public final class MetadataItemUtils {
/**
* Converts the given collection of metaedata items a new list of names.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/NumberUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/** Utilities for numbers. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class NumberUtils {
public final class NumberUtils {
/**
* Scales (rounds) the given double value to the given scale.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/ObjectUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ObjectUtils {
public final class ObjectUtils {
/**
* Indicates whether the given object is not null.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/util/RegexUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

/** Utilitis for regular expressions. */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class RegexUtils {
public final class RegexUtils {
/**
* Returns the first match of the given pattern in the provided value.
*
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/hisp/dhis/util/TextUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.slf4j.helpers.MessageFormatter;

public class TextUtils {
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TextUtils {
private static final Pattern PATTTERN_VARIABLE = Pattern.compile("^\\$\\{(.*?)\\}$");

private static final String PATTERN_LEAD_TICKS = "^```[a-zA-Z0-9]*\\s*\\n?";
Expand Down
Loading