use int instead of long

dhis2 · Dec 13, 2023 · 9b2e6f3 · 9b2e6f3
1 parent af8f091
commit 9b2e6f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/icon/CustomIconStore.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/icon/CustomIconStore.java
@@ -41,7 +41,7 @@ public interface CustomIconStore {
    */
   CustomIcon getIconByKey(String key);
 
-  long getCustomIconCount();
+  int getCustomIconCount();
 
   /**
    * Returns a list of custom icons that contain all the specified keywords

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/icon/IconService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/icon/IconService.java
@@ -56,7 +56,7 @@ public interface IconService {
 
   List<CustomIcon> getCustomIcons(String[] keywords);
 
-  long getIconCount();
+  int getIconCount();
 
   /**
    * Gets the icon associated to a key, if it exists

diff --git a/.../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/icon/DefaultIconService.java b/.../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/icon/DefaultIconService.java
@@ -104,7 +104,7 @@ public List<CustomIcon> getCustomIcons(String[] keywords) {
 
   @Override
   @Transactional(readOnly = true)
-  public long getIconCount() {
+  public int getIconCount() {
     return customIconStore.getCustomIconCount();
   }
 

diff --git a/...services/dhis-service-core/src/main/java/org/hisp/dhis/icon/jdbc/JdbcCustomIconStore.java b/...services/dhis-service-core/src/main/java/org/hisp/dhis/icon/jdbc/JdbcCustomIconStore.java
@@ -79,14 +79,14 @@ public CustomIcon getIconByKey(String key) {
   }
 
   @Override
-  public long getCustomIconCount() {
+  public int getCustomIconCount() {
     final String sql = """
                 select count(*) from customicon;
                 """;
 
-    Long count = jdbcTemplate.queryForObject(sql, Long.class);
+    Integer count = jdbcTemplate.queryForObject(sql, Integer.class);
 
-    return Optional.ofNullable(count).orElse(0L);
+    return Optional.ofNullable(count).orElse(0);
   }
 
   @Override

diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/icon/IconController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/icon/IconController.java
@@ -159,7 +159,7 @@ public void getIconData(@PathVariable String key, HttpServletResponse response)
       icons = iconService.getCustomIcons(keywords);
     }
 
-    long count = iconService.getIconCount();
+    int count = iconService.getIconCount();
 
     List<IconResponse> iconResponses = icons.stream().map(iconMapper::from).toList();
 
@@ -174,7 +174,7 @@ public void getIconData(@PathVariable String key, HttpServletResponse response)
             PagingWrapper.Pager.builder()
                 .pageSize(iconCriteria.getPageSize())
                 .page(iconCriteria.getPage())
-                .total(count)
+                .total((long) count)
                 .build());
 
     return listPagingWrapper.withInstances(iconResponses);