From 7fae44d7d22ee39858e6543f112f2a77238940c6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Jun 2013 11:31:33 -0400 Subject: [PATCH] Making DiskSpaceMonitorDescriptor public since it is hard to write a disk space monitor without it. --- .../AbstractDiskSpaceMonitor.java | 1 + .../node_monitors/DiskSpaceMonitor.java | 2 +- .../DiskSpaceMonitorDescriptor.java | 19 ++----------------- .../node_monitors/TemporarySpaceMonitor.java | 2 +- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java index f6c680067e..e667cd5db5 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java @@ -9,6 +9,7 @@ import java.util.logging.Logger; /** * @author Kohsuke Kawaguchi + * @see DiskSpaceMonitorDescriptor */ public abstract class AbstractDiskSpaceMonitor extends NodeMonitor { /** diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java index f2d49c4076..bc43661e2c 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -64,7 +64,7 @@ public class DiskSpaceMonitor extends AbstractDiskSpaceMonitor { return Messages.DiskSpaceMonitor_DisplayName(); } - protected DiskSpace getFreeSpace(Computer c) throws IOException, InterruptedException { + @Override protected DiskSpace monitor(Computer c) throws IOException, InterruptedException { FilePath p = c.getNode().getRootPath(); if(p==null) return null; diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java index cdb7e5435c..dd51ba5b9d 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java @@ -45,8 +45,9 @@ import org.kohsuke.stapler.export.Exported; * {@link AbstractNodeMonitorDescriptor} for {@link NodeMonitor} that checks a free disk space of some directory. * * @author Kohsuke Kawaguchi + * @since 1.520 */ -/*package*/ abstract class DiskSpaceMonitorDescriptor extends AbstractNodeMonitorDescriptor { +public abstract class DiskSpaceMonitorDescriptor extends AbstractNodeMonitorDescriptor { /** * Value object that represents the disk space. */ @@ -59,13 +60,6 @@ import org.kohsuke.stapler.export.Exported; private boolean triggered; private Class trigger; - /** - * @deprecated as of 1.467 - */ - public DiskSpace(long size) { - this(".",size); - } - /** * @param path * Specify the file path that was monitored. @@ -165,15 +159,6 @@ import org.kohsuke.stapler.export.Exported; private static final long serialVersionUID = 2L; } - protected DiskSpace monitor(Computer c) throws IOException, InterruptedException { - return getFreeSpace(c); - } - - /** - * Computes the free size. - */ - protected abstract DiskSpace getFreeSpace(Computer c) throws IOException, InterruptedException; - protected static final class GetUsableSpace implements FileCallable { @IgnoreJRERequirement public DiskSpace invoke(File f, VirtualChannel channel) throws IOException { diff --git a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java index a59fa2789a..f6919f56d3 100644 --- a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java @@ -66,7 +66,7 @@ public class TemporarySpaceMonitor extends AbstractDiskSpaceMonitor { return Messages.TemporarySpaceMonitor_DisplayName(); } - protected DiskSpace getFreeSpace(Computer c) throws IOException, InterruptedException { + @Override protected DiskSpace monitor(Computer c) throws IOException, InterruptedException { FilePath p = c.getNode().getRootPath(); if(p==null) return null; -- GitLab