Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
7f86e82
fix: Update code
larshelge Jun 19, 2025
43a9435
fix: Update code
larshelge Jun 19, 2025
53b8c07
merge: Merge from master branch
larshelge Jun 19, 2025
7250623
fix: Update code
larshelge Jun 19, 2025
bbbd73f
merge: Merge from master branch
larshelge Jun 19, 2025
33478ca
fix: Update code
larshelge Jun 19, 2025
38bcdeb
merge: Merge from master branch
larshelge Jun 19, 2025
09e3a3b
merge: Merge from master branch
larshelge Jun 19, 2025
7dda231
fix: Update code
larshelge Jun 19, 2025
77326a6
fix: Update code
larshelge Jun 19, 2025
3b99ab1
fix: Update code
larshelge Jun 19, 2025
964c56c
fix: Update code
larshelge Jun 19, 2025
be0a0e0
fix: Update code
larshelge Jun 19, 2025
169cd34
merge: Merge from master branch
larshelge Jun 19, 2025
121205e
fix: Update code
larshelge Jun 22, 2025
adadaa8
fix: Update code
larshelge Jun 22, 2025
439f87f
merge: Merge from master branch
larshelge Jun 22, 2025
1f0b6ee
fix: Update code
larshelge Jun 23, 2025
5547900
merge: Merge from master branch
larshelge Jun 23, 2025
e421810
merge: Merge from master branch
larshelge Jun 23, 2025
3a42475
fix: Update code
larshelge Jun 24, 2025
22054a6
fix: Update code
larshelge Jun 24, 2025
c9e7676
merge: Merge from master branch
larshelge Jun 24, 2025
06dc5b1
merge: Merge from master branch
larshelge Jun 24, 2025
06a909e
fix: Update code
larshelge Jun 24, 2025
fafcc63
merge: Merge from master branch
larshelge Jun 24, 2025
66c3d78
fix: Update code
larshelge Jun 24, 2025
9f11b41
merge: Merge from master branch
larshelge Jun 24, 2025
0d9a9e1
fix: Update code
larshelge Jun 24, 2025
edebfe1
fix: Update code
larshelge Jun 24, 2025
e1556ff
Merge branch 'master' into lars-dev
larshelge Jun 24, 2025
2477fac
fix: Update code
larshelge Jun 24, 2025
a0e9cd0
fix: Update code
larshelge Jun 24, 2025
a7c29de
merge: Merge from master branch
larshelge Jun 24, 2025
f277f3c
fix: Update code
larshelge Jun 24, 2025
20519d8
fix: Update code
larshelge Jun 24, 2025
e0a0f4b
fix: Update code
larshelge Jun 24, 2025
9ac16d8
merge: Merge from master branch
larshelge Jun 24, 2025
b90b2c4
fix: Update code
larshelge Jun 24, 2025
b2fa6ad
fix: Update code
larshelge Jun 24, 2025
3d0a742
merge: Merge from master branch
larshelge Jun 24, 2025
468fa01
fix: Update code
larshelge Jun 25, 2025
1903e51
fix: Update code
larshelge Jun 25, 2025
d915b22
merge: Merge from master branch
larshelge Jun 25, 2025
768354e
fix: Update code
larshelge Jun 26, 2025
2613840
fix: Update code
larshelge Jun 26, 2025
e4f8851
merge: Merge from master branch
larshelge Jun 26, 2025
8f7ad3b
fix: Update code
larshelge Jun 27, 2025
62f9a06
merge: Merge from master branch
larshelge Jun 27, 2025
0cdae50
fix: Update code
larshelge Jun 28, 2025
63a6adc
fix: Update code
larshelge Jun 28, 2025
f2294dd
fix: Update code
larshelge Jun 28, 2025
98745be
fix: Update code
larshelge Jun 28, 2025
4a52be0
fix: Update code
larshelge Jun 28, 2025
0b0f4c3
fix: Update code
larshelge Jun 28, 2025
3484382
fix: Update code
larshelge Jun 28, 2025
9d516ec
fix: Update code
larshelge Jun 30, 2025
df17209
fix: Update code
larshelge Jun 30, 2025
91b697f
merge: Merge from master branch
larshelge Jun 30, 2025
213eb0b
fix: Update code
larshelge Jun 30, 2025
5e79dcb
fix: Update code
larshelge Jun 30, 2025
fafdfb7
fix: Update code
larshelge Jun 30, 2025
5ff3358
fix: Update code
larshelge Jun 30, 2025
0ab8a2c
fix: Update code
larshelge Jun 30, 2025
d05bfae
merge: Merge from master branch
larshelge Jun 30, 2025
3a0115f
fix: Update code
larshelge Jun 30, 2025
5469073
merge: Merge from master branch
larshelge Jun 30, 2025
54549f2
fix: Update code
larshelge Jun 30, 2025
acdf8cd
merge: Merge from master branch
larshelge Jun 30, 2025
650eeaa
fix: Update code
larshelge Jun 30, 2025
4b69818
fix: Update code
larshelge Jun 30, 2025
824bb6e
merge: Merge from master branch
larshelge Jun 30, 2025
6521c11
fix: Update code
larshelge Jul 3, 2025
c4a5d52
fix: Update code
larshelge Jul 3, 2025
52e08c8
merge: Merge from master branch
larshelge Jul 3, 2025
55f4166
fix: Update code
larshelge Jul 3, 2025
ba57bff
fix: Update code
larshelge Jul 3, 2025
d2c9871
fix: Update code
larshelge Jul 3, 2025
23a01de
fix: Update code
larshelge Jul 3, 2025
e951a4e
merge: Merge from master branch
larshelge Jul 3, 2025
137cd1f
fix: Update code
larshelge Jul 3, 2025
23b25b3
merge: Merge from master branch
larshelge Jul 3, 2025
fe06194
merge: Merge from master branch
larshelge Jul 3, 2025
1da8bf9
fix: Update code
larshelge Jul 3, 2025
eb3fb7e
fix: Update code
larshelge Jul 3, 2025
fa6ca5d
merge: Merge from master branch
larshelge Jul 3, 2025
4abdb50
fix: Update code
larshelge Jul 4, 2025
e524d08
fix: Update code
larshelge Jul 4, 2025
e9a670f
fix: Update code
larshelge Jul 4, 2025
7ed8ed3
fix: Update code
larshelge Jul 4, 2025
f642ee9
fix: Update code
larshelge Jul 4, 2025
3d53320
fix: Update code
larshelge Jul 4, 2025
1aba86f
merge: Merge from master branch
larshelge Jul 4, 2025
e4cdfd9
fix: Update code
larshelge Jul 4, 2025
c4be404
merge: Merge from master branch
larshelge Jul 4, 2025
8c9a1d7
merge: Merge from master branch
larshelge Jul 4, 2025
87ec844
fix: Update code
larshelge Jul 5, 2025
6ad545a
merge: Merge from master branch
larshelge Jul 5, 2025
caadcc5
fix: Update code
larshelge Jul 5, 2025
da51a30
merge: Merge from master branch
larshelge Jul 5, 2025
e6f143e
Merge branch 'master' into lars-dev
larshelge Jul 5, 2025
a7544c6
fix: Update code
larshelge Jul 5, 2025
ea41e77
fix: Update code
larshelge Jul 5, 2025
2af60ad
merge: Merge from master branch
larshelge Jul 5, 2025
7ebf090
fix: Update code
larshelge Jul 6, 2025
3f68c0d
fix: Update code
larshelge Jul 6, 2025
4be971c
merge: Merge from master branch
larshelge Jul 6, 2025
51f747a
fix: Update code
larshelge Jul 6, 2025
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
34 changes: 17 additions & 17 deletions src/main/java/org/hisp/dhis/Dhis2.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.hisp.dhis.auth.AccessTokenAuthentication;
import org.hisp.dhis.auth.BasicAuthentication;
import org.hisp.dhis.auth.CookieAuthentication;
import org.hisp.dhis.model.AnalyticsTableHook;
import org.hisp.dhis.model.Attribute;
import org.hisp.dhis.model.Category;
import org.hisp.dhis.model.CategoryCombo;
Expand Down Expand Up @@ -91,7 +92,6 @@
import org.hisp.dhis.model.ProgramStageSection;
import org.hisp.dhis.model.SystemInfo;
import org.hisp.dhis.model.SystemSettings;
import org.hisp.dhis.model.TableHook;
import org.hisp.dhis.model.Visualization;
import org.hisp.dhis.model.analytics.AnalyticsData;
import org.hisp.dhis.model.completedatasetregistration.CompleteDataSetRegistration;
Expand Down Expand Up @@ -2332,38 +2332,38 @@ public List<Option> getOptions(Query query) {
// -------------------------------------------------------------------------

/**
* Saves a {@link TableHook}.
* Saves a {@link AnalyticsTableHook}.
*
* @param tableHook the object to save.
* @return {@link ObjectResponse} holding information about the operation.
*/
public ObjectResponse saveTableHook(TableHook tableHook) {
public ObjectResponse saveTableHook(AnalyticsTableHook tableHook) {
return saveMetadataObject("analyticsTableHooks", tableHook);
}

/**
* Saves or updates the list of {@link TableHook}.
* Saves or updates the list of {@link AnalyticsTableHook}.
*
* @param tableHooks the list of {@link TableHook}.
* @param tableHooks the list of {@link AnalyticsTableHook}.
* @return {@link ObjectsResponse} holding information about the operation.
*/
public ObjectsResponse saveTableHooks(List<TableHook> tableHooks) {
public ObjectsResponse saveTableHooks(List<AnalyticsTableHook> tableHooks) {
return saveMetadataObjects(new Dhis2Objects().setAnalyticsTableHooks(tableHooks));
}

/**
* Updates a {@link TableHook}.
* Updates a {@link AnalyticsTableHook}.
*
* @param tableHook the object to update.
* @return {@link ObjectResponse} holding information about the operation.
*/
public ObjectResponse updateTableHook(TableHook tableHook) {
public ObjectResponse updateTableHook(AnalyticsTableHook tableHook) {
return updateMetadataObject(
String.format("analyticsTableHooks/%s", tableHook.getId()), tableHook);
}

/**
* Removes a {@link TableHook}.
* Removes a {@link AnalyticsTableHook}.
*
* @param id the identifier of the object to remove.
* @return {@link ObjectResponse} holding information about the operation.
Expand All @@ -2373,18 +2373,18 @@ public ObjectResponse removeTableHook(String id) {
}

/**
* Retrieves an {@link TableHook}.
* Retrieves an {@link AnalyticsTableHook}.
*
* @param id the identifier of the table hook.
* @return the {@link TableHook}.
* @return the {@link AnalyticsTableHook}.
* @throws Dhis2ClientException if the object does not exist.
*/
public TableHook getTableHook(String id) {
return getObject("analyticsTableHooks", id, TableHook.class);
public AnalyticsTableHook getTableHook(String id) {
return getObject("analyticsTableHooks", id, AnalyticsTableHook.class);
}

/**
* Indicates whether a {@link TableHook} exists.
* Indicates whether a {@link AnalyticsTableHook} exists.
*
* @param id the object identifier.
* @return true if the object exists.
Expand All @@ -2394,12 +2394,12 @@ public boolean isTableHook(String id) {
}

/**
* Retrieves a list of {@link TableHook}.
* Retrieves a list of {@link AnalyticsTableHook}.
*
* @param query the {@link Query}.
* @return list of {@link TableHook}.
* @return list of {@link AnalyticsTableHook}.
*/
public List<TableHook> getTableHooks(Query query) {
public List<AnalyticsTableHook> getTableHooks(Query query) {
return getObject(
config
.getResolvedUriBuilder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@Getter
@Setter
@NoArgsConstructor
public class TableHook extends IdentifiableObject {
public class AnalyticsTableHook extends IdentifiableObject {
@JsonProperty private TablePhase phase;

@JsonProperty private ResourceTableType resourceTableType;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/model/Dhis2Objects.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
@Accessors(chain = true)
@NoArgsConstructor
public class Dhis2Objects {
@JsonProperty private List<TableHook> analyticsTableHooks = new ArrayList<>();
@JsonProperty private List<AnalyticsTableHook> analyticsTableHooks = new ArrayList<>();

@JsonProperty private List<Attribute> attributes = new ArrayList<>();

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/hisp/dhis/model/MetadatEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,14 @@
*/
package org.hisp.dhis.model;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

/** Enumeration of DHIS2 metadata entities. */
@Getter
@RequiredArgsConstructor
public enum MetadatEntity {
ANALYTICS_TABLE_HOOK,
TABLE_HOOK,
ATTRIBUTE,
CATEGORY_OPTION,
CATEGORY,
Expand Down