Preconditions and compatibility layer for java.util.Calendar

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
index 4b9ff67..5c5a0a4 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSL.scala
@@ -40,7 +40,7 @@ import com.kenai.crontabparser.impl.CronTabParserBridge
 import java.io.{InputStreamReader, InputStream}
 import gr.grnet.aquarium.util.Loggable
 import gr.grnet.aquarium.util.yaml._
-import java.util.Date
+import java.util.{Calendar, Date}
 
 /**
  * A parser for the Aquarium accounting DSL.
@@ -478,7 +478,42 @@ case class DSLTimeSpec(
   dom: Int,
   mon: Int,
   dow: Int
-)
+){
+  //Preconditions to force correct values on object creation
+  assert(-1 <= min && 60 > min)
+  assert(-1 <= hour && 24 > hour)
+  assert(-1 <= dom && 31 > dom && dom != 0)
+  assert(-1 <= mon && 12 > mon && mon != 0)
+  assert(-1 <= dow && 7 > dow)
+
+  /** Day of week conversions to stay compatible with [[java.util.Calendar]] */
+  def getCalendarDow(): Int = dow match {
+    case 0 => Calendar.SUNDAY
+    case 1 => Calendar.MONDAY
+    case 2 => Calendar.TUESDAY
+    case 3 => Calendar.WEDNESDAY
+    case 4 => Calendar.THURSDAY
+    case 5 => Calendar.FRIDAY
+    case 6 => Calendar.SATURDAY
+    case 7 => Calendar.SUNDAY
+  }
+
+  /** Month conversions to stay compatible with [[java.util.Calendar]] */
+  def getCalendarMonth(): Int = dow match {
+    case 1 => Calendar.JANUARY
+    case 2 => Calendar.FEBRUARY
+    case 3 => Calendar.MARCH
+    case 4 => Calendar.APRIL
+    case 5 => Calendar.MAY
+    case 6 => Calendar.JUNE
+    case 7 => Calendar.JULY
+    case 8 => Calendar.AUGUST
+    case 9 => Calendar.SEPTEMBER
+    case 10 => Calendar.OCTOBER
+    case 11 => Calendar.NOVEMBER
+    case 12 => Calendar.DECEMBER
+  }
+}
 
 /** Exception thrown when a parsing error occurs*/
 class DSLParseException(msg: String) extends Exception(msg)