Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 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
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.apache.commons.lang3.StringUtils;

@Getter
@Setter
@ToString
public class AnalyticsData implements Serializable {
/** Analytics column headers. */
@JsonProperty private List<AnalyticsHeader> headers;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/hisp/dhis/util/CollectionUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ public static <T> Set<T> filterToSet(Collection<T> collection, Predicate<T> pred
* @return a new list of the items in the given list which are not at the given indexes.
*/
public static <T> List<T> excludeIndexes(List<T> list, Set<Integer> indexes) {
if (empty(list) || empty(indexes)) {
return List.of();
if (empty(indexes)) {
return list;
}

return IntStream.range(0, list.size())
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/org/hisp/dhis/util/CollectionUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ void testExcludeIndexes() {
assertContainsExactly(excludeIndexes(list, Set.of(1, 3, 4)), pA, pC);
assertContainsExactly(excludeIndexes(list, Set.of(2, 4)), pA, pB, pD);
assertEmpty(excludeIndexes(list, Set.of(0, 1, 2, 3, 4)));
assertEmpty(excludeIndexes(null, Set.of(0, 2)));
assertEmpty(excludeIndexes(list, null));
assertEquals(list, excludeIndexes(list, Set.of()));
assertEquals(list, excludeIndexes(list, null));
assertEmpty(excludeIndexes(List.of(), Set.of(0, 2)));
assertEmpty(excludeIndexes(List.of(), Set.of()));
}

@Test
Expand Down
Loading