Reserved resources available again after reloading CasC configuration (…

…#650)

* Reserved resources available again after reloading CasC configuration

README.md

@@ -305,7 +305,6 @@ unclassified:
       - name: "S7_1200_1"
         description: "S7 PLC model 1200"
         labels: "plc:S7 model:1200"
-        reservedBy: "Reserved due maintenance window"
       - name: "S7_1200_2"
         labels: "plc:S7 model:1200"
       - name: "Resource-with-properties"
@@ -314,7 +313,7 @@ unclassified:
             value: "Value"
 ```
 
-Properties *description*, *labels* and *reservedBy* are optional.
+Properties *description*, *labels* and *properties* are optional.
 
 ----
 

src/main/java/org/jenkins/plugins/lockableresources/LockableResource.java

@@ -70,8 +70,8 @@ public class LockableResource extends AbstractDescribableImpl<LockableResource>
     private transient String labels = null;
 
     private List<String> labelsAsList = new ArrayList<>();
-    private String reservedBy = null;
-    private Date reservedTimestamp = null;
+    private transient String reservedBy = null;
+    private transient Date reservedTimestamp = null;
     private String note = "";
 
     /**

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config.jelly

@@ -20,9 +20,6 @@
   <f:entry title="${%entry.labels.title}" field="labels">
     <f:textbox/>
   </f:entry>
-  <f:entry title="${%entry.reservedBy.title}" field="reservedBy">
-    <f:textbox/>
-  </f:entry>
   <f:entry title="${%entry.properties.title}">
     <f:repeatableProperty field="properties" header="" minimum="0" add="${%entry.properties.add}">
       <f:block>

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config.properties

@@ -23,7 +23,6 @@
 entry.name.title=Name
 entry.description.title=Description
 entry.labels.title=Labels
-entry.reservedBy.title=Reserved by
 entry.properties.title=Properties
 entry.properties.add=Add Property
 entry.properties.delete=Delete Property

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config_cs.properties

@@ -22,5 +22,4 @@
 
 entry.name.title=Jm\u00e9no
 entry.description.title=Popis
-entry.labels.title=Popisky
-entry.reservedBy.title=Rezervace u\u017eivatelem
+entry.labels.title=Popisky

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config_de.properties

@@ -22,5 +22,4 @@
 
 entry.name.title=Name
 entry.description.title=Beschreibung
-entry.labels.title=Labels
-entry.reservedBy.title=Reserviert durch
+entry.labels.title=Labels

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config_fr.properties

@@ -23,7 +23,6 @@
 entry.name.title=Nom
 entry.description.title=Description
 entry.labels.title=Libell\u00e9s
-entry.reservedBy.title=R\u00e9serv\u00e9e par
 entry.properties.title=Propri\u00e9t\u00e9s
 entry.properties.add=Ajouter une propri\u00e9t\u00e9
 entry.properties.delete=Supprimer une propri\u00e9t\u00e9

src/main/resources/org/jenkins/plugins/lockableresources/LockableResource/config_sk.properties

@@ -22,5 +22,4 @@
 
 entry.name.title=Meno
 entry.description.title=Popis
-entry.labels.title=\u0160t\u00edtky
-entry.reservedBy.title=Rezervovan\u00e9 u\u017e\u00edvate\u013eom
+entry.labels.title=\u0160t\u00edtky

src/test/java/org/jenkins/plugins/lockableresources/ConfigurationAsCodeTest.java

@@ -42,7 +42,8 @@ public void should_support_configuration_as_code() {
         assertEquals("Resource_A", declaredResource.getName());
         assertEquals("Description_A", declaredResource.getDescription());
         assertEquals("Label_A", declaredResource.getLabels());
-        assertEquals("Reserved_A", declaredResource.getReservedBy());
+        // not supported in JCaC
+        // assertEquals("Reserved_A", declaredResource.getReservedBy());
         assertEquals("Note A", declaredResource.getNote());
 
         assertEquals(
@@ -54,7 +55,8 @@ public void should_support_configuration_as_code() {
         assertEquals("Resource_A", resource.getName());
         assertEquals("Description_A", resource.getDescription());
         assertEquals("Label_A", resource.getLabels());
-        assertEquals("Reserved_A", resource.getReservedBy());
+        // not supported in JCaC
+        // assertEquals("Reserved_A", resource.getReservedBy());
         assertEquals("Note A", resource.getNote());
     }
 

src/test/resources/org/jenkins/plugins/lockableresources/casc_expected_output.yml

@@ -3,4 +3,3 @@ declaredResources:
   labels: "Label_A"
   name: "Resource_A"
   note: "Note A"
-  reservedBy: "Reserved_A"

src/test/resources/org/jenkins/plugins/lockableresources/configuration-as-code.yml

@@ -10,5 +10,4 @@ unclassified:
       - description: "Description_A"
         labels: "Label_A"
         name: "Resource_A"
-        reservedBy: "Reserved_A"
         note: "Note A"