Remove conflicting FiniteDurationExpression implicits, close #4195

Motivation:

In 3.7, we added some `Int => Expression[FiniteDuration]` implicits that in some cases take over the expected `Any => Expression[Any]`.

Modification:

Drop those implicits and add lots for overrides for during-like loops.

Result:

No more conflicts. Breaking binary change, can only be released in 3.8.

gatling-core/src/main/scala/io/gatling/core/Predef.scala

@@ -19,7 +19,6 @@ package io.gatling.core
 import scala.concurrent.duration._
 
 import io.gatling.core.config.GatlingConfiguration
-import io.gatling.core.session._
 
 object Predef extends CoreDsl {
 
@@ -106,12 +105,8 @@ object Predef extends CoreDsl {
   }
 
   implicit def integerToFiniteDuration(i: Integer): FiniteDuration = intToFiniteDuration(i.toInt)
-  implicit def integerToFiniteDurationExpression(i: Integer): Expression[FiniteDuration] = intToFiniteDuration(i.toInt).expressionSuccess
 
   implicit def intToFiniteDuration(i: Int): FiniteDuration = i.seconds
-  implicit def intToFiniteDurationExpression(i: Int): Expression[FiniteDuration] = i.seconds.expressionSuccess
 
   implicit def jlongToFiniteDuration(i: java.lang.Long): FiniteDuration = i.toLong.seconds
-  implicit def jlongToFiniteDurationExpression(i: java.lang.Long): Expression[FiniteDuration] = i.toLong.seconds.expressionSuccess
-
 }

gatling-core/src/main/scala/io/gatling/core/structure/Feeds.scala

@@ -35,11 +35,6 @@ private[structure] trait Feeds[B] extends Execs[B] {
   def feed(feederBuilder: FeederBuilder): B =
     feed(feederBuilder, Feeds.OneExpression)
 
-  @deprecated("Feeding multiple records at once and translating names will be dropped in the next release", "3.7.0")
-  // we need this overload because Int => Expression[Int] and Int => Expression[FiniteDuration] suddenly conflict?!
-  def feed(feederBuilder: FeederBuilder, number: Int): B =
-    feed(feederBuilder, number.expressionSuccess)
-
   /**
    * Chain an action that will inject multiple data records into the virtual users' Session
    *

gatling-core/src/main/scala/io/gatling/core/structure/Loops.scala

@@ -52,6 +52,16 @@ private[structure] trait Loops[B] extends Execs[B] {
     )
   }
 
+  // we need these overrides because we can't add an Int => Expression[FiniteDuration] that would clash with Int => Expression[Any]
+  def during(duration: FiniteDuration)(chain: ChainBuilder): B =
+    during(duration.expressionSuccess)(chain)
+  def during(duration: FiniteDuration, counterName: String)(chain: ChainBuilder): B =
+    during(duration.expressionSuccess, counterName)(chain)
+  def during(duration: FiniteDuration, exitASAP: Boolean)(chain: ChainBuilder): B =
+    during(duration.expressionSuccess, exitASAP = exitASAP)(chain)
+  def during(duration: FiniteDuration, counterName: String, exitASAP: Boolean)(chain: ChainBuilder): B =
+    during(duration.expressionSuccess, counterName, exitASAP)(chain)
+
   @SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
   def during(duration: Expression[FiniteDuration], counterName: String = UUID.randomUUID.toString, exitASAP: Boolean = true)(chain: ChainBuilder): B =
     clockBasedLoop(
@@ -87,6 +97,16 @@ private[structure] trait Loops[B] extends Execs[B] {
           conditionValue <- condition(session)
         } yield conditionValue && clock.nowMillis - session.loopTimestampValue(counterName) <= durationValue.toMillis
 
+  // we need these overrides because we can't add an Int => Expression[FiniteDuration] that would clash with Int => Expression[Any]
+  def asLongAsDuring(condition: Expression[Boolean], duration: FiniteDuration)(chain: ChainBuilder): B =
+    asLongAsDuring(condition, duration.expressionSuccess)(chain)
+  def asLongAsDuring(condition: Expression[Boolean], duration: FiniteDuration, counterName: String)(chain: ChainBuilder): B =
+    asLongAsDuring(condition, duration.expressionSuccess, counterName)(chain)
+  def asLongAsDuring(condition: Expression[Boolean], duration: FiniteDuration, exitASAP: Boolean)(chain: ChainBuilder): B =
+    asLongAsDuring(condition, duration.expressionSuccess, exitASAP = exitASAP)(chain)
+  def asLongAsDuring(condition: Expression[Boolean], duration: FiniteDuration, counterName: String, exitASAP: Boolean)(chain: ChainBuilder): B =
+    asLongAsDuring(condition, duration.expressionSuccess, counterName, exitASAP)(chain)
+
   @SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
   def asLongAsDuring(
       condition: Expression[Boolean],
@@ -96,6 +116,16 @@ private[structure] trait Loops[B] extends Execs[B] {
   )(chain: ChainBuilder): B =
     clockBasedLoop(continueCondition(condition, duration, counterName), chain, counterName, exitASAP, AsLongAsDuringLoopType)
 
+  // we need these overrides because we can't add an Int => Expression[FiniteDuration] that would clash with Int => Expression[Any]
+  def doWhileDuring(condition: Expression[Boolean], duration: FiniteDuration)(chain: ChainBuilder): B =
+    doWhileDuring(condition, duration.expressionSuccess)(chain)
+  def doWhileDuring(condition: Expression[Boolean], duration: FiniteDuration, counterName: String)(chain: ChainBuilder): B =
+    doWhileDuring(condition, duration.expressionSuccess, counterName)(chain)
+  def doWhileDuring(condition: Expression[Boolean], duration: FiniteDuration, exitASAP: Boolean)(chain: ChainBuilder): B =
+    doWhileDuring(condition, duration.expressionSuccess, exitASAP = exitASAP)(chain)
+  def doWhileDuring(condition: Expression[Boolean], duration: FiniteDuration, counterName: String, exitASAP: Boolean)(chain: ChainBuilder): B =
+    doWhileDuring(condition, duration.expressionSuccess, counterName, exitASAP)(chain)
+
   @SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
   def doWhileDuring(
       condition: Expression[Boolean],

gatling-http/src/main/scala/io/gatling/http/action/sse/SseAwaitActionBuilder.scala

@@ -24,6 +24,7 @@ import io.gatling.http.check.sse.SseMessageCheck
 
 trait SseAwaitActionBuilder[T] extends ActionBuilder {
 
+  // we need this override because we can't add an Int => Expression[FiniteDuration] that would clash with Int => Expression[Any]
   def await(timeout: FiniteDuration)(checks: SseMessageCheck*): T =
     await(timeout.expressionSuccess)(checks: _*)
 

gatling-http/src/main/scala/io/gatling/http/action/ws/WsAwaitActionBuilder.scala

@@ -24,6 +24,7 @@ import io.gatling.http.check.ws.WsFrameCheck
 
 trait WsAwaitActionBuilder[T] extends ActionBuilder {
 
+  // we need this override because we can't add an Int => Expression[FiniteDuration] that would clash with Int => Expression[Any]
   def await(timeout: FiniteDuration)(checks: WsFrameCheck*): T =
     await(timeout.expressionSuccess)(checks: _*)