added a mechanism for creating invisible node properties

core/pom.xml

@@ -382,7 +382,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
-      <version>1.155</version>
+      <version>1.161</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>

core/src/main/java/hudson/model/Node.java

@@ -51,6 +51,7 @@ import hudson.util.TagCloud;
 import hudson.util.TagCloud.WeightFunction;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -58,6 +59,7 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import net.sf.json.JSONObject;
+import org.kohsuke.stapler.BindInterceptor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -365,8 +367,32 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
         return getACL().hasPermission(permission);
     }
 
-    public Node reconfigure(StaplerRequest req, JSONObject form) throws FormException {
-        return form==null ? null : getDescriptor().newInstance(req, form);
+    public Node reconfigure(final StaplerRequest req, JSONObject form) throws FormException {
+        if (form==null)     return null;
+
+        final JSONObject jsonForProperties = form.optJSONObject("nodeProperties");
+        BindInterceptor old = req.setBindListener(new BindInterceptor() {
+            @Override
+            public Object onConvert(Type targetType, Class targetTypeErasure, Object jsonSource) {
+                if (jsonForProperties!=jsonSource)  return DEFAULT;
+
+                try {
+                    DescribableList<NodeProperty<?>, NodePropertyDescriptor> tmp = new DescribableList<NodeProperty<?>, NodePropertyDescriptor>(Saveable.NOOP,getNodeProperties().toList());
+                    tmp.rebuild(req, jsonForProperties, NodeProperty.all());
+                    return tmp.toList();
+                } catch (FormException e) {
+                    throw new IllegalArgumentException(e);
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+        });
+
+        try {
+            return getDescriptor().newInstance(req, form);
+        } finally {
+            req.setBindListener(old);
+        }
     }
 
     public abstract NodeDescriptor getDescriptor();

core/src/main/java/hudson/slaves/NodeProperty.java

@@ -26,6 +26,8 @@ package hudson.slaves;
 import hudson.ExtensionPoint;
 import hudson.Launcher;
 import hudson.DescriptorExtensionList;
+import hudson.model.Descriptor.FormException;
+import hudson.model.ReconfigurableDescribable;
 import hudson.model.queue.CauseOfBlockage;
 import hudson.scm.SCM;
 import hudson.model.AbstractBuild;
@@ -35,6 +37,8 @@ import hudson.model.Environment;
 import hudson.model.Hudson;
 import hudson.model.Node;
 import hudson.model.Queue.Task;
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.IOException;
 import java.util.List;
@@ -63,7 +67,7 @@ import java.util.List;
  *
  * @since 1.286
  */
-public abstract class NodeProperty<N extends Node> implements Describable<NodeProperty<?>>, ExtensionPoint {
+public abstract class NodeProperty<N extends Node> implements ReconfigurableDescribable<NodeProperty<?>>, ExtensionPoint {
 
     protected transient N node;
 
@@ -109,6 +113,10 @@ public abstract class NodeProperty<N extends Node> implements Describable<NodePr
     	return new Environment() {};
     }
 
+    public NodeProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+        return form==null ? null : getDescriptor().newInstance(req, form);
+    }
+
     /**
      * Lists up all the registered {@link NodeDescriptor}s in the system.
      */

test/src/test/java/hudson/slaves/NodePropertyTest.java

+package hudson.slaves;
+
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlLabel;
+import hudson.model.Descriptor.FormException;
+import hudson.model.Slave;
+import net.sf.json.JSONObject;
+import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.StaplerRequest;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class NodePropertyTest extends HudsonTestCase {
+    public void testInvisibleProperty() throws Exception {
+        DumbSlave s = createSlave();
+        InvisibleProperty before = new InvisibleProperty();
+        s.getNodeProperties().add(before);
+        assertFalse(before.reconfigured);
+
+
+        DumbSlave s2 = configRoundtrip(s);
+        assertNotSame(s,s2);
+        InvisibleProperty after = s2.getNodeProperties().get(InvisibleProperty.class);
+
+        assertSame(before,after);
+        assertTrue(after.reconfigured);
+    }
+
+    public static class InvisibleProperty extends NodeProperty<Slave> {
+        boolean reconfigured = false;
+        @Override
+        public NodeProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+            reconfigured = true;
+            return this;
+        }
+
+        @TestExtension
+        public static class DescriptorImpl extends NodePropertyDescriptor {
+            @Override
+            public String getDisplayName() {
+                return null;
+            }
+        }
+    }
+
+    public void testBasicConfigRoundtrip() throws Exception {
+        DumbSlave s = createSlave();
+        HtmlForm f = createWebClient().goTo("/computer/" + s.getNodeName() + "/configure").getFormByName("config");
+        ((HtmlLabel)f.selectSingleNode(".//LABEL[text()='Some Property']")).click();
+        submit(f);
+        PropertyImpl p = hudson.getNode(s.getNodeName()).getNodeProperties().get(PropertyImpl.class);
+        assertEquals("Duke",p.name);
+
+        p.name = "Kohsuke";
+        configRoundtrip(s);
+
+        PropertyImpl p2 = hudson.getNode(s.getNodeName()).getNodeProperties().get(PropertyImpl.class);
+        assertNotSame(p,p2);
+        assertEqualDataBoundBeans(p,p2);
+    }
+
+    public static class PropertyImpl extends NodeProperty<Slave> {
+        public String name;
+
+        @DataBoundConstructor
+        public PropertyImpl(String name) {
+            this.name = name;
+        }
+
+        @TestExtension("testBasicConfigRoundtrip")
+        public static class DescriptorImpl extends NodePropertyDescriptor {
+            @Override
+            public String getDisplayName() {
+                return "Some Property";
+            }
+        }
+    }
+}

test/src/test/resources/hudson/slaves/NodePropertyTest/PropertyImpl/config.jelly

+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+  <f:entry field="name" title="${%Name}">
+    <f:textbox default="Duke"/>
+  </f:entry>
+</j:jelly>