Merge pull request #8 from asaitov/master

DataSketches aggregator

build.sbt

@@ -66,6 +66,7 @@ lazy val root = (project in file("."))
       "io.circe"          %% "circe-java8"     % circeVersion,
       "com.typesafe.akka" %% "akka-http"       % "10.0.11",
       "de.heikoseeberger" %% "akka-http-circe" % "1.19.0",
+      "ca.mrvisser"       %% "sealerate"       % "0.0.5",
       "ch.qos.logback"    % "logback-classic"  % "1.1.3",
       "org.scalactic"     %% "scalactic"       % "3.0.1",
       "org.scalatest"     %% "scalatest"       % "3.0.1" % "test"

src/main/scala/ing/wbaa/druid/DruidQuery.scala

@@ -17,6 +17,8 @@
 
 package ing.wbaa.druid
 
+import ca.mrvisser.sealerate
+
 import ing.wbaa.druid.definitions.{ Aggregation, Dimension, Filter, Granularity, GranularityType }
 
 import io.circe.generic.auto._
@@ -30,7 +32,7 @@ object QueryType extends EnumCodec[QueryType] {
   case object TopN       extends QueryType
   case object GroupBy    extends QueryType
   case object Timeseries extends QueryType
-  val values = Set(TopN, GroupBy, Timeseries)
+  val values: Set[QueryType] = sealerate.values[QueryType]
 }
 
 sealed trait DruidQuery {

src/main/scala/ing/wbaa/druid/Enum.scala

@@ -61,11 +61,7 @@ trait UpperCaseEnumStringEncoder extends EnumStringEncoder { this: Enum =>
 }
 
 trait CamelCaseEnumStringEncoder extends EnumStringEncoder { this: Enum =>
-  private def decapitalize(input: String) = {
-    val chars = input.toCharArray
-    chars(0) = Character.toLowerCase(chars(0))
-    chars.mkString
-  }
+  private def decapitalize(input: String) = input.head.toLower + input.tail
   def encode() = decapitalize(toString)
 }
 

src/main/scala/ing/wbaa/druid/definitions/Aggregation.scala

@@ -18,9 +18,10 @@
 package ing.wbaa.druid
 package definitions
 
+import ca.mrvisser.sealerate
+import io.circe._
 import io.circe.generic.auto._
 import io.circe.syntax._
-import io.circe._
 
 sealed trait AggregationType extends Enum with CamelCaseEnumStringEncoder
 object AggregationType extends EnumCodec[AggregationType] {
@@ -35,18 +36,9 @@ object AggregationType extends EnumCodec[AggregationType] {
   case object DoubleLast  extends AggregationType
   case object LongFirst   extends AggregationType
   case object LongLast    extends AggregationType
+  case object ThetaSketch extends AggregationType
 
-  val values = Set(Count,
-                   LongSum,
-                   DoubleSum,
-                   DoubleMax,
-                   DoubleMin,
-                   LongMin,
-                   LongMax,
-                   DoubleFirst,
-                   DoubleLast,
-                   LongFirst,
-                   LongLast)
+  val values: Set[AggregationType] = sealerate.values[AggregationType]
 }
 
 trait Aggregation {
@@ -81,6 +73,7 @@ object SingleFieldAggregation {
       case x: DoubleLastAggregation  => x.asJson
       case x: LongLastAggregation    => x.asJson
       case x: LongFirstAggregation   => x.asJson
+      case x: ThetaSketchAggregation => x.asJson
     }
   }
 }
@@ -116,3 +109,8 @@ case class LongFirstAggregation(name: String, fieldName: String) extends SingleF
 case class LongLastAggregation(name: String, fieldName: String) extends SingleFieldAggregation {
   val `type` = AggregationType.LongLast
 }
+case class ThetaSketchAggregation(name: String, fieldName: String, isInputThetaSketch: Boolean = false,
+                                  size: Long = 16384)
+    extends SingleFieldAggregation {
+  val `type` = AggregationType.ThetaSketch
+}

src/main/scala/ing/wbaa/druid/definitions/Filter.scala

@@ -18,9 +18,10 @@
 package ing.wbaa.druid
 package definitions
 
-import io.circe.syntax._
+import ca.mrvisser.sealerate
 import io.circe._
 import io.circe.generic.auto._
+import io.circe.syntax._
 
 sealed trait FilterType extends Enum with CamelCaseEnumStringEncoder
 
@@ -32,7 +33,7 @@ object FilterType extends EnumCodec[FilterType] {
   case object Regex            extends FilterType
   case object Not              extends FilterType
   case object Javascript       extends FilterType
-  val values = Set(And, Or, Selector, ColumnComparison, Regex, Not, Javascript)
+  val values: Set[FilterType] = sealerate.values[FilterType]
 }
 
 sealed trait Filter {

src/main/scala/ing/wbaa/druid/definitions/Granularity.scala

@@ -19,6 +19,7 @@ package ing.wbaa.druid
 package definitions
 
 import io.circe._
+import ca.mrvisser.sealerate
 
 sealed trait Granularity extends Enum with SnakeCaseEnumStringEncoder
 
@@ -42,16 +43,5 @@ object GranularityType extends EnumCodec[Granularity] {
   case object Month         extends Granularity
   case object Quarter       extends Granularity
   case object Year          extends Granularity
-  val values = Set(All,
-                   None,
-                   Second,
-                   Minute,
-                   FifteenMinute,
-                   ThirtyMinute,
-                   Hour,
-                   Day,
-                   Week,
-                   Month,
-                   Quarter,
-                   Year)
+  val values: Set[Granularity] = sealerate.values[Granularity]
 }

src/test/scala/ing/wbaa/druid/definitions/GranularitySpec.scala

@@ -1,12 +1,11 @@
-package ing.wbaa.druid
+package ing.wbaa.druid.definitions
 
 import org.scalatest._
-import ing.wbaa.druid.definitions._
 
 import io.circe._
 import io.circe.syntax._
 
-class GranularitySoec extends WordSpec with Matchers {
+class GranularitySpec extends WordSpec with Matchers {
   "Granularities" should {
     "be able to encode to json" in {
       implicit val granularityEncoder: Encoder[Granularity] = GranularityType.encoder