Added delay of 1 second if range events are scheduled at same instant

Signed-off-by: Amit Kumar Mondal <admin@amitinside.com>
eclipse-archived · Jun 27, 2017 · 6c03081 · 6c03081
1 parent 04a064c
commit 6c03081
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/...ome.binding.astro/src/main/java/org/eclipse/smarthome/binding/astro/internal/job/Job.java b/...ome.binding.astro/src/main/java/org/eclipse/smarthome/binding/astro/internal/job/Job.java
@@ -7,6 +7,7 @@
  */
 package org.eclipse.smarthome.binding.astro.internal.job;
 
+import static java.util.Calendar.SECOND;
 import static java.util.Objects.isNull;
 import static org.apache.commons.lang.time.DateFormatUtils.ISO_DATETIME_FORMAT;
 import static org.eclipse.smarthome.binding.astro.AstroBindingConstants.*;
@@ -39,7 +40,7 @@ public interface Job extends Runnable {
 
     /** Logger Instance */
     public final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
+    
     /**
      * Schedules the provided {@link Job} instance
      *
@@ -111,8 +112,16 @@ public static void scheduleRange(String thingUID, AstroThingHandler astroHandler
         if (thingNull || astroHandlerNull || rangeNull || channelIdNull) {
             return;
         }
-        scheduleEvent(thingUID, astroHandler, range.getStart(), EVENT_START, channelId);
-        scheduleEvent(thingUID, astroHandler, range.getEnd(), EVENT_END, channelId);
+
+        //add 1 second to the last scheduled event if both the events comprise same time instant
+        int secondsPadding = 1;
+        Calendar start = range.getStart();
+        Calendar end = range.getEnd();
+        if (isTimeEquals(start, end)) {
+            end.add(SECOND, secondsPadding);
+        }
+        scheduleEvent(thingUID, astroHandler, start, EVENT_START, channelId);
+        scheduleEvent(thingUID, astroHandler, end, EVENT_END, channelId);
     }
 
     /**

diff --git a/....astro/src/main/java/org/eclipse/smarthome/binding/astro/internal/util/DateTimeUtils.java b/....astro/src/main/java/org/eclipse/smarthome/binding/astro/internal/util/DateTimeUtils.java
@@ -167,7 +167,16 @@ public static boolean isTimeGreaterEquals(Calendar cal1, Calendar cal2) {
         Calendar truncCal2 = DateUtils.truncate(cal2, Calendar.MINUTE);
         return truncCal1.getTimeInMillis() >= truncCal2.getTimeInMillis();
     }
-
+
+    /**
+     * Returns {@code true}, if the provided calendar instances are same, ignoring milliseconds.
+     */
+    public static boolean isTimeEquals(Calendar cal1, Calendar cal2) {
+        Calendar truncCal1 = DateUtils.truncate(cal1, Calendar.SECOND);
+        Calendar truncCal2 = DateUtils.truncate(cal2, Calendar.SECOND);
+        return truncCal1.getTimeInMillis() == truncCal2.getTimeInMillis();
+    }
+
     /**
      * Applies the config to the given calendar.
      */