Removes usage of deprecated ANTLRException

This is no longer being thrown by Crontab constructor jenkinsci/jenkins#7293
jenkinsci · Sep 6, 2023 · 75d67ed · 75d67ed
1 parent 89687d9
commit 75d67ed
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 24 deletions.
diff --git a/src/main/java/hudson/plugins/disk_usage/BuildDiskUsageCalculationThread.java b/src/main/java/hudson/plugins/disk_usage/BuildDiskUsageCalculationThread.java
@@ -1,6 +1,5 @@
 package hudson.plugins.disk_usage;
 
-import antlr.ANTLRException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.AbstractBuild;
@@ -86,7 +85,7 @@ public void execute(TaskListener listener) throws IOException, InterruptedExcept
     }
 
     @Override
-    public CronTab getCronTab() throws ANTLRException {
+    public CronTab getCronTab() {
         DiskUsagePlugin plugin = Jenkins.get().getPlugin(DiskUsagePlugin.class);
         if (plugin == null) {
             return null;

diff --git a/src/main/java/hudson/plugins/disk_usage/DiskUsageCalculation.java b/src/main/java/hudson/plugins/disk_usage/DiskUsageCalculation.java
@@ -4,7 +4,6 @@
  */
 package hudson.plugins.disk_usage;
 
-import antlr.ANTLRException;
 import hudson.model.AsyncAperiodicWork;
 import hudson.scheduler.CronTab;
 import java.util.Calendar;
@@ -13,7 +12,6 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import jenkins.util.Timer;
 
 /**
@@ -56,20 +54,14 @@ public String getThreadName() {
     public abstract DiskUsageCalculation getLastTask();
 
     public long scheduledLastInstanceExecutionTime() {
-        try {
-            if(getLastTask() == null || getLastTask().isCancelled()) { // not scheduled
-                return 0L;
-            }
-            long time = getCronTab().ceil(new GregorianCalendar().getTimeInMillis()).getTimeInMillis();
-            if(time < new GregorianCalendar().getTimeInMillis()) {
-                return 0;
-            }
-            return time;
-
-        } catch (ANTLRException ex) {
-            Logger.getLogger(DiskUsageCalculation.class.getName()).log(Level.SEVERE, null, ex);
-            return -1;
+        if(getLastTask() == null || getLastTask().isCancelled()) { // not scheduled
+            return 0L;
+        }
+        long time = getCronTab().ceil(new GregorianCalendar().getTimeInMillis()).getTimeInMillis();
+        if(time < new GregorianCalendar().getTimeInMillis()) {
+            return 0;
         }
+        return time;
     }
 
     @Override
@@ -102,7 +94,7 @@ public void reschedule() {
         Timer.get().schedule(getNewInstance(), getRecurrencePeriod(), TimeUnit.MILLISECONDS);
     }
 
-    public abstract CronTab getCronTab() throws ANTLRException;
+    public abstract CronTab getCronTab();
 
     @Override
     public long getRecurrencePeriod() {

diff --git a/src/main/java/hudson/plugins/disk_usage/JobWithoutBuildsDiskUsageCalculation.java b/src/main/java/hudson/plugins/disk_usage/JobWithoutBuildsDiskUsageCalculation.java
@@ -4,7 +4,6 @@
  */
 package hudson.plugins.disk_usage;
 
-import antlr.ANTLRException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.AbstractProject;
@@ -91,7 +90,7 @@ public AperiodicWork getNewInstance() {
     }
 
     @Override
-    public CronTab getCronTab() throws ANTLRException {
+    public CronTab getCronTab() {
         DiskUsagePlugin plugin = Jenkins.get().getPlugin(DiskUsagePlugin.class);
         if (plugin == null) {
             return null;

diff --git a/src/main/java/hudson/plugins/disk_usage/WorkspaceDiskUsageCalculationThread.java b/src/main/java/hudson/plugins/disk_usage/WorkspaceDiskUsageCalculationThread.java
@@ -4,7 +4,6 @@
  */
 package hudson.plugins.disk_usage;
 
-import antlr.ANTLRException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.AbstractProject;
@@ -84,7 +83,7 @@ public AperiodicWork getNewInstance() {
     }
 
     @Override
-    public CronTab getCronTab() throws ANTLRException {
+    public CronTab getCronTab() {
         DiskUsagePlugin plugin = Jenkins.get().getPlugin(DiskUsagePlugin.class);
         if (plugin == null) {
             return null;

diff --git a/src/test/java/hudson/plugins/disk_usage/TestDiskUsageCalculation.java b/src/test/java/hudson/plugins/disk_usage/TestDiskUsageCalculation.java
@@ -1,6 +1,5 @@
 package hudson.plugins.disk_usage;
 
-import antlr.ANTLRException;
 import hudson.model.AperiodicWork;
 import hudson.model.TaskListener;
 import hudson.scheduler.CronTab;
@@ -36,7 +35,7 @@ public void setCron(String cron) {
     }
 
     @Override
-    public CronTab getCronTab() throws ANTLRException {
+    public CronTab getCronTab() {
         return new CronTab(cron);
     }