From f592d33a7ecf2c5806ae41c827f5d93b17da87b2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 23 Feb 2009 23:38:08 +0000 Subject: [PATCH] converting several DescriptorList in a new form git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15604 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/model/UsageStatistics.java | 2 +- .../node_monitors/ArchitectureMonitor.java | 15 +++++--------- .../hudson/node_monitors/ClockMonitor.java | 10 ++-------- .../node_monitors/DiskSpaceMonitor.java | 16 +++++++-------- .../hudson/node_monitors/NodeMonitor.java | 20 +++++-------------- .../node_monitors/ResponseTimeMonitor.java | 10 ++-------- .../node_monitors/SwapSpaceMonitor.java | 10 ++-------- core/src/main/java/hudson/slaves/Cloud.java | 2 +- .../test/java/hudson/ExtensionListTest.java | 12 +++++++++++ 9 files changed, 38 insertions(+), 59 deletions(-) diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java index c515915c59..f94904f64f 100644 --- a/core/src/main/java/hudson/model/UsageStatistics.java +++ b/core/src/main/java/hudson/model/UsageStatistics.java @@ -141,7 +141,7 @@ public class UsageStatistics extends PageDecorator { n.put("jvm-version", System.getProperty("java.version")); } n.put("executors",c.getNumExecutors()); - n.put("os", ArchitectureMonitor.DESCRIPTOR.get(c)); + n.put("os", ((ArchitectureMonitor.DescriptorImpl)h.getDescriptor(ArchitectureMonitor.class)).get(c)); nodes.add(n); } o.put("nodes",nodes); diff --git a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java index 105fe22bec..3ea759e3d0 100644 --- a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java @@ -24,7 +24,9 @@ package hudson.node_monitors; import hudson.model.Computer; +import hudson.model.Descriptor.FormException; import hudson.remoting.Callable; +import hudson.Extension; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; @@ -36,11 +38,8 @@ import java.io.IOException; * @author Kohsuke Kawaguchi */ public class ArchitectureMonitor extends NodeMonitor { - public AbstractNodeMonitorDescriptor getDescriptor() { - return DESCRIPTOR; - } - - public static final AbstractNodeMonitorDescriptor DESCRIPTOR = new AbstractNodeMonitorDescriptor() { + @Extension + public static final class DescriptorImpl extends AbstractNodeMonitorDescriptor { protected String monitor(Computer c) throws IOException, InterruptedException { return c.getChannel().call(new GetArchTask()); } @@ -52,7 +51,7 @@ public class ArchitectureMonitor extends NodeMonitor { public NodeMonitor newInstance(StaplerRequest req, JSONObject formData) throws FormException { return new ArchitectureMonitor(); } - }; + } /** * Obtains the string that represents the architecture. @@ -66,8 +65,4 @@ public class ArchitectureMonitor extends NodeMonitor { private static final long serialVersionUID = 1L; } - - static { - LIST.add(DESCRIPTOR); - } } diff --git a/core/src/main/java/hudson/node_monitors/ClockMonitor.java b/core/src/main/java/hudson/node_monitors/ClockMonitor.java index 8b40186e2b..f15384ee8f 100644 --- a/core/src/main/java/hudson/node_monitors/ClockMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ClockMonitor.java @@ -27,6 +27,7 @@ import hudson.model.Computer; import hudson.model.Node; import hudson.model.Descriptor; import hudson.util.ClockDifference; +import hudson.Extension; import org.kohsuke.stapler.StaplerRequest; import java.io.IOException; @@ -41,14 +42,11 @@ import net.sf.json.JSONObject; * @since 1.123 */ public class ClockMonitor extends NodeMonitor { - public AbstractNodeMonitorDescriptor getDescriptor() { - return DESCRIPTOR; - } - public ClockDifference getDifferenceFor(Computer c) { return DESCRIPTOR.get(c); } + @Extension public static final AbstractNodeMonitorDescriptor DESCRIPTOR = new AbstractNodeMonitorDescriptor() { protected ClockDifference monitor(Computer c) throws IOException, InterruptedException { Node n = c.getNode(); @@ -65,8 +63,4 @@ public class ClockMonitor extends NodeMonitor { return new ClockMonitor(); } }; - - static { - LIST.add(DESCRIPTOR); - } } diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java index 48d5427c37..342fad802f 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -26,6 +26,8 @@ package hudson.node_monitors; import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Util; +import hudson.Functions; +import hudson.Extension; import hudson.model.Computer; import hudson.model.Hudson; import hudson.remoting.VirtualChannel; @@ -46,10 +48,6 @@ import java.util.logging.Logger; * @since 1.123 */ public class DiskSpaceMonitor extends NodeMonitor { - public AbstractNodeMonitorDescriptor getDescriptor() { - return DESCRIPTOR; - } - public Long getFreeSpace(Computer c) { return DESCRIPTOR.get(c); } @@ -101,6 +99,12 @@ public class DiskSpaceMonitor extends NodeMonitor { } }; + @Extension + public static AbstractNodeMonitorDescriptor install() { + if(Functions.isMustangOrAbove()) return DESCRIPTOR; + return null; + } + private static final class GetUsableSpace implements FileCallable { @IgnoreJRERequirement public Long invoke(File f, VirtualChannel channel) throws IOException { @@ -114,9 +118,5 @@ public class DiskSpaceMonitor extends NodeMonitor { private static final long serialVersionUID = 1L; } - static { - LIST.add(DESCRIPTOR); - } - private static final Logger LOGGER = Logger.getLogger(DiskSpaceMonitor.class.getName()); } diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java index 2c300a121f..b9cc8d0780 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java @@ -29,6 +29,7 @@ import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.model.Describable; import hudson.model.Node; +import hudson.model.Hudson; import hudson.util.DescriptorList; import java.util.logging.Level; @@ -65,7 +66,9 @@ public abstract class NodeMonitor implements ExtensionPoint, Describable getDescriptor(); + public AbstractNodeMonitorDescriptor getDescriptor() { + return (AbstractNodeMonitorDescriptor)Hudson.getInstance().getDescriptor(getClass()); + } public Object data(Computer c) { return getDescriptor().get(c); @@ -96,18 +99,5 @@ public abstract class NodeMonitor implements ExtensionPoint, Describable LIST = new DescriptorList(); - - static { - try { - LIST.load(ClockMonitor.class); - if(Functions.isMustangOrAbove()) - LIST.load(DiskSpaceMonitor.class); - LIST.load(SwapSpaceMonitor.class); - LIST.load(ResponseTimeMonitor.class); - LIST.load(ArchitectureMonitor.class); - } catch (Throwable e) { - Logger.getLogger(NodeMonitor.class.getName()).log(Level.SEVERE, "Failed to load built-in monitors",e); - } - } + public static final DescriptorList LIST = new DescriptorList(NodeMonitor.class); } diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java index c72053b137..9d2e134eb7 100644 --- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java @@ -24,6 +24,7 @@ package hudson.node_monitors; import hudson.Util; +import hudson.Extension; import hudson.model.Computer; import hudson.remoting.Callable; import hudson.remoting.Future; @@ -46,10 +47,7 @@ import org.kohsuke.stapler.export.ExportedBean; * @author Kohsuke Kawaguchi */ public class ResponseTimeMonitor extends NodeMonitor { - public AbstractNodeMonitorDescriptor getDescriptor() { - return DESCRIPTOR; - } - + @Extension public static final AbstractNodeMonitorDescriptor DESCRIPTOR = new AbstractNodeMonitorDescriptor() { protected Data monitor(Computer c) throws IOException, InterruptedException { Data old = get(c); @@ -162,10 +160,6 @@ public class ResponseTimeMonitor extends NodeMonitor { private static final long serialVersionUID = 1L; } - static { - LIST.add(DESCRIPTOR); - } - /** * Time out interval in milliseconds. */ diff --git a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java index 1bb21416df..8f4106c164 100644 --- a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java @@ -24,6 +24,7 @@ package hudson.node_monitors; import hudson.Util; +import hudson.Extension; import hudson.model.Computer; import hudson.model.Hudson; import hudson.remoting.Callable; @@ -43,10 +44,6 @@ import java.io.IOException; * @sine 1.233 */ public class SwapSpaceMonitor extends NodeMonitor { - public AbstractNodeMonitorDescriptor getDescriptor() { - return DESCRIPTOR; - } - /** * Returns the HTML representation of the space. */ @@ -80,6 +77,7 @@ public class SwapSpaceMonitor extends NodeMonitor { return Hudson.getInstance().hasPermission(Hudson.ADMINISTER) ? super.getColumnCaption() : null; } + @Extension public static final AbstractNodeMonitorDescriptor DESCRIPTOR = new AbstractNodeMonitorDescriptor() { protected MemoryUsage monitor(Computer c) throws IOException, InterruptedException { return c.getChannel().call(new MonitorTask()); @@ -164,8 +162,4 @@ public class SwapSpaceMonitor extends NodeMonitor { return availableSwapSpace; } } - - static { - LIST.add(DESCRIPTOR); - } } diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java index aaeaae9051..c574e330ef 100644 --- a/core/src/main/java/hudson/slaves/Cloud.java +++ b/core/src/main/java/hudson/slaves/Cloud.java @@ -115,7 +115,7 @@ public abstract class Cloud extends AbstractModelObject implements ExtensionPoin /** * All registered {@link Cloud} implementations. */ - public static final DescriptorList ALL = new DescriptorList(); + public static final DescriptorList ALL = new DescriptorList(Cloud.class); /** * Permission constant to control mutation operations on {@link Cloud}. diff --git a/test/src/test/java/hudson/ExtensionListTest.java b/test/src/test/java/hudson/ExtensionListTest.java index 75e7c19871..ab224f73b5 100644 --- a/test/src/test/java/hudson/ExtensionListTest.java +++ b/test/src/test/java/hudson/ExtensionListTest.java @@ -67,6 +67,18 @@ public class ExtensionListTest extends HudsonTestCase { public static final class DescriptorImpl extends FishDescriptor {} } + /** + * Verifies that the automated {@link Descriptor} lookup works. + */ + public void testDescriptorLookup() throws Exception { + Descriptor d = new Sishamo().getDescriptor(); + + DescriptorExtensionList list = hudson.getDescriptorList(Fish.class); + assertSame(d,list.get(Sishamo.DescriptorImpl.class)); + + assertSame(d,hudson.getDescriptor(Sishamo.class)); + } + public void testFishDiscovery() throws Exception { // imagine that this is a static instance, like it is in many LIST static field in Hudson. DescriptorList LIST = new DescriptorList(Fish.class);