Address copilot reviews

Author: winterhazel

utils/src/main/java/org/apache/cloudstack/utils/usage/UsageUtils.java

@@ -46,8 +46,15 @@ protected static Date getJobExecutionTime(TimeZone usageTimeZone, String jobExec
             logger.warn("Unable to parse configuration 'usage.stats.job.exec.time'.");
             return null;
         }
-        int hourOfDay = Integer.parseInt(execTimeSegments[0]);
-        int minutes = Integer.parseInt(execTimeSegments[1]);
+        int hourOfDay;
+        int minutes;
+        try {
+            hourOfDay = Integer.parseInt(execTimeSegments[0]);
+            minutes = Integer.parseInt(execTimeSegments[1]);
+        } catch (NumberFormatException e) {
+            logger.warn("Unable to parse configuration 'usage.stats.job.exec.time' due to non-numeric values in [{}].", jobExecTimeConfig, e);
+            return null;
+        }
 
         Date currentDate = DateUtil.currentGMTTime();
         Calendar jobExecTime = Calendar.getInstance(usageTimeZone);
@@ -58,9 +65,9 @@ protected static Date getJobExecutionTime(TimeZone usageTimeZone, String jobExec
         jobExecTime.set(Calendar.MILLISECOND, 0);
 
         if (next && jobExecTime.getTime().before(currentDate)) {
-            jobExecTime.roll(Calendar.DAY_OF_YEAR, true);
+            jobExecTime.add(Calendar.DAY_OF_YEAR, 1);
         } else if (!next && jobExecTime.getTime().after(currentDate)) {
-            jobExecTime.roll(Calendar.DAY_OF_YEAR, false);
+            jobExecTime.add(Calendar.DAY_OF_YEAR, -1);
         }
 
         return jobExecTime.getTime();

utils/src/test/java/org/apache/cloudstack/utils/usage/UsageUtilsTest.java

@@ -102,4 +102,34 @@ public void getJobExecutionTimeTestReturnsExpectedDateWhenNextIsFalseAndExecutio
         }
     }
 
+    @Test
+    public void getJobExecutionTimeTestReturnsExpectedDateWhenNextExecutionIsOnNextYear() {
+        Date currentDate = new Date();
+        currentDate.setTime(1767236340000L);
+
+        try (MockedStatic<DateUtil> dateUtilMockedStatic = Mockito.mockStatic(DateUtil.class)) {
+            dateUtilMockedStatic.when(DateUtil::currentGMTTime).thenReturn(currentDate);
+
+            Date result = UsageUtils.getJobExecutionTime(usageTimeZone, "00:00", true);
+
+            Assert.assertNotNull(result);
+            Assert.assertEquals(1767236400000L, result.getTime());
+        }
+    }
+
+    @Test
+    public void getJobExecutionTimeTestReturnsExpectedDateWhenPreviousExecutionWasOnPreviousYear() {
+        Date currentDate = new Date();
+        currentDate.setTime(1767236460000L);
+
+        try (MockedStatic<DateUtil> dateUtilMockedStatic = Mockito.mockStatic(DateUtil.class)) {
+            dateUtilMockedStatic.when(DateUtil::currentGMTTime).thenReturn(currentDate);
+
+            Date result = UsageUtils.getJobExecutionTime(usageTimeZone, "23:59", false);
+
+            Assert.assertNotNull(result);
+            Assert.assertEquals(1767236340000L, result.getTime());
+        }
+    }
+
 }