Merge branch 'master' into master-transifex-ALL-20241116_224216

Author: jason-p-pickering

.github/workflows/run-api-tests.yml

@@ -41,13 +41,13 @@ jobs:
             # build and publish multi-arch images using Jib. Image is used for api tests in
             # this workflow and can be pulled from Dockerhub by devs to run locally, ...
             mvn clean verify --threads 2C --batch-mode --no-transfer-progress \
-              -DskipTests --update-snapshots --file dhis-2/pom.xml \
+              -DskipTests -Dmdep.analyze.skip --update-snapshots --file dhis-2/pom.xml \
               --projects dhis-web-server --also-make --activate-profiles jibBuild \
               -Djib.to.image=$CORE_IMAGE_NAME -Djib.container.labels=DHIS2_BUILD_REVISION=${{github.event.pull_request.head.sha}},DHIS2_BUILD_BRANCH=${{github.head_ref}}
           else
             # only build image for running api tests in this workflow i.e. master, 2.39, ...
             mvn clean verify --threads 2C --batch-mode --no-transfer-progress \
-              -DskipTests --update-snapshots --file dhis-2/pom.xml \
+              -DskipTests -Dmdep.analyze.skip --update-snapshots --file dhis-2/pom.xml \
               --projects dhis-web-server --also-make --activate-profiles jibDockerBuild \
               -Djib.to.image=$CORE_IMAGE_NAME
           fi

.github/workflows/run-tests.yml

@@ -24,6 +24,9 @@ jobs:
       - name: Run unit tests
         run: mvn clean test --threads 2C --batch-mode --no-transfer-progress --update-snapshots --file ./dhis-2/pom.xml --activate-profiles unit-test
         timeout-minutes: 30
+      - name: Run dependency analysis
+        run: mvn dependency:analyze --file ./dhis-2/pom.xml
+        timeout-minutes: 2
       - name: Report coverage to codecov
         uses: codecov/codecov-action@v3
         with:

dhis-2/dhis-api/src/main/java/org/hisp/dhis/category/CategoryCombo.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.category;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
@@ -195,6 +196,11 @@ public boolean hasOptionCombos() {
     return optionCombos != null && !optionCombos.isEmpty();
   }
 
+  @JsonIgnore
+  public List<Category> getDataDimensionCategories() {
+    return categories.stream().filter(Category::isDataDimension).toList();
+  }
+
   // -------------------------------------------------------------------------
   // Logic
   // -------------------------------------------------------------------------

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java

@@ -141,7 +141,6 @@ public static DimensionalObject linkAssociations(
       EventAnalyticalObject eventAnalyticalObject,
       DimensionalObject dimensionalObject,
       Attribute parent) {
-    // Associating event repetitions.
     List<EventRepetition> repetitions = eventAnalyticalObject.getEventRepetitions();
 
     if (isNotEmpty(repetitions)) {

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java

@@ -182,9 +182,6 @@ <T extends IdentifiableObject> List<T> getByCode(
   @CheckForNull
   <T extends IdentifiableObject> T search(@Nonnull Class<T> type, @Nonnull String query);
 
-  @Nonnull
-  <T extends IdentifiableObject> List<T> filter(@Nonnull Class<T> type, @Nonnull String query);
-
   @Nonnull
   <T extends IdentifiableObject> List<T> getAll(@Nonnull Class<T> type);
 

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/OpenApi.java

@@ -469,6 +469,7 @@ enum Status {
    */
   @Target(ElementType.TYPE)
   @Retention(RetentionPolicy.RUNTIME)
+  @Inherited
   @interface Shared {
 
     /**

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/collection/CollectionUtils.java

@@ -214,6 +214,7 @@ private static <T> Set<T> union(@Nonnull Set<T>... more) {
    * @return a string, or null if no matches.
    */
   public static String popStartsWith(Collection<String> collection, String prefix) {
+    if (collection == null || collection.isEmpty()) return null;
     Iterator<String> iterator = collection.iterator();
 
     while (iterator.hasNext()) {

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/embedded/EmbeddedDashboard.java

@@ -34,7 +34,11 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-/** Encapsulates metadata for an embedded and externally provided dashboard. */
+/**
+ * Encapsulates metadata for an embedded and externally provided dashboard.
+ *
+ * @author Lars Helge Overland
+ */
 @Getter
 @Setter
 @NoArgsConstructor

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/embedded/FilterOptions.java

@@ -34,6 +34,11 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+/**
+ * Encapsulates embedded dashboard filter options.
+ *
+ * @author Lars Helge Overland
+ */
 @Getter
 @Setter
 @NoArgsConstructor