#192 - Add multiple BusinessHours for a Resource

addon-scheduler/src/main/java/org/vaadin/stefan/fullcalendar/Resource.java

@@ -22,7 +22,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-import org.vaadin.stefan.fullcalendar.NotNull;
 import java.util.*;
 
 /**
@@ -35,32 +34,32 @@ public class Resource {
 
     /**
      * The id of this resource.
-     * 
-     * Uniquely identifies this resource. 
+     *
+     * Uniquely identifies this resource.
      */
     private final String id;
 
     /**
      * The title/name of this resource.
-     * 
+     *
      * Text that will be displayed on the resource when it is rendered.
      */
     private final String title;
 
     /**
      * The color of this resource.
-     * 
-     * Events associated with this resources will have their backgrounds and borders colored. 
+     *
+     * Events associated with this resources will have their backgrounds and borders colored.
      */
     private final String color;
 
     /**
-     * The BusinessHours of this resource.
-     * 
-     * A businessHours declaration that will only apply to this resource.
+     * The BusinessHours array of this resource.
+     *
+     * A businessHours[] declaration that will only apply to this resource.
      */
-    private final BusinessHours businessHours;
-    
+    private final BusinessHours[] businessHoursArray;
+
     /**
      * The childern's of the resource
      */
@@ -69,7 +68,7 @@ public class Resource {
      * The parent of the current resource
      */
     private Resource parent;
-    
+
     /**
      * The custom property list
      */
@@ -93,20 +92,6 @@ public Resource(String id, String title, String color) {
         this(id, title, color, null);
     }
 
-    /**
-     * New instance. Awaits id and title. If no id is provided, one will be generated.
-     * <br><br>
-     * Adds the given resources as children using {@link #addChildren(Collection)} if a value != null is passed.
-     *
-     * @param id       id
-     * @param title    title
-     * @param color    color (optional)
-     * @param children children (optional)
-     */
-    public Resource(String id, String title, String color, Collection<Resource> children) {
-    	this(id, title, color, children, null);
-    }
-
     /**
      * New instance. Awaits id and title. If no id is provided, one will be generated.
      * <br><br>
@@ -118,11 +103,11 @@ public Resource(String id, String title, String color, Collection<Resource> chil
      * @param children children (optional)
      * @param businessHours businessHours (optional)
      */
-    public Resource(String id, String title, String color, Collection<Resource> children, BusinessHours businessHours) {
+    public Resource(String id, String title, String color, Collection<Resource> children, BusinessHours... businessHours) {
         this.id = id != null ? id : UUID.randomUUID().toString();
         this.title = title;
         this.color = color;
-        this.businessHours = businessHours;
+        this.businessHoursArray = (businessHours != null && businessHours.length == 0) ? null : businessHours;
 
         if (children != null) {
             addChildren(children);
@@ -236,7 +221,7 @@ public void removeChildren(@NotNull Collection<Resource> children) {
 
         this.children.removeAll(children);
     }
-    
+
     /**
      * Add custom element to the extendedProp HashMap. This allow to set custom property to the resource.
      *
@@ -246,7 +231,7 @@ public void removeChildren(@NotNull Collection<Resource> children) {
     public void addExtendedProps(@NotNull String key, @NotNull Object value) {
     	extendedProps.put(key, value);
     }
-    
+
     /**
      * Remove the custom property based on the name.
      *
@@ -255,7 +240,7 @@ public void addExtendedProps(@NotNull String key, @NotNull Object value) {
     public void removeExtendedProps(@NotNull String key) {
     	extendedProps.remove(key);
     }
-    
+
     /**
      * remove specific custom property where the name and value match.
      *
@@ -278,10 +263,15 @@ protected JsonObject toJson() {
         jsonObject.put("id", getId());
         jsonObject.put("title", JsonUtils.toJsonValue(getTitle()));
         jsonObject.put("eventColor", JsonUtils.toJsonValue(getColor()));
-
-        if(getBusinessHours() != null)
-        	jsonObject.put("businessHours", getBusinessHours().toJson());
-
+
+        if(getBusinessHoursArray() != null && getBusinessHoursArray().length > 0) {
+            JsonArray businessHoursJsonArray = Json.createArray();
+            for(int i = 0; i < getBusinessHoursArray().length; i++) {
+                businessHoursJsonArray.set(i, getBusinessHoursArray()[i].toJson());
+            }
+            jsonObject.put("businessHours", businessHoursJsonArray);
+        }
+
         getParent().ifPresent(parent -> jsonObject.put("parentId", parent.getId()));
 
         Set<Resource> children = getChildren();
@@ -294,7 +284,7 @@ protected JsonObject toJson() {
 
             jsonObject.put("children", jsonArray);
         }
-        
+
         HashMap<String, Object> extendedProps = getExtendedProps();
         if (!extendedProps.isEmpty()) {
             for (Map.Entry<String, Object> prop : extendedProps.entrySet()) {
@@ -323,6 +313,16 @@ private void setParent(Resource parent) {
         this.parent = parent;
     }
 
+    /**
+     * Returns the first item from businessHoursArray or null if array is empty
+     *
+     * @return BusinessHours or null
+     */
+    public BusinessHours getBusinessHours() {
+        if(businessHoursArray == null || businessHoursArray.length == 0) return null;
+
+        return businessHoursArray[0];
+    }
 
     @Override
     public String toString() {

demo/pom.xml

@@ -115,6 +115,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>