Resolving potential cache collision scenario

Author: gilbertw1

src/main/scala/com/sparcedge/turbine/query/Grouping.scala

@@ -63,6 +63,7 @@ abstract class DurationGrouping extends Grouping {
 	val duration: String
 	val segment = "ts"
 	val offset: Int
+	val uniqueId: String
 
 	override def apply(event: Event): String = {
 		apply(event.ts)
@@ -74,43 +75,46 @@ abstract class DurationGrouping extends Grouping {
 	}
 
 	def calculateDurationValue(ts: Long): Long
-
-	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class YearDurationGrouping(offsetOpt: Option[Int]) extends DurationGrouping {
 	val duration = "year"
 	val offset = offsetOpt.getOrElse(0)
 
 	def calculateDurationValue(ts: Long): Long = calculateYearCombined(ts)
+	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class MonthDurationGrouping(offsetOpt: Option[Int]) extends DurationGrouping {
 	val duration = "month"
 	val offset = offsetOpt.getOrElse(0)
 
 	def calculateDurationValue(ts: Long): Long = calculateMonthCombined(ts)
+	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class DayDurationGrouping(offsetOpt: Option[Int]) extends DurationGrouping {
 	val duration = "day"
 	val offset = offsetOpt.getOrElse(0)
 
 	def calculateDurationValue(ts: Long): Long = calculateDayCombined(ts)
+	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class HourDurationGrouping(offsetOpt: Option[Int]) extends DurationGrouping {
 	val duration = "hour"
 	val offset = offsetOpt.getOrElse(0)
 
 	def calculateDurationValue(ts: Long): Long = calculateHourCombined(ts)
+	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class MinuteDurationGrouping(offsetOpt: Option[Int]) extends DurationGrouping {
 	val duration = "minute"
 	val offset = offsetOpt.getOrElse(0)
 
 	def calculateDurationValue(ts: Long): Long = calculateMinuteCombined(ts)
+	val uniqueId: String = s"DurationGrouping.${duration}.${offset}"
 }
 
 class IndexGrouping(val indexDuration: String) extends Grouping {