Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 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
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
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/AttributeValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -39,7 +40,7 @@
@Getter
@Setter
@NoArgsConstructor
public class AttributeValue {
public class AttributeValue implements Serializable {
@JsonProperty private Attribute attribute;

@JsonProperty private String value;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/DataSetElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
package org.hisp.dhis.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
public class DataSetElement {
public class DataSetElement implements Serializable {
@JsonProperty private CategoryCombo categoryCombo;

@JsonProperty private DataSet dataSet;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/Dhis2Objects.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand Down Expand Up @@ -55,7 +56,7 @@
@Setter
@Accessors(chain = true)
@NoArgsConstructor
public class Dhis2Objects {
public class Dhis2Objects implements Serializable {
@JsonProperty private List<AnalyticsTableHook> analyticsTableHooks = new ArrayList<>();

@JsonProperty private List<Attribute> attributes = new ArrayList<>();
Expand Down Expand Up @@ -153,5 +154,5 @@

@JsonProperty private List<Visualization> visualizations = new ArrayList<>();

@JsonProperty private Pager pager;

Check failure on line 157 in src/main/java/org/hisp/dhis/model/Dhis2Objects.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make non-static "pager" transient or serializable.

See more on https://sonarcloud.io/project/issues?id=dhis2_dhis2-java-client&issues=AZzPU7RhC1LEfgiIiiRY&open=AZzPU7RhC1LEfgiIiiRY&pullRequest=503
}
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/IdScheme.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@
*/
package org.hisp.dhis.model;

import java.io.Serializable;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.Validate;
import org.hisp.dhis.model.exception.IllegalArgumentFormatException;

public class IdScheme {
public class IdScheme implements Serializable {
public static final IdScheme UID = new IdScheme(ObjectProperty.UID);

public static final IdScheme CODE = new IdScheme(ObjectProperty.CODE);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/OptionSetObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -41,7 +42,7 @@
@Setter
@Accessors(chain = true)
@NoArgsConstructor
public class OptionSetObjects {
public class OptionSetObjects implements Serializable {
@JsonProperty private List<OptionSet> optionSets = new ArrayList<>();

@JsonProperty private List<Option> options = new ArrayList<>();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/ProgramObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -45,7 +46,7 @@
@Setter
@Accessors(chain = true)
@NoArgsConstructor
public class ProgramObjects {
public class ProgramObjects implements Serializable {
@JsonProperty private List<Program> programs = new ArrayList<>();

@JsonProperty private List<ProgramSection> programSections = new ArrayList<>();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/SystemInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -37,7 +38,7 @@
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class SystemInfo {
public class SystemInfo implements Serializable {
@JsonProperty private String version;

@JsonProperty private String revision;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/SystemSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -36,7 +37,7 @@
@Getter
@Setter
@NoArgsConstructor
public class SystemSettings {
public class SystemSettings implements Serializable {
@JsonProperty(value = "keyCalendar")
private String calendar;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@
*/
package org.hisp.dhis.model.analytics;

import java.io.Serializable;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class AnalyticsDimension {
public class AnalyticsDimension implements Serializable {
/** Data dimension identifier. */
public static final String DATA_X = "dx";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@
*/
package org.hisp.dhis.model.analytics;

import java.io.Serializable;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class AnalyticsKeyword {
public final class AnalyticsKeyword implements Serializable {
/** User org unit. */
public static final String USER_ORGUNIT = "USER_ORGUNIT";

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -39,7 +40,7 @@
@Getter
@Setter
@NoArgsConstructor
public class CompleteDataSetRegistration {
public class CompleteDataSetRegistration implements Serializable {
@JsonProperty private String dataSet;

@JsonProperty private String period;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/
package org.hisp.dhis.model.completedatasetregistration;

import java.io.Serializable;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -37,7 +38,7 @@
@Getter
@Setter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class CompleteDataSetRegistrationImportOptions {
public class CompleteDataSetRegistrationImportOptions implements Serializable {
/** Identifier property used for data sets in the response. Overrides idScheme. */
private IdScheme dataSetIdScheme;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/hisp/dhis/model/dashboard/Dashboard.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
@Setter
@NoArgsConstructor
public class Dashboard extends NameableObject {

/**
* Optional, only set if this dashboard is embedded and loaded from an external provider.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.datastore;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Expand All @@ -38,6 +39,6 @@
@Getter
@Setter
@NoArgsConstructor
public class DataStoreEntries {
public class DataStoreEntries implements Serializable {
@JsonProperty private List<Map<String, Object>> entries = new ArrayList<>();

Check failure on line 43 in src/main/java/org/hisp/dhis/model/datastore/DataStoreEntries.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make non-static "entries" transient or serializable.

See more on https://sonarcloud.io/project/issues?id=dhis2_dhis2-java-client&issues=AZzPU7OSC1LEfgiIiiRX&open=AZzPU7OSC1LEfgiIiiRX&pullRequest=503
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.datastore;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
Expand All @@ -37,7 +38,7 @@
@Getter
@Setter
@ToString
public class EntryMetadata {
public class EntryMetadata implements Serializable {
@JsonProperty private String id;

@JsonProperty private String namespace;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/enrollment/Enrollment.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import lombok.Getter;
Expand All @@ -42,7 +43,7 @@
@Setter
@ToString
@NoArgsConstructor
public class Enrollment {
public class Enrollment implements Serializable {
@JsonProperty private String enrollment;

@JsonProperty private String program;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.enrollment;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -37,7 +38,7 @@
@Getter
@Setter
@NoArgsConstructor
public class EnrollmentsResult {
public class EnrollmentsResult implements Serializable {
@JsonProperty private List<Enrollment> enrollments = new ArrayList<>();

public EnrollmentsResult(List<Enrollment> enrollments) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.relationship;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -38,7 +39,7 @@
@Setter
@ToString
@NoArgsConstructor
public class Relationship {
public class Relationship implements Serializable {
@JsonProperty private String relationship;

@JsonProperty private String relationshipType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.relationship;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -40,7 +41,7 @@
@Setter
@ToString
@NoArgsConstructor
public class RelationshipItem {
public class RelationshipItem implements Serializable {
@JsonProperty private TrackedEntity trackedEntity;

@JsonProperty private Event event;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.relationship;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -37,7 +38,7 @@
@Getter
@Setter
@NoArgsConstructor
public class RelationshipsResult {
public class RelationshipsResult implements Serializable {
@JsonProperty private List<Relationship> relationships = new ArrayList<>();

public RelationshipsResult(List<Relationship> relationships) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
Expand All @@ -48,7 +49,7 @@
@Setter
@ToString
@NoArgsConstructor
public class TrackedEntity {
public class TrackedEntity implements Serializable {
@JsonProperty private String trackedEntity;

@JsonProperty private String trackedEntityType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.trackedentity;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -39,7 +40,7 @@
@Setter
@ToString
@NoArgsConstructor
public class TrackedEntityAttributeValue {
public class TrackedEntityAttributeValue implements Serializable {
@JsonProperty private String attribute;

@JsonProperty private String displayName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.trackedentity;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -37,7 +38,7 @@
@Setter
@ToString
@NoArgsConstructor
public class TrackedEntityTypeAttribute {
public class TrackedEntityTypeAttribute implements Serializable {
@JsonProperty private String id;

@JsonProperty private TrackedEntityAttribute trackedEntityAttribute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package org.hisp.dhis.model.tracker;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -45,7 +46,7 @@
@Accessors(chain = true)
@ToString
@NoArgsConstructor
public class TrackedEntityObjects {
public class TrackedEntityObjects implements Serializable {
@JsonProperty private List<TrackedEntity> trackedEntities = new ArrayList<>();

@JsonProperty private List<Enrollment> enrollments = new ArrayList<>();
Expand Down
Loading
Loading