fixup! Fixes #23948: Remove early return to prepare to Scala3 migrati…

…on in box sequence/traverse Fixes #23948: Remove early return to prepare to Scala3 migration in box sequence/traverse
Normation · Dec 21, 2023 · 4f0ccc3 · 4f0ccc3
1 parent 355a9f5
commit 4f0ccc3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.../sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala b/.../sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
@@ -686,7 +686,7 @@ class ClassicTechniqueWriter(basePath: String, parameterTypeService: ParameterTy
             method_info              <- methods.get(call.methodId)
             (_, classParameterValue) <- call.parameters.find(_._1 == method_info.classParameter)
 
-            params <- Control.sequence(method_info.parameters) { p =>
+            params <- Control.traverse(method_info.parameters) { p =>
                         for {
                           (_, value) <- Box(call.parameters.find(_._1 == p.id))
                           escaped    <- parameterTypeService.translate(value, p.parameterType, AgentType.CfeCommunity).toBox

diff --git a/...der/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala b/...der/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
@@ -92,7 +92,7 @@ import com.normation.rudder.services.reports.CacheComplianceQueueAction.Expected
 import com.normation.rudder.services.reports.CacheExpectedReportAction
 import com.normation.rudder.services.reports.CacheExpectedReportAction.InsertNodeInCache
 import com.normation.rudder.services.reports.InvalidateCache
-import com.normation.utils.Control.sequence
+import com.normation.utils.Control.traverse
 import net.liftweb.common.Box
 import net.liftweb.common.Empty
 import net.liftweb.common.EmptyBox
@@ -517,7 +517,7 @@ trait ComposedNewNodeManager extends NewNodeManager with NewNodeManagerHooks {
 
     // validate pre acceptance for a Node, if an error occurs, stop everything on that node.
     def passPreAccept(inventory: FullInventory) = {
-      sequence(unitAcceptors)(unitAcceptor => {
+      traverse(unitAcceptors)(unitAcceptor => {
         unitAcceptor.preAccept(Seq(inventory), modId, actor) match {
           case Full(seq) => // ok, cool
             NodeLogger.PendingNode.debug(s"Pre acceptance phase: '${unitAcceptor.name}' OK")
@@ -537,7 +537,7 @@ trait ComposedNewNodeManager extends NewNodeManager with NewNodeManagerHooks {
 
     // accept one node
     def acceptOne(sm: FullInventory, modId: ModificationId, actor: EventActor): Box[FullInventory] = {
-      (sequence(unitAcceptors) { unitAcceptor =>
+      (traverse(unitAcceptors) { unitAcceptor =>
         try {
           unitAcceptor.acceptOne(sm, modId, actor) ?~! "Error when executing accept node process named %s".format(
             unitAcceptor.name
@@ -561,7 +561,7 @@ trait ComposedNewNodeManager extends NewNodeManager with NewNodeManagerHooks {
 
     // validate post acceptance for a Node, if an error occurs, Rollback the node acceptance
     def passPostAccept(inventory: FullInventory) = {
-      sequence(unitAcceptors)(unitAcceptor => {
+      traverse(unitAcceptors)(unitAcceptor => {
         unitAcceptor.postAccept(Seq(inventory), modId, actor) match {
           case Full(seq) => // ok, cool
             NodeLogger.PendingNode.debug(s"Post acceptance phase: '${unitAcceptor.name}' OK")

diff --git a/...es/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala b/...es/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala
@@ -1473,7 +1473,7 @@ final case class RestExtractorService(
                             .extractJsonListString(
                               json,
                               "agent_support",
-                              sequence(_) {
+                              traverse(_) {
                                 case "dsc"                => Full(AgentType.Dsc :: Nil)
                                 case "cfengine-community" => Full(AgentType.CfeCommunity :: AgentType.CfeEnterprise :: Nil)
                                 case _                    => Failure("invalid agent")

diff --git a/...pp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/...pp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
@@ -1201,7 +1201,7 @@ class NodeApiService2(
         newNodeManager.refuse(ids, modId, actor, "").map(_.map(serializeServerInfo(_, "refused")))
 
       case DeleteNode =>
-        boxSequence(ids.map(actualNodeDeletion(_, modId, actor)))
+        sequence(ids.map(actualNodeDeletion(_, modId, actor)))
     }).map(_.toList)
   }
 

diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/Control.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/Control.scala
@@ -32,7 +32,7 @@ object Control {
 
   import cats.syntax.traverse._
 
-  private implicit val boxApplicative: Applicative[Box] = new Applicative[Box] {
+  implicit private val boxApplicative: Applicative[Box] = new Applicative[Box] {
     override def pure[A](x: A): Box[A] = Full(x)
 
     override def ap[A, B](ff: Box[A => B])(fa: Box[A]): Box[B] = ff.flatMap(f => fa.map(f))