Revert "#1356 Fix integer custom field"

This reverts commit 3506d12.
TheHive-Project · May 25, 2020 · 28611b9 · 28611b9
1 parent 3506d12
commit 28611b9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/thehive/app/org/thp/thehive/models/Alert.scala b/thehive/app/org/thp/thehive/models/Alert.scala
@@ -11,14 +11,14 @@ case class AlertCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
     booleanValue: Option[Boolean] = None,
-    integerValue: Option[Long] = None,
+    integerValue: Option[Int] = None,
     floatValue: Option[Double] = None,
     dateValue: Option[Date] = None
 ) extends CustomFieldValue[AlertCustomField] {
   override def order_=(value: Option[Int]): AlertCustomField            = copy(order = value)
   override def stringValue_=(value: Option[String]): AlertCustomField   = copy(stringValue = value)
   override def booleanValue_=(value: Option[Boolean]): AlertCustomField = copy(booleanValue = value)
-  override def integerValue_=(value: Option[Long]): AlertCustomField    = copy(integerValue = value)
+  override def integerValue_=(value: Option[Int]): AlertCustomField     = copy(integerValue = value)
   override def floatValue_=(value: Option[Double]): AlertCustomField    = copy(floatValue = value)
   override def dateValue_=(value: Option[Date]): AlertCustomField       = copy(dateValue = value)
 }

diff --git a/thehive/app/org/thp/thehive/models/Case.scala b/thehive/app/org/thp/thehive/models/Case.scala
@@ -41,14 +41,14 @@ case class CaseCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
     booleanValue: Option[Boolean] = None,
-    integerValue: Option[Long] = None,
+    integerValue: Option[Int] = None,
     floatValue: Option[Double] = None,
     dateValue: Option[Date] = None
 ) extends CustomFieldValue[CaseCustomField] {
   override def order_=(value: Option[Int]): CaseCustomField            = copy(order = value)
   override def stringValue_=(value: Option[String]): CaseCustomField   = copy(stringValue = value)
   override def booleanValue_=(value: Option[Boolean]): CaseCustomField = copy(booleanValue = value)
-  override def integerValue_=(value: Option[Long]): CaseCustomField    = copy(integerValue = value)
+  override def integerValue_=(value: Option[Int]): CaseCustomField     = copy(integerValue = value)
   override def floatValue_=(value: Option[Double]): CaseCustomField    = copy(floatValue = value)
   override def dateValue_=(value: Option[Date]): CaseCustomField       = copy(dateValue = value)
 }

diff --git a/thehive/app/org/thp/thehive/models/CaseTemplate.scala b/thehive/app/org/thp/thehive/models/CaseTemplate.scala
@@ -13,14 +13,14 @@ case class CaseTemplateCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
     booleanValue: Option[Boolean] = None,
-    integerValue: Option[Long] = None,
+    integerValue: Option[Int] = None,
     floatValue: Option[Double] = None,
     dateValue: Option[Date] = None
 ) extends CustomFieldValue[CaseTemplateCustomField] {
   override def order_=(value: Option[Int]): CaseTemplateCustomField            = copy(order = value)
   override def stringValue_=(value: Option[String]): CaseTemplateCustomField   = copy(stringValue = value)
   override def booleanValue_=(value: Option[Boolean]): CaseTemplateCustomField = copy(booleanValue = value)
-  override def integerValue_=(value: Option[Long]): CaseTemplateCustomField    = copy(integerValue = value)
+  override def integerValue_=(value: Option[Int]): CaseTemplateCustomField     = copy(integerValue = value)
   override def floatValue_=(value: Option[Double]): CaseTemplateCustomField    = copy(floatValue = value)
   override def dateValue_=(value: Option[Date]): CaseTemplateCustomField       = copy(dateValue = value)
 }

diff --git a/thehive/app/org/thp/thehive/models/CustomField.scala b/thehive/app/org/thp/thehive/models/CustomField.scala
@@ -12,13 +12,13 @@ trait CustomFieldValue[C] extends Product {
   def order: Option[Int]
   def stringValue: Option[String]
   def booleanValue: Option[Boolean]
-  def integerValue: Option[Long]
+  def integerValue: Option[Int]
   def floatValue: Option[Double]
   def dateValue: Option[Date]
   def order_=(value: Option[Int]): C
   def stringValue_=(value: Option[String]): C
   def booleanValue_=(value: Option[Boolean]): C
-  def integerValue_=(value: Option[Long]): C
+  def integerValue_=(value: Option[Int]): C
   def floatValue_=(value: Option[Double]): C
   def dateValue_=(value: Option[Date]): C
 }
@@ -27,7 +27,7 @@ class CustomFieldValueEdge(db: Database, edge: Edge) extends CustomFieldValue[Cu
   override def order: Option[Int]            = db.getOptionProperty(edge, "order", UniMapping.int.optional)
   override def stringValue: Option[String]   = db.getOptionProperty(edge, "stringValue", UniMapping.string.optional)
   override def booleanValue: Option[Boolean] = db.getOptionProperty(edge, "booleanValue", UniMapping.boolean.optional)
-  override def integerValue: Option[Long]    = db.getOptionProperty(edge, "integerValue", UniMapping.long.optional)
+  override def integerValue: Option[Int]     = db.getOptionProperty(edge, "integerValue", UniMapping.int.optional)
   override def floatValue: Option[Double]    = db.getOptionProperty(edge, "floatValue", UniMapping.double.optional)
   override def dateValue: Option[Date]       = db.getOptionProperty(edge, "dateValue", UniMapping.date.optional)
 
@@ -44,8 +44,8 @@ class CustomFieldValueEdge(db: Database, edge: Edge) extends CustomFieldValue[Cu
     db.setOptionProperty(edge, "booleanValue", value, UniMapping.boolean.optional)
     this
   }
-  override def integerValue_=(value: Option[Long]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "integerValue", value, UniMapping.long.optional)
+  override def integerValue_=(value: Option[Int]): CustomFieldValueEdge = {
+    db.setOptionProperty(edge, "integerValue", value, UniMapping.int.optional)
     this
   }
   override def floatValue_=(value: Option[Double]): CustomFieldValueEdge = {
@@ -137,23 +137,23 @@ object CustomFieldBoolean extends CustomFieldType[Boolean] {
   override def getValue(ccf: CustomFieldValue[_]): Option[Boolean] = ccf.booleanValue
 }
 
-object CustomFieldInteger extends CustomFieldType[Long] {
-  override val name: String         = "integer"
-  override val writes: Writes[Long] = Writes.LongWrites
+object CustomFieldInteger extends CustomFieldType[Int] {
+  override val name: String        = "integer"
+  override val writes: Writes[Int] = Writes.IntWrites
 
   override def setValue[C <: CustomFieldValue[C]](customFieldValue: C, value: Option[Any]): Try[C] = value.getOrElse(JsNull) match {
-    case v: Long       => Success(customFieldValue.integerValue = Some(v))
-    case JsNumber(n)   => Success(customFieldValue.integerValue = Some(n.toLong))
+    case v: Int        => Success(customFieldValue.integerValue = Some(v))
+    case JsNumber(n)   => Success(customFieldValue.integerValue = Some(n.toInt))
     case JsNull | null => Success(customFieldValue.integerValue = None)
     case obj: JsObject =>
-      val integerValue = (obj \ "integer").asOpt[Long]
+      val integerValue = (obj \ "integer").asOpt[Int]
       val order        = (obj \ "order").asOpt[Int]
       Success((customFieldValue.integerValue = integerValue).order = order)
 
     case _ => setValueFailure(value)
   }
 
-  override def getValue(ccf: CustomFieldValue[_]): Option[Long] = ccf.integerValue
+  override def getValue(ccf: CustomFieldValue[_]): Option[Int] = ccf.integerValue
 }
 
 object CustomFieldFloat extends CustomFieldType[Double] {