Merge branch 'branch-8.1-scala-3-migration-3_pr' into branches/rudder…

…/8.1
Normation · Mar 18, 2024 · 0ed3344 · 0ed3344
2 parents be0970f + 5f75c3a
commit 0ed3344
Show file tree

Hide file tree

Showing 583 changed files with 4,758 additions and 4,700 deletions.
diff --git a/webapp/sources/.scalafmt.conf b/webapp/sources/.scalafmt.conf
@@ -1,7 +1,9 @@
-version = "3.5.9"
+version = "3.7.17"
 maxColumn = 130
 runner.debug = true
-runner.dialect = scala213
+runner.dialect = scala213Source3
+
+rewrite.scala3.convertToNewSyntax = true
 
 align.preset = most
 align.multiline = true

diff --git a/...ap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala b/...ap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala
@@ -37,9 +37,9 @@
 
 package com.normation.inventory.domain
 
-import com.normation.errors._
-import zio._
-import zio.syntax._
+import com.normation.errors.*
+import zio.*
+import zio.syntax.*
 
 /**
  * The enumeration holding the values for the agent
@@ -114,9 +114,9 @@ object AgentType {
     override def displayName  = "Rudder"
     override def toRulesPath  = "/cfengine-community"
     override def inventoryAgentNames: Set[String] = Set("cfengine-community", "community")
-    override val inventorySoftwareName                           = "rudder-agent"
+    override val inventorySoftwareName = "rudder-agent"
     override def toAgentVersionName(softwareVersionName: String) = softwareVersionName
-    override val defaultPolicyExtension                          = ".cf"
+    override val defaultPolicyExtension = ".cf"
   }
 
   final case object Dsc extends AgentType {
@@ -125,9 +125,9 @@ object AgentType {
     override def displayName  = "Rudder Windows"
     override def toRulesPath  = "/dsc"
     override def inventoryAgentNames: Set[String] = Set("dsc")
-    override val inventorySoftwareName                           = "Rudder agent (DSC)"
+    override val inventorySoftwareName = "Rudder agent (DSC)"
     override def toAgentVersionName(softwareVersionName: String) = softwareVersionName
-    override val defaultPolicyExtension                          =
+    override val defaultPolicyExtension =
       "" // no extension - .ps1 extension is already in the template name (more by convention than anything else)
   }
 
@@ -162,9 +162,9 @@ final case class AgentInfo(
 )
 
 object AgentInfoSerialisation {
-  import com.normation.inventory.domain.AgentType._
-  import net.liftweb.json._
-  import net.liftweb.json.JsonDSL._
+  import com.normation.inventory.domain.AgentType.*
+  import net.liftweb.json.*
+  import net.liftweb.json.JsonDSL.*
 
   implicit class ToJson(val agent: AgentInfo) extends AnyVal {
 

diff --git a/...dap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala b/...dap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala
@@ -38,7 +38,7 @@
 package com.normation.inventory.domain
 
 import com.normation.NamedZioLogger
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.InventoryError.CryptoEx
 import com.normation.inventory.services.provisioning.ParsedSecurityToken
 import java.io.StringReader
@@ -47,8 +47,8 @@ import org.bouncycastle.cert.X509CertificateHolder
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
 import org.bouncycastle.openssl.PEMParser
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
-import zio._
-import zio.syntax._
+import zio.*
+import zio.syntax.*
 
 /**
  * A file that contains all the simple data types, like Version,

diff --git a/...p-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Identifiers.scala b/...p-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Identifiers.scala
@@ -74,7 +74,7 @@ object IdGenerator {
    */
   def md5Hash(s: String): String = {
     val md5 = MessageDigest.getInstance("MD5").digest(s.getBytes)
-    val id  = (md5.map(0xff & _).map("%02x".format(_)).foldLeft("") { _ + _ }).toLowerCase
+    val id  = (md5.map(0xff & _).map("%02x".format(_)).foldLeft("")(_ + _)).toLowerCase
     s"${id.substring(0, 8)}-${id.substring(8, 12)}-${id.substring(12, 16)}-${id.substring(16, 20)}-${id.substring(20)}"
   }
 }
diff --git a/...ventory/inventory-api/src/main/scala/com/normation/inventory/domain/JsonSerializers.scala b/...ventory/inventory-api/src/main/scala/com/normation/inventory/domain/JsonSerializers.scala
@@ -40,7 +40,7 @@ package com.normation.inventory.domain
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormatter
 import org.joda.time.format.ISODateTimeFormat
-import zio.json._
+import zio.json.*
 
 /*
  * This file provide serializer for core inventory objects.

diff --git a/...entory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala b/...entory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala
@@ -153,8 +153,8 @@ object VmType {
   case object OpenVZ        extends VmType("openvz")
   case object LXC           extends VmType("lxc")
 
-  def all:              Set[VmType] = ca.mrvisser.sealerate.values[VmType]
-  def parse(s: String): VmType      = all.find(_.name == s.toLowerCase).getOrElse(UnknownVmType)
+  def all: Set[VmType] = ca.mrvisser.sealerate.values[VmType]
+  def parse(s: String): VmType = all.find(_.name == s.toLowerCase).getOrElse(UnknownVmType)
 }
 
 /**

diff --git a/...inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala b/...inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
@@ -536,19 +536,19 @@ object KeyStatus {
 final case class AgentCapability(value: String) extends AnyVal
 
 final case class NodeInventory(
-    main:               NodeSummary,
-    name:               Option[String] = None,
-    description:        Option[String] = None,
-    ram:                Option[MemorySize] = None,
-    swap:               Option[MemorySize] = None,
-    inventoryDate:      Option[DateTime] = None,
-    receiveDate:        Option[DateTime] = None,
-    archDescription:    Option[String] = None,
-    lastLoggedUser:     Option[String] = None,
-    lastLoggedUserTime: Option[DateTime] = None,
-    agents:             Seq[AgentInfo] = Seq(),
-    serverIps:          Seq[String] = Seq(),
-    machineId:          Option[(MachineUuid, InventoryStatus)] =
+    main:                 NodeSummary,
+    name:                 Option[String] = None,
+    description:          Option[String] = None,
+    ram:                  Option[MemorySize] = None,
+    swap:                 Option[MemorySize] = None,
+    inventoryDate:        Option[DateTime] = None,
+    receiveDate:          Option[DateTime] = None,
+    archDescription:      Option[String] = None,
+    lastLoggedUser:       Option[String] = None,
+    lastLoggedUserTime:   Option[DateTime] = None,
+    agents:               Seq[AgentInfo] = Seq(),
+    serverIps:            Seq[String] = Seq(),
+    machineId:            Option[(MachineUuid, InventoryStatus)] =
       None, // if we want several ids, we would have to ass an "alternate machine" field
 
     softwareIds:          Seq[SoftwareUuid] = Seq(),

diff --git a/...ry-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala b/...ry-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala
@@ -37,8 +37,8 @@
 
 package com.normation.inventory.services.core
 
-import com.normation.errors._
-import com.normation.inventory.domain._
+import com.normation.errors.*
+import com.normation.inventory.domain.*
 
 trait ReadOnlyMachineRepository {
 

diff --git a/...tory/inventory-api/src/main/scala/com/normation/inventory/services/core/SoftwareDAO.scala b/...tory/inventory-api/src/main/scala/com/normation/inventory/services/core/SoftwareDAO.scala
@@ -37,7 +37,7 @@
 
 package com.normation.inventory.services.core
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.InventoryStatus
 import com.normation.inventory.domain.NodeId
 import com.normation.inventory.domain.Software

diff --git a/...i/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala b/...i/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala
@@ -36,17 +36,17 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.errors.IOResult
-import com.normation.inventory.domain.{PublicKey => AgentKey, _}
+import com.normation.inventory.domain.{PublicKey as AgentKey, *}
 import java.io.InputStream
 import java.security.PublicKey
 import java.security.Signature
 import java.util.Properties
 import org.apache.commons.io.IOUtils
 import org.bouncycastle.util.encoders.Hex
-import zio._
-import zio.syntax._
+import zio.*
+import zio.syntax.*
 
 /**
  * We are using a simple date structure that handle the digest file
@@ -83,7 +83,7 @@ class ParseInventoryDigestFileV1 extends ParseInventoryDigestFile {
 
     for {
       loaded <- ZIO.attempt {
-                  import scala.jdk.CollectionConverters._
+                  import scala.jdk.CollectionConverters.*
                   properties.load(is)
                   properties.asInstanceOf[java.util.Map[String, String]].asScala.toMap
                 } mapError { ex =>

diff --git a/...ry-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala b/...ry-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala
@@ -37,11 +37,11 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
-import com.normation.inventory.domain._
-import net.liftweb.common._
-import zio._
-import zio.syntax._
+import com.normation.errors.*
+import com.normation.inventory.domain.*
+import net.liftweb.common.*
+import zio.*
+import zio.syntax.*
 
 /*
  * Implementation of IdFinderAction that is pipelinable

diff --git a/...ory-api/src/main/scala/com/normation/inventory/services/provisioning/IdFinderAction.scala b/...ory-api/src/main/scala/com/normation/inventory/services/provisioning/IdFinderAction.scala
@@ -37,8 +37,8 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
-import com.normation.inventory.domain._
+import com.normation.errors.*
+import com.normation.inventory.domain.*
 
 /**
  * Generic interface to the service that try

diff --git a/...ry-api/src/main/scala/com/normation/inventory/services/provisioning/InventoryParser.scala b/...ry-api/src/main/scala/com/normation/inventory/services/provisioning/InventoryParser.scala
@@ -37,13 +37,13 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.Inventory
 import com.normation.inventory.domain.InventoryError
 import java.io.InputStream
-import scala.xml._
-import zio._
-import zio.syntax._
+import scala.xml.*
+import zio.*
+import zio.syntax.*
 
 /**
  * General interface to process inventory files

diff --git a/...ory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala b/...ory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala
@@ -37,12 +37,12 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.Inventory
 import com.normation.inventory.domain.InventoryProcessingLogger
-import com.normation.zio._
+import com.normation.zio.*
 import net.liftweb.common.Loggable
-import zio._
+import zio.*
 
 /**
  *

diff --git a/...ventory-api/src/main/scala/com/normation/inventory/services/provisioning/PostCommit.scala b/...ventory-api/src/main/scala/com/normation/inventory/services/provisioning/PostCommit.scala
@@ -37,7 +37,7 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.Inventory
 
 /**

diff --git a/...nventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreCommit.scala b/...nventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreCommit.scala
@@ -37,7 +37,7 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.inventory.domain.Inventory
 
 /**

diff --git a/...api/src/main/scala/com/normation/inventory/services/provisioning/PreInventoryParser.scala b/...api/src/main/scala/com/normation/inventory/services/provisioning/PreInventoryParser.scala
@@ -37,7 +37,7 @@
 
 package com.normation.inventory.services.provisioning
 
-import com.normation.errors._
+import com.normation.errors.*
 import scala.xml.NodeSeq
 
 /**

diff --git a/...nventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala b/...nventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala
@@ -38,9 +38,9 @@
 package com.normation.inventory.domain
 
 import com.normation.zio.ZioRuntime
-import org.junit.runner._
-import org.specs2.mutable._
-import org.specs2.runner._
+import org.junit.runner.*
+import org.specs2.mutable.*
+import org.specs2.runner.*
 
 /**
  * Test properties about agent type, especially regarding serialisation

diff --git a/...ap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/MemoryTest.scala b/...ap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/MemoryTest.scala
@@ -37,9 +37,9 @@
 
 package com.normation.inventory.domain
 
-import org.junit.runner._
-import org.specs2.mutable._
-import org.specs2.runner._
+import org.junit.runner.*
+import org.specs2.mutable.*
+import org.specs2.runner.*
 
 /**
  * Test properties about Memory serialization and deserialization

diff --git a/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala b/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
@@ -37,24 +37,24 @@
 
 package com.normation.inventory.provisioning.fusion
 
-import com.normation.errors._
-import com.normation.inventory.domain._
+import com.normation.errors.*
+import com.normation.inventory.domain.*
 import com.normation.inventory.domain.InventoryError.Inconsistency
 import com.normation.inventory.domain.NodeTimezone
-import com.normation.inventory.domain.VmType._
-import com.normation.inventory.services.provisioning._
+import com.normation.inventory.domain.VmType.*
+import com.normation.inventory.services.provisioning.*
 import com.normation.utils.HostnameRegex
 import com.normation.utils.StringUuidGenerator
-import com.softwaremill.quicklens._
+import com.softwaremill.quicklens.*
 import java.net.InetAddress
 import java.util.Locale
 import net.liftweb.json.JsonAST.JString
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.DateTimeFormatter
-import scala.xml._
-import zio._
-import zio.syntax._
+import scala.xml.*
+import zio.*
+import zio.syntax.*
 
 class FusionInventoryParser(
     uuidGen:                      StringUuidGenerator,
@@ -285,7 +285,7 @@ class FusionInventoryParser(
 
   // the whole content of the CUSTOM_PROPERTIES attribute should be valid JSON Array
   def processCustomProperties(xml: NodeSeq): List[CustomProperty] = {
-    import net.liftweb.json._
+    import net.liftweb.json.*
 
     parseOpt(xml.text) match {
       case None       => Nil
@@ -889,7 +889,7 @@ class FusionInventoryParser(
   }
 
   def processNetworks(n: NodeSeq): Option[Network] = {
-    import com.normation.inventory.domain.InetAddressUtils._
+    import com.normation.inventory.domain.InetAddressUtils.*
     // in fusion inventory, we may have several IP address separated by comma
     def getAddresses(addressString: String): Seq[InetAddress] = {
       for {

diff --git a/...cala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala b/...cala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala
@@ -38,16 +38,16 @@
 package com.normation.inventory.provisioning
 package fusion
 
-import com.normation.errors._
+import com.normation.errors.*
 import com.normation.errors.RudderError
 import com.normation.inventory.domain.InventoryError
-import com.normation.inventory.services.provisioning._
+import com.normation.inventory.services.provisioning.*
 import com.normation.utils.NodeIdRegex
 import scala.xml.Elem
 import scala.xml.Node
 import scala.xml.NodeSeq
-import zio._
-import zio.syntax._
+import zio.*
+import zio.syntax.*
 
 class PreInventoryParserCheckConsistency extends PreInventoryParser {
   override val name = "post_process_inventory:check_consistency"
@@ -238,9 +238,9 @@ class PreInventoryParserCheckConsistency extends PreInventoryParser {
   // for check kernel version
   private[this] class AddChildrenTo(label: String, newChild: scala.xml.Node) extends scala.xml.transform.RewriteRule {
     override def transform(n: scala.xml.Node): scala.collection.Seq[Node] = n match {
-      case Elem(prefix, "OPERATINGSYSTEM", attribs, scope, child @ _*) =>
+      case Elem(prefix, "OPERATINGSYSTEM", attribs, scope, child*) =>
         Elem(prefix, label, attribs, scope, false, child ++ newChild: _*)
-      case other                                                       => other
+      case other                                                   => other
     }
   }