Fix for issue #71 Allow Query setTime and EndTime to be equal

kairosdb · May 29, 2018 · 3d74656 · 3d74656
1 parent daa5c1d
commit 3d74656
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/org/kairosdb/client/builder/TimeValidator.java b/src/main/java/org/kairosdb/client/builder/TimeValidator.java
@@ -22,32 +22,32 @@
  */
 public class TimeValidator
 {
-	private static final String START_TIME_EARLIER = "Start time must be earlier than the ending time\" (note the subtle difference";
+	private static final String START_TIME_EARLIER = "Start time must be equal to or earlier than the ending time";
 
 	private TimeValidator()
 	{
 	}
 
 	public static void validateEndTimeLaterThanStartTime(long startTime, long endTime)
 	{
-		checkState(endTime > startTime, START_TIME_EARLIER);
+		checkState(endTime >= startTime, START_TIME_EARLIER);
 	}
 
 	public static void validateEndTimeLaterThanStartTime(RelativeTime startTime, RelativeTime endTime)
 	{
 		long now = System.currentTimeMillis();
-		checkState(startTime.getTimeRelativeTo(now) < endTime.getTimeRelativeTo(now), START_TIME_EARLIER);
+		checkState(startTime.getTimeRelativeTo(now) <= endTime.getTimeRelativeTo(now), START_TIME_EARLIER);
 	}
 
 	public static void validateEndTimeLaterThanStartTime(long startTime, RelativeTime endTime)
 	{
 		long now = System.currentTimeMillis();
-		checkState(startTime < endTime.getTimeRelativeTo(now), START_TIME_EARLIER);
+		checkState(startTime <= endTime.getTimeRelativeTo(now), START_TIME_EARLIER);
 	}
 
 	public static void validateEndTimeLaterThanStartTime(RelativeTime startTime, long endTime)
 	{
 		long now = System.currentTimeMillis();
-		checkState(startTime.getTimeRelativeTo(now) < endTime, START_TIME_EARLIER);
+		checkState(startTime.getTimeRelativeTo(now) <= endTime, START_TIME_EARLIER);
 	}
 }
diff --git a/src/test/java/org/kairosdb/client/builder/TimeValidatorTest.java b/src/test/java/org/kairosdb/client/builder/TimeValidatorTest.java
@@ -86,4 +86,14 @@ public void test_RelativeStartLaterThanRelativeEnd_Invalid()
 		TimeValidator.validateEndTimeLaterThanStartTime(startTime, endTime);
 	}
 
+	@Test
+	public void test_StartAndEndTimeEqual()
+	{
+		long time = System.currentTimeMillis();
+		RelativeTime relativetime = new RelativeTime(2, TimeUnit.DAYS);
+		TimeValidator.validateEndTimeLaterThanStartTime(time, time);
+		TimeValidator.validateEndTimeLaterThanStartTime(new RelativeTime(1, TimeUnit.HOURS), new RelativeTime(1, TimeUnit.HOURS));
+		TimeValidator.validateEndTimeLaterThanStartTime(relativetime.getTimeRelativeTo(System.currentTimeMillis()), relativetime);
+		TimeValidator.validateEndTimeLaterThanStartTime(relativetime, relativetime.getTimeRelativeTo(System.currentTimeMillis()));
+	}
 }