fix: sonar issues

dhis2 · Dec 4, 2024 · 6477534 · 6477534
1 parent 5ac26b9
commit 6477534
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...rvices/dhis-service-core/src/main/java/org/hisp/dhis/category/DefaultCategoryService.java b/...rvices/dhis-service-core/src/main/java/org/hisp/dhis/category/DefaultCategoryService.java
@@ -91,8 +91,9 @@ public class DefaultCategoryService implements CategoryService {
   public void validate(Category category) throws ConflictException {
     int maxOptions = configuration.getIntProperty(ConfigurationKey.METADATA_CATEGORIES_MAX_OPTIONS);
     int actualOptions = category.getCategoryOptions().size();
-    if (actualOptions == 0) // assume a transient object that does not have options set
-    actualOptions = categoryOptionStore.getCategoryOptionsCount(UID.of(category.getUid()));
+    if (actualOptions == 0)
+      // assume a transient object that does not have options set
+      actualOptions = categoryOptionStore.getCategoryOptionsCount(UID.of(category.getUid()));
     if (actualOptions > maxOptions)
       throw new ConflictException(ErrorCode.E1127, category.getUid(), maxOptions, actualOptions);
   }
@@ -334,8 +335,9 @@ public void validate(CategoryCombo combo) throws ConflictException {
     int actualCombinations = 1;
     for (Category c : combo.getCategories()) {
       int options = c.getCategoryOptions().size();
-      if (options == 0) // assume c is a transient object that has no options set
-      options = categoryOptionStore.getCategoryOptionsCount(UID.of(c.getUid()));
+      if (options == 0)
+        // assume c is a transient object that has no options set
+        options = categoryOptionStore.getCategoryOptionsCount(UID.of(c.getUid()));
       actualCombinations *= options;
     }
     if (actualCombinations > maxCombinations)

diff --git a/...test-web-api/src/test/java/org/hisp/dhis/test/webapi/H2ControllerIntegrationTestBase.java b/...test-web-api/src/test/java/org/hisp/dhis/test/webapi/H2ControllerIntegrationTestBase.java
@@ -28,7 +28,6 @@
 package org.hisp.dhis.test.webapi;
 
 import static java.util.stream.Collectors.joining;
-import static org.hisp.dhis.common.DataDimensionType.DISAGGREGATION;
 import static org.hisp.dhis.http.HttpAssertions.assertStatus;
 import static org.hisp.dhis.http.HttpStatus.CREATED;
 
@@ -77,10 +76,10 @@ protected final List<String> postCategoryOptions(List<String> names) {
 
   protected final HttpResponse postCategoryCombo(
       String name, DataDimensionType type, List<String> categories) {
-    String catIdsArray = categories.stream().map("{'id': '%s'}"::formatted).collect(joining(","));
+    String catObjects = categories.stream().map("{'id': '%s'}"::formatted).collect(joining(","));
     String body =
         "{'name': '%s', 'dataDimensionType': '%s', 'categories': [%s]}"
-            .formatted("maxCat", DISAGGREGATION, catIdsArray);
+            .formatted(name, type, catObjects);
     return POST("/categoryCombos", body);
   }
 }